[Midnightbsd-cvs] mports [19074] nspr 4.10.8
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 23 14:14:08 EDT 2015
Revision: 19074
http://svnweb.midnightbsd.org/mports/?rev=19074
Author: laffer1
Date: 2015-05-23 14:14:07 -0400 (Sat, 23 May 2015)
Log Message:
-----------
nspr 4.10.8
Modified Paths:
--------------
trunk/devel/nspr/Makefile
trunk/devel/nspr/distinfo
trunk/devel/nspr/files/patch-tests
trunk/devel/nspr/pkg-plist
Added Paths:
-----------
trunk/devel/nspr/files/patch-bug1163346
Removed Paths:
-------------
trunk/devel/nspr/files/patch-bug782113
trunk/devel/nspr/files/patch-bug782124
Property Changed:
----------------
trunk/devel/nspr/files/patch-..::config::autoconf.mk.in
trunk/devel/nspr/files/patch-..::configure
trunk/devel/nspr/files/patch-bug301986
trunk/devel/nspr/files/patch-bug782109
trunk/devel/nspr/files/patch-bug782111
trunk/devel/nspr/files/patch-config-nsprc.pc.in
trunk/devel/nspr/files/patch-libtests
trunk/devel/nspr/files/patch-tests
trunk/devel/nspr/files/patch-warnings
Modified: trunk/devel/nspr/Makefile
===================================================================
--- trunk/devel/nspr/Makefile 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/Makefile 2015-05-23 18:14:07 UTC (rev 19074)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= nspr
-DISTVERSION= 4.10
+DISTVERSION= 4.10.8
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
@@ -13,9 +14,10 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/nspr/build
+USES= cpe gmake
+CPE_VENDOR= mozilla
+CPE_PRODUCT= netscape_portable_runtime
USE_LDCONFIG= yes
-USE_GMAKE= yes
-MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT=../configure
CONFIGURE_ARGS= --srcdir=${WRKSRC:H}
@@ -22,13 +24,11 @@
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 <bsd.port.pre.mk>
+OPTIONS_DEFINE= DEBUG
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
+DEBUG_CONFIGURE_ENABLE=debug
do-install:
${MKDIR} ${PREFIX}/include/nspr
@@ -43,7 +43,7 @@
${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin
${MKDIR} ${PREFIX}/libdata/pkgconfig
${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${PREFIX}/libdata/pkgconfig
-.for lib in ${LIBS}
+.for lib in ${LIBRARIES}
.if defined(STRIP) && ${STRIP} != ""
${STRIP_CMD} ${PREFIX}/lib/${lib}
.endif
@@ -52,12 +52,12 @@
.endfor
prtests:
- ${GMAKE} -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:
- ${GMAKE} -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
@@ -80,4 +80,4 @@
#
#.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/devel/nspr/distinfo
===================================================================
--- trunk/devel/nspr/distinfo 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/distinfo 2015-05-23 18:14:07 UTC (rev 19074)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.tar.gz) = 0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16
-SIZE (nspr-4.10.tar.gz) = 1103862
+SHA256 (nspr-4.10.8.tar.gz) = 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15
+SIZE (nspr-4.10.8.tar.gz) = 1131130
Index: trunk/devel/nspr/files/patch-..::config::autoconf.mk.in
===================================================================
--- trunk/devel/nspr/files/patch-..::config::autoconf.mk.in 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-..::config::autoconf.mk.in 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-..::config::autoconf.mk.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/nspr/files/patch-..::configure
===================================================================
--- trunk/devel/nspr/files/patch-..::configure 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-..::configure 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-..::configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Added: trunk/devel/nspr/files/patch-bug1163346
===================================================================
--- trunk/devel/nspr/files/patch-bug1163346 (rev 0)
+++ trunk/devel/nspr/files/patch-bug1163346 2015-05-23 18:14:07 UTC (rev 19074)
@@ -0,0 +1,124 @@
+--- ../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: trunk/devel/nspr/files/patch-bug1163346
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/devel/nspr/files/patch-bug301986
===================================================================
--- trunk/devel/nspr/files/patch-bug301986 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-bug301986 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-bug301986
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/nspr/files/patch-bug782109
===================================================================
--- trunk/devel/nspr/files/patch-bug782109 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-bug782109 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-bug782109
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/nspr/files/patch-bug782111
===================================================================
--- trunk/devel/nspr/files/patch-bug782111 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-bug782111 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-bug782111
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/devel/nspr/files/patch-bug782113
===================================================================
--- trunk/devel/nspr/files/patch-bug782113 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-bug782113 2015-05-23 18:14:07 UTC (rev 19074)
@@ -1,113 +0,0 @@
---- ../pr/include/md/_freebsd.cfg
-+++ ../pr/include/md/_freebsd.cfg
-@@ -251,6 +251,97 @@
- #define PR_ALIGN_OF_POINTER 8
- #define PR_ALIGN_OF_WORD 8
-
-+#elif defined(__powerpc64__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#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(__powerpc__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+
-+#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
-+++ ../pr/include/md/_freebsd.h
-@@ -25,6 +25,10 @@
- #define _PR_SI_ARCHITECTURE "ia64"
- #elif defined(__amd64__)
- #define _PR_SI_ARCHITECTURE "amd64"
-+#elif defined(__powerpc64__)
-+#define _PR_SI_ARCHITECTURE "powerpc64"
-+#elif defined(__powerpc__)
-+#define _PR_SI_ARCHITECTURE "powerpc"
- #else
- #error "Unknown CPU architecture"
- #endif
Deleted: trunk/devel/nspr/files/patch-bug782124
===================================================================
--- trunk/devel/nspr/files/patch-bug782124 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-bug782124 2015-05-23 18:14:07 UTC (rev 19074)
@@ -1,37 +0,0 @@
---- ../pr/src/misc/prsystem.c~
-+++ ../pr/src/misc/prsystem.c
-@@ -24,7 +24,7 @@
-
- /* BSD-derived systems use sysctl() to get the number of processors */
- #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
-- || defined(OPENBSD) || defined(DARWIN)
-+ || defined(OPENBSD) || defined(DRAGONFLY) || defined(DARWIN)
- #define _PR_HAVE_SYSCTL
- #include <sys/param.h>
- #include <sys/sysctl.h>
-@@ -292,15 +292,23 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void)
- if (pageSize >= 0 && pageCount >= 0)
- bytes = (PRUint64) pageSize * pageCount;
-
--#elif defined(NETBSD) || defined(OPENBSD)
--
-+#elif defined(NETBSD) || defined(OPENBSD) \
-+ || defined(FREEBSD) || defined(DRAGONFLY)
- int mib[2];
- int rc;
-+#ifdef HW_PHYSMEM64
- uint64_t memSize;
-+#else
-+ unsigned long memSize;
-+#endif
- size_t len = sizeof(memSize);
-
- mib[0] = CTL_HW;
-+#ifdef HW_PHYSMEM64
- mib[1] = HW_PHYSMEM64;
-+#else
-+ mib[1] = HW_PHYSMEM;
-+#endif
- rc = sysctl(mib, 2, &memSize, &len, NULL, 0);
- if (-1 != rc) {
- bytes = memSize;
Index: trunk/devel/nspr/files/patch-config-nsprc.pc.in
===================================================================
--- trunk/devel/nspr/files/patch-config-nsprc.pc.in 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-config-nsprc.pc.in 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-config-nsprc.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/nspr/files/patch-libtests
===================================================================
--- trunk/devel/nspr/files/patch-libtests 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-libtests 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-libtests
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/nspr/files/patch-tests
===================================================================
--- trunk/devel/nspr/files/patch-tests 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-tests 2015-05-23 18:14:07 UTC (rev 19074)
@@ -279,9 +279,8 @@
while ( rh != NULL )
{
- PR_GET_COUNTER_NAME_FROM_HANDLE( rh, qname, rname, desc );
-- tCtr = PR_GET_COUNTER(tCtr, rh);
+ PR_GET_COUNTER_NAME_FROM_HANDLE( rh, &qn, &rn, &dn );
-+ PR_GET_COUNTER(tCtr, rh);
+ PR_GET_COUNTER(tCtr, rh);
PR_LOG( lm, msgLevel,
( "QName: %s RName: %s Desc: %s Value: %ld\n",
@@ -134,13 +134,13 @@
Property changes on: trunk/devel/nspr/files/patch-tests
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/devel/nspr/files/patch-warnings
===================================================================
--- trunk/devel/nspr/files/patch-warnings 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/files/patch-warnings 2015-05-23 18:14:07 UTC (rev 19074)
Property changes on: trunk/devel/nspr/files/patch-warnings
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/devel/nspr/pkg-plist
===================================================================
--- trunk/devel/nspr/pkg-plist 2015-05-23 16:18:18 UTC (rev 19073)
+++ trunk/devel/nspr/pkg-plist 2015-05-23 18:14:07 UTC (rev 19074)
@@ -90,7 +90,3 @@
lib/libplds4.so
lib/libplds4.so.1
libdata/pkgconfig/nspr.pc
- at dirrm include/nspr/private
- at dirrm include/nspr/obsolete
- at dirrm include/nspr/md
- at dirrm include/nspr
More information about the Midnightbsd-cvs
mailing list