--- ddclient-3.6.6.ebuild	2006-02-03 00:11:38.000000000 -0500
+++ ddclient-3.6.7.ebuild	2006-02-03 00:11:21.000000000 -0500
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.6.6.ebuild,v 1.8 2005/08/23 21:58:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ddclient/ddclient-3.6.7.ebuild,v 1.8 2005/08/23 21:58:23 dragonheart Exp $
 
 inherit eutils
 
@@ -22,8 +22,7 @@
 
 src_unpack() {
 	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${PN}-mss1.diff
-	epatch ${FILESDIR}/${PN}-daemon0inconfig.diff
+	epatch ${FILESDIR}/${P}-combined.patch
 
 	sed -i 's:/var/run/ddclient.pid:/var/run/ddclient/ddclient.pid:' \
 		sample-etc_ddclient.conf
@@ -45,18 +44,19 @@
 }
 
 pkg_postinst() {
-	echo
-	einfo
-	ewarn "The files in ${ROOT}etc/ddclient *NEED* be chowned to"
-	ewarn "root:ddclient, and chmodded to 640:"
-	ewarn "(user/group read; user write)"
-	ewarn "Please run etc-update and update your initscript to take"
-	ewarn "advantage of non-root permissions on the daemon"
-	ewarn "Further, please note that your config files must be owned"
-	ewarn "by the user ddclient or have group ownership by ddclient."
-	ewarn "The initscript will NOT run unless you do this.  Please see"
-	ewarn "bug #88225"
-	einfo
-	ebeep
-	epause
+	local conf perms owner group
+
+	conf="/etc/ddclient/ddclient.conf"
+	perms=`stat -c %a $conf`
+	owner=`stat -c %U $conf`
+	group=`stat -c %G $conf`
+
+	if [ $owner != "root" -o $group != "ddclient" -o $perms != "640" ]; then
+		ewarn "It is recommended that /etc/ddclient/ddclient.conf be chown'ed"
+		ewarn "root:ddclient with '640' permissions if you want to run the"
+		ewarn "ddclient initscript at startup. You can use the following"
+		ewarn "commands to do this:"
+		ewarn "	chown root:ddclient /etc/ddclient/ddclient.conf"
+		ewarn "	chmod 640 /etc/ddclient/ddclient.conf"
+	fi
 }