From b3a9391a2240b94f15ceb1808d7d157f0be28255 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 27 Oct 2011 07:58:03 +0000 Subject: [PATCH] match uint64_t and int64_t typedefs with the system ones to avoid confusion in chrome for example ok jasper@ --- devel/nspr/Makefile | 4 ++-- .../patch-mozilla_nsprpub_pr_include_prlong_h | 12 ++++++++++++ .../patch-mozilla_nsprpub_pr_include_prtypes_h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prlong_h create mode 100644 devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prtypes_h diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 95e16e05df0..66e1993e18d 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2011/10/04 21:35:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.38 2011/10/27 07:58:03 robert 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 @@ -9,7 +9,7 @@ COMMENT-docs= HTML Documentation for NSPR VER= 4.8.9 DISTNAME= nspr-${VER} PKGNAME-main= ${DISTNAME} -REVISION-main = 0 +REVISION-main = 1 PKGNAME-docs= nspr-docs-${VER} REVISION-docs = 0 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prlong_h b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prlong_h new file mode 100644 index 00000000000..ed7b728bd0b --- /dev/null +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prlong_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-mozilla_nsprpub_pr_include_prlong_h,v 1.1 2011/10/27 07:58:03 robert Exp $ +--- mozilla/nsprpub/pr/include/prlong.h.orig Wed Oct 12 11:57:07 2011 ++++ mozilla/nsprpub/pr/include/prlong.h Wed Oct 12 11:57:16 2011 +@@ -67,7 +67,7 @@ NSPR_API(PRUint64) LL_MaxUint(void); + #if defined(HAVE_LONG_LONG) + + /* Keep this in sync with prtypes.h. */ +-#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) ++#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) && !defined(__OpenBSD__) + #define LL_MAXINT 9223372036854775807L + #define LL_MININT (-LL_MAXINT - 1L) + #define LL_ZERO 0L diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prtypes_h b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prtypes_h new file mode 100644 index 00000000000..7f8de6b808e --- /dev/null +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_prtypes_h @@ -0,0 +1,12 @@ +$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; + * match uint64_t, otherwise our uint64 typedef conflicts with the uint64 + * typedef in cssmconfig.h, which CoreServices.h includes indirectly. + */ +-#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) ++#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) && !defined(__OpenBSD__) + typedef long PRInt64; + typedef unsigned long PRUint64; + #elif defined(WIN32) && !defined(__GNUC__)