4 files changed, 27 insertions, 28 deletions

diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index b5fa6e9ff484..3008bd33d994 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	dcc-dccd
-PORTVERSION=	1.2.66
+PORTVERSION=	1.3.5
 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
@@ -33,16 +33,6 @@ DCCUID?=	112
 DCCGROUP?=	dcc
 DCCGID?=	112
 
-#
-# You can choose the sendmail to be used by specifying
-#
-# WITH_SENDMAIL_BASE=yes
-#  or
-# WITH_SENDMAIL_PORT=yes
-#  or
-# WITHOUT_SENDMAIL=yes
-#
-
 # if no preference was set, check for an up to date base version
 # but give an installed port preference over it.
 
@@ -61,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"
+BROKEN=		"Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes"
 .endif
 .endif
 .else
@@ -97,6 +87,17 @@ 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'
 
+pre-everything::
+	@${ECHO_MSG} ' '
+	@${ECHO_MSG} 'You can choose the sendmail to be used by specifying:'
+	@${ECHO_MSG} ' '
+	@${ECHO_MSG} 'WITH_SENDMAIL_BASE=yes'
+	@${ECHO_MSG} 'or'
+	@${ECHO_MSG} 'WITH_SENDMAIL_PORT=yes'
+	@${ECHO_MSG} 'or'
+	@${ECHO_MSG} 'WITHOUT_SENDMAIL=yes'
+	@${ECHO_MSG} ''
+
 post-patch:
 	${FIND} ${WRKSRC} -type f -exec \
 		${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' {} \;
diff --git a/mail/dcc-dccd/distinfo b/mail/dcc-dccd/distinfo
index 2210236b048e..0be08702d81b 100644
--- a/mail/dcc-dccd/distinfo
+++ b/mail/dcc-dccd/distinfo
@@ -1,2 +1,2 @@
-MD5 (dcc-dccd-1.2.66.tar.Z) = fa59dd012edab462462e552482bd9872
-SIZE (dcc-dccd-1.2.66.tar.Z) = 1181351
+MD5 (dcc-dccd-1.3.5.tar.Z) = f51fe9106e79fe0dd00192f7c7998447
+SIZE (dcc-dccd-1.3.5.tar.Z) = 1307125
diff --git a/mail/dcc-dccd/files/patch-configure b/mail/dcc-dccd/files/patch-configure
index f9c6cec4f8f6..c080050755d1 100644
--- a/mail/dcc-dccd/files/patch-configure
+++ b/mail/dcc-dccd/files/patch-configure
@@ -1,18 +1,16 @@
---- configure.orig	Mon May 17 21:32:49 2004
-+++ configure	Tue May 25 18:19:48 2004
-@@ -2244,6 +2244,15 @@
+--- configure.orig	Thu May 26 21:52:13 2005
++++ configure	Sun Jun 12 11:17:03 2005
+@@ -2491,6 +2491,13 @@
      SENDMAIL_EVAL="$SENDMAIL"
      with_sendmail=yes
  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
++    SENDMAIL_OBJ=$SENDMAIL/lib
++    SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
++    SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
 +    fi
 +fi
-+#
  if test -z "$SENDMAIL"; then
      # prefer a parallel ../sendmail directory
      DEPTH=.
diff --git a/mail/dcc-dccd/files/patch-homedir::Makefile.in b/mail/dcc-dccd/files/patch-homedir::Makefile.in
index 6efaf21851ad..154aa5b51d63 100644
--- a/mail/dcc-dccd/files/patch-homedir::Makefile.in
+++ b/mail/dcc-dccd/files/patch-homedir::Makefile.in
@@ -1,9 +1,9 @@
---- homedir/Makefile.in	Tue May 25 20:37:04 2004
-+++ homedir/Makefile.in	Tue May 25 20:38:04 2004
-@@ -28,11 +28,7 @@
- install:
+--- homedir/Makefile.in.orig	Sun Jun 12 11:09:03 2005
++++ homedir/Makefile.in	Sun Jun 12 11:10:04 2005
+@@ -44,11 +44,7 @@
  	for nm in $(INST_HOMEDIR) $(INST_HOMEDIR)/log; do \
- 	  $(HINSTALL) -m 755 -d $$nm; done
+ 	  if test ! -d $$nm; then \
+ 	    $(HINSTALL) -m 755 -d $$nm; fi; done
 -	if test -s $(INST_HOMEDIR)/dcc_conf; then \
 -	  sh make-dcc_conf -h $(INST_HOMEDIR); \
 -	else \