summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-09-26 11:29:29 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-09-26 11:29:29 +0000
commit4b158fa4db7e2deaa13b5e51989513d5c25bb704 (patch)
treecc8230c593409978fe0c8fd3d9bbcca1476f095b /dev-libs/nspr
parentutil-vserver-0.30.210 needs =automake-1.9*, fixing DEPEND. This fixes #149085... (diff)
downloadgentoo-2-4b158fa4db7e2deaa13b5e51989513d5c25bb704.tar.gz
gentoo-2-4b158fa4db7e2deaa13b5e51989513d5c25bb704.tar.bz2
gentoo-2-4b158fa4db7e2deaa13b5e51989513d5c25bb704.zip
Add patch to build on FreeBSD 6.2.
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'dev-libs/nspr')
-rw-r--r--dev-libs/nspr/ChangeLog6
-rw-r--r--dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch19
-rw-r--r--dev-libs/nspr/nspr-4.6.3.ebuild9
3 files changed, 29 insertions, 5 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 502d0b72a443..6b07fb5c4f3d 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.54 2006/09/21 19:20:03 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.55 2006/09/26 11:29:29 flameeyes Exp $
+
+ 26 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+ +files/nspr-4.6.3-fbsd62.patch, nspr-4.6.3.ebuild:
+ Add patch to build on FreeBSD 6.2.
21 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> nspr-4.6.3.ebuild:
hppa stable, bug #148284
diff --git a/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch
new file mode 100644
index 000000000000..3c76e94709db
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.6.3-fbsd62.patch
@@ -0,0 +1,19 @@
+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;
+ #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
+ #define _PR_HAVE_5_ARG_GETPROTO_R
diff --git a/dev-libs/nspr/nspr-4.6.3.ebuild b/dev-libs/nspr/nspr-4.6.3.ebuild
index b05f3dc462c2..0b9f5189ebd2 100644
--- a/dev-libs/nspr/nspr-4.6.3.ebuild
+++ b/dev-libs/nspr/nspr-4.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.3.ebuild,v 1.8 2006/09/21 19:20:03 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.3.ebuild,v 1.9 2006/09/26 11:29:29 flameeyes Exp $
inherit eutils gnuconfig
@@ -23,6 +23,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
+ epatch "${FILESDIR}"/${PN}-4.6.3-fbsd62.patch
gnuconfig_update
}
@@ -79,15 +80,15 @@ src_install () {
#and link them back :)
cd ${D}/usr/$(get_libdir)/nspr
for file in *.so; do
- mv ${file} ${file}.${MINOR_VERSION}
- ln -s ${file}.${MINOR_VERSION} ${file}
+ mv ${file} ${file}.${MINOR_VERSION}
+ ln -s ${file}.${MINOR_VERSION} ${file}
done
# cope with libraries being in /usr/lib/nspr
dodir /etc/env.d
echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
# install nspr-config
- insinto /usr/bin
+ insinto /usr/bin
doins ${S}/build/config/nspr-config
chmod a+x ${D}/usr/bin/nspr-config