From cjm2@weeble.dyndns.org  Tue Oct 24 16:27:59 2000
Return-Path: <cjm2@weeble.dyndns.org>
Received: from cartman.weeble.dyndns.org (ny-lancaster2a-194.buf.adelphia.net [24.49.118.194])
	by hub.freebsd.org (Postfix) with ESMTP id 91DD137B479
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Oct 2000 16:27:58 -0700 (PDT)
Received: (from root@localhost)
	by cartman.weeble.dyndns.org (8.11.0/8.11.0) id e9ONRiA46111;
	Tue, 24 Oct 2000 19:27:44 -0400 (EDT)
	(envelope-from cjm2)
Message-Id: <200010242327.e9ONRiA46111@cartman.weeble.dyndns.org>
Date: Tue, 24 Oct 2000 19:27:44 -0400 (EDT)
From: cjm2@altavista.net
Sender: cjm2@weeble.dyndns.org
Reply-To: cjm2@altavista.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: Upgrade ddup port to version 3.0
X-Send-Pr-Version: 3.2

>Number:         22280
>Category:       ports
>Synopsis:       Upgrade ddup port to latest version (prev version obsolete)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    knu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 24 16:30:01 PDT 2000
>Closed-Date:    Sat Nov 4 01:21:51 JST 2000
>Last-Modified:  Sat Nov 04 01:22:40 JST 2000
>Originator:     Christopher J. Michaels
>Release:        FreeBSD 4.1.1-STABLE i386
>Organization:
none
>Environment:

	FreeBSD 4.1.1-STABLE i386

>Description:

	The ddup program has been upgraded to version 3.0.  This pr updates
	the port to match the latest version.

	This is a required update for the ddup port as the old version will
	be obsolete in the near future.

>How-To-Repeat:

	See diff below.
	* files/patch-ad has been deleted.

>Fix:

diff -ruN ddup.orig/Makefile ddup/Makefile
--- ddup.orig/Makefile	Thu Oct 12 18:53:47 2000
+++ ddup/Makefile	Tue Oct 24 19:11:55 2000
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	ddup
-PORTVERSION=	2.2
+PORTVERSION=	3.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ddup.sourceforge.net/pub/ddup/
-DISTNAME=	ddup-2.2Dm
+MASTER_SITES=	ftp://ftp.ddup.org/pub/ddup/
+DISTFILES=	ddup-3.0-unix.tar.gz
 
 MAINTAINER=	cjm2@altavista.net
 
 MAN1=		ddup.1
 MANCOMPRESSED=	yes
 
-WRKSRC=		${WRKDIR}/ddup-2.2Dm
+#WRKSRC=		${WRKDIR}/ddup-2.2Dm
 
 # Uncomment this if you want to enable debugging.
 #DEBUG=		-g
 
 pre-build:
