[pkgsrc/trunk]: pkgsrc/devel Make nss and nspr install pkg-config files. Bum...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fd967fc4f0f
branches:  trunk
changeset: 501023:1fd967fc4f0f
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Oct 16 11:15:10 2005 +0000

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

diffstat:

 devel/nspr/Makefile |  17 ++++++++++++-----
 devel/nspr/PLIST    |   3 ++-
 devel/nss/Makefile  |  14 ++++++++++++--
 devel/nss/PLIST     |   3 ++-
 4 files changed, 28 insertions(+), 9 deletions(-)

diffs (102 lines):

diff -r f0dfcedebbb8 -r 1fd967fc4f0f devel/nspr/Makefile
--- a/devel/nspr/Makefile       Sun Oct 16 09:50:38 2005 +0000
+++ b/devel/nspr/Makefile       Sun Oct 16 11:15:10 2005 +0000
@@ -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 @@
        (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 -r f0dfcedebbb8 -r 1fd967fc4f0f devel/nspr/PLIST
--- a/devel/nspr/PLIST  Sun Oct 16 09:50:38 2005 +0000
+++ b/devel/nspr/PLIST  Sun Oct 16 11:15:10 2005 +0000
@@ -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.${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 -r f0dfcedebbb8 -r 1fd967fc4f0f devel/nss/Makefile
--- a/devel/nss/Makefile        Sun Oct 16 09:50:38 2005 +0000
+++ b/devel/nss/Makefile        Sun Oct 16 11:15:10 2005 +0000
@@ -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 @@
        (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 -r f0dfcedebbb8 -r 1fd967fc4f0f devel/nss/PLIST
--- a/devel/nss/PLIST   Sun Oct 16 09:50:38 2005 +0000
+++ b/devel/nss/PLIST   Sun Oct 16 11:15:10 2005 +0000
@@ -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/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