aboutsummaryrefslogtreecommitdiff
path: root/devel/nspr
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-09-09 06:16:35 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-09-09 06:16:35 +0000
commitf4aef6b62c614ecd1d50069031eae67318ac5ff9 (patch)
tree781de0366f06f8728245988a38a42d4e172d024d /devel/nspr
parentebc9843f2f48e534a414da8a8ee31543e08cfdf6 (diff)
Notes
Diffstat (limited to 'devel/nspr')
-rw-r--r--devel/nspr/Makefile16
-rw-r--r--devel/nspr/distinfo4
-rw-r--r--devel/nspr/files/patch-bug7821138
3 files changed, 13 insertions, 15 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 92ae249b5e2f..d4f1d85ae85a 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nspr
-DISTVERSION= 4.10.6
+DISTVERSION= 4.10.7
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
@@ -23,11 +23,9 @@ MAKE_ENV= DIST=${WRKSRC}/dist
LIBRARIES= libnspr4.so.1 libplc4.so.1 libplds4.so.1
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= DEBUG
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
+DEBUG_CONFIGURE_ENABLE=debug
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/nspr
@@ -46,17 +44,17 @@ do-install:
.if defined(STRIP) && ${STRIP} != ""
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
.endif
- ${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/lib/${lib}
+ ${CHMOD} ${LIBMODE} ${STAGEDIR}${PREFIX}/lib/${lib}
${LN} -sf ${lib} ${STAGEDIR}${PREFIX}/lib/${lib:R}
.endfor
prtests:
- ${MAKE_CMD} -C ${WRKSRC}/pr/tests
+ ${DO_MAKE_BUILD} -C ${WRKSRC}/pr/tests
${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
libtests:
- ${MAKE_CMD} -C ${WRKSRC}/lib/tests
+ ${DO_MAKE_BUILD} -C ${WRKSRC}/lib/tests
${WRKSRC}/lib/tests/string
${WRKSRC}/lib/tests/base64t
# The test below is commented out, because arena requires
@@ -79,4 +77,4 @@ post-build:
#
#.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index d553b1fa1220..e7db98c713ae 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.6.tar.gz) = df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a
-SIZE (nspr-4.10.6.tar.gz) = 1131328
+SHA256 (nspr-4.10.7.tar.gz) = 389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938
+SIZE (nspr-4.10.7.tar.gz) = 1131171
diff --git a/devel/nspr/files/patch-bug782113 b/devel/nspr/files/patch-bug782113
index db2e5fc89046..46c2d733f146 100644
--- a/devel/nspr/files/patch-bug782113
+++ b/devel/nspr/files/patch-bug782113
@@ -1,5 +1,5 @@
---- ../pr/include/md/_freebsd.cfg.orig 2014-06-05 21:42:08.000000000 +0000
-+++ ../pr/include/md/_freebsd.cfg 2014-08-18 00:20:35.358964562 +0000
+--- ../pr/include/md/_freebsd.cfg
++++ ../pr/include/md/_freebsd.cfg
@@ -251,6 +251,147 @@
#define PR_ALIGN_OF_POINTER 8
#define PR_ALIGN_OF_WORD 8
@@ -148,8 +148,8 @@
#else
#error "Unknown CPU architecture"
---- ../pr/include/md/_freebsd.h.orig 2014-08-18 00:19:52.236967851 +0000
-+++ ../pr/include/md/_freebsd.h 2014-08-18 00:19:52.507967938 +0000
+--- ../pr/include/md/_freebsd.h
++++ ../pr/include/md/_freebsd.h
@@ -25,6 +25,12 @@
#define _PR_SI_ARCHITECTURE "ia64"
#elif defined(__amd64__)