Index: branches/2017Q3/devel/nspr/Makefile =================================================================== --- branches/2017Q3/devel/nspr/Makefile (revision 447222) +++ branches/2017Q3/devel/nspr/Makefile (revision 447223) @@ -1,46 +1,46 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.15 +DISTVERSION= 4.16 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src MAINTAINER= gecko@FreeBSD.org COMMENT= Platform-neutral API for system level and libc like functions USES= cpe gmake pathfix CPE_VENDOR= mozilla CPE_PRODUCT= netscape_portable_runtime WRKSRC_SUBDIR= nspr GNU_CONFIGURE= yes USE_LDCONFIG= yes OPTIONS_DEFINE= DEBUG TEST DEBUG_CONFIGURE_ENABLE=debug post-patch: # Do not install tools to build itself @${REINPLACE_CMD} -e '/RELEASE_BINS/d' \ ${WRKSRC}/pr/src/misc/Makefile.in post-build-TEST-on: @${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/lib/tests @${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/pr/tests @${LN} -fs libmy.so.1 ${BUILD_WRKSRC}/pr/tests/dll/libmy.so post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so do-test-TEST-on: ${TEST_WRKSRC}/lib/tests/string ${TEST_WRKSRC}/lib/tests/base64t cd ${TEST_WRKSRC}/pr/tests && ${WRKSRC}/pr/tests/runtests.sh # The test below is commented out, because arena requires # command-line arguments. If you can provide reasonable values # for it, please contact ${MAINTAINER}. Thank you. # ${TEST_WRKSRC}/lib/tests/arena # .include Index: branches/2017Q3/devel/nspr/distinfo =================================================================== --- branches/2017Q3/devel/nspr/distinfo (revision 447222) +++ branches/2017Q3/devel/nspr/distinfo (revision 447223) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496693760 -SHA256 (nspr-4.15.tar.gz) = 27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 -SIZE (nspr-4.15.tar.gz) = 1140182 +TIMESTAMP = 1501158687 +SHA256 (nspr-4.16.tar.gz) = 9b3102d97665504aeee73363c11a21c062ad67a2522242368b7f019f96a53cd1 +SIZE (nspr-4.16.tar.gz) = 1140681 Index: branches/2017Q3/devel/nspr/files/patch-bug1350414 =================================================================== --- branches/2017Q3/devel/nspr/files/patch-bug1350414 (revision 447222) +++ branches/2017Q3/devel/nspr/files/patch-bug1350414 (nonexistent) @@ -1,55 +0,0 @@ ---- configure~ -+++ configure -@@ -6730,6 +6730,8 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5 - - $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h - -+ $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h -+ - CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" - MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - if test "$MOZ_OBJFORMAT" = "elf"; then -@@ -7340,6 +7342,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." - - $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h - -+ $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h -+ - if test -z "$USE_NSPR_THREADS"; then - USE_PTHREADS=1 - fi -@@ -7396,6 +7400,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." - - $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h - -+ $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h -+ - CFLAGS="$CFLAGS -ansi -Wall" - CXXFLAGS="$CXXFLAGS -ansi -Wall" - DLL_SUFFIX=so.1.0 ---- configure.in~ -+++ configure.in -@@ -1554,6 +1554,7 @@ tools are selected during the Xcode/Developer Tools installation.]) - AC_DEFINE(FREEBSD) - AC_DEFINE(HAVE_BSD_FLOCK) - AC_DEFINE(HAVE_SOCKLEN_T) -+ AC_DEFINE(HAVE_POINTER_LOCALTIME_R) - CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" - MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - if test "$MOZ_OBJFORMAT" = "elf"; then -@@ -2114,6 +2115,7 @@ tools are selected during the Xcode/Developer Tools installation.]) - AC_DEFINE(NETBSD) - AC_DEFINE(HAVE_BSD_FLOCK) - AC_DEFINE(HAVE_SOCKLEN_T) -+ AC_DEFINE(HAVE_POINTER_LOCALTIME_R) - if test -z "$USE_NSPR_THREADS"; then - USE_PTHREADS=1 - fi -@@ -2162,6 +2164,7 @@ tools are selected during the Xcode/Developer Tools installation.]) - AC_DEFINE(OPENBSD) - AC_DEFINE(HAVE_BSD_FLOCK) - AC_DEFINE(HAVE_SOCKLEN_T) -+ AC_DEFINE(HAVE_POINTER_LOCALTIME_R) - CFLAGS="$CFLAGS -ansi -Wall" - CXXFLAGS="$CXXFLAGS -ansi -Wall" - DLL_SUFFIX=so.1.0 Property changes on: branches/2017Q3/devel/nspr/files/patch-bug1350414 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q3/devel/nspr/files/patch-bug1350966 =================================================================== --- branches/2017Q3/devel/nspr/files/patch-bug1350966 (revision 447222) +++ branches/2017Q3/devel/nspr/files/patch-bug1350966 (nonexistent) @@ -1,17 +0,0 @@ ---- pr/src/pthreads/ptsynch.c~ -+++ pr/src/pthreads/ptsynch.c -@@ -55,12 +55,11 @@ void _PR_InitLocks(void) - rv = _PT_PTHREAD_MUTEXATTR_INIT(&_pt_mattr); - PR_ASSERT(0 == rv); - --#ifdef LINUX --#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) -+#if (defined(LINUX) && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) || \ -+ (defined(FREEBSD) && __FreeBSD_version > 700055) - rv = pthread_mutexattr_settype(&_pt_mattr, PTHREAD_MUTEX_ADAPTIVE_NP); - PR_ASSERT(0 == rv); - #endif --#endif - - rv = _PT_PTHREAD_CONDATTR_INIT(&_pt_cvar_attr); - PR_ASSERT(0 == rv); Property changes on: branches/2017Q3/devel/nspr/files/patch-bug1350966 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 447222) +++ branches/2017Q3 (revision 447223) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r446781