Index: head/mail/mimedefang/Makefile
===================================================================
--- head/mail/mimedefang/Makefile	(revision 456303)
+++ head/mail/mimedefang/Makefile	(revision 456304)
@@ -1,94 +1,86 @@
 # Created by: Andrey V. Pevnev <andrey@mgul.ac.ru>
 # $FreeBSD$
 
 PORTNAME=	mimedefang
-PORTVERSION=	2.78
-PORTREVISION=	2
+PORTVERSION=	2.83
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/ \
 		http://fossies.org/linux/misc/
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Milter based anti-spam and anti-virus filtering program
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	\
 	p5-IO-stringy>=0:devel/p5-IO-stringy \
 	p5-MIME-Tools>=5.417:mail/p5-MIME-Tools \
 	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
 	spamassassin>=3.0:mail/spamassassin
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	CLAMAV EXAMPLES DOCS
 OPTIONS_DEFAULT=	CLAMAV
 CLAMAV_DESC=	Enable Clamav
 
 USES=		perl5 shebangfix
-SHEBANG_FILES=	script/mimedefang-util
 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} \
 			--with-spooldir=${SPOOLDIR} \
 			--with-quarantinedir=${QUARANTINEDIR} \
 			--with-ipheader \
 			--prefix=${PREFIX}
 
 SUB_FILES=	pkg-message
 
 PLIST_SUB+=	USER="${MIMEDEFANG_USER}" \
 		GROUP="${MIMEDEFANG_GROUP}" \
 		MIMEDEFANG_RUNDIR="${SPOOLDIR}" \
 		MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"
 
 CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
 
 .include <bsd.port.options.mk>
 
-.if !exists( /usr/include/libmilter/mfapi.h )
-BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:mail/libmilter
-.endif
+.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if exists( ${LOCALBASE}/include/libmilter/mfapi.h )
+.if defined(WITH_SENDMAIL_PORT)
 CONFIGURE_ARGS+=	--with-milterinc=${LOCALBASE}/include --with-milterlib=${LOCALBASE}/lib
 .endif
 
