[Midnightbsd-cvs] mports: Makefile: use bsd.mport.options.mk

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Nov 7 12:59:15 EST 2008


Log Message:
-----------
use bsd.mport.options.mk

Modified Files:
--------------
    mports/sysutils/ucspi-tcp:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/sysutils/ucspi-tcp/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sysutils/ucspi-tcp/Makefile -L sysutils/ucspi-tcp/Makefile -u -r1.2 -r1.3
--- sysutils/ucspi-tcp/Makefile
+++ sysutils/ucspi-tcp/Makefile
@@ -24,13 +24,14 @@
 		RBL2SMTPD "Don't drop connection, pass envvar to smtpd" off
 
 RESTRICTED=	Unsure of djb's license
+# '
 
 ALL_TARGET=	prog install instcheck
 
 SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
 		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 .if defined(WITH_MAN)
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:man \
@@ -50,8 +51,7 @@
 .endif
 
 .if defined(WITH_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+EXTENSIONS+=	openssl
 PATCH_SITES+=	http://www.nrg4u.com/qmail/
 PATCHFILES+=	ucspi-tcp-ssl-20050405.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -67,6 +67,8 @@
 PATCH_DIST_STRIP=	-p1
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-configure:
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc


More information about the Midnightbsd-cvs mailing list