ports/93881: Upgraded Port: mail/dcc-dccd to 1.3.29

[Dean Hollister]

>Number:         93881
>Category:       ports
>Synopsis:       Upgraded Port: mail/dcc-dccd to 1.3.29
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 27 02:10:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Dean Hollister
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Australian Public Access Network Association Inc
>Environment:
System: FreeBSD odyssey.apana.org.au 4.11-STABLE FreeBSD 4.11-STABLE #0: Wed Sep 21 06:20:10 WST 2005 root at odyssey.apana.org.au:/usr/obj/usr/src/sys/ODYSSEY i386
>Description:
Upgraded Port: mail/dcc-dccd to 1.3.29.
Deinstallation of config files problem is fixed in this upgrade. Config files will now install with 
.dist extensions.

This PR is to replace PR 93415.
>How-To-Repeat:
>Fix:
diff -ruN dcc-dccd.orig/Makefile dcc-dccd/Makefile
--- dcc-dccd.orig/Makefile	Mon Feb 27 09:23:29 2006
+++ dcc-dccd/Makefile	Mon Feb 27 09:41:34 2006
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	dcc-dccd
-PORTVERSION=	1.3.27
+PORTVERSION=	1.3.29
 CATEGORIES=	mail
-MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/old/ \
+MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/unix/packages/
 EXTRACT_SUFX=	.tar.Z
@@ -16,9 +16,6 @@
 MAINTAINER=	dean at odyssey.apana.org.au
 COMMENT=	Distributed Checksum Clearinghouse procmail, sendmail support
 
-#BROKEN=		Unfetchable
-
-USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 MANCOMPRESSED=	yes
 MAN8=		cdcc.8 dbclean.8 dblist.8 dcc.8 dccd.8 dccifd.8 dccm.8 \
@@ -54,7 +51,7 @@
 WITH_SENDMAIL=	yes
 .else
 .if !defined(WITHOUT_SENDMAIL)
-BROKEN=		"Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes"
+BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes
 .endif
 .endif
 .else
diff -ruN dcc-dccd.orig/distinfo dcc-dccd/distinfo
--- dcc-dccd.orig/distinfo	Tue Feb 21 07:00:25 2006
+++ dcc-dccd/distinfo	Mon Feb 27 08:24:10 2006
@@ -1,3 +1,3 @@
-MD5 (dcc-dccd-1.3.27.tar.Z) = 1aa43c1ec6841b86bae50208b3ffdf03
-SHA256 (dcc-dccd-1.3.27.tar.Z) = 28d189c1602fbe369f3133946cc827d38bae0b00e281f55401c3adceeb408a29
-SIZE (dcc-dccd-1.3.27.tar.Z) = 1400407
+MD5 (dcc-dccd-1.3.29.tar.Z) = 5d52f9a6173a8755355c745f67a21856
+SHA256 (dcc-dccd-1.3.29.tar.Z) = bbaa3b864221a31ec3aebe72910578a6544d37248744e7e5373c35681ea141d9
+SIZE (dcc-dccd-1.3.29.tar.Z) = 1399517
diff -ruN dcc-dccd.orig/files/patch-homedir::Makefile.in dcc-dccd/files/patch-homedir::Makefile.in
--- dcc-dccd.orig/files/patch-homedir::Makefile.in	Sun Sep 18 04:12:28 2005
+++ dcc-dccd/files/patch-homedir::Makefile.in	Mon Feb 27 09:31:14 2006
@@ -1,6 +1,6 @@
---- homedir/Makefile.in.orig	Tue Aug  2 18:04:26 2005
-+++ homedir/Makefile.in	Sat Sep 17 13:42:56 2005
-@@ -45,11 +45,7 @@
+--- homedir/Makefile.in.orig	Thu Sep  8 09:57:07 2005
++++ homedir/Makefile.in	Mon Feb 27 09:30:03 2006
+@@ -51,15 +51,11 @@
  	  $(HINSTALL) -m 755 -d $(INST_HOMEDIR); fi
  	if test ! -d $(INST_HOMEDIR)/log; then \
  	  $(HINSTALL) -m 710 -d $(INST_HOMEDIR)/log; fi
@@ -13,3 +13,24 @@
  	for nm in flod grey_flod whitelist grey_whitelist \
  		whiteclnt whitecommon; do \
  	  if test ! -f $(INST_HOMEDIR)/$$nm; then \
+-		$(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm; fi; \
++		$(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm.dist; fi; \
+ 	  done
+ 	@if test ! -f $(INST_HOMEDIR)/ids \
+ 		 -a ! -f $(INST_HOMEDIR)/map \
+@@ -67,11 +63,11 @@
+ 	  PASSWD1=`ps|cksum|tr ' 	' 'xy'`; \
+ 	  PASSWD2=`ps|cksum|tr ' 	' 'yx'`; \
+ 	  umask 077; \
+-	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt; \
++	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt.dist; \
+ 	  sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids \
+-		>$(INST_HOMEDIR)/ids; \
++		>$(INST_HOMEDIR)/ids.dist; \
+ 	  ${DEPTH}/cdcc/cdcc -qh $(INST_HOMEDIR) 'new map; load -' \
+ 		<$(INST_HOMEDIR)/map.txt >/dev/null; \
+-	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt \
+-			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids; \
++	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt.dist \
++			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids.dist; \
+ 	fi
diff -ruN dcc-dccd.orig/pkg-plist dcc-dccd/pkg-plist
--- dcc-dccd.orig/pkg-plist	Sun Sep 18 04:12:27 2005
+++ dcc-dccd/pkg-plist	Mon Feb 27 09:34:02 2006
@@ -11,10 +11,10 @@
 dcc/cgi-bin/webuser-notify
 @unexec if cmp -s %D/dcc/dcc_conf %D/dcc/dcc_conf.dist; then rm -f %D/dcc/dcc_conf; fi
 dcc/dcc_conf.dist
-dcc/flod
-dcc/grey_flod
-dcc/grey_whitelist
-dcc/ids
+dcc/flod.dist
+dcc/grey_flod.dist
+dcc/grey_whitelist.dist
+dcc/ids.dist
 dcc/libexec/cron-dccd
 %%WITH_DCCIFD%%dcc/libexec/dccifd
 %%WITH_SENDMAIL%%dcc/libexec/dccm
@@ -40,11 +40,11 @@
 dcc/libexec/stop-dccd
 dcc/libexec/updatedcc
 dcc/libexec/wlist
-dcc/map
-dcc/map.txt
-dcc/whiteclnt
-dcc/whitecommon
-dcc/whitelist
+dcc/map.dist
+dcc/map.txt.dist
+dcc/whiteclnt.dist
+dcc/whitecommon.dist
+dcc/whitelist.dist
 @dirrm dcc/log
 @dirrm dcc/libexec
 @dirrm dcc/cgi-bin
>Release-Note:
>Audit-Trail:
>Unformatted: