Update net/ddclient to 3.6. Pkgsrc changes include:

- buildlink'ify
- use general INSTALL scripts as ddclient now requires a config file and
  can use a rc.d script to operate in daemon mode

Changes from version 2.3.2 include:

- bug fixes
- new ddclient.conf format
- rewritten to support DynDNS's NIC2 and other dynamic DNS services:
-   added EasyDNS (easydns.com)
-   added Hammernode (hn.org)
-   added ZoneEdit (zoneedit.com)
-   added DSLreports (dslreports.com) host monitoring
- added support for obtaining IP addresses from :
-   interfaces, commands, web, external commands, routers
- added daemon mode
- added logging msgs to syslog and e-mail
- add detection of SIGHUP. When this signal is received, ddclient will
  wake up immediately, reload it's configuration file, and update
  the IP addresses if necessary.

7 files changed, 114 insertions, 77 deletions

diff --git a/net/ddclient/DEINSTALL b/net/ddclient/DEINSTALL
new file mode 100644
index 00000000000..6f7cb8747b2
--- /dev/null
+++ b/net/ddclient/DEINSTALL
@@ -0,0 +1,11 @@
+# $NetBSD: DEINSTALL,v 1.1 2001/12/09 19:55:35 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+
+POST-DEINSTALL)
+	${RM} -f @PKG_SYSCONFDIR@/ddclient.cache
+	;;
+
+esac
diff --git a/net/ddclient/MESSAGE b/net/ddclient/MESSAGE
index d85907a1367..bd0973e5ed3 100644
--- a/net/ddclient/MESSAGE
+++ b/net/ddclient/MESSAGE
@@ -1,9 +1,5 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:55:09 zuntum Exp $
-
-1. Please register at http://www.dyndns.org/
-
-2. Copy ${PREFIX}/etc/ddclient.conf-example to ${PREFIX}/etc/ddclient.conf
-   and adjust to your needs.
+$NetBSD: MESSAGE,v 1.2 2001/12/09 19:55:35 jlam Exp $
 
+Please register at http://www.dyndns.org/ for an account.
 ======================================================================
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 47170210eeb..89dc65f4644 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,32 +1,55 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 18:18:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2001/12/09 19:55:35 jlam Exp $
 
-DISTNAME=	ddclient-2.3.2
+DISTNAME=	ddclient-3.6
 CATEGORIES=	net
-MASTER_SITES=	http://burry.net/ddclient/
+MASTER_SITES=	${HOMEPAGE}
 
 MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://burry.net/ddclient
-COMMENT=	Client to update dynamic DNS entries for accounts on dyndns.org
+HOMEPAGE=	http://burry.ca:4141/ddclient/
+COMMENT=	Client to update dynamic DNS entries
 
-NO_BUILD=	yes
+USE_BUILDLINK_ONLY=	YES
+
+DOCDIR=			${PREFIX}/share/doc/ddclient
+EGDIR=			${PREFIX}/share/examples/ddclient
+RCD_SCRIPTS=		ddclient
+CONF_FILES_PERMS=	${EGDIR}/sample-etc_ddclient.conf		\
+			${PKG_SYSCONFDIR}/ddclient.conf			\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+
+do-configure:
+	cd ${WRKSRC}; for file in ddclient; do				\
+		${SED}	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"	\
+			-e "s|@PERL5@|${PERL5}|g"			\
+			$${file} > $${file}.fixed;			\
+		if [ -x $${file} ]; then				\
+			${CHMOD} +x $${file}.fixed;			\
+		fi;							\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+
+do-build:	# empty
+
+pre-install:
+	@for script in ${RCD_SCRIPTS}; do				\
+		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
+			> ${WRKDIR}/$${script};				\
+	done
 
 do-install:
