From f69b2a179e9345b598a5d70d44e3226209d6c8b1 Mon Sep 17 00:00:00 2001 From: DPorts Builder Date: Sat, 21 Jun 2014 15:13:03 -0700 Subject: [PATCH] Update devel/nspr to version 4.10.6 --- devel/nspr/Makefile | 10 +++++----- devel/nspr/distinfo | 4 ++-- devel/nspr/dragonfly/patch-nsprpub_configure.in | 10 +++++----- .../dragonfly/patch-nsprpub_pr_include_md__freebsd.h | 4 ++-- .../nspr/dragonfly/patch-nsprpub_pr_include_md__pth.h | 2 +- .../dragonfly/patch-nsprpub_pr_include_md_prosdep.h | 2 +- .../dragonfly/patch-nsprpub_pr_src_md_unix_uxrng.c | 4 ++-- .../nspr/dragonfly/patch-nsprpub_pr_src_misc_prnetdb.c | 8 ++++---- .../dragonfly/patch-nsprpub_pr_src_pthreads_ptio.c | 4 ++-- .../dragonfly/patch-nsprpub_pr_src_pthreads_ptsynch.c | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 137be465960..7b3c89ddb25 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -2,25 +2,25 @@ # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.10.4 +DISTVERSION= 4.10.6 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src MAINTAINER= gecko@FreeBSD.org -COMMENT= A platform-neutral API for system level and libc like functions +COMMENT= Platform-neutral API for system level and libc like functions WRKSRC= ${WRKDIR}/${DISTNAME}/nspr/build USES= gmake USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf CONFIGURE_ARGS= --srcdir=${WRKSRC:H} CONFIGURE_WRKSRC= ${WRKSRC}/.. MAKE_ENV= DIST=${WRKSRC}/dist -LIBS= libnspr4.so.1 libplc4.so.1 libplds4.so.1 +LIBRARIES= libnspr4.so.1 libplc4.so.1 libplds4.so.1 .include @@ -49,7 +49,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig -.for lib in ${LIBS} +.for lib in ${LIBRARIES} .if defined(STRIP) && ${STRIP} != "" ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib} .endif diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index ff07a7051b7..d553b1fa122 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,2 +1,2 @@ -SHA256 (nspr-4.10.4.tar.gz) = eb3fcc5e4cbd90f244c19ea05c2dfb4d22df4acc777d34ec6946dbfae560d838 -SIZE (nspr-4.10.4.tar.gz) = 1107127 +SHA256 (nspr-4.10.6.tar.gz) = df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a +SIZE (nspr-4.10.6.tar.gz) = 1131328 diff --git a/devel/nspr/dragonfly/patch-nsprpub_configure.in b/devel/nspr/dragonfly/patch-nsprpub_configure.in index a9d401868b2..5ec2588319c 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_configure.in +++ b/devel/nspr/dragonfly/patch-nsprpub_configure.in @@ -1,6 +1,6 @@ ---- ../configure.in.orig 2013-03-14 17:34:31.000000000 +0000 +--- ../configure.in.orig 2014-06-05 21:42:08.000000000 +0000 +++ ../configure.in -@@ -2151,6 +2151,20 @@ tools are selected during the Xcode/Deve +@@ -2163,6 +2163,20 @@ tools are selected during the Xcode/Deve MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' ;; @@ -21,7 +21,7 @@ *-osf*) SHELL_OVERRIDE="SHELL = /usr/bin/ksh" AC_DEFINE(XP_UNIX) -@@ -2807,7 +2821,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2769,7 +2783,7 @@ if test -n "$USE_PTHREADS"; then if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then ac_cv_have_dash_pthread=yes case "$target_os" in @@ -30,7 +30,7 @@ # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2872,6 +2886,13 @@ if test -n "$USE_PTHREADS"; then +@@ -2834,6 +2848,13 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS=-pthread fi ;; @@ -44,7 +44,7 @@ *-linux*|*-gnu*|*-k*bsd*-gnu) AC_DEFINE(_REENTRANT) ;; -@@ -2926,7 +2947,7 @@ case "$target" in +@@ -2888,7 +2909,7 @@ case "$target" in AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__freebsd.h b/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__freebsd.h index b720226245e..26741970532 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__freebsd.h +++ b/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__freebsd.h @@ -1,5 +1,5 @@ ---- ../pr/include/md/_freebsd.h.intermediate 2012-12-27 20:11:52.328785000 +0100 -+++ ../pr/include/md/_freebsd.h 2012-12-27 20:13:06.578889000 +0100 +--- ../pr/include/md/_freebsd.h.intermediate 2014-06-20 12:34:59.566379000 +0000 ++++ ../pr/include/md/_freebsd.h @@ -59,7 +59,7 @@ #define _PR_HAVE_GETHOST_R #define _PR_HAVE_GETHOST_R_INT diff --git a/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__pth.h b/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__pth.h index 641d7f497f3..656889f2597 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__pth.h +++ b/devel/nspr/dragonfly/patch-nsprpub_pr_include_md__pth.h @@ -1,4 +1,4 @@ ---- ../pr/include/md/_pth.h.orig 2012-05-18 21:55:29.000000000 +0000 +--- ../pr/include/md/_pth.h.orig 2014-06-05 21:42:08.000000000 +0000 +++ ../pr/include/md/_pth.h @@ -114,7 +114,7 @@ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) diff --git a/devel/nspr/dragonfly/patch-nsprpub_pr_include_md_prosdep.h b/devel/nspr/dragonfly/patch-nsprpub_pr_include_md_prosdep.h index df4789bd156..8566724150f 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_pr_include_md_prosdep.h +++ b/devel/nspr/dragonfly/patch-nsprpub_pr_include_md_prosdep.h @@ -1,4 +1,4 @@ ---- ../pr/include/md/prosdep.h.orig 2012-10-24 22:19:09.000000000 +0000 +--- ../pr/include/md/prosdep.h.orig 2014-06-05 21:42:08.000000000 +0000 +++ ../pr/include/md/prosdep.h @@ -43,6 +43,9 @@ PR_BEGIN_EXTERN_C #elif defined(OPENBSD) diff --git a/devel/nspr/dragonfly/patch-nsprpub_pr_src_md_unix_uxrng.c b/devel/nspr/dragonfly/patch-nsprpub_pr_src_md_unix_uxrng.c index 68fd75c111d..c0ecb0b6654 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_pr_src_md_unix_uxrng.c +++ b/devel/nspr/dragonfly/patch-nsprpub_pr_src_md_unix_uxrng.c @@ -1,6 +1,6 @@ ---- ../pr/src/md/unix/uxrng.c.orig 2012-05-18 21:55:29.000000000 +0000 +--- ../pr/src/md/unix/uxrng.c.orig 2014-06-05 21:42:08.000000000 +0000 +++ ../pr/src/md/unix/uxrng.c -@@ -94,7 +94,7 @@ GetHighResClock(void *buf, size_t maxbyt +@@ -86,7 +86,7 @@ GetHighResClock(void *buf, size_t maxbyt #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \ diff --git a/devel/nspr/dragonfly/patch-nsprpub_pr_src_misc_prnetdb.c b/devel/nspr/dragonfly/patch-nsprpub_pr_src_misc_prnetdb.c index a85e9875fc1..b3d597258e5 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_pr_src_misc_prnetdb.c +++ b/devel/nspr/dragonfly/patch-nsprpub_pr_src_misc_prnetdb.c @@ -1,6 +1,6 @@ ---- ../pr/src/misc/prnetdb.c.intermediate 2012-12-27 20:06:15.368314000 +0100 -+++ ../pr/src/misc/prnetdb.c 2012-12-27 20:09:15.078565000 +0100 -@@ -78,6 +78,11 @@ +--- ../pr/src/misc/prnetdb.c.orig 2014-06-20 12:34:59.566379000 +0000 ++++ ../pr/src/misc/prnetdb.c +@@ -78,6 +78,11 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_GETPROTO_R_INT #endif @@ -12,7 +12,7 @@ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) #define _PR_HAVE_GETPROTO_R -@@ -295,7 +300,7 @@ +@@ -295,7 +300,7 @@ _pr_QueryNetIfs(void) } #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ diff --git a/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptio.c b/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptio.c index 7f672edb666..b1194e70eb9 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptio.c +++ b/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptio.c @@ -1,4 +1,4 @@ ---- ../pr/src/pthreads/ptio.c.orig 2012-03-06 13:14:21.000000000 +0000 +--- ../pr/src/pthreads/ptio.c.orig 2014-06-20 12:34:59.616376000 +0000 +++ ../pr/src/pthreads/ptio.c @@ -180,7 +180,8 @@ static PRBool _pr_ipv6_v6only_on_by_defa || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ @@ -10,7 +10,7 @@ #define _PRSelectFdSetArg_t fd_set * #else #error "Cannot determine architecture" -@@ -3254,7 +3255,7 @@ static PRIOMethods _pr_socketpollfd_meth +@@ -3256,7 +3257,7 @@ static PRIOMethods _pr_socketpollfd_meth || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ || defined(OPENBSD) || defined(BSDI) || defined(NTO) \ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \ diff --git a/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptsynch.c b/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptsynch.c index 6ba91771806..e7b8428e889 100644 --- a/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptsynch.c +++ b/devel/nspr/dragonfly/patch-nsprpub_pr_src_pthreads_ptsynch.c @@ -1,6 +1,6 @@ ---- ../pr/src/pthreads/ptsynch.c.orig 2012-03-06 13:14:21.000000000 +0000 +--- ../pr/src/pthreads/ptsynch.c.orig 2014-06-20 12:34:59.616376000 +0000 +++ ../pr/src/pthreads/ptsynch.c -@@ -810,7 +810,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor +@@ -919,7 +919,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor */ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \ -- 2.41.0