ebuild cleanup and initscript cleanup

3 files changed, 22 insertions, 16 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 52429089b3b3..a040afe61eba 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.16 2004/02/22 08:21:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.17 2004/02/23 00:01:31 dragonheart Exp $
 
-  22 Feb 2004; Daniel Black <dragonheart@gentoo.org> :
+*pdnsd-1.1.10 (23 Feb 2004)
+
+  23 Feb 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.10.ebuild,
+  files/pdnsd.rc6:
+  ebuild cleanup.
+
+  22 Feb 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.10.ebuild:
   version bump. Avoid clobbering previous cache. Cache moved to /var/cache from
   /var/lib.
 
diff --git a/net-dns/pdnsd/files/pdnsd.rc6 b/net-dns/pdnsd/files/pdnsd.rc6
index ddbf2f4a0a6f..ac5a528fdcc5 100644
--- a/net-dns/pdnsd/files/pdnsd.rc6
+++ b/net-dns/pdnsd/files/pdnsd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6,v 1.8 2004/02/22 08:20:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6,v 1.9 2004/02/23 00:01:31 dragonheart Exp $
 
 depend() {
         need net
@@ -10,8 +10,8 @@ depend() {
 
 checkconfig() {
 	if [ ! -e /etc/pdnsd/pdnsd.conf ] ; then
-		eerror "You need an /etc/pdnsd/pdnsd.conf file first"
-		eerror "There is a  sample  in  /usr/share/doc/pdnsd"
+		eerror "You need an /etc/pdnsd/pdnsd.conf file first."
+		eerror "There is a sample in /etc/pdnsd/pdnsd.conf.sample"
 		return 1
 	fi
 }
diff --git a/net-dns/pdnsd/pdnsd-1.1.10.ebuild b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
index 6b2e31e973b4..0608f1626807 100644
--- a/net-dns/pdnsd/pdnsd-1.1.10.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.1 2004/02/22 08:20:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.2 2004/02/23 00:01:31 dragonheart Exp $
 
 DESCRIPTION="Proxy DNS server with permanent caching"
 
@@ -13,7 +13,8 @@ HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://home.t-online.de/h
 IUSE="ipv6 debug isdn"
 
 DEPEND="virtual/glibc
-	>=sys-apps/sed-4"
+	sys-apps/sed
+	sys-apps/gawk"
 
 RDEPEND="virtual/glibc"
 
@@ -35,7 +36,7 @@ src_compile() {
 	cd ${S} || die
 	local myconf
 
-	if [ `use debug` ]; then
+	if use debug; then
 	 	myconf="${myconf} --with-debug=3"
 		CFLAGS="${CFLAGS} -g"
 	fi
@@ -45,6 +46,7 @@ src_compile() {
 		--sysconfdir=/etc/pdnsd \
 		--with-cachedir=/var/cache/pdnsd \
 		--infodir=/usr/share/info --mandir=/usr/share/man \
+		--with-default-id=pdnsd \
 		`use_enable ipv6` `use_enable isdn` \
 		${myconf} \
 		|| die "bad configure"
@@ -64,12 +66,6 @@ src_install() {
 	# Don't clobber existing cache
 	[ -f /var/cache/pdnsd/pdnsd.cache ] && rm ${D}/var/cache/pdnsd/pdnsd.cache
 
-	fowners pdnsd:pdnsd /var/cache/pdnsd
-
-	[ -f ${D}/var/cache/pdnsd/pdnsd.cache ] fowners pdnsd:pdnsd /var/cache/pdnsd/pdnsd.cache
-
-	sed -i 's/run_as=.*/run_as="pdnsd";/' ${D}/etc/pdnsd/pdnsd.conf.sample
-
 	dodoc AUTHORS COPYING* ChangeLog* NEWS README THANKS TODO README.par
 	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
 	docinto html ; dohtml doc/html/*
@@ -85,16 +81,20 @@ src_install() {
 
 	keepdir /etc/conf.d
 	local config=${D}/etc/conf.d/pdnsd-online
-	echo "# Enter the interface that connects you to the dns servers" > ${config}
+
+	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" > ${config}
+	echo "# Enter the interface that connects you to the dns servers" >> ${config}
 	echo "# This will correspond to /etc/init.d/net.${IFACE}" >> ${config}
 	echo "IFACE=ppp0" >> ${config}
 	use ipv6 && echo PDNSDCONFIG="-6" >> ${config} \
 		|| echo PDNSDCONFIG="" >> ${config}
 
-	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" >> ${config}
 
 	einfo "Add pdnsd to your default runlevel."
 	einfo ""
 	einfo "Add pdnsd-online to your online runlevel."
 	einfo "The online interface will be listed in /etc/conf.d/pdnsd-online"
+	einfo ""
+	einfo "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
+
 }