summaryrefslogtreecommitdiff
path: root/devel/nspr
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-07-23 17:21:55 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-07-23 17:21:55 +0000
commit35412b878ea687fa50fb79c93d08e95c4b9fa7e1 (patch)
tree007821cded840db6df1cd149169c5aca29abe60f /devel/nspr
parentRemove extraneous trailing slash from MASTERDIR. (diff)
Add additional definitions now that we have gethost_r functions and
hour normal gethost functions are thread-safe. Also, wrap thread-safe definitions around a check for _PR_PTHREADS. Reported by: Sean C. Farley <sean-freebsd@farley.org>
Notes
Notes: svn path=/head/; revision=168569
Diffstat (limited to 'devel/nspr')
-rw-r--r--devel/nspr/Makefile2
-rw-r--r--devel/nspr/files/patch-.._pr_include_md__freebsd.h11
2 files changed, 9 insertions, 4 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 09dc1b834e1f..ce76d2466cb7 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nspr
PORTVERSION= 4.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= nspr/releases/v${PORTVERSION}/src
diff --git a/devel/nspr/files/patch-.._pr_include_md__freebsd.h b/devel/nspr/files/patch-.._pr_include_md__freebsd.h
index d4c9f4ca4e36..b02b5a35df21 100644
--- a/devel/nspr/files/patch-.._pr_include_md__freebsd.h
+++ b/devel/nspr/files/patch-.._pr_include_md__freebsd.h
@@ -1,12 +1,17 @@
---- ../pr/include/md/_freebsd.h.orig Sat Apr 22 17:14:55 2006
-+++ ../pr/include/md/_freebsd.h Sat Apr 22 17:14:47 2006
-@@ -106,6 +106,11 @@
+--- ../pr/include/md/_freebsd.h.orig Mon Nov 22 16:24:53 2004
++++ ../pr/include/md/_freebsd.h Sun Jul 23 13:15:29 2006
+@@ -106,6 +106,16 @@
#define _PR_IPV6_V6ONLY_PROBE
#endif
+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
++#if defined(_PR_PTHREADS)
+#define _PR_HAVE_GETPROTO_R
+#define _PR_HAVE_5_ARG_GETPROTO_R
++#define _PR_HAVE_GETHOST_R
++#define _PR_HAVE_GETHOST_R_INT
++#define _PR_HAVE_THREADSAFE_GETHOST
++#endif
+#endif
+
#define USE_SETJMP