diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-26 17:02:33 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-26 17:02:33 +0000 |
| commit | 98685ed8601fdde6bfb43762e270f574bc389be3 (patch) | |
| tree | 524e44528a28a1c55dd568a9ff194b2397ec2f4c /dev-libs/nspr | |
| parent | sign manifest (diff) | |
| download | gentoo-2-98685ed8601fdde6bfb43762e270f574bc389be3.tar.gz gentoo-2-98685ed8601fdde6bfb43762e270f574bc389be3.tar.bz2 gentoo-2-98685ed8601fdde6bfb43762e270f574bc389be3.zip | |
Simplify patch as per upstrem bug #354305.
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'dev-libs/nspr')
| -rw-r--r-- | dev-libs/nspr/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 6b07fb5c4f3d..21873f752472 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.55 2006/09/26 11:29:29 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.56 2006/09/26 17:02:33 flameeyes Exp $ + + 26 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> + files/nspr-4.6.3-fbsd62.patch: + Simplify patch as per upstrem bug #354305. 26 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> +files/nspr-4.6.3-fbsd62.patch, nspr-4.6.3.ebuild: diff --git a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch index 3c76e94709db..525c44775d82 100644 --- a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch +++ b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch @@ -2,17 +2,14 @@ Index: nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c =================================================================== --- nspr-4.6.3.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c +++ nspr-4.6.3/mozilla/nsprpub/pr/src/misc/prnetdb.c -@@ -108,6 +108,14 @@ PRLock *_pr_dnsLock = NULL; +@@ -108,6 +108,11 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_GETPROTO_R_INT #endif -+#if defined(__FreeBSD__) -+#include <sys/param.h> +#if __FreeBSD_version >= 602000 +#define _PR_HAVE_GETPROTO_R +#define _PR_HAVE_5_ARG_GETPROTO_R +#endif -+#endif + #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) #define _PR_HAVE_GETPROTO_R |