-	${SED} \
-		-e 's,@LOCALBASE@,${LOCALBASE},g' \
-		-e 's,@PREFIX@,${PREFIX},g' \
-		${WRKSRC}/ddclient >${PREFIX}/bin/ddclient
-	${CHMOD} +x ${PREFIX}/bin/ddclient
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ddclient
-	for F in README COPYING COPYRIGHT sample-etc_cron.d_ddclient	     \
-		sample-etc_dhcpc_dhcpcd-eth0.exe sample-etc_ppp_ip-up.local; \
-	do								     \
-		${INSTALL_DATA} ${WRKSRC}/$$F ${PREFIX}/share/doc/ddclient; \
+	for script in ${RCD_SCRIPTS}; do				\
+		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
+			${PREFIX}/etc/rc.d/$${script};			\
 	done
-	${INSTALL_DATA} ${WRKSRC}/sample-ddclient.conf			     \
-		${PREFIX}/etc/ddclient.conf-example
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ddclient/contrib
-	${INSTALL_DATA} ${WRKSRC}/contrib/*				     \
-		 ${PREFIX}/share/doc/ddclient/contrib
+	${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${PREFIX}/sbin
+	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.cisco ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample-* ${EGDIR}
 
+.include "../../lang/perl5/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ddclient/PLIST b/net/ddclient/PLIST
index 77b1f27c1aa..fdadddd5326 100644
--- a/net/ddclient/PLIST
+++ b/net/ddclient/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:10 zuntum Exp $
-bin/ddclient
-etc/ddclient.conf-example
+@comment $NetBSD: PLIST,v 1.2 2001/12/09 19:55:35 jlam Exp $
+etc/rc.d/ddclient
+sbin/ddclient
 share/doc/ddclient/COPYING
 share/doc/ddclient/COPYRIGHT
 share/doc/ddclient/README
-share/doc/ddclient/sample-etc_cron.d_ddclient
-share/doc/ddclient/sample-etc_dhcpc_dhcpcd-eth0.exe
-share/doc/ddclient/sample-etc_ppp_ip-up.local
-share/doc/ddclient/contrib/ddupdate
-@dirrm share/doc/ddclient/contrib
+share/doc/ddclient/README.cisco
+share/examples/ddclient/sample-etc_cron.d_ddclient
+share/examples/ddclient/sample-etc_ddclient.conf
+share/examples/ddclient/sample-etc_dhclient-enter-hooks
+share/examples/ddclient/sample-etc_dhcpc_dhcpcd-eth0.exe
+share/examples/ddclient/sample-etc_ppp_ip-up.local
+share/examples/ddclient/sample-etc_rc.d_init.d_ddclient
+share/examples/ddclient/sample-etc_rc.d_init.d_ddclient.redhat
+@dirrm share/examples/ddclient
 @dirrm share/doc/ddclient
diff --git a/net/ddclient/distinfo b/net/ddclient/distinfo
index bc26daadd61..1cbb78cd0ec 100644
--- a/net/ddclient/distinfo
+++ b/net/ddclient/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:13 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/12/09 19:55:35 jlam Exp $
 
-SHA1 (ddclient-2.3.2.tar.gz) = 8460cdff63341c0cadb7f89261b8d394ed4950fa
-Size (ddclient-2.3.2.tar.gz) = 15287 bytes
-SHA1 (patch-aa) = 07781a138843f558399239c474ca48c237e686ac
+SHA1 (ddclient-3.6.tar.gz) = d69c9303aed0e0a8a852116aac2a62b624038544
+Size (ddclient-3.6.tar.gz) = 32459 bytes
+SHA1 (patch-aa) = 95f103edb6433caec994681233ee9a14b9a51597
diff --git a/net/ddclient/files/ddclient.sh b/net/ddclient/files/ddclient.sh
new file mode 100644
index 00000000000..9b21bb18ebd
--- /dev/null
+++ b/net/ddclient/files/ddclient.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $NetBSD: ddclient.sh,v 1.1 2001/12/09 19:55:36 jlam Exp $
+#
+# Dynamic DNS update client
+#
+# PROVIDE: ddclient
+# REQUIRE: DAEMON
+
+if [ -e /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="ddclient"
+rcvar=${name}
+command="@PREFIX@/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="@PERL5@ @PKG_SYSCONFDIR@/${name}.conf"
+extra_commands="reload"
+
+if [ -e /etc/rc.subr ]
+then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	@ECHO@ -n " ${name}"
+	${command} ${ddclient_flags} ${command_args}
+fi
diff --git a/net/ddclient/patches/patch-aa b/net/ddclient/patches/patch-aa
index 01a03101a17..e200b1c49d6 100644
--- a/net/ddclient/patches/patch-aa
+++ b/net/ddclient/patches/patch-aa
@@ -1,40 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/07 02:50:13 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/09 19:55:36 jlam Exp $
 
---- ddclient.orig	Tue Jul 18 22:04:54 2000
-+++ ddclient	Mon Aug  7 04:33:20 2000
-@@ -1,2 +1,2 @@
+--- ddclient.orig	Sun Nov 18 19:54:48 2001
++++ ddclient
+@@ -1,3 +1,2 @@
 -#!/usr/bin/perl -w
-+#!@LOCALBASE@/bin/perl -w
+-#!/usr/local/bin/perl -w
++#!@PERL5@ -w
  ######################################################################
-@@ -32,4 +32,4 @@
- 	[ "server",   "=s", "members.dyndns.org",  "-server host     : update DNS information on 'host'" ],
--	[ "file",     "=s", "/etc/ddclient.conf",  "-file path       : load configuration information from 'path'" ],
--	[ "cache",    "=s", "/etc/ddclient.cache", "-cache path      : record address used in 'path'" ],
-+	[ "file",     "=s", "@PREFIX@/etc/ddclient.conf",  "-file path       : load configuration information from 'path'" ],
-+	[ "cache",    "=s", "@PREFIX@/etc/ddclient.cache", "-cache path      : record address used in 'path'" ],
- 	"",
-@@ -57,3 +57,3 @@
- 	"  ${program} -ip 192.168.1.1 -retry",
--	"  -- set the ip address of all dyndns hosts listed in the /etc/ddclient.conf to 192.168.1.1",
-+	"  -- set the ip address of all dyndns hosts listed in the @PREFIX@/etc/ddclient.conf to 192.168.1.1",
- 	"  -- mark failures so they may be retried with -refresh",
-@@ -74,3 +74,3 @@
- 	"  ${program} -refresh -force -retry",
--	"  -- refresh all dyndns hosts listed in the /etc/ddclient.conf",
-+	"  -- refresh all dyndns hosts listed in the @PREFIX@/etc/ddclient.conf",
- 	"  -- force an update even if it may be unneccessary",
-@@ -82,3 +82,3 @@
- 	"  ${program} -refresh -retry",
--	"  -- refresh all dyndns hosts listed in the /etc/ddclient.conf that could not be updated",
-+	"  -- refresh all dyndns hosts listed in the @PREFIX@/etc/ddclient.conf that could not be updated",
- 	"     (hosts that do not require update will be skipped)",
-@@ -443,3 +443,3 @@
-     } elsif (($result = update(%args)) eq 'OK') {
--	$cache{$host} = { %args, time => time };
-+	$cache{$host} = { %args, time() => time() };
- 	write_cache($opt{'cache'});
-@@ -448,3 +448,3 @@
-         warning("$host was not set to $args{'ip'}, use -refresh to retry later");
--    	$cache{$host} = { %args, time => 0 };
-+    	$cache{$host} = { %args, time() => 0 };
-         write_cache($opt{'cache'});
+@@ -22,3 +21,3 @@
+ my $hostname  = hostname();
+-my $etc       = ($program =~ /test/i) ? './'   : '/etc/';
++my $etc       = ($program =~ /test/i) ? './'   : '@PKG_SYSCONFDIR@/';
+ my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';