Index: head/devel/nspr/Makefile =================================================================== --- head/devel/nspr/Makefile (revision 394865) +++ head/devel/nspr/Makefile (revision 394866) @@ -1,81 +1,80 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.10.8 -PORTREVISION= 1 +DISTVERSION= 4.10.9 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 WRKSRC= ${WRKDIR}/${DISTNAME}/nspr/build USES= cpe gmake CPE_VENDOR= mozilla CPE_PRODUCT= netscape_portable_runtime USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure CONFIGURE_ARGS= --srcdir=${WRKSRC:H} MAKE_ENV= DIST=${WRKSRC}/dist LIBRARIES= libnspr4.so.1 libplc4.so.1 libplds4.so.1 OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ENABLE=debug do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/nspr ${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \ ${TAR} -C ${STAGEDIR}${PREFIX}/include -xof - ${FIND} ${STAGEDIR}${PREFIX}/include/nspr -type d | \ ${XARGS} ${CHMOD} 0755 ${FIND} ${STAGEDIR}${PREFIX}/include/nspr -type f | \ ${XARGS} ${CHMOD} ${SHAREMODE} ${TAR} -C ${WRKSRC}/dist/lib --dereference -cf - . | \ ${TAR} -C ${STAGEDIR}${PREFIX}/lib -xof - ${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 ${LIBRARIES} .if defined(STRIP) && ${STRIP} != "" ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib} .endif ${CHMOD} ${LIBMODE} ${STAGEDIR}${PREFIX}/lib/${lib} ${LN} -sf ${lib} ${STAGEDIR}${PREFIX}/lib/${lib:R} .endfor prtests: ${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: ${DO_MAKE_BUILD} -C ${WRKSRC}/lib/tests ${WRKSRC}/lib/tests/string ${WRKSRC}/lib/tests/base64t # 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. # ${WRKSRC}/lib/tests/arena # test: libtests prtests #regression-test: test #.if defined(PACKAGE_BUILDING) #post-build: test #.else post-build: # # Please, consider running ``make test'' to find any # possible build problems. # #.endif .include Index: head/devel/nspr/distinfo =================================================================== --- head/devel/nspr/distinfo (revision 394865) +++ head/devel/nspr/distinfo (revision 394866) @@ -1,2 +1,2 @@ -SHA256 (nspr-4.10.8.tar.gz) = 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 -SIZE (nspr-4.10.8.tar.gz) = 1131130 +SHA256 (nspr-4.10.9.tar.gz) = 4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881 +SIZE (nspr-4.10.9.tar.gz) = 1134015 Index: head/devel/nspr/files/patch-bug1163346 =================================================================== --- head/devel/nspr/files/patch-bug1163346 (revision 394865) +++ head/devel/nspr/files/patch-bug1163346 (nonexistent) @@ -1,124 +0,0 @@ ---- ../pr/include/md/_freebsd.cfg.orig 2015-01-22 20:44:59 UTC -+++ ../pr/include/md/_freebsd.cfg -@@ -392,6 +392,108 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__mips64__) -+ -+#if defined(__MIPSEB__) || defined(_MIPSEB) -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#else -+#undef IS_BIG_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#endif -+ -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__mips__) -+ -+#if defined(__MIPSEB__) || defined(_MIPSEB) -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#else -+#undef IS_BIG_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#endif -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" ---- ../pr/include/md/_freebsd.h.orig 2015-01-22 20:44:59 UTC -+++ ../pr/include/md/_freebsd.h -@@ -31,6 +31,10 @@ - #define _PR_SI_ARCHITECTURE "powerpc" - #elif defined(__arm__) - #define _PR_SI_ARCHITECTURE "arm" -+#elif defined(__mips64__) -+#define _PR_SI_ARCHITECTURE "mips64" -+#elif defined(__mips__) -+#define _PR_SI_ARCHITECTURE "mips" - #else - #error "Unknown CPU architecture" - #endif Property changes on: head/devel/nspr/files/patch-bug1163346 ___________________________________________________________________ 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: head/devel/nspr/files/patch-warnings =================================================================== --- head/devel/nspr/files/patch-warnings (revision 394865) +++ head/devel/nspr/files/patch-warnings (revision 394866) @@ -1,144 +1,98 @@ --- ../pr/src/pthreads/ptio.c 2009-05-09 23:07:02.000000000 -0400 +++ ../pr/src/pthreads/ptio.c 2009-11-04 15:24:47.000000000 -0500 @@ -3758,7 +3769,7 @@ * We use these variables to figure out how much time has * elapsed and how much of the timeout still remains. */ - PRIntervalTime start, elapsed, remaining; + PRIntervalTime start = 0, elapsed, remaining; if (pt_TestAbort()) return -1; @@ -4927,6 +4938,7 @@ if (timeout == PR_INTERVAL_NO_TIMEOUT) { tvp = NULL; + start = 0; /* Not needed, but shuts down a warning */ } else { tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout); tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds( --- ../pr/src/pthreads/ptsynch.c Mon Nov 22 16:24:53 2004 +++ ../pr/src/pthreads/ptsynch.c Mon Jul 25 00:03:49 2005 @@ -63,5 +63,5 @@ #endif /* defined(DEBUG) */ -#if defined(FREEBSD) +#if defined(FREEBSD) && (defined(DEBUG) || defined(FORCE_PR_ASSERT)) /* * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK. -@@ -343,5 +343,8 @@ - if (cv != NULL) - { -- int rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); -+#if defined(DEBUG) || defined(FORCE_PR_ASSERT) -+ int rv = -+#endif -+ _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); - PR_ASSERT(0 == rv); - cv->lock = lock; -@@ -358,5 +361,9 @@ - if (0 > PR_AtomicDecrement(&cvar->notify_pending)) - { -- PRIntn rv = pthread_cond_destroy(&cvar->cv); PR_ASSERT(0 == rv); -+#if defined(DEBUG) || defined(FORCE_PR_ASSERT) -+ PRIntn rv = -+#endif -+ pthread_cond_destroy(&cvar->cv); -+ PR_ASSERT(0 == rv); - #if defined(DEBUG) - memset(cvar, 0xaf, sizeof(PRCondVar)); -@@ -1080,6 +1087,9 @@ - if (cv != NULL) - { -+#if defined(DEBUG) || defined(FORCE_PR_ASSERT) - int rv; -- rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); -+ rv = -+#endif -+ _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); - PR_ASSERT(0 == rv); - cv->lock = _PR_NAKED_CV_LOCK; --- ../pr/include/prcountr.h Sun Apr 25 11:00:47 2004 +++ ../pr/include/prcountr.h Mon Jul 25 20:43:03 2005 @@ -427,5 +427,5 @@ (counter) = PR_GetCounter((handle)) #else -#define PR_GET_COUNTER(counter,handle) 0 +#define PR_GET_COUNTER(counter,handle) #endif @@ -501,5 +501,5 @@ (next) = PR_FindNextCounterQname((handle)) #else -#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL +#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) #endif --- ../pr/src/io/prprf.c 2008-05-31 11:10:17.000000000 -0400 +++ ../pr/src/io/prprf.c 2009-11-04 14:27:19.000000000 -0500 @@ -698,5 +698,5 @@ int rv, i; struct NumArg* nas = NULL; - struct NumArg* nap; + struct NumArg* nap = NULL; struct NumArg nasArray[ NAS_DEFAULT_NUM ]; char pattern[20]; --- ../pr/src/io/prscanf.c 2005-08-05 18:44:06.000000000 -0400 +++ ../pr/src/io/prscanf.c 2009-11-04 14:31:24.000000000 -0500 @@ -230,5 +230,5 @@ { char buf[FMAX + 1], *p; - int ch; + int ch = -1; static const char digits[] = "0123456789abcdefABCDEF"; PRBool seenDigit = PR_FALSE; @@ -340,5 +340,5 @@ { char buf[FMAX + 1], *p; - int ch; + int ch = -1; PRBool seenDigit = PR_FALSE; --- ../pr/src/misc/pralarm.c 2009-05-06 01:40:37.000000000 -0400 +++ ../pr/src/misc/pralarm.c 2009-11-04 14:34:27.000000000 -0500 @@ -134,5 +134,5 @@ while (why != abort) { - PRIntervalTime pause; + PRIntervalTime pause = 0; PR_Lock(alarm->lock); --- ../pr/src/misc/prdtoa.c 2009-10-05 18:58:41.000000000 -0400 +++ ../pr/src/misc/prdtoa.c 2009-11-04 14:36:24.000000000 -0500 @@ -2765,5 +2765,5 @@ */ - int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1, + int bbits, b2, b5, be, dig, i, ieps, ilim = -1, ilim0, ilim1 = -1, j, j1, k, k0, k_check, leftright, m2, m5, s2, s5, spec_case, try_quick; ---- ../pr/src/misc/prenv.c 2009-05-06 01:40:37.000000000 -0400 -+++ ../pr/src/misc/prenv.c 2009-11-04 15:02:32.000000000 -0500 -@@ -94,5 +94,10 @@ - - _PR_LOCK_ENV(); -- result = _PR_MD_PUT_ENV(string); -+ /* -+ * putenv() does not modify the contents, but allows -+ * the caller to modify it later. So, it is Ok to -+ * drop the const-ness here... -+ */ -+ result = _PR_MD_PUT_ENV((char *)string); - _PR_UNLOCK_ENV(); - return (result)? PR_FAILURE : PR_SUCCESS; --- ../pr/src/misc/prtpool.c 2005-04-28 18:37:25.000000000 -0400 +++ ../pr/src/misc/prtpool.c 2009-11-04 15:08:05.000000000 -0500 @@ -314,6 +314,6 @@ int rv; PRCList *qp, *nextqp; -PRPollDesc *pollfds; -PRJob **polljobs; +PRPollDesc *pollfds = NULL; +PRJob **polljobs = NULL; int poll_timeout; PRIntervalTime now;