[pkgsrc/trunk]: pkgsrc/devel/nss Only for Linux, FreeBSD, DragonFly and NetBS...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/516fee24b89b
branches:  trunk
changeset: 498526:516fee24b89b
user:      reed <reed%pkgsrc.org@localhost>
date:      Thu Aug 25 00:11:01 2005 +0000

description:
Only for Linux, FreeBSD, DragonFly and NetBSD for now.  NSS will
build and run on other platforms when MAINTAINER knows what magic
Makefile glue is required.  This is from maintainer's discussion
on tech-pkg.

Remove patch-af. Use LD_LIBS instead, which the build already knows
about.

Add custom settings for above platforms so they install correctly.
Idea provided by maintainer on tech-pkg. I tweaked it more.
I tested on NetBSD 2.0.2, Linux and DragonFly.

Also remove blank line from end of Makefile.

diffstat:

 devel/nss/Makefile         |  27 +++++++++++++++++++++++----
 devel/nss/distinfo         |   3 +--
 devel/nss/patches/patch-af |  19 -------------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diffs (102 lines):

diff -r 2d9923cefdff -r 516fee24b89b devel/nss/Makefile
--- a/devel/nss/Makefile        Wed Aug 24 22:43:02 2005 +0000
+++ b/devel/nss/Makefile        Thu Aug 25 00:11:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/19 16:18:02 reed Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/25 00:11:01 reed Exp $
 
 DISTNAME=              nss-3.9.2
 PKGREVISION=           2
@@ -11,12 +11,16 @@
 
 BUILD_DEPENDS+=                zip>=2.3:../../archivers/zip
 
+# NSS will build and run on other platforms when MAINTAINER knows what
+# magic Makefile glue is required
+ONLY_FOR_PLATFORM+=    NetBSD-*-* FreeBSD-*-* Linux-*-* DragonFly-*-*
+
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/mozilla/security/nss
 
 USE_TOOLS+=            gmake perl
 DIST=                  ${WRKSRC}/../../dist
 BUILD_TARGET=          nss_build_all
-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=              LD_LIBS="-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"
@@ -30,6 +34,22 @@
 .endif
 PLIST_SUBST+=          SO_SUFFIX=${SO_SUFFIX}
 
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+NSS_OBJ_DIR=   ${OPSYS}${OS_VERSION}_OPT.OBJ
+.elif ${OPSYS} == "Linux"
+_NSS_SHORT_OS_VERSION!=        echo ${OS_VERSION} | ${SED} -e 's/^\([[:digit:]]\.[[:digit:]]\)\..*$$/\1/'
+.if ${MACHINE_ARCH} == "i386"
+_NSS_MACHINE_ARCH=     _x86
+.elif ${MACHINE_ARCH} == "parisc" || ${MACHINE_ARCH} == "parisc64"
+_NSS_MACHINE_ARCH=     _hppa
+.elif ${MACHINE_ARCH} == "sparc64"
+_NSS_MACHINE_ARCH=     _sparc
+.else
+_NSS_MACHINE_ARCH=     _${MACHINE_ARCH}
+.endif
+NSS_OBJ_DIR=   ${OPSYS}${_NSS_SHORT_OS_VERSION}${_NSS_MACHINE_ARCH}_glibc_PTH_OPT.OBJ
+.endif
+
 pre-configure:
        ${CP} ${FILESDIR}/DragonFly.mk \
                ${WRKDIR}/${DISTNAME}/mozilla/security/coreconf/
@@ -38,10 +58,9 @@
        ${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 && \
+       (cd ${DIST}/${NSS_OBJ_DIR}/lib && \
                ${PAX} -Lrwpe *.${SO_SUFFIX} ${PREFIX}/lib/nss/ )
 
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff -r 2d9923cefdff -r 516fee24b89b devel/nss/distinfo
--- a/devel/nss/distinfo        Wed Aug 24 22:43:02 2005 +0000
+++ b/devel/nss/distinfo        Thu Aug 25 00:11:01 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/08/12 20:11:26 reed Exp $
+$NetBSD: distinfo,v 1.6 2005/08/25 00:11:01 reed Exp $
 
 SHA1 (nss-3.9.2.tar.gz) = 017b748d92c5f7376bda78915d1b78b260b44133
 RMD160 (nss-3.9.2.tar.gz) = c9e41ac596af2e717da76546c3a5dfd37272c195
@@ -8,7 +8,6 @@
 SHA1 (patch-ac) = f1857c2e7de7746e66602155cc3d10996a62fc6b
 SHA1 (patch-ad) = 0fecd3fc1e5865525bcfce2fc6140622bc7a8f19
 SHA1 (patch-ae) = ad64e308931d4eb5cbfb11ca897cd11688af5b4f
-SHA1 (patch-af) = 4c933d1cfb1ec4708b69dec18ea6b3acfbd91cfa
 SHA1 (patch-ag) = e99c7396f4a6b7430321124e7c03528ab6e7681c
 SHA1 (patch-ah) = 6c8c335d9ffe4a1dbc83a3b8defe05930d866a40
 SHA1 (patch-ai) = a68c262b67af7778024b6db350c044fe8474919e
diff -r 2d9923cefdff -r 516fee24b89b devel/nss/patches/patch-af
--- a/devel/nss/patches/patch-af        Wed Aug 24 22:43:02 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
-
---- ../coreconf/NetBSD.mk.orig Thu Jan 20 09:04:51 2005
-+++ ../coreconf/NetBSD.mk      Thu Jan 20 09:06:49 2005
-@@ -58,12 +58,12 @@
- 
- OS_CFLAGS             = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
--OS_LIBS                       = -lcompat
-+OS_LIBS                       = -lcompat $(BSD_LDOPTS)
- 
- ARCH                  = netbsd
- 
- DSO_CFLAGS            = -fPIC -DPIC
--DSO_LDOPTS            = -shared
-+DSO_LDOPTS            = -shared $(BSD_LDOPTS)
- DSO_LDFLAGS           =
- ifeq ($(OBJECT_FMT),ELF)
- DSO_LDOPTS            += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)