[Midnightbsd-cvs] mports: Makefile: use new options stuff.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Thu Nov 6 15:56:34 EST 2008
Log Message:
-----------
use new options stuff.
Modified Files:
--------------
mports/ftp/proftpd:
Makefile (r1.3 -> r1.4)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/ftp/proftpd/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L ftp/proftpd/Makefile -L ftp/proftpd/Makefile -u -r1.3 -r1.4
--- ftp/proftpd/Makefile
+++ ftp/proftpd/Makefile
@@ -60,6 +60,7 @@
--localstatedir=/var/run \
--sysconfdir=${PREFIX}/etc \
--disable-sendfile
+
OPTIONS= BAN "Include mod_ban (Requires CTRLS)" off \
CLAMAV "Include mod_clamav" off \
CTRLS "Include controls" off \
@@ -85,7 +86,7 @@
LIBDIRS?=
INCLUDEDIRS?=
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
.if !defined(WITHOUT_RATIO)
MODULES:=${MODULES}:mod_ratio
@@ -187,7 +188,7 @@
.endif
.if defined(WITH_OPENSSL)
-.include <${PORTSDIR}/Mk/bsd.openssl.mk>
+EXTENSIONS+= openssl
CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC}
PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB}
MODULES:=${MODULES}:mod_tls
@@ -237,6 +238,8 @@
MODULES:=${MODULES}:mod_ifsession
.endif
+.include <bsd.port.pre.mk>
+
# Keep this here below, in case similar constructs need to be made
CONFIGURE_ENV+= "LIBS=${PROFTPD_LIBS}"
More information about the Midnightbsd-cvs
mailing list