Use pcap_bpf.h since pcap doesn't provide net/bpf.h anymore; bug 75356.

(Portage version: 2.0.51.19)

5 files changed, 63 insertions, 27 deletions

diff --git a/net-misc/dhcp-agent/ChangeLog b/net-misc/dhcp-agent/ChangeLog
index 95511948a25e..da4387f3c54e 100644
--- a/net-misc/dhcp-agent/ChangeLog
+++ b/net-misc/dhcp-agent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp-agent
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp-agent/ChangeLog,v 1.7 2005/01/29 21:21:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp-agent/ChangeLog,v 1.8 2005/03/31 14:21:21 ka0ttic Exp $
+
+  31 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dhcp-agent-0.41-bpf.diff, dhcp-agent-0.37.ebuild,
+  dhcp-agent-0.41.ebuild:
+  Use pcap_bpf.h since pcap doesn't provide net/bpf.h anymore; bug 75356.
 
   30 Jan 2005; Daniel Black <dragonheart@gentoo.org> dhcp-agent-0.37.ebuild,
   dhcp-agent-0.41.ebuild:
diff --git a/net-misc/dhcp-agent/Manifest b/net-misc/dhcp-agent/Manifest
index 8790b900645d..eebe60065c78 100644
--- a/net-misc/dhcp-agent/Manifest
+++ b/net-misc/dhcp-agent/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2a8b31f2f519f91d4ccd324d5b74db2d ChangeLog 869
-MD5 d710cd7d4c2d5eb29de10b953e1cacaf dhcp-agent-0.37.ebuild 610
-MD5 257700228404d741cee8864a4d8a1385 dhcp-agent-0.41.ebuild 1125
+MD5 d803886d9aab924417c4bd91f0a4b143 dhcp-agent-0.41.ebuild 1260
+MD5 2ab09bc378a40ee2515cc4cbf0406a4e dhcp-agent-0.37.ebuild 737
+MD5 c03ac9b5277c18a54531a87b968731ce ChangeLog 1078
+MD5 266ccfbf119159edc8620b24330a991d files/dhcp-agent-0.41-bpf.diff 970
 MD5 0f4db3ad1136755fd8a72247359cb188 files/digest-dhcp-agent-0.37 67
 MD5 474707d9c00ab92458a152206b997060 files/digest-dhcp-agent-0.41 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB+/56mdTrptrqvGERAvEdAJ0XuCI3U0UhxXSB9UXcJaa8GwyqkgCffT60
-6Iq9NKzob0Jbef9LXxM2crE=
-=yL3l
------END PGP SIGNATURE-----
diff --git a/net-misc/dhcp-agent/dhcp-agent-0.37.ebuild b/net-misc/dhcp-agent/dhcp-agent-0.37.ebuild
index 74b6a52123e4..68fc732210f5 100644
--- a/net-misc/dhcp-agent/dhcp-agent-0.37.ebuild
+++ b/net-misc/dhcp-agent/dhcp-agent-0.37.ebuild
@@ -1,19 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp-agent/dhcp-agent-0.37.ebuild,v 1.10 2005/01/29 21:21:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp-agent/dhcp-agent-0.37.ebuild,v 1.11 2005/03/31 14:21:21 ka0ttic Exp $
 
 DESCRIPTION="dhcp-agent is a portable UNIX Dynamic Host Configuration suite"
 HOMEPAGE="http://dhcp-agent.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dhcp-agent/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="x86 ~sparc"
 IUSE=""
 
 DEPEND=">=dev-libs/libdnet-1.4
 		virtual/libpcap"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:net/bpf.h:pcap-bpf.h:' dhcp-net.c || die "sed failed"
+}
+
 src_install() {
-	emake DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 	dodoc README THANKS TODO UPGRADING CAVEATS
 }