-	${ECHO} "char *file_name = \"${PREFIX}/etc/ddup.conf\";" > ${WRKSRC}/options.h
+	${ECHO} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c ddup.c
@@ -36,10 +36,10 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ddup ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/testip ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/ddupcron.sh ${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}/INSTALL ${PREFIX}/share/doc/ddup
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/ddup
 	${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/ddup
 
diff -ruN ddup.orig/distinfo ddup/distinfo
--- ddup.orig/distinfo	Sun Feb 27 02:23:34 2000
+++ ddup/distinfo	Tue Oct 24 19:03:30 2000
@@ -1 +1 @@
-MD5 (ddup-2.2Dm.tar.gz) = 8c4a4bcabca77da7e1ceda12f57a2108
+MD5 (ddup-3.0-unix.tar.gz) = 6ca3f43ed54a1da2a151387e08171d09
diff -ruN ddup.orig/files/patch-ad ddup/files/patch-ad
--- ddup.orig/files/patch-ad	Tue Feb 22 21:52:34 2000
+++ ddup/files/patch-ad	Wed Dec 31 19:00:00 1969
@@ -1,16 +0,0 @@
---- testip.orig	Sat Feb 19 13:31:53 2000
-+++ testip	Sat Feb 19 13:33:40 2000
-@@ -5,7 +5,7 @@
- HOST=$1
- # Change IFACE to your network interface name
- IFACE="tun0"
--IFCHECK=$(/sbin/ifconfig|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
-+IFCHECK=$(/sbin/ifconfig -a|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
- # This line uses the 'host' command to check DNS you can comment this out
- #if you use the nslookup one
- DNSCHECK=$(host $HOST|cut -d ' ' -f4)
-@@ -21,4 +21,3 @@
- 	#for options
- 	/usr/local/sbin/ddup --host $HOST --wildcard
- fi
--	
diff -ruN ddup.orig/pkg-comment ddup/pkg-comment
--- ddup.orig/pkg-comment	Thu Feb 10 18:15:55 2000
+++ ddup/pkg-comment	Tue Oct 24 18:47:35 2000
@@ -1 +1 @@
-A DynDNS.org client for UNIX
+A DynDNS.org client for UNIX (Now support NIC v2.0)
diff -ruN ddup.orig/pkg-descr ddup/pkg-descr
--- ddup.orig/pkg-descr	Tue Feb 22 21:52:35 2000
+++ ddup/pkg-descr	Tue Oct 24 19:11:39 2000
@@ -1,9 +1,18 @@
-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
+
+WWW: http://www.ddup.org/
 
 EMAIL: cjm2@altavista.net
diff -ruN ddup.orig/pkg-message ddup/pkg-message
--- ddup.orig/pkg-message	Tue Feb 22 21:52:35 2000
+++ ddup/pkg-message	Tue Oct 24 19:11:46 2000
@@ -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 -ruN ddup.orig/pkg-plist ddup/pkg-plist
--- ddup.orig/pkg-plist	Tue Feb 22 21:52:35 2000
+++ ddup/pkg-plist	Tue Oct 24 19:12:35 2000
@@ -1,6 +1,6 @@
 sbin/ddup
-sbin/testip
+sbin/ddupcron.sh
 share/doc/ddup/README
-share/doc/ddup/INSTALL-C
+share/doc/ddup/INSTALL
 share/doc/ddup/COPYING
 @dirrm share/doc/ddup

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->knu 
Responsible-Changed-By: knu 
Responsible-Changed-When: Thu Nov 2 14:11:18 JST 2000 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22280 

From: "Akinori MUSHA" <knu@idaemons.org>
To: cjm2@altavista.net
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/22280: Upgrade ddup port to version 3.0
Date: Thu, 02 Nov 2000 14:49:23 +0900

 Hi,
 
 At Tue, 24 Oct 2000 19:27:44 -0400 (EDT),
 cjm2@altavista.net wrote:
 > >Synopsis:       Upgrade ddup port to latest version (prev version obsolete)
 
 > >Description:
 > 
 > 	The ddup program has been upgraded to version 3.0.  This pr updates
 > 	the port to match the latest version.
 > 
 > 	This is a required update for the ddup port as the old version will
 > 	be obsolete in the near future.
 > 
 
 Looked fine, and I made some further improvement on your port as
 attached.  It includes all your changes, of course. :)
 
 Can I commit it?
 
 -- 
                            /
                           /__  __
                          / )  )  ) )  /    and.or.jp / ruby-lang.org
 Akinori -Aki- MUSHA aka / (_ /  ( (__(  @ idaemons.org / FreeBSD.org
 
 "We're only at home when we're on the run, on the wing, on the fly"
 
 M Makefile
 M distinfo
 M pkg-comment
 M pkg-descr
 M pkg-message
 M pkg-plist
 A files/Makefile
 R files/patch-ad
 A files/patch-ddupcron.sh
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/net/ddup/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 --- Makefile	2000/10/08 10:22:27	1.7
 +++ Makefile	2000/11/02 05:19:26
 @@ -6,45 +6,39 @@
  #
  
  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
  
 -pre-build:
 -	${ECHO} "char *file_name = \"${PREFIX}/etc/ddup.conf\";" > ${WRKSRC}/options.h
 +MAKE_ARGS=	DEBUG="${DEBUG}"
  
 -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
 +post-extract:
 +	cd ${WRKSRC}; ${GUNZIP_CMD} ddup.1.gz
 +
 +post-patch:
 +	${PERL} -i -pe 's,!!PREFIX!!,${PREFIX},' ${WRKSRC}/ddupcron.sh
  
 +pre-build:
 +	${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>
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/net/ddup/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo	2000/02/27 07:23:34	1.4
 +++ distinfo	2000/11/02 04:44:02
 @@ -1 +1 @@
 -MD5 (ddup-2.2Dm.tar.gz) = 8c4a4bcabca77da7e1ceda12f57a2108
 +MD5 (ddup-3.0.1-unix.tar.gz) = 6c3ee8158f994de4cbbaf0593fb0226c
 Index: pkg-comment
 ===================================================================
 RCS file: /home/ncvs/ports/net/ddup/pkg-comment,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-comment
 --- pkg-comment	2000/02/10 23:15:55	1.2
 +++ pkg-comment	2000/11/02 05:09:17
 @@ -1 +1 @@
 -A DynDNS.org client for UNIX
 +A DynDNS.org client for UNIX (Now support NIC v2.0)
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/net/ddup/pkg-descr,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-descr
 --- pkg-descr	2000/02/23 02:52:35	1.3
 +++ pkg-descr	2000/11/02 05:11:02
 @@ -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
 Index: pkg-message
 ===================================================================
 RCS file: /home/ncvs/ports/net/ddup/pkg-message,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-message
 --- pkg-message	2000/02/23 02:52:35	1.1
 +++ pkg-message	2000/11/02 04:41:17
 @@ -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                                  ***
 -********************************************************
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/net/ddup/pkg-plist,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-plist
 --- pkg-plist	2000/02/23 02:52:35	1.3
 +++ pkg-plist	2000/11/02 05:18:15
 @@ -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
 Index: files/Makefile
 ===================================================================
 RCS file: Makefile
 diff -N Makefile
 --- /dev/null	Thu Nov  2 14:22:00 2000
 +++ Makefile	Thu Nov  2 13:58:22 2000
 @@ -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>
 +
 Index: files/patch-ad
 ===================================================================
 RCS file: patch-ad
 diff -N patch-ad
 --- /var/tmp/cvsLvXCNJ8897	Thu Nov  2 14:39:09 2000
 +++ /dev/null	Thu Nov  2 14:22:00 2000
 @@ -1,16 +0,0 @@
 ---- testip.orig	Sat Feb 19 13:31:53 2000
 -+++ testip	Sat Feb 19 13:33:40 2000
 -@@ -5,7 +5,7 @@
 - HOST=$1
 - # Change IFACE to your network interface name
 - IFACE="tun0"
 --IFCHECK=$(/sbin/ifconfig|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
 -+IFCHECK=$(/sbin/ifconfig -a|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
 - # This line uses the 'host' command to check DNS you can comment this out
 - #if you use the nslookup one
 - DNSCHECK=$(host $HOST|cut -d ' ' -f4)
 -@@ -21,4 +21,3 @@
 - 	#for options
 - 	/usr/local/sbin/ddup --host $HOST --wildcard
 - fi
 --	
 Index: files/patch-ddupcron.sh
 ===================================================================
 RCS file: patch-ddupcron.sh
 diff -N patch-ddupcron.sh
 --- /dev/null	Thu Nov  2 14:22:00 2000
 +++ patch-ddupcron.sh	Thu Nov  2 14:19:37 2000
 @@ -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"
 + 
 + 
 

From: "Akinori MUSHA" <knu@idaemons.org>
To: cjm2@altavista.net
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/22280: Upgrade ddup port to version 3.0
Date: Thu, 02 Nov 2000 15:42:49 +0900

 I'd like to add the following line to post-patch, also.
 
 	${PERL} -i -pe 's,/etc\b,${PREFIX}$$&,' ${WRKSRC}/ddup.1
 
 Regards,
 
 -- 
                            /
                           /__  __
                          / )  )  ) )  /    and.or.jp / ruby-lang.org
 Akinori -Aki- MUSHA aka / (_ /  ( (__(  @ idaemons.org / FreeBSD.org
 
 "We're only at home when we're on the run, on the wing, on the fly"
 
State-Changed-From-To: open->closed 
State-Changed-By: knu 
State-Changed-When: Sat Nov 4 01:21:51 JST 2000 
State-Changed-Why:  
Committed with some improvements, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22280 
>Unformatted:
