Update to nspr 4.9, needed for mozilla 11+.

Tested on alpha amd64 hppa i386 powerpc sparc64, no change in regression
output (well, dtoa still fails, but thats not surprising given
corresponding code is heavily patched)
This commit is contained in:
landry 2012-02-20 09:17:00 +00:00
parent 1bf8237062
commit 73f17c0d11
5 changed files with 28 additions and 30 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2011/10/27 07:58:03 robert Exp $
# $OpenBSD: Makefile,v 1.39 2012/02/20 09:17:00 landry Exp $
# $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
@ -6,12 +6,10 @@ ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
COMMENT-main= Netscape Portable Runtime
COMMENT-docs= HTML Documentation for NSPR
VER= 4.8.9
VER= 4.9
DISTNAME= nspr-${VER}
PKGNAME-main= ${DISTNAME}
REVISION-main = 1
PKGNAME-docs= nspr-docs-${VER}
REVISION-docs = 0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
nspr-reference${EXTRACT_SUFX}:0

View File

@ -1,10 +1,10 @@
MD5 (nspr-4.8.9.tar.gz) = YHcNRdwIwPGBsizfzlvj6A==
MD5 (nspr-4.9.tar.gz) = qgyWCyOp1mo8MMPmuoCpmg==
MD5 (nspr-reference.tar.gz) = jZRQOnk+OzIiUnYci0jz4A==
RMD160 (nspr-4.8.9.tar.gz) = bHCJqdeYNnuNVZ5d6o5zLnO0ffI=
RMD160 (nspr-4.9.tar.gz) = NSmKR1KqZXGWudL0GtRvG+9+IqI=
RMD160 (nspr-reference.tar.gz) = 4eQ4pZI64spNagflIfhYo+D3wcY=
SHA1 (nspr-4.8.9.tar.gz) = UJeF5o9SVCd4x3BEUynMTbFcdJs=
SHA1 (nspr-4.9.tar.gz) = V6a7Ccy5DRQwPD2absJZLYpcB1I=
SHA1 (nspr-reference.tar.gz) = mihC1ynB3kmPoYRmevtjk5qdcec=
SHA256 (nspr-4.8.9.tar.gz) = /0PHyBnnLwO7kI52UsXV9ZpdMe6GwzPmkmUCBxA9HM4=
SHA256 (nspr-4.9.tar.gz) = 7MYyvFeMElZQmZd2Zz7v+VIJavptFR9tkfbDqT4ecWo=
SHA256 (nspr-reference.tar.gz) = zhhZrKNh2VTVMaJ+qR7AzZwW8lssI0mT1E5+d1gHiwo=
SIZE (nspr-4.8.9.tar.gz) = 1235265
SIZE (nspr-4.9.tar.gz) = 1218528
SIZE (nspr-reference.tar.gz) = 195121

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_nsprpub_config_rules_mk,v 1.5 2010/08/30 20:12:55 landry Exp $
--- mozilla/nsprpub/config/rules.mk.orig Tue Mar 30 20:03:10 2010
+++ mozilla/nsprpub/config/rules.mk Sun Aug 1 13:16:27 2010
@@ -214,7 +214,7 @@ ifdef RELEASE_HEADERS
$OpenBSD: patch-mozilla_nsprpub_config_rules_mk,v 1.6 2012/02/20 09:17:00 landry Exp $
--- mozilla/nsprpub/config/rules.mk.orig Mon Aug 29 19:02:51 2011
+++ mozilla/nsprpub/config/rules.mk Fri Feb 17 08:50:22 2012
@@ -215,7 +215,7 @@ ifdef RELEASE_HEADERS
$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
endif
ifdef RELEASE_LIBS

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.12 2011/08/23 20:07:08 landry Exp $
--- mozilla/nsprpub/configure.in.orig Thu Jul 28 15:08:33 2011
+++ mozilla/nsprpub/configure.in Tue Aug 16 09:09:12 2011
@@ -2146,9 +2146,11 @@ mips-sony-newsos*)
$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.13 2012/02/20 09:17:00 landry Exp $
--- mozilla/nsprpub/configure.in.orig Tue Feb 14 20:06:00 2012
+++ mozilla/nsprpub/configure.in Fri Feb 17 08:51:34 2012
@@ -2232,9 +2232,11 @@ mips-sony-newsos*)
AC_DEFINE(OPENBSD)
AC_DEFINE(HAVE_BSD_FLOCK)
AC_DEFINE(HAVE_SOCKLEN_T)
@ -14,11 +14,11 @@ $OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.12 2011/08/23 20:07:08 landry E
DSO_CFLAGS=-fPIC
MDCPUCFG_H=_openbsd.cfg
PR_MD_CSRCS=openbsd.c
@@ -3266,6 +3268,7 @@ config/autoconf.mk
config/nsprincl.mk
config/nsprincl.sh
config/nspr-config
+config/nspr.pc
lib/Makefile
lib/ds/Makefile
lib/libc/Makefile
@@ -3357,6 +3359,7 @@ MAKEFILES="
config/nsprincl.mk
config/nsprincl.sh
config/nspr-config
+ config/nspr.pc
lib/Makefile
lib/ds/Makefile
lib/libc/Makefile

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_nsprpub_pr_include_prtypes_h,v 1.1 2011/10/27 07:58:03 robert Exp $
--- mozilla/nsprpub/pr/include/prtypes.h.orig Wed Oct 12 11:53:51 2011
+++ mozilla/nsprpub/pr/include/prtypes.h Wed Oct 12 11:54:11 2011
@@ -351,7 +351,7 @@ typedef long PRInt32;
$OpenBSD: patch-mozilla_nsprpub_pr_include_prtypes_h,v 1.2 2012/02/20 09:17:00 landry Exp $
--- mozilla/nsprpub/pr/include/prtypes.h.orig Tue Feb 14 19:21:25 2012
+++ mozilla/nsprpub/pr/include/prtypes.h Fri Feb 17 08:50:22 2012
@@ -368,7 +368,7 @@ typedef long PRInt32;
* match uint64_t, otherwise our uint64 typedef conflicts with the uint64
* typedef in cssmconfig.h, which CoreServices.h includes indirectly.
*/
@ -9,4 +9,4 @@ $OpenBSD: patch-mozilla_nsprpub_pr_include_prtypes_h,v 1.1 2011/10/27 07:58:03 r
+#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) && !defined(__OpenBSD__)
typedef long PRInt64;
typedef unsigned long PRUint64;
#elif defined(WIN32) && !defined(__GNUC__)
#define PR_INT64(x) x ## L