4 files changed, 22 insertions, 26 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 92315bba6b42..3fe40f6304d3 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mimedefang
-PORTVERSION=	2.83
-PORTREVISION=	3
+PORTVERSION=	2.84
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/ \
 		http://fossies.org/linux/misc/
@@ -24,13 +23,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5 shebangfix
 perl_OLD_CMD=	perl
 GNU_CONFIGURE=	yes
-
-MIMEDEFANG_USER?=	mailnull
-MIMEDEFANG_GROUP?=	mailnull
-SPOOLDIR?=		/var/spool/MIMEDefang
-QUARANTINEDIR?=		/var/spool/MD-Quarantine
-
-CONFIGURE_ENV+=		PERL=${PERL}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
 			--with-confsubdir=mimedefang \
 			--with-user=${MIMEDEFANG_USER} \
@@ -38,6 +30,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
 			--with-quarantinedir=${QUARANTINEDIR} \
 			--with-ipheader \
 			--prefix=${PREFIX}
+CONFIGURE_ENV+=		PERL=${PERL}
 
 SUB_FILES=	pkg-message
 
@@ -46,9 +39,13 @@ PLIST_SUB+=	USER="${MIMEDEFANG_USER}" \
 		MIMEDEFANG_RUNDIR="${SPOOLDIR}" \
 		MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"
 
+MIMEDEFANG_USER?=	mailnull
+MIMEDEFANG_GROUP?=	mailnull
+SPOOLDIR?=		/var/spool/MIMEDefang
+QUARANTINEDIR?=		/var/spool/MD-Quarantine
 CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
 
-OPTIONS_DEFINE=	CLAMAV EXAMPLES DOCS
+OPTIONS_DEFINE=	CLAMAV DOCS EXAMPLES
 OPTIONS_DEFAULT=	CLAMAV
 
 CLAMAV_DESC=	Enable Clamav
@@ -72,15 +69,14 @@ pre-install:
 post-install:
 	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${STAGEDIR}${PREFIX}/etc/rc.d/mimedefang
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/
-.endif
 
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \
 		suggested-minimum-filter-for-windows-clients README ${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 96eaeeb09894..0d497b8ab867 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509788754
-SHA256 (mimedefang-2.83.tar.gz) = e92ae6afc09991d5398fd6a0b9d6fd7ff391d9ab9f7722f935926b87c3619068
-SIZE (mimedefang-2.83.tar.gz) = 371389
+TIMESTAMP = 1610741610
+SHA256 (mimedefang-2.84.tar.gz) = 6d1531c70a901fcddf9cb989d488beaf78ac0cc16d11beb981b99200146c4848
+SIZE (mimedefang-2.84.tar.gz) = 371596
diff --git a/mail/mimedefang/pkg-descr b/mail/mimedefang/pkg-descr
index 362dec9817f4..272db2acd69f 100644
--- a/mail/mimedefang/pkg-descr
+++ b/mail/mimedefang/pkg-descr
@@ -17,4 +17,4 @@ things that you can do very easily with MIMEDefang:
 
     Add or delete recipients for a message.
 
-WWW: http://www.mimedefang.org/
+WWW: https://www.mimedefang.org/
diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist
index 62c3cf4b1a14..5dfd868b13d3 100644
--- a/mail/mimedefang/pkg-plist
+++ b/mail/mimedefang/pkg-plist
@@ -1,8 +1,8 @@
-bin/mimedefang-multiplexor
+bin/md-mx-ctrl
 bin/mimedefang
-bin/mimedefang.pl
+bin/mimedefang-multiplexor
 bin/mimedefang-util
-bin/md-mx-ctrl
+bin/mimedefang.pl
 bin/watch-mimedefang
 bin/watch-multiple-mimedefangs.tcl
 etc/rc.d/mimedefang
@@ -16,19 +16,19 @@ man/man8/mimedefang.8.gz
 man/man8/mimedefang.pl.8.gz
 man/man8/watch-mimedefang.8.gz
 man/man8/watch-multiple-mimedefangs.8.gz
-@sample %%ETCDIR%%/mimedefang-ip-key.sample
 @sample %%ETCDIR%%/mimedefang-filter.sample
+@sample %%ETCDIR%%/mimedefang-ip-key.sample
 @sample %%ETCDIR%%/sa-mimedefang.cf.sample
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN
-%%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE
+%%PORTDOCS%%%%DOCSDIR%%/README.IRIX
 %%PORTDOCS%%%%DOCSDIR%%/README.NONROOT
 %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE
+%%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN
 %%PORTDOCS%%%%DOCSDIR%%/README.TRU64
-%%PORTDOCS%%%%DOCSDIR%%/README.IRIX
 %%PORTDOCS%%%%DOCSDIR%%/README.VEXIRA
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stream-by-domain-filter
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
-@dir(%%USER%%,%%GROUP%%,710) %%MIMEDEFANG_RUNDIR%%
 @dir(%%USER%%,%%GROUP%%,700) %%MIMEDEFANG_QUARANTINEDIR%%
+@dir(%%USER%%,%%GROUP%%,710) %%MIMEDEFANG_RUNDIR%%