summaryrefslogtreecommitdiff
path: root/devel/nspr/files/patch-bug782124
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-08-30 14:54:17 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-08-30 14:54:17 +0000
commit2f4c3550c50b8b9afa1652eff05e983b4e0d3f51 (patch)
tree2e5e88926978106511a58859840701a45059d65c /devel/nspr/files/patch-bug782124
parent- Use more clear and consistent description for OGG (diff)
- update firefox and thunderbird to 15.0
- update firefox-esr, thunderbird-esr, linux-thunderbird and linux-firefox to 10.0.7 - update seamonkey and linux-seamonkey to 2.12 - update nss to 3.13.6 - update bsdipc code (posix_spawn, SysV shared memory) - rename patches to easily track those not (yet) submitted upstream - reduce package size, except for www/libxul[1] - restore default objdir to what it was in 13.0 - fix mail/enigmail after thunderbird build changes - don't accidentally pick up headers from installed ports[3] - add support for PREFIX != LOCALBASE to Makefile.webplugins [4] - document vulnerabilities in vuln.xml - *miscellaneous cleanups and fixups* Obtained from: OpenBSD ports[1] PR: ports/159831, ports/160933, ports/170467[3], ports/170236 [4] Submitted by: avilla [4] In collaboration with: Jan Beich <jbeich@tormail.net> Who did most of the hard work.
Notes
Notes: svn path=/head/; revision=303378
Diffstat (limited to 'devel/nspr/files/patch-bug782124')
-rw-r--r--devel/nspr/files/patch-bug78212437
1 files changed, 37 insertions, 0 deletions
diff --git a/devel/nspr/files/patch-bug782124 b/devel/nspr/files/patch-bug782124
new file mode 100644
index 000000000000..3f24011274d7
--- /dev/null
+++ b/devel/nspr/files/patch-bug782124
@@ -0,0 +1,37 @@
+--- ../pr/src/misc/prsystem.c~
++++ ../pr/src/misc/prsystem.c
+@@ -24,7 +24,7 @@
+
+ /* BSD-derived systems use sysctl() to get the number of processors */
+ #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
+- || defined(OPENBSD) || defined(DARWIN)
++ || defined(OPENBSD) || defined(DRAGONFLY) || defined(DARWIN)
+ #define _PR_HAVE_SYSCTL
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+@@ -292,15 +292,23 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void)
+ if (pageSize >= 0 && pageCount >= 0)
+ bytes = (PRUint64) pageSize * pageCount;
+
+-#elif defined(NETBSD) || defined(OPENBSD)
+-
++#elif defined(NETBSD) || defined(OPENBSD) \
++ || defined(FREEBSD) || defined(DRAGONFLY)
+ int mib[2];
+ int rc;
++#ifdef HW_PHYSMEM64
+ uint64_t memSize;
++#else
++ unsigned long memSize;
++#endif
+ size_t len = sizeof(memSize);
+
+ mib[0] = CTL_HW;
++#ifdef HW_PHYSMEM64
+ mib[1] = HW_PHYSMEM64;
++#else
++ mib[1] = HW_PHYSMEM;
++#endif
+ rc = sysctl(mib, 2, &memSize, &len, NULL, 0);
+ if (-1 != rc) {
+ bytes = memSize;