-.if defined (MIMEDEFANG_DISABLE_CLAMAV) || ! ${PORT_OPTIONS:MCLAMAV}
-CONFIGURE_ARGS+=	--disable-antivirus \
-			--disable-clamav \
-			--disable-clamd
-.else
-BUILD_DEPENDS+=	clamscan:security/clamav
-RUN_DEPENDS+=	clamscan:security/clamav
-.endif
+CLAMAV_BUILD_DEPENDS+=		clamscan:security/clamav
+CLAMAV_RUN_DEPENDS+=		clamscan:security/clamav
+CLAMAV_CONFIGURE_ENABLE+=	antivirus clamav clamd
 
 post-patch:
 	@${REINPLACE_CMD} -e '/fgrep -e/d' ${WRKSRC}/configure
 
 pre-install:
 	@${REINPLACE_CMD} -e '/LOCAL_STATE_DIR/s,/var/lib,/var/db,' ${WRKSRC}/mimedefang.pl
 
 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}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${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>
Index: head/mail/mimedefang/distinfo
===================================================================
--- head/mail/mimedefang/distinfo	(revision 456303)
+++ head/mail/mimedefang/distinfo	(revision 456304)
@@ -1,2 +1,3 @@
-SHA256 (mimedefang-2.78.tar.gz) = 8c363063fa6937826f8647e47fc3e5ef999ccb90110e0cb64befdd45cda8372c
-SIZE (mimedefang-2.78.tar.gz) = 364501
+TIMESTAMP = 1509788754
+SHA256 (mimedefang-2.83.tar.gz) = e92ae6afc09991d5398fd6a0b9d6fd7ff391d9ab9f7722f935926b87c3619068
+SIZE (mimedefang-2.83.tar.gz) = 371389
Index: head/mail/mimedefang/files/patch-Makefile.in
===================================================================
--- head/mail/mimedefang/files/patch-Makefile.in	(revision 456303)
+++ head/mail/mimedefang/files/patch-Makefile.in	(revision 456304)
@@ -1,47 +1,47 @@
---- Makefile.in.orig	2012-01-20 15:20:32 UTC
+--- Makefile.in.orig	2016-09-29 20:20:27 UTC
 +++ Makefile.in
-@@ -156,14 +156,14 @@ install-redhat: install
+@@ -157,14 +157,14 @@ install-redhat: install
  
  install: all
  	$(INSTALL) -m 755 -d $(DESTDIR)${CONFDIR}
 -	-if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key" ; then \
 -		$(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key ;\
 -		-chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 ; \
 +	-if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample" ; then \
 +		$(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample ;\
 +		-chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample > /dev/null 2>&1 ; \
  	fi
  
  	if test "$(DEFANGUSER)" != "" ; then \
  		if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \
 -			chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
 +			chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample > /dev/null 2>&1 || true; \
  			test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 || true; \
  			test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 || true; \
                  fi \
-@@ -185,11 +185,7 @@ install: all
+@@ -186,11 +186,7 @@ install: all
  	-test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 750 $(DESTDIR)$(SPOOLDIR) || true
  	-test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 750 $(DESTDIR)$(QDIR) || true
  
 -	if test -f $(DESTDIR)${CONFDIR}/mimedefang-filter ; then \
 -		$(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.example || exit 1; \
 -	else \
 -		$(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter || exit 1; \
 -	fi
 +	$(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.sample || exit 1
  
  	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor   $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor
  	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) md-mx-ctrl               $(DESTDIR)$(prefix)/bin/md-mx-ctrl
-@@ -210,11 +206,7 @@ install: all
+@@ -211,11 +207,7 @@ install: all
  	$(INSTALL) -m 644 mimedefang-protocol.7    $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7
  	$(INSTALL) -m 644 mimedefang-notify.7      $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7
  	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
 -		if test -f $(DESTDIR)${CONFDIR}/sa-mimedefang.cf ; then \
 -			$(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
 -		else \
 -			$(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf || exit 1; \
 -		fi \
 +		$(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.sample || exit 1; \
  	fi
  
  distro: FORCE
Index: head/mail/mimedefang/files/patch-examples__init-script.in
===================================================================
--- head/mail/mimedefang/files/patch-examples__init-script.in	(revision 456303)
+++ head/mail/mimedefang/files/patch-examples__init-script.in	(revision 456304)
@@ -1,107 +1,107 @@
---- examples/init-script.in.orig	2012-01-20 15:24:01 UTC
+--- examples/init-script.in.orig	2017-09-07 17:52:24 UTC
 +++ examples/init-script.in
-@@ -39,6 +39,12 @@ export LC_ALL
+@@ -41,6 +41,12 @@ export LC_ALL
  # The socket used by mimedefang to communicate with sendmail
  # SOCKET=$SPOOLDIR/mimedefang.sock
  
 +# Timeout while waiting for socket to appear
 +# SOCKET_TIMEOUT=60
 +
 +# The value of socket file access mode
 +# SOCKET_MODE=600
 +
  # Run the multiplexor and filters as this user, not root.  RECOMMENDED
  MX_USER=@DEFANGUSER@
  
-@@ -136,11 +142,11 @@ MX_MAXIMUM=10
+@@ -138,11 +144,11 @@ MX_MAXIMUM=10
  
- # Limit slave processes' resident-set size to this many kilobytes.  Default
+ # Limit worker processes' resident-set size to this many kilobytes.  Default
  # is unlimited.
 -# MX_MAX_RSS=10000
 +MX_MAX_RSS=100000
  
- # Limit total size of slave processes' memory space to this many kilobytes.
+ # Limit total size of worker processes' memory space to this many kilobytes.
  # Default is unlimited.
 -# MX_MAX_AS=30000
 +MX_MAX_AS=300000
  
  # If you want to use the "notification" facility, set the appropriate port.
  # See the mimedefang-notify man page for details.
-@@ -187,7 +193,7 @@ then
+@@ -189,7 +195,7 @@ then
      . /etc/rc.subr
  
      name=$prog
 -    rcvar=`set_rcvar`
 +    rcvar=${prog}_enable
      # default to not enabled, enable in rc.conf
      eval $rcvar=\${$rcvar:-NO}
  
-@@ -197,6 +203,7 @@ then
+@@ -199,6 +205,7 @@ then
      procname=$PROGDIR/$prog-multiplexor
      start_cmd="start_it"
      stop_cmd="stop_it"
 +    restart_cmd="restart_it"
      sig_reload="INT"
      reread_cmd="reread_it"
      # provide both "reload", the FreeBSD default, with a direct signal to
-@@ -207,6 +214,8 @@ fi
+@@ -209,6 +216,8 @@ fi
  # Make sure required vars are set
  SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock}
  MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock}
 +SOCKET_TIMEOUT=${SOCKET_TIMEOUT:=60}
 +SOCKET_MODE=${SOCKET_MODE:=600}
  
  start_it() {
      if test -r $PID ; then
-@@ -292,6 +301,29 @@ start_it() {
+@@ -294,6 +303,29 @@ start_it() {
  	kill `cat $MXPID`
  	return 1
      fi
 +
 +    SOCKET_PREFIX=${SOCKET%:*}
 +    # We can have inet or inet6, try to remove 6
 +    SOCKET_PREFIX=${SOCKET_PREFIX%6}
 +
 +    if [ "x$SOCKET" != "x" -a "${SOCKET_PREFIX}" != "inet" ] ; then
 +        printf "Waiting for $prog socket."
 +        i=${SOCKET_TIMEOUT}
 +        while [ $i -ne 0 ]
 +        do
 +            [ -S "$SOCKET" ] && break
 +            printf "."
 +            sleep 1
 +            i=$(($i-1))
 +        done
 +        echo ""
 +        if [ $i -eq 0 ] ; then
 +            echo "There is no $prog socket (${SOCKET})!"
 +            return 1
 +        fi
 +        %%CHMOD%% ${SOCKET_MODE} ${SOCKET} > /dev/null 2>&1
 +    fi
 +
      return 0
  }
  
-@@ -327,7 +359,7 @@ stop_it() {
+@@ -329,7 +361,7 @@ stop_it() {
      rm -f $MX_SOCKET > /dev/null 2>&1
      rm -f $SOCKET > /dev/null 2>&1
  
 -    if [ "$1" = "wait" ] ; then
 +    if [ 1 ] ; then
  	printf "Waiting for daemons to exit."
  	WAITPID=""
  	test -f $PID && WAITPID=`cat $PID`
-@@ -379,6 +411,12 @@ reread_it() {
+@@ -381,6 +413,12 @@ reread_it() {
  	fi
  }
  
 +restart_it() {
 +    stop_it wait
 +    start_it
 +    RETVAL=$?
 +}
 +
  if type run_rc_command > /dev/null 2>&1
  then
      # NetBSD/FreeBSD compatible startup script
Index: head/mail/mimedefang/files/pkg-message.in
===================================================================
--- head/mail/mimedefang/files/pkg-message.in	(revision 456303)
+++ head/mail/mimedefang/files/pkg-message.in	(revision 456304)
@@ -1,20 +1,18 @@
 To finish installation please follow these steps:
 
 1. Edit %%ETCDIR%%/mimedefang-filter
 
 2. Reconfigure sendmail to use MIMEDefang, for example add this lines to
    your sendmail.mc:
 
    MAIL_FILTER(`mimedefang', `S=local:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=C:15m;S:4m;R:4m;E:10m')dnl
    define(`confINPUT_MAIL_FILTERS', `mimedefang')dnl
 
    rebuild sendmail.cf and install it.
 
 Also, you can install some anti-virus software to check your mail, for example:
 
    security/clamav
       Open source AV package with automatic virus definition updates
    security/f-prot
       F-Prot Antivirus for BSD Workstations
-   security/vscan
-      Evaluation version of a DOS/Windows/Linux file virus scanner