We can't install these libraries into ${PREFIX}/lib, since mozilla

browsers might then falsely load these instead of their own.
So: Install the libraries into their own directory.
Bump PKGREVISION.

4 files changed, 27 insertions, 18 deletions

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 29e4874a142..ef346fedc54 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/03 18:05:40 jschauma Exp $
 
 DISTNAME=		nss-3.9.2
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES?=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/
 
@@ -17,13 +18,11 @@ USE_PERL5=		build
 USE_GNU_TOOLS+=		make
 DIST=			${WRKSRC}/../../dist
 BUILD_TARGET=		nss_build_all
-MAKE_ENV=		BSD_LDOPTS="-L${LOCALBASE}/lib" BUILD_OPT=1
-MAKE_ENV+=		LIBRUNPATH=${PREFIX}/lib
+MAKE_ENV=		BSD_LDOPTS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
+MAKE_ENV+=		LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1
 
 .include		"../../mk/bsd.prefs.mk"
 
-CFLAGS+=		-I${LOCALBASE}/include/nspr
-
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=		so
 .elif ${OBJECT_FMT} == "Mach-O"
@@ -35,9 +34,10 @@ PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/nss
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/nss
 	(cd ${DIST}/public && ${PAX} -Lrwpe . ${PREFIX}/include/nss/ )
 	(cd ${DIST}/${OPSYS}${OS_VERSION}_OPT.OBJ/lib && \
-		${PAX} -Lrwpe *.${SO_SUFFIX} ${PREFIX}/lib/ )
+		${PAX} -Lrwpe *.${SO_SUFFIX} ${PREFIX}/lib/nss/ )
 
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/nss/PLIST b/devel/nss/PLIST
index 4a00674713a..ad0cfbff6ca 100644
--- a/devel/nss/PLIST
+++ b/devel/nss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/03 18:05:40 jschauma Exp $
 include/nss/dbm/cdefs.h
 include/nss/dbm/mcom_db.h
 include/nss/dbm/ncompat.h
@@ -97,14 +97,15 @@ include/nss/nss/watcomfx.h
 include/nss/seccmd/secutil.h
 include/nss/seccmd/zconf.h
 include/nss/seccmd/zlib.h
-lib/libfort.${SO_SUFFIX}
-lib/libnss3.${SO_SUFFIX}
-lib/libnssckbi.${SO_SUFFIX}
-lib/libsmime3.${SO_SUFFIX}
-lib/libsoftokn3.${SO_SUFFIX}
-lib/libssl3.${SO_SUFFIX}
-lib/libswft.${SO_SUFFIX}
+lib/nss/libfort.${SO_SUFFIX}
+lib/nss/libnss3.${SO_SUFFIX}
+lib/nss/libnssckbi.${SO_SUFFIX}
+lib/nss/libsmime3.${SO_SUFFIX}
+lib/nss/libsoftokn3.${SO_SUFFIX}
+lib/nss/libssl3.${SO_SUFFIX}
+lib/nss/libswft.${SO_SUFFIX}
 @dirrm include/nss/seccmd
 @dirrm include/nss/nss
 @dirrm include/nss/dbm
 @dirrm include/nss
+@dirrm lib/nss
diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk
index ae0f57431ca..f3dcc3f46bf 100644
--- a/devel/nss/buildlink3.mk
+++ b/devel/nss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/02/03 18:05:40 jschauma Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NSS_BUILDLINK3_MK:=	${NSS_BUILDLINK3_MK}+
@@ -11,9 +11,17 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnss}
 BUILDLINK_PACKAGES+=	nss
 
 .if !empty(NSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nss+=		nss>=3.9.2
-BUILDLINK_RECOMMENDED.nss+=	nss>=3.9.2
+BUILDLINK_DEPENDS.nss+=		nss>=3.9.2nb1
+BUILDLINK_RECOMMENDED.nss+=	nss>=3.9.2nb1
 BUILDLINK_PKGSRCDIR.nss?=	../../devel/nss
+
+BUILDLINK_FILES.nss+=   	lib/nss/*
+BUILDLINK_FILES.nss+=   	include/nss/*
+
+BUILDLINK_INCDIRS.nss+=        include/nss
+BUILDLINK_LIBDIRS.nss+=        lib/nss
+BUILDLINK_RPATHDIRS.nss+=      lib/nss
+
 .endif  # NSS_BUILDLINK3_MK
 
 .include "../../devel/nspr/buildlink3.mk"
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 6fa8e16d0be..e337ae1dfa3 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2005/02/03 18:05:40 jschauma Exp $
 
 SHA1 (nss-3.9.2.tar.gz) = 017b748d92c5f7376bda78915d1b78b260b44133
 Size (nss-3.9.2.tar.gz) = 4734817 bytes