[SVN-Commit] r1666 - in trunk: devel/nspr security/nss

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sun Aug 24 06:17:52 2014
New Revision: 1666

Log:
convert DEBUG to an option in NSPR/NSS

Modified:
   trunk/devel/nspr/Makefile
   trunk/security/nss/Makefile

Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile	Sun Aug 24 06:17:38 2014	(r1665)
+++ trunk/devel/nspr/Makefile	Sun Aug 24 06:17:52 2014	(r1666)
@@ -23,11 +23,9 @@
 
 LIBRARIES=	libnspr4.so.1 libplc4.so.1 libplds4.so.1
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DEBUG
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
+DEBUG_CONFIGURE_ENABLE=debug
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/nspr
@@ -79,4 +77,4 @@
 	#
 #.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Sun Aug 24 06:17:38 2014	(r1665)
+++ trunk/security/nss/Makefile	Sun Aug 24 06:17:52 2014	(r1666)
@@ -41,15 +41,17 @@
 		p7verify pk12util rsaperf shlibsign signtool signver \
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
-.if !defined(WITH_DEBUG)
+OPTIONS_DEFINE=	DEBUG
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MDEBUG}
 MAKE_ENV+=	BUILD_OPT=1
 BINS=		${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 .else
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == amd64
 USE_BINUTILS=	# intel-gcm.s
 CFLAGS+=	-B${LOCALBASE}/bin
@@ -95,4 +97,4 @@
 	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>