Cleanup, and workaround for bug #73858.

(Portage version: 2.0.51.16)

6 files changed, 72 insertions, 8 deletions

diff --git a/net-dns/ndu/ChangeLog b/net-dns/ndu/ChangeLog
index 82b9262a6bd2..88a8c5d2d6ff 100644
--- a/net-dns/ndu/ChangeLog
+++ b/net-dns/ndu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/ndu
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ChangeLog,v 1.6 2004/07/19 09:43:28 dholm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ChangeLog,v 1.7 2005/02/13 03:38:27 robbat2 Exp $
+
+*ndu-0.4-r2 (12 Feb 2005)
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +ndu-0.4-r2.ebuild:
+  Cleanup, and workaround for bug #73858.
 
   19 Jul 2004; David Holm <dholm@gentoo.org> ndu-0.4-r1.ebuild:
   Added to ~ppc.
diff --git a/net-dns/ndu/Manifest b/net-dns/ndu/Manifest
index 137fc9b789fe..5ac23a2617c9 100644
--- a/net-dns/ndu/Manifest
+++ b/net-dns/ndu/Manifest
@@ -1,6 +1,8 @@
+MD5 d8c6f802552c9e2c0e906f6917f4968f ndu-0.4-r2.ebuild 1649
+MD5 2e3a625596e4fa54ba01af7f1d836027 ndu-0.4-r1.ebuild 1094
 MD5 d351f78f918ba54e2d49665497c67960 ChangeLog 610
 MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
 MD5 9b2566bc669a0b867afb0d672bc5f036 ndu-0.4.ebuild 1103
-MD5 2e3a625596e4fa54ba01af7f1d836027 ndu-0.4-r1.ebuild 1094
-MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4 58
 MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4-r1 58
+MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4-r2 58
+MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4 58
diff --git a/net-dns/ndu/files/digest-ndu-0.4-r2 b/net-dns/ndu/files/digest-ndu-0.4-r2
new file mode 100644
index 000000000000..5093a5f3bafe
--- /dev/null
+++ b/net-dns/ndu/files/digest-ndu-0.4-r2
@@ -0,0 +1 @@
+MD5 dbf8b8e7b65cf189e732ff11c7f08181 ndu-0.4.tar.gz 16118
diff --git a/net-dns/ndu/ndu-0.4-r1.ebuild b/net-dns/ndu/ndu-0.4-r1.ebuild
index b609e7861c59..4fd92cde68a1 100644
--- a/net-dns/ndu/ndu-0.4-r1.ebuild
+++ b/net-dns/ndu/ndu-0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r1.ebuild,v 1.2 2004/07/19 09:43:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r1.ebuild,v 1.3 2005/02/13 03:38:27 robbat2 Exp $
 
 DESCRIPTION="DNS serial number incrementer and reverse zone builder"
 URI_BASE="http://uranus.it.swin.edu.au/~jn/linux/"
diff --git a/net-dns/ndu/ndu-0.4-r2.ebuild b/net-dns/ndu/ndu-0.4-r2.ebuild
new file mode 100644
index 000000000000..1ca9ad867abc
--- /dev/null
+++ b/net-dns/ndu/ndu-0.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r2.ebuild,v 1.1 2005/02/13 03:38:27 robbat2 Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DNS serial number incrementer and reverse zone builder"
+URI_BASE="http://uranus.it.swin.edu.au/~jn/linux/"
+SRC_URI="${URI_BASE}/${P}.tar.gz"
+HOMEPAGE="${URI_BASE}/dns.htm"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="sys-apps/sed 
+		virtual/libc"
+RDEPEND="virtual/libc 
+		sys-apps/ed" # dnstouch calls ed to do the dirty work
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/src
+	# use the correct compiler
+	sed -e 's|gcc|$(CXX)|g' -i Makefile
+	# set correct config pathes
+	sed -e 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' -i ndu.cpp
+	sed -e 's|"/etc/ndu.conf"|"/etc/bind/ndu.conf"|g' -i dnstouch.cpp
+	# hack up something to work around bug #73858
+	sed -e 's|execlp("ed", "ed", filename, 0);|execlp("ed", "ed", "-s", filename, 0);|g' -i dnstouch.cpp
+	# use the correct editor
+	sed -e 's|VISUAL|EDITOR|g' -i dnsedit
+
+	cd ${S}
+	# match our bind config
+	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf
+	# document the support for the chrooted BIND setup
+	echo '// if you use a chrooted setup, then you need to uncomment these lines:' >>ndu.conf
+	echo '//process "/chroot/dns/named.conf"' >>ndu.conf
+	echo '//chroot "/chroot/dns"' >>ndu.conf
+}
+
+src_compile() {
+	cd ${S}/src
+	emake CFLAGS="${CFLAGS}" CXX="$(tc-getCXX)"
+}
+
+src_install () {
+	into /usr
+	dosbin src/{dnsedit,ndu}
+	dobin src/dnstouch
+	into /
+	insinto /etc/bind
+	doins ndu.conf
+	dodoc README INSTALL
+}
diff --git a/net-dns/ndu/ndu-0.4.ebuild b/net-dns/ndu/ndu-0.4.ebuild
index 2d758e574ae6..e0fc996843dd 100644
--- a/net-dns/ndu/ndu-0.4.ebuild
+++ b/net-dns/ndu/ndu-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4.ebuild,v 1.6 2004/07/14 23:33:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4.ebuild,v 1.7 2005/02/13 03:38:27 robbat2 Exp $
 
 DESCRIPTION="DNS serial number incrementer and reverse zone builder"
 URI_BASE="http://uranus.it.swin.edu.au/~jn/linux/"