Thu Mar 13 16:56:52 2008 UTC ()
Fix DESTDIR installation.


(joerg)
diff -r1.28 -r1.29 pkgsrc/devel/nss/Makefile
cvs diff -r1.28 -r1.29 pkgsrc/devel/nss/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nss/Makefile 2008/03/03 17:45:36 1.28
+++ pkgsrc/devel/nss/Makefile 2008/03/13 16:56:52 1.29
@@ -1,59 +1,59 @@ @@ -1,59 +1,59 @@
1# $NetBSD: Makefile,v 1.28 2008/03/03 17:45:36 jlam Exp $ 1# $NetBSD: Makefile,v 1.29 2008/03/13 16:56:52 joerg Exp $
2 2
3DISTNAME= nss-3.11.5 3DISTNAME= nss-3.11.5
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_11_5_RTM/src/} 5MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_11_5_RTM/src/}
6 6
7MAINTAINER= mjl@luckie.org.nz 7MAINTAINER= mjl@luckie.org.nz
8HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/ 8HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/
9COMMENT= Libraries to support development of security-enabled applications 9COMMENT= Libraries to support development of security-enabled applications
10 10
11BUILD_DEPENDS+= zip>=2.3:../../archivers/zip 11BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15BUILD_DIRS= mozilla/security/nss 15BUILD_DIRS= mozilla/security/nss
16 16
17USE_TOOLS+= awk gmake perl 17USE_TOOLS+= awk gmake perl
18DIST= ${WRKSRC}/mozilla/dist 18DIST= ${WRKSRC}/mozilla/dist
19BUILD_TARGET= nss_build_all 19BUILD_TARGET= nss_build_all
20MAKE_ENV+= LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss" 20MAKE_ENV+= LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
21MAKE_ENV+= LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1 21MAKE_ENV+= LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1
22 22
 23INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig
 24
23MAKE_JOBS_SAFE= no 25MAKE_JOBS_SAFE= no
24 26
25.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
26 28
27.if ${OBJECT_FMT} == "ELF" 29.if ${OBJECT_FMT} == "ELF"
28SO_SUFFIX= so 30SO_SUFFIX= so
29.elif ${OBJECT_FMT} == "Mach-O" 31.elif ${OBJECT_FMT} == "Mach-O"
30SO_SUFFIX= dylib 32SO_SUFFIX= dylib
31.else 33.else
32SO_SUFFIX= so.1.0 34SO_SUFFIX= so.1.0
33.endif 35.endif
34PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} 36PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
35 37
36.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc) 38.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
37MAKEFLAGS+= NS_USE_GCC=YES 39MAKEFLAGS+= NS_USE_GCC=YES
38.endif 40.endif
39 41
40pre-configure: 42pre-configure:
41 ${CP} ${FILESDIR}/DragonFly.mk \ 43 ${CP} ${FILESDIR}/DragonFly.mk \
42 ${WRKSRC}/mozilla/security/coreconf/ 44 ${WRKSRC}/mozilla/security/coreconf/
43 45
44do-install: 46do-install:
45 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/nss 
46 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/nss 
47 (cd ${DIST}/public && ${PAX} -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ ) 47 (cd ${DIST}/public && ${PAX} -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ )
48 (cd ${DIST}/*_OPT.OBJ/lib && \ 48 (cd ${DIST}/*_OPT.OBJ/lib && \
49 ${PAX} -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ ) 49 ${PAX} -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
50 set -e; \ 50 set -e; \
51 { ${ECHO} "Name: NSS"; \ 51 { ${ECHO} "Name: NSS"; \
52 ${ECHO} "Description: Mozilla Network Security Services"; \ 52 ${ECHO} "Description: Mozilla Network Security Services"; \
53 ${ECHO} "Version: ${PKGVERSION}"; \ 53 ${ECHO} "Version: ${PKGVERSION}"; \
54 ${ECHO} "Cflags: -I${PREFIX}/include/nss"; \ 54 ${ECHO} "Cflags: -I${PREFIX}/include/nss"; \
55 ${ECHO} "Libs: -L${PREFIX}/lib/nss" \ 55 ${ECHO} "Libs: -L${PREFIX}/lib/nss" \
56 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \ 56 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \
57 "-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \ 57 "-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \
58 } >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc 58 } >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
59 59