From 9ab42def12260cc4a395ebc30772c2010ff87b0a Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Fri, 3 Mar 2006 09:09:23 +0000 Subject: - Update to to 1.3.29 - Unbreak (make it fetchable again) PR: 93415, 93881 Submitted by: ehaupt, Dean Hollister (maintainer) Approved by: portmgr (erwin) --- mail/dcc-dccd/Makefile | 13 +++++--- mail/dcc-dccd/distinfo | 6 ++-- mail/dcc-dccd/files/patch-homedir::Makefile.in | 28 +++++++++++++++-- mail/dcc-dccd/pkg-plist | 43 +++++++++++++++++++------- 4 files changed, 67 insertions(+), 23 deletions(-) (limited to 'mail') diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile index 131f9e6387f7..d4fed6918d14 100644 --- a/mail/dcc-dccd/Makefile +++ b/mail/dcc-dccd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dcc-dccd -PORTVERSION= 1.3.27 +PORTVERSION= 1.3.29 CATEGORIES= mail MASTER_SITES= http://www.rhyolite.com/anti-spam/dcc/source/ \ http://www.wa.apana.org.au/~dean/sources/ \ @@ -16,9 +16,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= dean@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 @@ MILTERBASE= /usr 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" +IGNORE= base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes .endif .endif .else @@ -110,4 +107,10 @@ pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL +post-install: +.if !exists(${PREFIX}/dcc/map) + ${CP} ${PREFIX}/dcc/map ${PREFIX}/dcc/map.dist + @${CHOWN} ${DCCUSER} ${PREFIX}/dcc/map.dist +.endif + .include diff --git a/mail/dcc-dccd/distinfo b/mail/dcc-dccd/distinfo index c93723cbac7a..b80d9226fe88 100644 --- a/mail/dcc-dccd/distinfo +++ b/mail/dcc-dccd/distinfo @@ -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 --git a/mail/dcc-dccd/files/patch-homedir::Makefile.in b/mail/dcc-dccd/files/patch-homedir::Makefile.in index ba48b83c0722..86224591e1e9 100644 --- a/mail/dcc-dccd/files/patch-homedir::Makefile.in +++ b/mail/dcc-dccd/files/patch-homedir::Makefile.in @@ -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 Wed Mar 1 07:39:11 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,25 @@ 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; \ ++ <$(INST_HOMEDIR)/map.txt.dist >/dev/null; \ ++ set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt.dist \ ++ $(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids.dist; \ + fi diff --git a/mail/dcc-dccd/pkg-plist b/mail/dcc-dccd/pkg-plist index d892590ced6d..c7f3179e5b02 100644 --- a/mail/dcc-dccd/pkg-plist +++ b/mail/dcc-dccd/pkg-plist @@ -1,3 +1,33 @@ +@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 +@exec [ -f %B/dcc_conf ] || cp %B/%f %B/dcc_conf +@unexec if cmp -s %D/dcc/flod %D/dcc/flod.dist; then rm -f %D/dcc/flod; fi +dcc/flod.dist +@exec [ -f %B/flod ] || cp %B/%f %B/flod +@unexec if cmp -s %D/dcc/grey_flod %D/dcc/grey_flod.dist; then rm -f %D/dcc/grey_flod; fi +dcc/grey_flod.dist +@exec [ -f %B/grey_flod ] || cp %B/%f %B/grey_flod +@unexec if cmp -s %D/dcc/grey_whitelist %D/dcc/grey_whitelist.dist; then rm -f %D/dcc/grey_whitelist; fi +dcc/grey_whitelist.dist +@exec [ -f %B/grey_whitelist ] || cp %B/%f %B/grey_whitelist +@unexec if cmp -s %D/dcc/ids %D/dcc/ids.dist; then rm -f %D/dcc/ids; fi +dcc/ids.dist +@exec [ -f %B/ids ] || cp %B/%f %B/ids +@unexec if cmp -s %D/dcc/map %D/dcc/map.dist; then rm -f %D/dcc/map; fi +dcc/map.dist +@exec [ -f %B/map ] || cp %B/%f %B/map +@unexec if cmp -s %D/dcc/map.txt %D/dcc/map.txt.dist; then rm -f %D/dcc/map.txt; fi +dcc/map.txt.dist +@exec [ -f %B/map.txt ] || cp %B/%f %B/map.txt +@unexec if cmp -s %D/dcc/whiteclnt %D/dcc/whiteclnt.dist; then rm -f %D/dcc/whiteclnt; fi +dcc/whiteclnt.dist +@exec [ -f %B/whiteclnt ] || cp %B/%f %B/whiteclnt +@unexec if cmp -s %D/dcc/whitecommon %D/dcc/whitecommon.dist; then rm -f %D/dcc/whitecommon; fi +dcc/whitecommon.dist +@exec [ -f %B/whitecommon ] || cp %B/%f %B/whitecommon +@unexec if cmp -s %D/dcc/whitelist %D/dcc/whitelist.dist; then rm -f %D/dcc/whitelist; fi +dcc/whitelist.dist +@exec [ -f %B/whitelist ] || cp %B/%f %B/whitelist bin/cdcc bin/dccif-test bin/dccproc @@ -9,12 +39,6 @@ dcc/cgi-bin/http2https dcc/cgi-bin/list-log dcc/cgi-bin/list-msg 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/libexec/cron-dccd %%WITH_DCCIFD%%dcc/libexec/dccifd %%WITH_SENDMAIL%%dcc/libexec/dccm @@ -40,12 +64,7 @@ dcc/libexec/stats-get dcc/libexec/stop-dccd dcc/libexec/updatedcc dcc/libexec/wlist -dcc/map -dcc/map.txt -dcc/whiteclnt -dcc/whitecommon -dcc/whitelist @dirrm dcc/log @dirrm dcc/libexec @dirrm dcc/cgi-bin -@dirrm dcc +@dirrmtry dcc -- cgit v1.2.3