Make nss and nspr install pkg-config files. Bump their PKGREVISION.

4 files changed, 28 insertions, 9 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index aa2199c7794..bd9d0104672 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/10/16 11:15:10 jmmv Exp $
 
 DISTNAME=		nspr-4.4.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES?=		${MASTER_SIZE_MOZILLA:=nspr/releases/v4.4.1/src}
 
@@ -42,14 +42,21 @@ do-install:
 	(cd ${WRKSRC}/dist/include && ${PAX} -Lrwpe . ${PREFIX}/include/ )
 	(cd ${WRKSRC}/dist/lib && ${PAX} -Lrwpe . ${PREFIX}/lib/nspr/ )
 	${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin
-
-
-.include "../../mk/pthread.buildlink3.mk"
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
+	{ ${ECHO} "Name: NSPR"; \
+	  ${ECHO} "Description: The Netscape Portable Runtime"; \
+	  ${ECHO} "Version: ${PKGVERSION}"; \
+	  ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \
+	  ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \
+	      "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \
+	      "-lplds4 -lplc4 -lnspr4 ${BUILDLINK_LIBS.pthread}"; \
+	} >${PREFIX}/lib/pkgconfig/nspr.pc
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
 CONFIGURE_ARGS+=	--without-pthreads
 .else
 CONFIGURE_ARGS+=	--with-pthreads
+.include "../../mk/pthread.buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST
index df4940530fc..93f86074943 100644
--- a/devel/nspr/PLIST
+++ b/devel/nspr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/03 17:54:21 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/10/16 11:15:10 jmmv Exp $
 bin/nspr-config
 include/nspr/md/_aix.h
 include/nspr/md/_aix32.cfg
@@ -135,6 +135,7 @@ lib/nspr/libplc4.a
 lib/nspr/libplc4.${SO_SUFFIX}
 lib/nspr/libplds4.a
 lib/nspr/libplds4.${SO_SUFFIX}
+lib/pkgconfig/nspr.pc
 @dirrm include/nspr/private
 @dirrm include/nspr/obsolete
 @dirrm include/nspr/md
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index b5d0a68138c..389393f22af 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/09/20 12:53:40 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2005/10/16 11:15:10 jmmv Exp $
 
 DISTNAME=		nss-3.9.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		security
 MASTER_SITES?=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/
 
@@ -68,6 +68,16 @@ do-install:
 	(cd ${DIST}/public && ${PAX} -Lrwpe . ${PREFIX}/include/nss/ )
 	(cd ${DIST}/${NSS_OBJ_DIR}/lib && \
 		${PAX} -Lrwpe *.${SO_SUFFIX} ${PREFIX}/lib/nss/ )
+	{ ${ECHO} "Name: NSS"; \
+	  ${ECHO} "Description: Mozilla Network Security Services"; \
+	  ${ECHO} "Version: ${PKGVERSION}"; \
+	  ${ECHO} "Cflags: -I${PREFIX}/include/nss"; \
+	  ${ECHO} "Libs: -L${PREFIX}/lib/nss" \
+	      "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \
+	      "-lnss3 -lsmime3 -lssl3 -lsoftokn3 ${BUILDLINK_LIBS.pthread}"; \
+	} >${PREFIX}/lib/pkgconfig/nss.pc
+
+BUILDLINK_DEPENDS.nspr+=	nspr>=4.4.1nb2
 
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/nss/PLIST b/devel/nss/PLIST
index ad0cfbff6ca..32bbcf114f5 100644
--- a/devel/nss/PLIST
+++ b/devel/nss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/03 18:05:40 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/10/16 11:15:10 jmmv Exp $
 include/nss/dbm/cdefs.h
 include/nss/dbm/mcom_db.h
 include/nss/dbm/ncompat.h
@@ -104,6 +104,7 @@ lib/nss/libsmime3.${SO_SUFFIX}
 lib/nss/libsoftokn3.${SO_SUFFIX}
 lib/nss/libssl3.${SO_SUFFIX}
 lib/nss/libswft.${SO_SUFFIX}
+lib/pkgconfig/nss.pc
 @dirrm include/nss/seccmd
 @dirrm include/nss/nss
 @dirrm include/nss/dbm