diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/nss/Makefile | 27 | ||||
| -rw-r--r-- | devel/nss/distinfo | 3 | ||||
| -rw-r--r-- | devel/nss/patches/patch-af | 19 |
3 files changed, 24 insertions, 25 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile index 373dfdd6d99..66183085fb4 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -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 @@ COMMENT= Libraries to support development of security-enabled applications 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 @@ SO_SUFFIX= so.1.0 .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 @@ 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 && \ + (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 --git a/devel/nss/distinfo b/devel/nss/distinfo index 9a21f3cd959..535eabab03f 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -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-ab) = 21008be57eb73f4ddd36cf89d9ca56aa082a43ee 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 --git a/devel/nss/patches/patch-af b/devel/nss/patches/patch-af deleted file mode 100644 index 7390739963b..00000000000 --- a/devel/nss/patches/patch-af +++ /dev/null @@ -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) |