- Update to 4.8

Tested by:	exp-run
Approved by:	gnome (marcus)
Thanks to:	gahr, pav, beat, flo :)

7 files changed, 72 insertions, 202 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 7d1c1735759..5f3aed627ac 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $
 
 PORTNAME=	nspr
-DISTVERSION=	4.7
+DISTVERSION=	4.8
 CATEGORIES=	devel
 #MASTER_SITES=	LOCAL/ahze
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index 941bbb7ecd3..bc9adb70ff1 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,3 +1,3 @@
-MD5 (nspr-4.7.tar.gz) = f937c37f45b116130fef34b15afb6fac
-SHA256 (nspr-4.7.tar.gz) = 6662a33cd04dee12d3b85c195277d05b81f46ec22369589fe371dad06e681aff
-SIZE (nspr-4.7.tar.gz) = 1304632
+MD5 (nspr-4.8.tar.gz) = e0916a72bcc6c427551ea262183fdb26
+SHA256 (nspr-4.8.tar.gz) = a2de84aa21a7bbabd93c4f172123d58c6432c2358807bb260ac338b2dc61dbfe
+SIZE (nspr-4.8.tar.gz) = 1170419
diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure
index e74898f2ca8..90602869ecb 100644
--- a/devel/nspr/files/patch-..::configure
+++ b/devel/nspr/files/patch-..::configure
@@ -1,30 +1,15 @@
---- ../configure.orig	Tue Nov 14 10:37:41 2006
-+++ ../configure	Mon Nov 27 22:52:52 2006
-@@ -3466,16 +3466,21 @@
- #define HAVE_SOCKLEN_T 1
- EOF
- 
--    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+    cat >> confdefs.h <<\EOF
-+#define HAVE_SOCKLEN_T 1
-+EOF
-+
-+    CFLAFS="$CFLAGS $DSO_CFLAGS -ansi -Wall -pipe -DXP_UNIX"
-     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+--- ../configure.orig	2009-05-08 15:12:31.000000000 +0200
++++ ../configure	2009-06-17 09:18:56.000000000 +0200
+@@ -3508,7 +3508,7 @@
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
      if test "$MOZ_OBJFORMAT" = "elf"; then
 -        DLL_SUFFIX=so
 +        DLL_SUFFIX=so.1
      else
          DLL_SUFFIX=so.1.0
      fi
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     DSO_CFLAGS=-fPIC
-     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS="$DSO_LDOPTS $BSD_PTHREAD_LIBS"
-     MDCPUCFG_H=_freebsd.cfg
-     PR_MD_CSRCS=freebsd.c
-     ;;
-@@ -5467,11 +5472,6 @@
+@@ -5649,11 +5649,6 @@
  #define _THREAD_SAFE 1
  EOF
  
@@ -36,7 +21,7 @@
  	    ;;
      *-netbsd*)
  	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-@@ -5864,6 +5864,7 @@
+@@ -6037,6 +6032,7 @@
  config/nsprincl.mk
  config/nsprincl.sh
  config/nspr-config
diff --git a/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg b/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
deleted file mode 100644
index ee0a6a27eab..00000000000
--- a/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../pr/include/md/_freebsd.cfg
-+++ ../pr/include/md/_freebsd.cfg
-@@ -283,6 +283,51 @@
- #define PR_ALIGN_OF_POINTER 8
- #define PR_ALIGN_OF_WORD    8
- 
-+#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"
diff --git a/devel/nspr/files/patch-tests b/devel/nspr/files/patch-tests
index 05fb3b5d046..cc836017f7e 100644
--- a/devel/nspr/files/patch-tests
+++ b/devel/nspr/files/patch-tests
@@ -680,14 +680,6 @@
 +			exitcode = 1;
  			break;
  		default:
