Switch to using econf / make install destdir.

4 files changed, 71 insertions, 3 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index d0f01583bdfd..885aad688826 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.38 2004/11/01 10:37:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.39 2004/11/04 03:24:53 vapier Exp $
+
+*dhcpcd-1.3.22_p4-r6 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  dhcpcd-1.3.22_p4-r5.ebuild, +dhcpcd-1.3.22_p4-r6.ebuild:
+  Switch to using econf / make install destdir.
 
   01 Nov 2004; Joshua Kinard <kumba@gentoo.org> dhcpcd-1.3.22_p4-r5.ebuild:
   Marked stable on mips.
diff --git a/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild
index df799212c2fa..05a06c5ee2d6 100644
--- a/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild,v 1.12 2004/11/01 10:37:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r5.ebuild,v 1.13 2004/11/04 03:24:53 vapier Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.phystech.com/pub/${P/_p/-pl}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa ~mips amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="build static"
 
 DEPEND="virtual/libc"
diff --git a/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r6.ebuild b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r6.ebuild
new file mode 100644
index 000000000000..20ce3a822e1a
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-1.3.22_p4-r6.ebuild,v 1.1 2004/11/04 03:24:53 vapier Exp $
+
+inherit gnuconfig flag-o-matic eutils
+
+DESCRIPTION="A dhcp client only"
+HOMEPAGE="http://www.phystech.com/download/"
+SRC_URI="ftp://ftp.phystech.com/pub/${P/_p/-pl}.tar.gz
+	http://dev.gentoo.org/~drobbins/${P}.diff.bz2
+	http://dev.gentoo.org/~drobbins/${P}-keepCacheAndResolv.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="build static"
+
+DEPEND="virtual/libc"
+PROVIDE="virtual/dhcpc"
+
+S=${WORKDIR}/${P/_p/-pl}
+
+src_unpack() {
+	unpack ${A}
+	gnuconfig_update
+
+	cd ${S}
+	#Started working on this patch from an older version I found; then
+	#discovered that LFS had an updated one. We're using a patch that is
+	#identical to theirs. It makes dhcpcd FHS-compliant. (drobbins, 06
+	#Sep 2003)
+	epatch ${DISTDIR}/${P}.diff.bz2
+	#This next patch from Alwyn Schoeman <alwyn@smart.com.ph> is great;
+	#it adds a -z (shutdown, keep cache) and various other little tweaks.
+	#See http://bugs.gentoo.org/show_bug.cgi?id=23428 for more info.
+	epatch ${DISTDIR}/${P}-keepCacheAndResolv.diff.bz2
+	#This patch remove the iface down instruction from dhcpcd allowing us
+	#to have physical iface scripts (gmsoft, 11 Nov 2003)
+	epatch ${FILESDIR}/${P}-no-iface-down.diff
+	#remove hard-coded arch stuff (drobbins, 06 Sep 2003)
+	sed -i "s/ -march=i.86//g" configure
+	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' dhcpconfig.c
+}
+
+src_compile() {
+	use static && append-flags -static
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	rm -rf "${D}"/etc
+	if ! use build ; then
+		dodoc AUTHORS ChangeLog NEWS README
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-1.3.22_p4-r6 b/net-misc/dhcpcd/files/digest-dhcpcd-1.3.22_p4-r6
new file mode 100644
index 000000000000..80b4247cc65e
--- /dev/null
+++ b/net-misc/dhcpcd/files/digest-dhcpcd-1.3.22_p4-r6
@@ -0,0 +1,3 @@
+MD5 dd627a121e43835bead3ffef5b1a72fd dhcpcd-1.3.22-pl4.tar.gz 148455
+MD5 0960ef5d5070da205ffacd5107492e36 dhcpcd-1.3.22_p4.diff.bz2 1646
+MD5 6a502cc0c572f898f8ba5daa34c37901 dhcpcd-1.3.22_p4-keepCacheAndResolv.diff.bz2 1800