diff --git a/net-misc/dhcp-agent/dhcp-agent-0.41.ebuild b/net-misc/dhcp-agent/dhcp-agent-0.41.ebuild
index 74148b0875de..75c68ddaea82 100644
--- a/net-misc/dhcp-agent/dhcp-agent-0.41.ebuild
+++ b/net-misc/dhcp-agent/dhcp-agent-0.41.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp-agent/dhcp-agent-0.41.ebuild,v 1.2 2005/01/29 21:21:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp-agent/dhcp-agent-0.41.ebuild,v 1.3 2005/03/31 14:21:21 ka0ttic Exp $
+
+inherit eutils
 
 DESCRIPTION="dhcp-agent is a portable UNIX Dynamic Host Configuration suite"
 HOMEPAGE="http://dhcp-agent.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dhcp-agent/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
@@ -17,19 +20,22 @@ DEPEND=">=dev-libs/libdnet-1.7
 
 src_unpack() {
 	unpack ${A}
-	#sed -i -e "s:LDADD = -ldhcputil:LDADD = -L${S}/src/.libs -ldhcputil:g" ${S}/src/Makefile.in
-	sed -i -e "s:LDADD = -ldhcputil:LDADD = -L${S}/src/.libs/ libdhcputil.la:g" \
-		-e 's:${dhcplocalstate:$(DESTDIR)${dhcplocalstate:g' ${S}/src/Makefile.in
-
+	cd ${S}
+	sed -i -e "s:\(LDADD = \)-ldhcputil:\1-L${S}/src/.libs/ libdhcputil.la:g" \
+		-e 's:\(mkdir -p \).*\$\(.*\)\$\(.*\)\$\(.*\):\1\$(DESTDIR)\$\2\$(DESTDIR)\$\3\$(DESTDIR)\$\4:' \
+		src/Makefile.am || die "sed Makefile.am failed"
+	sed -i "s:^\(dhcpdocdir=\).*$:\"\1/share/doc/${PF}\":" configure.ac || \
+		die "sed configure.ac failed"
+	epatch ${FILESDIR}/${P}-bpf.diff
 }
 
 src_compile() {
-	econf `use_enable doc htmldoc` || die
-	emake -j1 || die
-	sed -i -e "s:/usr/doc/dhcp-agent:/usr/share/doc/${PF}:" ${S}/man/dhcp-*.1
+	autoreconf -fi || die "autoreconf failed"
+	econf $(use_enable doc htmldoc) || die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR=${D} dhcpdocdir=/share/doc/${PF} install || die
+	make DESTDIR=${D} install || die "make install failed"
 	dodoc README THANKS TODO UPGRADING CAVEATS
 }
diff --git a/net-misc/dhcp-agent/files/dhcp-agent-0.41-bpf.diff b/net-misc/dhcp-agent/files/dhcp-agent-0.41-bpf.diff
new file mode 100644
index 000000000000..2200ace2d021
--- /dev/null
+++ b/net-misc/dhcp-agent/files/dhcp-agent-0.41-bpf.diff
@@ -0,0 +1,27 @@
+diff --exclude='*~' -urN dhcp-agent-0.41.orig/configure.ac dhcp-agent-0.41/configure.ac
+--- dhcp-agent-0.41.orig/configure.ac	2005-03-31 00:34:41.000000000 -0500
++++ dhcp-agent-0.41/configure.ac	2005-03-31 00:40:21.000000000 -0500
+@@ -58,7 +58,7 @@
+ dnl check header files we should have
+ 
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(inttypes.h signal.h varargs.h stdarg.h sys/utsname.h getopt.h)
++AC_CHECK_HEADERS(inttypes.h signal.h varargs.h stdarg.h sys/utsname.h getopt.h net/bpf.h)
+ 
+ dnl
+ dnl check for types
+diff --exclude='*~' -urN dhcp-agent-0.41.orig/src/dhcp-local.h dhcp-agent-0.41/src/dhcp-local.h
+--- dhcp-agent-0.41.orig/src/dhcp-local.h	2005-03-31 00:34:41.000000000 -0500
++++ dhcp-agent-0.41/src/dhcp-local.h	2005-03-31 00:41:16.000000000 -0500
+@@ -81,7 +81,11 @@
+ #include <time.h>
+ #include <ctype.h>
+ 
++#ifdef HAVE_NET_BPH_H
+ #include <net/bpf.h>
++#define PCAP_DONT_INCLUDE_PCAP_BPF_H
++#endif				/* HAVE_NET_BPH_H */
++
+ #include <dnet.h>
+ #include <pcap.h>
+