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

[ctriv at midnightbsd.org]

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

Modified Files:
--------------
    mports/net/freeradius:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/freeradius/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L net/freeradius/Makefile -L net/freeradius/Makefile -u -r1.5 -r1.6
--- net/freeradius/Makefile
+++ net/freeradius/Makefile
@@ -63,7 +63,7 @@
 		NOPERL		"Do not require perl (use only if necessary)" off \
 		EXPERIMENTAL	"Build experimental modules" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 # Default requirements for rc script
 _REQUIRE=	NETWORKING SERVERS
@@ -87,11 +87,6 @@
 CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
 		--with-large-files \
 		--with-openssl-includes=${OPENSSLINC}
-# This conditionality avoids -L/usr/lib in the radiusd build step when
-# building with base system OpenSSL
-.if ${OPENSSLLIB} != "/usr/lib"
-CONFIGURE_ARGS+=--with-openssl-libraries=${OPENSSLLIB}
-.endif
 CONFIGURE_ARGS+=--without-rlm_sql_db2 \
 		--without-rlm_sql_freetds \
 		--without-rlm_sql_iodbc \
@@ -170,8 +165,6 @@
 
 .ifdef(WITH_EXPERIMENTAL)
 USE_PYTHON=	yes
-# hack to get the dependency
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=--with-experimental-modules
 PLIST_SUB+=	EXPM=""
 .else
@@ -191,6 +184,14 @@
 PLIST_SUB+=	RLMPERL=""
 .endif
 
+.include <bsd.port.pre.mk>
+
+# This conditionality avoids -L/usr/lib in the radiusd build step when
+# building with base system OpenSSL
+.if ${OPENSSLLIB} != "/usr/lib"
+CONFIGURE_ARGS+=--with-openssl-libraries=${OPENSSLLIB}
+.endif
+
 USE_LDCONFIG=	yes
 
 MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \