From beat@FreeBSD.org  Wed Jul 28 19:18:51 2010
Return-Path: <beat@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BAE0106566C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 28 Jul 2010 19:18:51 +0000 (UTC)
	(envelope-from beat@FreeBSD.org)
Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55])
	by mx1.freebsd.org (Postfix) with ESMTP id C24908FC20
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 28 Jul 2010 19:18:50 +0000 (UTC)
Received: from _HOSTNAME_ (126-84.76-83.cust.bluewin.ch [83.76.84.126])
	(authenticated bits=0)
	by marvin.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o6SJImQ5019089
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Jul 2010 19:18:48 GMT
	(envelope-from beat@FreeBSD.org)
Received: by _HOSTNAME_ (sSMTP sendmail emulation); Wed, 28 Jul 2010 21:20:39 +0200
Message-Id: <201007281918.o6SJImQ5019089@marvin.chruetertee.ch>
Date: Wed, 28 Jul 2010 21:20:39 +0200
From: Beat Gtzi <beat@FreeBSD.org>
Reply-To: Beat Gtzi <beat@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: [PATCH] devel/nspr: Update to 4.8.6
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         149045
>Category:       ports
>Synopsis:       [PATCH] devel/nspr: Update to 4.8.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 28 19:20:00 UTC 2010
>Closed-Date:    Wed Jul 28 21:33:51 UTC 2010
>Last-Modified:  Wed Jul 28 21:40:04 UTC 2010
>Originator:     Beat Gtzi
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD daedalus.network.local 8.1-RELEASE FreeBSD 8.1-RELEASE #18 r210472M: Sun Jul 25 19:44:08 CEST 2010 root@daedalus.network.local:/usr/obj/usr/src/sys/BEASTIE i386


	
>Description:
	- Update to 4.8.6. This update is required for the upcoming Firefox 4.
	- Add support for powerpc64. This patch was submitted by Andreas Tobler via the gecko@ SVN.
	
>How-To-Repeat:
	
>Fix:

	

--- nspr-4.8.6.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/nspr/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile	11 Nov 2009 05:36:52 -0000	1.39
+++ Makefile	28 Jul 2010 19:10:29 -0000
@@ -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}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/nspr/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	11 Nov 2009 05:36:52 -0000	1.17
+++ distinfo	28 Jul 2010 19:10:29 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/nspr/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist	28 Jun 2009 19:22:16 -0000	1.9
+++ pkg-plist	28 Jul 2010 19:10:29 -0000
@@ -42,7 +42,6 @@
 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
Index: files/patch-.._pr_include_md__freebsd.cfg
===================================================================
RCS file: /home/pcvs/ports/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg,v
retrieving revision 1.3
diff -u -r1.3 patch-.._pr_include_md__freebsd.cfg
--- files/patch-.._pr_include_md__freebsd.cfg	8 Aug 2009 21:44:10 -0000	1.3
+++ files/patch-.._pr_include_md__freebsd.cfg	28 Jul 2010 19:10:33 -0000
@@ -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
Index: files/patch-.._pr_include_md__freebsd.h
===================================================================
RCS file: /home/pcvs/ports/devel/nspr/files/patch-.._pr_include_md__freebsd.h,v
retrieving revision 1.4
diff -u -r1.4 patch-.._pr_include_md__freebsd.h
--- files/patch-.._pr_include_md__freebsd.h	4 Nov 2008 07:11:16 -0000	1.4
+++ files/patch-.._pr_include_md__freebsd.h	28 Jul 2010 19:10:33 -0000
@@ -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
  
Index: files/patch-warnings
===================================================================
RCS file: /home/pcvs/ports/devel/nspr/files/patch-warnings,v
retrieving revision 1.3
diff -u -r1.3 patch-warnings
--- files/patch-warnings	11 Nov 2009 05:36:53 -0000	1.3
+++ files/patch-warnings	28 Jul 2010 19:10:33 -0000
@@ -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__))
--- nspr-4.8.6.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jul 28 19:20:11 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149045 

From: Jeremy Messenger <mezz.freebsd@gmail.com>
To: bug-followup@FreeBSD.org, beat@FreeBSD.org
Cc:  
Subject: Re: ports/149045: [PATCH] devel/nspr: Update to 4.8.6
Date: Wed, 28 Jul 2010 14:47:25 -0500

 --0016e64607c2193a75048c77e39e
 Content-Type: text/plain; charset=ISO-8859-1
 
 Approved, thanks!
 
 --0016e64607c2193a75048c77e39e
 Content-Type: text/html; charset=ISO-8859-1
 
 <p>Approved, thanks!</p>
 
 --0016e64607c2193a75048c77e39e--
State-Changed-From-To: open->closed 
State-Changed-By: beat 
State-Changed-When: Wed Jul 28 21:33:10 UTC 2010 
State-Changed-Why:  
Committed. Thanks for the quick approval! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149045 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/149045: commit references a PR
Date: Wed, 28 Jul 2010 21:32:28 +0000 (UTC)

 beat        2010-07-28 21:32:09 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/nspr           Makefile distinfo pkg-plist 
     devel/nspr/files     patch-.._pr_include_md__freebsd.cfg 
                          patch-.._pr_include_md__freebsd.h 
                          patch-warnings 
   Log:
   - 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@
   
   Revision  Changes    Path
   1.40      +1 -1      ports/devel/nspr/Makefile
   1.18      +3 -3      ports/devel/nspr/distinfo
   1.4       +49 -3     ports/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
   1.5       +6 -4      ports/devel/nspr/files/patch-.._pr_include_md__freebsd.h
   1.4       +0 -12     ports/devel/nspr/files/patch-warnings
   1.10      +0 -1      ports/devel/nspr/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
