8 files changed, 86 insertions, 42 deletions

diff --git a/net/ddup/Makefile b/net/ddup/Makefile
index 146548df9caa..22099e710d5b 100644
--- a/net/ddup/Makefile
+++ b/net/ddup/Makefile
@@ -6,45 +6,40 @@
 #
 
 PORTNAME=	ddup
-PORTVERSION=	2.2
+PORTVERSION=	3.0.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ddup.sourceforge.net/pub/ddup/
-DISTNAME=	ddup-2.2Dm
+MASTER_SITES=	http://www.ddup.org/download/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-unix
 
 MAINTAINER=	cjm2@altavista.net
 
 MAN1=		ddup.1
-MANCOMPRESSED=	yes
+MANCOMPRESSED=	maybe
 
-WRKSRC=		${WRKDIR}/ddup-2.2Dm
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 # Uncomment this if you want to enable debugging.
 #DEBUG=		-g
 
+MAKE_ARGS=	DEBUG="${DEBUG}"
+
+post-extract:
+	cd ${WRKSRC}; ${GUNZIP_CMD} ddup.1.gz
+
+post-patch:
+	${PERL} -i -pe 's,!!PREFIX!!,${PREFIX},' ${WRKSRC}/ddupcron.sh
+	${PERL} -i -pe 's,/etc\b,${PREFIX}$$&,' ${WRKSRC}/ddup.1
+
 pre-build:
-	${ECHO} "char *file_name = \"${PREFIX}/etc/ddup.conf\";" > ${WRKSRC}/options.h
-
-do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c ddup.c
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c ddup_functions.c
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c getopt.c
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c getopt1.c
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c parse_config.c
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c parse_option.c
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c update.c
-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -o ddup ddup.o ddup_functions.o getopt.o getopt1.o parse_config.o parse_option.o update.o ${LIBS}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ddup ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/testip ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/ddup.1.gz ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/doc/ddup
-	${INSTALL_MAN} ${WRKSRC}/INSTALL-C ${PREFIX}/share/doc/ddup
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/ddup
-	${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/ddup
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
+	${ECHO} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h
 
 post-install:
-	strip ${PREFIX}/sbin/ddup
-	${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKSRC}/ddupcron.sh ${PREFIX}/sbin/
+.if !defined(NOPORTSDOC)
+	${MKDIR} ${PREFIX}/share/doc/ddup
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ddup/
+.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/ddup/distinfo b/net/ddup/distinfo
index 0ff801b6d886..fb43fa3f1d8d 100644
--- a/net/ddup/distinfo
+++ b/net/ddup/distinfo
@@ -1 +1 @@
-MD5 (ddup-2.2Dm.tar.gz) = 8c4a4bcabca77da7e1ceda12f57a2108
+MD5 (ddup-3.0.1-unix.tar.gz) = 6c3ee8158f994de4cbbaf0593fb0226c
diff --git a/net/ddup/files/Makefile b/net/ddup/files/Makefile
new file mode 100644
index 000000000000..c875fcafb1c9
--- /dev/null
+++ b/net/ddup/files/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PROG=		ddup
+SRCS=		ddup.c \
+		ddup_functions.c \
+		getopt.c \
+		getopt1.c \
+		parse_config.c \
+		parse_option.c \
+		update.c
+CFLAGS+=	${DEBUG}
+MAN1=		ddup.1
+BINDIR=		${LOCALBASE}/sbin
+MANDIR=		${LOCALBASE}/man/man
+
+.include <bsd.prog.mk>
+
diff --git a/net/ddup/files/patch-ddupcron.sh b/net/ddup/files/patch-ddupcron.sh
new file mode 100644
index 000000000000..ed354d7afff8
--- /dev/null
+++ b/net/ddup/files/patch-ddupcron.sh
@@ -0,0 +1,29 @@
+--- ddupcron.sh.orig	Mon Oct 23 02:11:48 2000
++++ ddupcron.sh	Thu Nov  2 14:16:39 2000
+@@ -2,19 +2,23 @@
+ 
+ # Define the host to be updated as 1st arguement to script
+ if [ -z $1 ]; then
+-	echo "Usage: ddupcron.sh hostname"
++	echo "Usage: ddupcron.sh hostname [interface]"
+ 	exit
+ else
+ 	HOST=$1
+ fi
+ # Define interface to grep address from
+-IFACE="eth0"
++if [ -z $2 ]; then
++	IFACE=fxp0
++else
++	IFACE=$2
++fi
+ IFCHECK=$(/sbin/ifconfig $IFACE|grep ask|awk '{print $2}'|cut -d ':' -f2)
+ # Define where we should store last IP
+ IPFILE="/tmp/ddupip"
+ IPCHECK=$(cat $IPFILE)
+ # Define path to ddup and ddup arguments (except --host)
+-DDUP_PATH="/home/ddup/ddup"
++DDUP_PATH="!!PREFIX!!/sbin/ddup"
+ DDUP_ARGS="--debug"
+ 
+ 
diff --git a/net/ddup/pkg-comment b/net/ddup/pkg-comment
index 5fff85a62074..3a489e82631d 100644
--- a/net/ddup/pkg-comment
+++ b/net/ddup/pkg-comment
@@ -1 +1 @@
-A DynDNS.org client for UNIX
+A DynDNS.org client for UNIX (Now support NIC v2.0)
diff --git a/net/ddup/pkg-descr b/net/ddup/pkg-descr
index 55fcf3853fa2..a39e2362e40d 100644
--- a/net/ddup/pkg-descr
+++ b/net/ddup/pkg-descr
@@ -1,9 +1,19 @@
-DD-UP in C by Thomas Gandy (tegandy@enid.com)
----------------------------------------------------------
+DD-UP is a program that is used to update a host provided by the Free
+DynDNS service of dyndns.org.
 
-DD-UP is a program that is used to update a host
-provided by the Free DynDNS service of dyndns.org.
+This version supports:
+ - Dynamic Hostnames
+ - Static Hostnames
+ - DynDNS.Org NIC v2.0
 
-WWW: http://ddup.sourceforce.net/
+Features in this version include:
+ - Automatic IP Detection
+ - Manual IP Specification
+ - Wildcard hosts
+ - Backup MX hosts
+ - Operation through a proxy server
+
+Author:	Thomas Gandy <tegandy@enid.com>
+WWW:	http://www.ddup.org/
 
 EMAIL: cjm2@altavista.net
diff --git a/net/ddup/pkg-message b/net/ddup/pkg-message
index 06b265ecad16..74555f9fa182 100644
--- a/net/ddup/pkg-message
+++ b/net/ddup/pkg-message
@@ -3,8 +3,3 @@
 *** you MUST make your configuration file by typing  ***
 *** ddup --makeconf                                  ***
 ********************************************************
-********************************************************
-*** If you are upgrading or are a first time user    ***
-*** you MUST make your configuration file by typing  ***
-*** ddup --makeconf                                  ***
-********************************************************
diff --git a/net/ddup/pkg-plist b/net/ddup/pkg-plist
index ddba371de314..03f294b6ea19 100644
--- a/net/ddup/pkg-plist
+++ b/net/ddup/pkg-plist
@@ -1,6 +1,4 @@
 sbin/ddup
-sbin/testip
+sbin/ddupcron.sh
 share/doc/ddup/README
-share/doc/ddup/INSTALL-C
-share/doc/ddup/COPYING
 @dirrm share/doc/ddup