diff options
| author | flo <flo@FreeBSD.org> | 2012-09-08 06:10:01 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2012-09-08 06:10:01 +0800 |
| commit | f8ae57259d2b6995d3f55494b27d00983b0eab62 (patch) | |
| tree | 260671c3ea7a2a410e3f9cc7f050e3a71604a633 /security | |
| parent | f282aa59ea4a4c778851cc8c8e9910f59bc43330 (diff) | |
| download | freebsd-ports-gnome-f8ae57259d2b6995d3f55494b27d00983b0eab62.tar.gz freebsd-ports-gnome-f8ae57259d2b6995d3f55494b27d00983b0eab62.tar.zst freebsd-ports-gnome-f8ae57259d2b6995d3f55494b27d00983b0eab62.zip | |
- Update firefox to 15.0.1
- Sync changes from gecko repository@r995
general
- don't specify prefix for libevent when using pkg-config
- ia64 and sparc64 use 8k pagesize by default
- add visibility hack for clang 3.2 with libc++
- fix build using clang 3.2 (on FreeBSD 10-CURRENT)
- rename a few more patches to ease tracking of bugzilla bugs
www/seamonkey
- unbreak unsetting LDAP and MAILNEWS options after bug 707305
- use compile time debugging WITH_DEBUG
security/nss
- unbreak install WITH_DEBUG
- unbreak powerpc64
devel/nspr
- use absolute paths when specifiying srcdir to make gdb(1) happy
In collaboration with: andreast, zeising, Jan Beich <jbeich@tormail.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/Makefile | 19 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::FreeBSD.mk | 5 |
2 files changed, 15 insertions, 9 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 5c59ceee6f10..1c7689d895f0 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -31,7 +31,7 @@ USE_LDCONFIG= ${PREFIX}/lib/nss USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ - BUILD_OPT=1 NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 + NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 ALL_TARGET= nss_build_all CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib @@ -41,13 +41,18 @@ EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,} -BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ - INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \ mangle modutil ocspclnt oidcalc p7content p7env p7sign \ p7verify pk12util rsaperf shlibsign signtool signver \ ssltap strsclnt symkeyutil vfychain vfyserv +.if !defined(WITH_DEBUG) +MAKE_ENV+= BUILD_OPT=1 +BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ +.else +BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ +.endif + check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ @@ -87,15 +92,15 @@ do-install: ${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss ${FIND} ${DIST}/public/nss -type l \ -exec ${INSTALL_DATA} {} ${PREFIX}/include/nss/nss \; - ${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \ + ${INSTALL_DATA} ${BINS}/lib/*.so.1 \ ${PREFIX}/lib/nss - ${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \ + ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ ${PREFIX}/lib/nss .for bin in ${INSTALL_BINS} - ${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \ + ${INSTALL_PROGRAM} ${BINS}/bin/${bin} \ ${PREFIX}/bin .endfor - cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \ + cd ${BINS}/lib && \ ${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf - ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk index a6bb4772784c..2b8c57181be8 100644 --- a/security/nss/files/patch-..::coreconf::FreeBSD.mk +++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk @@ -13,14 +13,15 @@ RANLIB = ranlib CPU_ARCH = $(OS_TEST) -@@ -52,6 +52,12 @@ endif +@@ -52,6 +52,13 @@ endif ifeq ($(CPU_ARCH),amd64) CPU_ARCH = x86_64 endif +ifneq (,$(filter powerpc%, $(CPU_ARCH))) +CPU_ARCH = ppc +endif -+ifneq (,$(filter %64, $(CPU_ARCH))) ++ ++ifneq (,$(filter %64, $(OS_TEST))) +USE_64 = 1 +endif |