Build -fPIC on FreeBSD too (thanks to Timothy Redaelli, bug #262060).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 78 insertions, 2 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 076bfaee763d..6e68c47cf749 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.118 2009/05/12 10:09:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.119 2009/05/26 08:48:31 jer Exp $
+
+*libpcap-1.0.0-r2 (26 May 2009)
+
+  26 May 2009; Jeroen Roovers <jer@gentoo.org> +libpcap-1.0.0-r2.ebuild,
+  +files/libpcap-1.0.0-freebsd-pic.patch:
+  Build -fPIC on FreeBSD too (thanks to Timothy Redaelli, bug #262060).
 
   12 May 2009; Peter Alfredsen <loki_val@gentoo.org>
   libpcap-1.0.0-r1.ebuild:
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 532f1e0ba01c..c576b7de295a 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -6,6 +6,7 @@ AUX libpcap-0.9.8-pcap_compile.patch 1487 RMD160 f801931d825896d31af682866884178
 AUX libpcap-1.0.0-LDFLAGS.patch 410 RMD160 fe677c8b5e7c9bd62eeaad6e4baa733e10e1b4b2 SHA1 2bb315b365f78405a2cd7be32249bbc20f956e26 SHA256 ea3fffb83db4878bd6086e580e669eda4754df80dae9fef1b36ba444819068bd
 AUX libpcap-1.0.0-bindir.patch 508 RMD160 565810d2b8a46fb7c3c47c5eeca29ac7e82e1289 SHA1 5ea64bb60ffed019a213bc943634cbac2f3d3411 SHA256 677269478a1c4a7cb786fefb3353d565d8ea032b03aa40b9d771cf702152d6f4
 AUX libpcap-1.0.0-cross-linux.patch 1079 RMD160 76d9460f8cd4d022cd5e50ec23c95599f68b161e SHA1 b33c25ee785123a09347da4db5b04e8e63e2093a SHA256 2946f4336a40227caa1904e243cf388aa7ef70926aea881748dd7f3f9305bcfb
+AUX libpcap-1.0.0-freebsd-pic.patch 210 RMD160 e208e84b89c43f890a744d782ab4162db4c10577 SHA1 d83140682f0f3d748d96cd8d2befb20297fd78bf SHA256 b2772a18e81d455e5adccc3fdd1eaccef9047c737c1749d20ee850defc633dc7
 AUX libpcap-1.0.0-install-bindir.patch 493 RMD160 2e30779a1b45cbbeaeec98e2d9b61cd896114d86 SHA1 b950a7c5157652d8e99ca09c58682e1f299038f1 SHA256 17d4a14dbf8a5d12570f5b72cf5b5848988d64a2b60e4dd7a3363daea92b9a5b
 AUX libpcap-1.0.0-install-headers.patch 1447 RMD160 c68db41d4417a57c4b51613699b748a4524781c3 SHA1 83c5496eed2e3f4cc262aa6613596d80883eb9d2 SHA256 4e913dd0a4d460fdf5d57c4ebc67cc379178dcd06c8ef33422661c174ffd7e27
 AUX libpcap-1.0.0-optional-bluetooth.patch 5394 RMD160 df5093800385df09e5a0f9a22d359c5e04269a5f SHA1 bdeb0237b720e40585c463fabc3a305f99170024 SHA256 53b01de2108b00c74e2eda513ae8f5253e2b7d960cb8ab22494cbe0631cb3056
@@ -15,6 +16,7 @@ DIST libpcap-0.9.8.tar.gz 520526 RMD160 2f5ecbc9840d8bd646798c977b7a02abe191311e
 DIST libpcap-1.0.0.tar.gz 524273 RMD160 20857fe6af5dc70fffb19da46e0fee908f55b3ea SHA1 9893654027ae11033d785045ff35583da43fe8fa SHA256 a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
 EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769742 SHA1 edcc59e68dc8a21036c1f5b9df87b9cb0516ef93 SHA256 f5c8ed79b684c390791df95dfaad5b2ab0a6f7108ca6048823f5101f18c24a4e
 EBUILD libpcap-1.0.0-r1.ebuild 1713 RMD160 92070239b089b6edf4b2b9b07dd395478ac4eadb SHA1 8aa7bfec1c906bba048c892a97deac395a923faf SHA256 6b877f1d9a760fb1d796d8a9b242e541cae970b2e8d9700f409226702e0de901
+EBUILD libpcap-1.0.0-r2.ebuild 1753 RMD160 5919c3b1b5a10563bad6c9df2d50533ac5698aa9 SHA1 ed4594fbd71a1b0ef60201c43a6586d36607a5db SHA256 6e1ebec9bce66d7b08c713ea4db7e09a443d408313b0572776d38f74506eda1c
 EBUILD libpcap-1.0.0.ebuild 1848 RMD160 5157adebf36517e05378d9194039075e541497a4 SHA1 f186df5c489c0fb4c6258f98255ff943da61b2f1 SHA256 afc354237c91f1d67694c24ccaa589734b805c5c193699ed324eb6aa1408becb
-MISC ChangeLog 15331 RMD160 cf80be42bc06835da9acfa1c290f050a92d58771 SHA1 de765fa46af34b004a2ca30910e46d51bf54fbf1 SHA256 f7fb15d57f411314142dea2f8257314fb6cdeb6d6421ce2be9e658d0d9b369ef
+MISC ChangeLog 15547 RMD160 d1a14552619b441dc720908ee942ff0e7afc7457 SHA1 6e2797d4ee2b75e097ed7aaf7fc2222c807a31cd SHA256 7ae6c5c99ad46e3831c1a6f54aa6eea7d644daff29a96d9ae021cb972d273e79
 MISC metadata.xml 261 RMD160 5bcf72e234ef387b24ffb9221623eaf927a41f02 SHA1 31a589dbbde4597dc3df248c57b5213889c67423 SHA256 92d6c306fe13ead877997b8ff3007ffa601a1e7c96ca3ec2208f88884a95c791
diff --git a/net-libs/libpcap/files/libpcap-1.0.0-freebsd-pic.patch b/net-libs/libpcap/files/libpcap-1.0.0-freebsd-pic.patch
new file mode 100644
index 000000000000..93b633df6d56
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.0.0-freebsd-pic.patch
@@ -0,0 +1,13 @@
+Compile with -fPIC also on FreeBSD (it's needed for amd64-fbsd)
+
+--- configure.in.orig
++++ configure.in
+@@ -959,7 +959,7 @@
+ 	MAN_MISC_INFO=5
+ 	;;
+ 
+-linux*)
++linux*|freebsd*)
+ 	V_CCOPT="$V_CCOPT -fPIC"
+ 	;;
+ 
diff --git a/net-libs/libpcap/libpcap-1.0.0-r2.ebuild b/net-libs/libpcap/libpcap-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..46096a881863
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.0.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.0-r2.ebuild,v 1.1 2009/05/26 08:48:31 jer Exp $
+
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+	http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 bluetooth"
+
+RDEPEND="!virtual/libpcap
+	bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+PROVIDE="virtual/libpcap"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-cross-linux.patch"
+	epatch "${FILESDIR}/${P}-install-bindir.patch"
+	epatch "${FILESDIR}/${P}-install-headers.patch"
+	epatch "${FILESDIR}/${P}-optional-bluetooth.patch"
+	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
+	epatch "${FILESDIR}/${P}-freebsd-pic.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable ipv6) \
+		$(use_enable bluetooth)
+	emake all shared || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-shared || die "emake install failed"
+
+	dosym libpcap.so.${PV:0:5} /usr/$(get_libdir)/libpcap.so.1
+	dosym libpcap.so.${PV:0:5} /usr/$(get_libdir)/libpcap.so
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h || die "failed to install pcap-int.h"
+	fi
+
+	# We are not installing README.{Win32,aix,hpux,tru64} (bug 183057)
+	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+}