5 files changed, 45 insertions, 46 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index db2d1f11fe56..73710106a81c 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mimedefang
-PORTVERSION=	2.68
-PORTREVISION=	1
+PORTVERSION=	2.71
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/
 
@@ -22,6 +21,7 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+LICENSE=	GPLv2
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
@@ -50,6 +50,8 @@ MAN8=	mimedefang.8 mimedefang.pl.8 mimedefang-multiplexor.8 \
 
 SUB_FILES=	pkg-message
 
+CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf
+
 .include <bsd.port.pre.mk>
 
 .if !exists( /usr/include/libmilter/mfapi.h )
@@ -73,6 +75,12 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}/
 .endif
+.for f in ${CONFIG_FILES}
+	@if [ ! -f ${ETCDIR}/${f} ]; then \
+		${CP} -p ${ETCDIR}/${f}.example ${ETCDIR}/${f} ; \
+	fi
+.endfor
+
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 5c01c71aedce..39bb5e38e187 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.68.tar.gz) = af6d947eef87f00fe513045bf79828808ea42b9cf70eaee033d5e96e73edf61a
-SIZE (mimedefang-2.68.tar.gz) = 342973
+SHA256 (mimedefang-2.71.tar.gz) = e743bf506b68110cc0ed1fa588749372330b251b2aa8276377e1cec3fb051e68
+SIZE (mimedefang-2.71.tar.gz) = 343211
diff --git a/mail/mimedefang/files/patch-Makefile.in b/mail/mimedefang/files/patch-Makefile.in
index 15e6a17b5eea..951ac2d921a0 100644
--- a/mail/mimedefang/files/patch-Makefile.in
+++ b/mail/mimedefang/files/patch-Makefile.in
@@ -1,38 +1,30 @@
---- ./Makefile.in.orig	2010-02-16 17:29:59.000000000 +0100
-+++ ./Makefile.in	2010-05-09 16:46:21.000000000 +0200
-@@ -201,7 +201,7 @@
- 		chown "$(DEFANGUSER)" $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
- 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ > /dev/null 2>&1 || true; \
- 		chown "$(DEFANGUSER)" $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true; \
--		chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || exit 1; \
-+		chmod 710 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || exit 1; \
- 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ > /dev/null 2>&1 || true; \
- 		chown "$(DEFANGUSER)" $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || true; \
- 		chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || exit 1; \
-@@ -215,12 +215,11 @@
- 	-mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man5 && chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man5
- 	-mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man7 && chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man7
+--- Makefile.in.orig	2010-06-16 23:06:45.000000000 +0400
++++ Makefile.in	2011-06-21 22:17:55.182195879 +0400
+@@ -217,13 +217,7 @@
  	-mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man8 && chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man8
--	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
-+	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 710 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
+ 	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
  	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || true
- 
+-
 -	if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \
 -		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
 -	else \
-+	@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example
-+	if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter) ; then \
- 		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \
- 	fi
- 
-@@ -242,9 +241,8 @@
+-		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \
+-	fi
+-
++	@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1
+ 	@INSTALL@ -m 755 mimedefang-multiplexor   $(DESTDIR)$(RPM_INSTALL_ROOT)$(prefix)/bin/mimedefang-multiplexor
+ 	@INSTALL@ -m 755 md-mx-ctrl               $(DESTDIR)$(RPM_INSTALL_ROOT)$(prefix)/bin/md-mx-ctrl
+ 	@INSTALL@ -m 755 watch-mimedefang         $(DESTDIR)$(RPM_INSTALL_ROOT)$(prefix)/bin/watch-mimedefang
+@@ -242,11 +236,7 @@
  	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
  		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} > /dev/null 2>&1 ; \
  		chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} ;\
 -		if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf ; then \
- 			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
+-			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
 -		else \
-+		if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf) ; then \
- 			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf || exit 1; \
- 		fi \
+-			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf || exit 1; \
+-		fi \
++		@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1 ; \
  	fi
+ 
+ 	@echo ""
diff --git a/mail/mimedefang/files/patch-mimedefang.pl.in b/mail/mimedefang/files/patch-mimedefang.pl.in
index 662183db6bad..cec261143c14 100644
--- a/mail/mimedefang/files/patch-mimedefang.pl.in
+++ b/mail/mimedefang/files/patch-mimedefang.pl.in
@@ -1,11 +1,9 @@
---- ./mimedefang.pl.in.orig	2010-02-24 15:55:03.000000000 +0100
-+++ ./mimedefang.pl.in	2010-05-09 16:46:21.000000000 +0200
-@@ -184,7 +184,7 @@
+--- mimedefang.pl.in.orig	2011-02-18 22:08:53.000000000 +0300
++++ mimedefang.pl.in	2011-02-18 22:09:18.000000000 +0300
+@@ -172,7 +172,7 @@
  $Fprotd6Host = "127.0.0.1:10200";
  
- $SophieSock = "@SPOOLDIR@/sophie";
--$ClamdSock  = "@SPOOLDIR@/clamd.sock";
-+$ClamdSock  = "/var/run/clamav/clamd.sock";
- $TrophieSock = "@SPOOLDIR@/trophie";
- 
- package MIME::Parser::ParanoidFiler;
+ $SophieSock = '@SPOOLDIR@/sophie';
+-$ClamdSock  = '@SPOOLDIR@/clamd.sock';
++$ClamdSock  = '/var/run/clamav/clamd.sock';
+ $TrophieSock = '@SPOOLDIR@/trophie';
diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist
index 3e3a829ef001..6b20f1e7a0e0 100644
--- a/mail/mimedefang/pkg-plist
+++ b/mail/mimedefang/pkg-plist
@@ -5,12 +5,13 @@ bin/md-mx-ctrl
 bin/watch-mimedefang
 bin/watch-multiple-mimedefangs.tcl
 etc/rc.d/mimedefang
-@unexec if cmp -s %D/etc/mimedefang/mimedefang-filter %D/etc/mimedefang/mimedefang-filter.example; then rm -f %D/etc/mimedefang/mimedefang-filter; fi
-etc/mimedefang/mimedefang-filter.example
-@unexec if cmp -s %D/etc/mimedefang/sa-mimedefang.cf %D/etc/mimedefang/sa-mimedefang.cf.example; then rm -f %D/etc/mimedefang/sa-mimedefang.cf; fi
-etc/mimedefang/sa-mimedefang.cf.example
+@unexec if cmp -s %D/%%ETCDIR%%/mimedefang-filter %D/%%ETCDIR%%/mimedefang-filter.example; then rm -f %D/%%ETCDIR%%/mimedefang-filter; fi
+%%ETCDIR%%/mimedefang-filter.example
+@exec [ -f %B/mimedefang-filter ] || cp -p %D/%F %B/mimedefang-filter
+@unexec if cmp -s %D/%%ETCDIR%%/sa-mimedefang.cf %D/%%ETCDIR%%/sa-mimedefang.cf.example; then rm -f %D/%%ETCDIR%%/sa-mimedefang.cf; fi
+%%ETCDIR%%/sa-mimedefang.cf.example
+@exec [ -f %B/sa-mimedefang.cf ] || cp -p %D/%F %B/sa-mimedefang.cf
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.ANOMY
 %%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN
 %%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE
 %%PORTDOCS%%%%DOCSDIR%%/README.NONROOT
@@ -23,7 +24,7 @@ etc/mimedefang/sa-mimedefang.cf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/mimedefang
+@dirrmtry %%ETCDIR%%
 @cwd /var/spool
 @dirrm MIMEDefang
 @dirrm MD-Quarantine