upgrade to 2.20

PR:		42494
Submitted by:	maintainer

4 files changed, 18 insertions, 15 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 332e649..5838231 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mimedefang
-PORTVERSION=	2.19
+PORTVERSION=	2.20
 CATEGORIES=	mail
 MASTER_SITES=	http://www.roaringpenguin.com/mimedefang/
 
@@ -23,7 +23,9 @@ BUILD_DEPENDS=	\
 USE_PERL5=	yes
 PERL_SITELIBDIR=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/mimedefang --with-confsubdir=
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/mimedefang \
+			--with-confsubdir= \
+			--with-user=mailnull
 
 MAN5=	mimedefang-filter.5
 MAN7=	mimedefang-protocol.7
@@ -43,8 +45,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}
 .endif
-	@${CHOWN} mailnull:mailnull /var/spool/MIMEDefang
-	@${CHMOD} 700 /var/spool/MIMEDefang
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 18645fa..a315424 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1 +1 @@
-MD5 (mimedefang-2.19.tar.gz) = 7be1744ce6aae957e8bae21e7c597c5b
+MD5 (mimedefang-2.20.tar.gz) = cf1513a79581e622d30a8b569bedf8a2
diff --git a/mail/mimedefang/files/patch-Makefile.in b/mail/mimedefang/files/patch-Makefile.in
index 0cb64dc..009ac79 100644
--- a/mail/mimedefang/files/patch-Makefile.in
+++ b/mail/mimedefang/files/patch-Makefile.in
@@ -1,8 +1,11 @@
---- Makefile.in.orig	Thu Aug 22 10:50:20 2002
-+++ Makefile.in	Thu Aug 22 11:24:27 2002
-@@ -112,9 +112,8 @@
- 	-mkdir -p $(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@SPOOLDIR@
- 	-mkdir -p $(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@QDIR@
+--- Makefile.in.orig	Sat Sep  7 02:05:48 2002
++++ Makefile.in	Sat Sep  7 02:18:17 2002
+@@ -128,11 +128,10 @@
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(MANDIR)/man7
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(MANDIR)/man8
+ 	-test ! -d $(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@SPOOLDIR@
+-	-test ! -d $(RPM_INSTALL_ROOT)@QDIR@ mkdir -p $(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@QDIR@
++	-test ! -d $(RPM_INSTALL_ROOT)@QDIR@ && mkdir -p $(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@QDIR@
  
 -	if test -f $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \
 -		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
@@ -12,7 +15,7 @@
  		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \
  	fi
  
-@@ -127,10 +126,9 @@
+@@ -145,10 +144,9 @@
  	@INSTALL@ -m 644 mimedefang-filter.5      $(RPM_INSTALL_ROOT)$(MANDIR)/man5/mimedefang-filter.5
  	@INSTALL@ -m 644 mimedefang-protocol.7    $(RPM_INSTALL_ROOT)$(MANDIR)/man7/mimedefang-protocol.7
  	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
diff --git a/mail/mimedefang/files/patch-init-script.in b/mail/mimedefang/files/patch-init-script.in
index e650afe..dbd39b2 100644
--- a/mail/mimedefang/files/patch-init-script.in
+++ b/mail/mimedefang/files/patch-init-script.in
@@ -1,11 +1,11 @@
---- examples/init-script.in.orig	Sat Jun 15 19:27:26 2002
-+++ examples/init-script.in	Sat Jun 15 19:28:03 2002
+--- examples/init-script.in.orig	Sat Sep  7 02:04:17 2002
++++ examples/init-script.in	Sat Sep  7 02:05:03 2002
 @@ -37,7 +37,7 @@
  MULTIPLEXOR=yes
  
  # Run the multiplexor and filters as this user, not root.  RECOMMENDED
--# MX_USER=defang
-+MX_USER=mailnull
+-# MX_USER=@DEFANGUSER_DEFAULT@
++MX_USER=@DEFANGUSER_DEFAULT@
  
  # If you want to keep spool directories around if the filter fails,
  # set the next one to yes