-@@ -305,5 +309,6 @@
- }
- 
--void main(int argc, char **argv)
-+int
-+main(int argc, char **argv)
- {
- 	
 @@ -352,3 +357,4 @@
  
  
@@ -727,33 +719,6 @@
 +            ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)),
              PR_PRIORITY_NORMAL, scope, PR_JOINABLE_THREAD, 0);
      if (NULL == clientThread) {
---- ../pr/tests/server_test.c	Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/server_test.c	Mon Jul 25 21:35:37 2005
-@@ -93,5 +93,5 @@
- #define DPRINTF printf
- #else
--#define DPRINTF
-+#define DPRINTF(...)
- #endif
- 
-@@ -531,4 +531,5 @@
- }
- 
-+#if 0
- static void do_workUK(void)
- {
-@@ -551,4 +552,5 @@
-     do_work();
- }
-+#endif
- 
- 
-@@ -568,4 +570,5 @@
- 
- 
-+int
- main(int argc, char **argv)
- {
 --- ../pr/tests/servr_kk.c	Sun Apr 25 11:01:02 2004
 +++ ../pr/tests/servr_kk.c	Mon Jul 25 21:38:28 2005
 @@ -90,5 +90,5 @@
@@ -775,51 +740,6 @@
 +#endif
  
  static void do_workKK(void)
---- ../pr/tests/servr_ku.c	Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/servr_ku.c	Mon Jul 25 21:40:29 2005
-@@ -90,5 +90,5 @@
- #define DPRINTF printf
- #else
--#define DPRINTF
-+#define DPRINTF(...)
- #endif
- 
-@@ -527,4 +527,5 @@
- 
- 
-+int
- main(int argc, char **argv)
- {
---- ../pr/tests/servr_uk.c	Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/servr_uk.c	Mon Jul 25 21:41:31 2005
-@@ -90,5 +90,5 @@
- #define DPRINTF printf
- #else
--#define DPRINTF
-+#define DPRINTF(...)
- #endif
- 
-@@ -529,4 +529,5 @@
- 
- 
-+int
- main(int argc, char **argv)
- {
---- ../pr/tests/servr_uu.c	Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/servr_uu.c	Mon Jul 25 21:42:27 2005
-@@ -90,5 +90,5 @@
- #define DPRINTF printf
- #else
--#define DPRINTF
-+#define DPRINTF(...)
- #endif
- 
-@@ -526,4 +526,5 @@
- 
- 
-+int
- main(int argc, char **argv)
- {
 --- ../pr/tests/short_thread.c	Sun Apr 25 11:01:02 2004
 +++ ../pr/tests/short_thread.c	Mon Jul 25 21:44:20 2005
 @@ -76,6 +76,6 @@
@@ -1232,13 +1152,6 @@
 +            "prsocet_test: PR_TransmitFile failed: (%d, %d)\n",
              PR_GetError(), PR_GetOSError());
          failed_already=1;
-@@ -1527,5 +1531,5 @@
-     if (bytes != LARGE_FILE_SIZE) {
-         fprintf(stderr,
--            "prsocket_test: PR_TransmitFile failed: (%ld, %ld)\n",
-+            "prsocket_test: PR_TransmitFile failed: (%d, %d)\n",
-             PR_GetError(), PR_GetOSError());
-         failed_already=1;
 @@ -1555,5 +1559,5 @@
  									slen, bytes);
          fprintf(stderr,
@@ -1288,13 +1201,6 @@
 +            "prsocket_test: PR_SendFile failed: (%d, %d)\n",
              PR_GetError(), PR_GetOSError());
          failed_already=1;
-@@ -1713,5 +1717,5 @@
- 									slen, bytes);
-         fprintf(stderr,
--            "prsocket_test: PR_SendFile failed: (%ld, %ld)\n",
-+            "prsocket_test: PR_SendFile failed: (%d, %d)\n",
-             PR_GetError(), PR_GetOSError());
-         failed_already=1;
 @@ -1788,5 +1792,5 @@
      }
  
@@ -1365,15 +1271,6 @@
 +        fprintf(stderr,"prsocket_test failed to rmdir %s: (%d, %d)\n",
              TEST_DIR, PR_GetError(), PR_GetOSError());
          failed_already=1;
---- ../pr/tests/sockopt.c	Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/sockopt.c	Mon Jul 25 22:16:20 2005
-@@ -79,5 +79,5 @@
- }  /* Incr */
- 
--PRIntn main(PRIntn argc, char *argv)
-+PRIntn main(PRIntn argc, char *argv[])
- {
-     PRStatus rv;
 --- ../pr/tests/sprintf.c	Sun Apr 25 11:01:02 2004
 +++ ../pr/tests/sprintf.c	Mon Jul 25 22:21:32 2005
 @@ -162,5 +162,5 @@
@@ -1465,13 +1362,6 @@
 +    printf("My Stack Pointer = %p\n", PR_GetSP(me));
      PR_ResumeAll();
  
-@@ -197,5 +199,5 @@
- 
- 
--void
-+int
- main(int argc, char **argv)
- {
 @@ -227,4 +229,6 @@
      CreateThreadsKU();
      PR_Cleanup();
@@ -1893,3 +1783,63 @@
 -
 -
 -
+--- ../pr/tests/server_test.c.orig	2009-03-18 10:49:45.000000000 +0100
++++ ../pr/tests/server_test.c	2009-06-17 09:30:18.000000000 +0200
+@@ -92,7 +92,7 @@
+ #ifdef DEBUGPRINTS
+ #define DPRINTF printf
+ #else
+-#define DPRINTF
++#define DPRINTF(...)
+ #endif
+ 
+ 
+@@ -534,6 +534,7 @@
+     do_work();
+ }
+ 
++#if 0
+ static void do_workUK(void)
+ {
+     ServerScope = PR_LOCAL_THREAD;
+@@ -554,6 +555,7 @@
+     ClientScope = PR_GLOBAL_THREAD;
+     do_work();
+ }
++#endif
+ 
+ 
+ static void Measure(void (*func)(void), const char *msg)
+--- ../pr/tests/servr_ku.c.orig	2009-03-18 10:49:46.000000000 +0100
++++ ../pr/tests/servr_ku.c	2009-06-17 09:51:45.000000000 +0200
+@@ -89,7 +89,7 @@
+ #ifdef DEBUGPRINTS
+ #define DPRINTF printf
+ #else
+-#define DPRINTF
++#define DPRINTF(...)
+ #endif
+ 
+ PRIntn failed_already=0;
+--- ../pr/tests/servr_uk.c.orig	2009-03-18 10:49:46.000000000 +0100
++++ ../pr/tests/servr_uk.c	2009-06-17 09:53:37.000000000 +0200
+@@ -89,7 +89,7 @@
+ #ifdef DEBUGPRINTS
+ #define DPRINTF printf
+ #else
+-#define DPRINTF
++#define DPRINTF(...)
+ #endif
+ 
+ PRIntn failed_already=0;
+--- ../pr/tests/servr_uu.c.orig	2009-03-18 10:49:46.000000000 +0100
++++ ../pr/tests/servr_uu.c	2009-06-17 09:55:30.000000000 +0200
+@@ -89,7 +89,7 @@
+ #ifdef DEBUGPRINTS
+ #define DPRINTF printf
+ #else
+-#define DPRINTF
++#define DPRINTF(...)
+ #endif
+ 
+ PRIntn failed_already=0;
diff --git a/devel/nspr/files/patch-warnings b/devel/nspr/files/patch-warnings
index d4e7145e99f..85949265f27 100644
--- a/devel/nspr/files/patch-warnings
+++ b/devel/nspr/files/patch-warnings
@@ -1,13 +1,3 @@
---- ../pr/src/misc/prdtoa.c	Sun Apr 25 11:01:01 2004
-+++ ../pr/src/misc/prdtoa.c	Sun Jul 24 23:55:19 2005
-@@ -3355,5 +3355,7 @@
- 		}
- 	else {
-+#ifdef Honor_FLT_ROUNDS
-  trimzeros:
-+#endif
- 		while(*--s == '0');
- 		s++;
 --- ../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 @@
diff --git a/devel/nspr/pkg-plist b/devel/nspr/pkg-plist
index 71d505c00c1..7d6788a8e75 100644
--- a/devel/nspr/pkg-plist
+++ b/devel/nspr/pkg-plist
@@ -17,7 +17,6 @@ include/nspr/md/_netbsd.cfg
 include/nspr/md/_nextstep.cfg
 include/nspr/md/_nto.cfg
 include/nspr/md/_openbsd.cfg
-include/nspr/md/_openvms.cfg
 include/nspr/md/_os2.cfg
 include/nspr/md/_osf1.cfg
 include/nspr/md/_qnx.cfg
@@ -27,9 +26,9 @@ include/nspr/md/_scoos.cfg
 include/nspr/md/_solaris.cfg
 include/nspr/md/_sony.cfg
 include/nspr/md/_sunos4.cfg
+include/nspr/md/_symbian.cfg
 include/nspr/md/_unixware.cfg
 include/nspr/md/_unixware7.cfg
-include/nspr/md/_win16.cfg
 include/nspr/md/_win95.cfg
 include/nspr/md/_winnt.cfg
 include/nspr/nspr.h