4 files changed, 29 insertions, 29 deletions

diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index 54f55979ae6f..18dcd966b455 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dcc-dccd
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
@@ -16,10 +16,6 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	Distributed Checksum Clearinghouse procmail, sendmail support
 
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 MANCOMPRESSED=	yes
@@ -37,11 +33,12 @@ DCCUID?=	112
 DCCGROUP?=	dcc
 DCCGID?=	112
 
-# if no preference was set, check for an up to date base version
-# but give an installed port preference over it.
+#
+# Use configure script to set locations of all files. Use of
+# sed scripting breaks things.
+#
 
-HOMEDIR=	${PREFIX}/dcc
-CONFIGURE_ARGS=	--homedir=${HOMEDIR}
+CONFIGURE_ARGS=	--homedir=${PREFIX}/dcc --bindir=${PREFIX}/bin --mandir=${PREFIX}/man --with-rundir=/var/run
 
 .include <bsd.port.pre.mk>
 
@@ -87,6 +84,7 @@ PLIST_SUB+=	WITH_DCCIFD=""
 .endif
 
 CONFIGURE_ARGS+=	--with-uid=${DCCUSER}
+
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%DCCUSER%%|${DCCUSER}|g' -e 's|%%DCCUID%%|${DCCUID}|g' \
 		-e 's|%%DCCGROUP%%|${DCCGROUP}|g' -e 's|%%DCCGID%%|${DCCGID}|g'
@@ -102,23 +100,12 @@ pre-everything::
 	@${ECHO_MSG} 'WITHOUT_SENDMAIL=yes'
 	@${ECHO_MSG} ''
 
-post-patch:
-	${FIND} ${WRKSRC} -type f -exec \
-		${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' {} \;
-	${REINPLACE_CMD} -e 's,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS -pthread,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS,g' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's,FreeBSD)\n\tPTHREAD_LDFLAGS,FreeBSD)\n\tDCC_CFLAGS="${PTHREAD_CFLAGS} $$DCC_CFLAGS"\n\tPTHREAD_LDFLAGS,g' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's,PTHREAD_LIBS="$$PTHREAD_LIBS -lc_r,PTHREAD_LIBS=" ${PTHREAD_LIBS},g' ${WRKSRC}/configure
-
 post-build:
 	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
 	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
-
-post-install:
-	@[ -s ${HOMEDIR}/dcc_conf ] || \
-		${CP} ${HOMEDIR}/dcc_conf.dist ${HOMEDIR}/dcc_conf
+	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/mail/dcc-dccd/distinfo b/mail/dcc-dccd/distinfo
index 0be08702d81b..9c3cb1eed5fd 100644
--- a/mail/dcc-dccd/distinfo
+++ b/mail/dcc-dccd/distinfo
@@ -1,2 +1,2 @@
-MD5 (dcc-dccd-1.3.5.tar.Z) = f51fe9106e79fe0dd00192f7c7998447
-SIZE (dcc-dccd-1.3.5.tar.Z) = 1307125
+MD5 (dcc-dccd-1.3.9.tar.Z) = 89d6336ec9d365db13f0c9a22d64172a
+SIZE (dcc-dccd-1.3.9.tar.Z) = 1346997
diff --git a/mail/dcc-dccd/files/patch-configure b/mail/dcc-dccd/files/patch-configure
index c080050755d1..fca8fdf5605d 100644
--- a/mail/dcc-dccd/files/patch-configure
+++ b/mail/dcc-dccd/files/patch-configure
@@ -1,16 +1,27 @@
---- configure.orig	Thu May 26 21:52:13 2005
-+++ configure	Sun Jun 12 11:17:03 2005
-@@ -2491,6 +2491,13 @@
+--- configure.orig	Fri Jul 22 11:36:56 2005
++++ configure	Sat Jul 23 11:27:41 2005
+@@ -2371,8 +2371,8 @@
+ 	;;
+     *)
+ 	DCCUID=root
+-	BINUID=bin
+-	BIN_GRP=bin
++	BINUID=root
++	BIN_GRP=dcc
+ 	;;
+ esac
+ 
+@@ -2445,6 +2445,13 @@
+     SENDMAIL="$with_sendmail"
      SENDMAIL_EVAL="$SENDMAIL"
      with_sendmail=yes
- fi
++fi
 +if test -n "$SENDMAIL" -a "$SENDMAIL" != "no"; then
 +    if test -f $SENDMAIL/include/libmilter/mfapi.h -a -f $SENDMAIL/lib/libmilter.a; then
 +    SENDMAIL_OBJ=$SENDMAIL/lib
 +    SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
 +    SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
 +    fi
-+fi
+ fi
  if test -z "$SENDMAIL"; then
      # prefer a parallel ../sendmail directory
-     DEPTH=.
diff --git a/mail/dcc-dccd/pkg-plist b/mail/dcc-dccd/pkg-plist
index 75507ee3053d..b5e672b4fb98 100644
--- a/mail/dcc-dccd/pkg-plist
+++ b/mail/dcc-dccd/pkg-plist
@@ -24,8 +24,10 @@ dcc/libexec/dcc-stats-graph
 dcc/libexec/dcc-stats-init
 dcc/libexec/dccd
 dcc/libexec/dccsight
+dcc/libexec/fetchblack
 dcc/libexec/fetch-testmsg-whitelist
 dcc/libexec/hackmc
+dcc/libexec/list-clients
 dcc/libexec/logger
 dcc/libexec/newwebuser
 dcc/libexec/rcDCC