Use emake install. This incidentally installs the .cf man page in the correct location (bug #303919 comment #5). It also installs the executable in /usr/sbin.

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

5 files changed, 21 insertions, 57 deletions

diff --git a/net-analyzer/dhcp_probe/ChangeLog b/net-analyzer/dhcp_probe/ChangeLog
index c837b136117a..4ede93dbc3cd 100644
--- a/net-analyzer/dhcp_probe/ChangeLog
+++ b/net-analyzer/dhcp_probe/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/dhcp_probe
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/ChangeLog,v 1.4 2009/11/19 17:34:00 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/ChangeLog,v 1.5 2010/02/20 16:31:57 jer Exp $
+
+*dhcp_probe-1.3.0-r2 (20 Feb 2010)
+
+  20 Feb 2010; Jeroen Roovers <jer@gentoo.org> -dhcp_probe-1.3.0.ebuild,
+  -dhcp_probe-1.3.0-r1.ebuild, +dhcp_probe-1.3.0-r2.ebuild,
+  files/dhcp_probe.initd:
+  Use emake install. This incidentally installs the .cf man page in the
+  correct location (bug #303919 comment #5). It also installs the executable
+  in /usr/sbin.
 
 *dhcp_probe-1.3.0-r1 (19 Nov 2009)
 
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index 44017c56be9a..2a1bcddf4163 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -7,10 +7,9 @@ AUX 1.3.0/06-return.patch 271 RMD160 dba08ed322a655415038da275cf9bd902c0249d9 SH
 AUX 1.3.0/07-comment.patch 747 RMD160 9ad82819bdefb7e742140ca045a37a8a9096d0f4 SHA1 49bd0a7a4d64528c3a26cfe402f5a961e282de1d SHA256 66129bcd66fe4cede6db6f9954b0d27a01d9a61060f4d3451cc52c6c8997f9b6
 AUX 1.3.0/08-man8.patch 612 RMD160 14d6dddcf19e94d91011f575df2344fa9cb12a1f SHA1 ff4f5bed003752f76e8503ea471c50eecf8d0dcb SHA256 e4112e698ec27b19b7bd99f1a46523675e82fd4be5f3e40f7b6fd4925fe48db7
 AUX dhcp_probe.confd 339 RMD160 d1e318936e215b43c316db5d74977dee8be1ab60 SHA1 eb14ad11f52986baf37968ee27929c43092e0929 SHA256 20c44eafe35b90357acd738fef73aa7b55a3f414a3a3f920bab2d66b6f17171e
-AUX dhcp_probe.initd 1295 RMD160 377f4bbf3aaaf7dffa355e49d100f247ff9eaea1 SHA1 0418d2aa6749fa1d814d30088fc549b4337f7e90 SHA256 55cf1c53fe29e6e6354ed7837fcefc88ce03b763dbe5c5288e198d1575f6dc19
+AUX dhcp_probe.initd 1296 RMD160 da95c774d8dead41dfe54aa40188cacebc461333 SHA1 d51cc141e5ca4394d6f12950ec39cfa7caa792fa SHA256 f9c9412ded85bb2afc7faa9d288a79d44732b91c620257fd0eeba31c2e11153f
 AUX dhcp_probe_mail 627 RMD160 67f8d1fff3882a1ec5423b37382eb4b1292297c7 SHA1 bac0ee9cc1fc42b4b3e01d8547d055539520ef16 SHA256 13837b61cf7e29e311b5cf81fc7cad93d42ceecea76777e1a4e9ae8667d98341
 DIST dhcp_probe-1.3.0.tar.gz 211613 RMD160 fb988165ced12e5baf95ffe030b72999b52d2624 SHA1 c25796bbf70ecffd285ce40ec8bb9956e4654ad1 SHA256 227cd6a82a7fa4d989994cb076f18092bc2c82592ceaeb31c4fdd09294b9265f
-EBUILD dhcp_probe-1.3.0-r1.ebuild 1121 RMD160 03cc0894e732dd53f0ef311cc4612b99fd8416da SHA1 93fcea1f9815f12a030a1091d697f57b4ab39832 SHA256 a1164b1a8ed950db049dcd330b6846d69727d23fd0c75568a7da5a01982f5997
-EBUILD dhcp_probe-1.3.0.ebuild 1051 RMD160 f562b126a357eca5964929865eb7f3e448c00bb7 SHA1 fdee8205a5166d0a7a458ba457f91004c3de38d3 SHA256 7d2de33f4138467fa1c2ee00c41838052960f1e7c23d6e87efd8881de805ad66
-MISC ChangeLog 1124 RMD160 4cba8363d6d774761811060d632ee294ce956b68 SHA1 9d85e5e7ac4445c09db569730054a748a9ddfca3 SHA256 520bffb15144d990dfe44ddd513ab041cee247305499835f27c76a321c062533
+EBUILD dhcp_probe-1.3.0-r2.ebuild 1001 RMD160 a928fd4ce4a882d60f91b5e86ee31ee2230586f8 SHA1 cc594432615eb4eff7488dc55e0de42b93fafa78 SHA256 be3b554ac893a861be6b96469c0a0116fedcb1f3322cf8adf1cb6ef5b7572f99
+MISC ChangeLog 1485 RMD160 6e48ada692aa9b4cf6f51c953a71caced435f752 SHA1 a39c4609172666aa62c271e833390f5cafbb49bb SHA256 6094ff41deb31ceafa2ce3d01a8931475b22f0e45a00303d33fef4e51be1233e
 MISC metadata.xml 387 RMD160 8f48f50bd1b2b6a20fec6089c4e100fbf48167c0 SHA1 fd421b76d2e5756376e3dd65c2f381473e61c1bf SHA256 8ba4bcc9c0681fc85e79fa71905f1a4176170e0ee068593e614a961a739174a9
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r1.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild
index 60a97769b999..c59b6cb2b376 100644
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r1.ebuild
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r1.ebuild,v 1.1 2009/11/19 17:34:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r2.ebuild,v 1.1 2010/02/20 16:31:57 jer Exp $
 
 EAPI="2"
 
@@ -30,9 +30,11 @@ src_configure() {
 }
 
 src_install() {
+	emake install DESTDIR="${D}"
+
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dobin src/dhcp_probe "${FILESDIR}"/dhcp_probe_mail || die "dobin failed"
+
 	dodoc \
 		extras/dhcp_probe.cf.sample \
 		NEWS \
@@ -41,8 +43,4 @@ src_install() {
 		AUTHORS \
 		TODO \
 		|| die "dodoc failed"
-	doman \
-		doc/dhcp_probe.8 \
-		doc/dhcp_probe.cf.5 \
-		|| die "doman failed"
 }
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0.ebuild
deleted file mode 100644
index d3fb4bf55783..000000000000
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/dhcp_probe-1.3.0.ebuild,v 1.2 2009/10/28 04:18:57 robbat2 Exp $
-
-EAPI="2"
-
-DESCRIPTION="dhcp_probe attempts to discover DHCP and BootP servers on a directly-attached Ethernet network"
-HOMEPAGE="http://www.net.princeton.edu/software/dhcp_probe/"
-SRC_URI="http://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r2
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	STRIP=true econf || die "econf failed"
-}
-
-src_install() {
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dobin src/dhcp_probe "${FILESDIR}"/dhcp_probe_mail || die "dobin failed"
-	dodoc \
-		extras/dhcp_probe.cf.sample \
-		NEWS \
-		README \
-		ChangeLog \
-		AUTHORS \
-		TODO \
-		|| die "dodoc failed"
-	doman \
-		doc/dhcp_probe.8 \
-		doc/dhcp_probe.cf.5 \
-		|| die "doman failed"
-}
diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe.initd b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
index 4f13e5ba9d96..e150a48ba48d 100644
--- a/net-analyzer/dhcp_probe/files/dhcp_probe.initd
+++ b/net-analyzer/dhcp_probe/files/dhcp_probe.initd
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/files/dhcp_probe.initd,v 1.1 2009/05/26 00:00:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dhcp_probe/files/dhcp_probe.initd,v 1.2 2010/02/20 16:31:58 jer Exp $
 
 opts="reload"
 
-DHCP_PROBE_BINARY="/usr/bin/dhcp_probe"
+DHCP_PROBE_BINARY="/usr/sbin/dhcp_probe"
 DHCP_PROBE_CONFIG="/etc/dhcp_probe.cf"
 DHCP_PROBE_PIDFILE="/var/run/${SVCNAME}.pid"
 DHCP_PROBE_INTERFACE="${SVCNAME#*.}"