- Update to 4.8.6

- Add support for powerpc64 [1]

PR:		ports/149045
Submitted by:	Andreas Tobler <andreast-list AT fgznet.ch> [1]
Approved by:	mezz@

6 files changed, 59 insertions, 24 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 0685edb6255d..1a0b36a97167 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.8.2
+DISTVERSION=	4.8.6
 CATEGORIES=	devel
 #MASTER_SITES=	LOCAL/ahze
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index b1898bd9f372..64eba9cce344 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,3 +1,3 @@
-MD5 (nspr-4.8.2.tar.gz) = 2a6fbfa56c9760ed3651d527272249c7
-SHA256 (nspr-4.8.2.tar.gz) = 23ec182a42eec4b6df01f3c02c632ed9f7e004d6c320d048d5fe24054d319bce
-SIZE (nspr-4.8.2.tar.gz) = 1232677
+MD5 (nspr-4.8.6.tar.gz) = 592c275728c29d193fdba8009165990b
+SHA256 (nspr-4.8.6.tar.gz) = d9040bb01536fa63881c423c4fa831ea459696b32d2097f614842f824e1a9f6d
+SIZE (nspr-4.8.6.tar.gz) = 1202257
diff --git a/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg b/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
index ee0a6a27eab5..93917808c5d4 100644
--- a/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
+++ b/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
@@ -1,9 +1,55 @@
---- ../pr/include/md/_freebsd.cfg
-+++ ../pr/include/md/_freebsd.cfg
-@@ -283,6 +283,51 @@
+--- ../pr/include/md/_freebsd.cfg.orig	2007-11-26 19:17:17.000000000 +0100
++++ ../pr/include/md/_freebsd.cfg	2010-06-09 20:30:03.000000000 +0200
+@@ -283,6 +283,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
diff --git a/devel/nspr/files/patch-.._pr_include_md__freebsd.h b/devel/nspr/files/patch-.._pr_include_md__freebsd.h
index 724f58b21b3d..04dfc4a88644 100644
--- a/devel/nspr/files/patch-.._pr_include_md__freebsd.h
+++ b/devel/nspr/files/patch-.._pr_include_md__freebsd.h
@@ -1,15 +1,17 @@
---- ../pr/include/md/_freebsd.h
-+++ ../pr/include/md/_freebsd.h
-@@ -57,6 +57,8 @@
+--- ../pr/include/md/_freebsd.h.orig	2004-11-22 21:24:53.000000000 +0000
++++ ../pr/include/md/_freebsd.h	2010-06-07 20:53:33.000000000 +0000
+@@ -57,6 +57,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
-@@ -106,6 +108,16 @@
+@@ -106,6 +110,16 @@
  #define _PR_IPV6_V6ONLY_PROBE
  #endif
  
diff --git a/devel/nspr/files/patch-warnings b/devel/nspr/files/patch-warnings
index 8ec21cc48f3c..3a89f86e1aed 100644
--- a/devel/nspr/files/patch-warnings
+++ b/devel/nspr/files/patch-warnings
@@ -123,15 +123,3 @@
 +PRJob **polljobs = NULL;
  int poll_timeout;
  PRIntervalTime now;
---- ../pr/include/prlog.h	2009-02-22 14:56:13.000000000 -0500
-+++ ../pr/include/prlog.h	2009-11-04 15:30:48.000000000 -0500
-@@ -232,7 +232,8 @@
- #endif /* NO_NSPR_10_SUPPORT */
- 
-+NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln);
-+
- #if defined(DEBUG) || defined(FORCE_PR_ASSERT)
- 
--NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln);
- #define PR_ASSERT(_expr) \
-     ((_expr)?((void)0):PR_Assert(# _expr,__FILE__,__LINE__))
diff --git a/devel/nspr/pkg-plist b/devel/nspr/pkg-plist
index 7d6788a8e75a..563ed2d8773a 100644
--- a/devel/nspr/pkg-plist
+++ b/devel/nspr/pkg-plist
@@ -42,7 +42,6 @@ include/nspr/plbase64.h
 include/nspr/plerror.h
 include/nspr/plgetopt.h
 include/nspr/plhash.h
-include/nspr/plresolv.h
 include/nspr/plstr.h
 include/nspr/pratom.h
 include/nspr/prbit.h