From owner-freebsd-gecko@FreeBSD.ORG  Fri Sep 28 03:30:13 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B78DD106567B
	for <freebsd-gecko@freebsd.org>; Fri, 28 Sep 2012 03:30:13 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 46AC48FC08
	for <freebsd-gecko@freebsd.org>; Fri, 28 Sep 2012 03:30:13 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q8S3UCxJ075079
	for <freebsd-gecko@freebsd.org>; Fri, 28 Sep 2012 03:30:12 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8S3U7q2074472
	for freebsd-gecko@freebsd.org; Fri, 28 Sep 2012 03:30:07 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 28 Sep 2012 03:30:07 GMT
Message-Id: <201209280330.q8S3U7q2074472@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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r1035 - in trunk: Mk security/nss/files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Fri, 28 Sep 2012 03:30:13 -0000

Author: jbeich
Date: Fri Sep 28 03:30:07 2012
New Revision: 1035

Log:
unbreak --with-system-nss on mozilla-central checkout

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/security/nss/files/nss-config.in

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Fri Sep 28 03:29:58 2012	(r1034)
+++ trunk/Mk/bsd.gecko.mk	Fri Sep 28 03:30:07 2012	(r1035)
@@ -543,7 +543,7 @@
 MOZ_OPTIONS+=	--prefix="${FAKEDIR}"
 
 CPPFLAGS+=		-isystem${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
+LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 
 # Standard depends
 _ALL_DEPENDS=	cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip
@@ -578,8 +578,6 @@
 nss_MOZ_OPTIONS=	--with-system-nss
 nss_EXTRACT_AFTER_ARGS=	--exclude mozilla*/security/coreconf \
 						--exclude mozilla*/security/nss
-nss_CPPFLAGS+=		-I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss
-nss_LDFLAGS+=		-L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 
 png_LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
@@ -606,8 +604,6 @@
 RUN_DEPENDS+=	${${dep}_RUN_DEPENDS}
 MOZ_OPTIONS+=	${${dep}_MOZ_OPTIONS}
 EXTRACT_AFTER_ARGS+=	${${dep}_EXTRACT_AFTER_ARGS}
-CPPFLAGS+=	${${dep}_CPPFLAGS}
-LDFLAGS+=	${${dep}_LDFLAGS}
 .endif
 .endfor
 

Modified: trunk/security/nss/files/nss-config.in
==============================================================================
--- trunk/security/nss/files/nss-config.in	Fri Sep 28 03:29:58 2012	(r1034)
+++ trunk/security/nss/files/nss-config.in	Fri Sep 28 03:30:07 2012	(r1035)
@@ -123,7 +123,7 @@
 fi
 
 if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
+    echo -I$includedir -I$includedir/nss
 fi
 
 if test "$echo_libs" = "yes"; then