From owner-freebsd-gecko@FreeBSD.ORG  Sun Aug 24 06:17:59 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B00A8FCE
 for <freebsd-gecko@freebsd.org>; Sun, 24 Aug 2014 06:17:59 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4431B3B09
 for <freebsd-gecko@freebsd.org>; Sun, 24 Aug 2014 06:17:59 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s7O6Hvxw075839
 for <freebsd-gecko@freebsd.org>; Sun, 24 Aug 2014 06:17:57 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s7O6Hqsd075292
 for freebsd-gecko@freebsd.org; Sun, 24 Aug 2014 06:17:52 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sun, 24 Aug 2014 06:17:52 GMT
Message-Id: <201408240617.s7O6Hqsd075292@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1666 - in trunk: devel/nspr security/nss
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reply-To: freebsd-gecko@freebsd.org
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Aug 2014 06:17:59 -0000

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>