4 files changed, 18 insertions, 25 deletions

diff --git a/security/amavisd-milter/Makefile b/security/amavisd-milter/Makefile
index fe2a4001acf4..4e4d1a2d7216 100644
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amavisd-milter
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	security mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,22 +25,20 @@ USE_RCORDER=	${PORTNAME}.sh
 
 SUB_FILES=	pkg-message
 SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
-		AMAVISDIR=${AMAVISDIR} \
+		AMAVISDIR=${AMAVISDIR}
 
-DOCS=		AUTHORS CHANGES INSTALL LICENSE README TODO
+PORTDOCS=	AUTHORS CHANGES INSTALL LICENSE README TODO
 
-.include <bsd.port.pre.mk>
-
-PLIST_SUB+=	RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX} \
+PLIST_SUB=	RC_DIR=${RC_DIR} \
+		RC_SUFX=${RC_SUFX}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in ${DOCS}
+.for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/amavisd-milter/distinfo b/security/amavisd-milter/distinfo
index 2c00c563d2fd..1aea7e579559 100644
--- a/security/amavisd-milter/distinfo
+++ b/security/amavisd-milter/distinfo
@@ -1,2 +1,3 @@
-MD5 (amavisd-milter-1.0.2.tar.gz) = b661a4b8cf2986e5c6aa2a86d61d04c3
-SIZE (amavisd-milter-1.0.2.tar.gz) = 126640
+MD5 (amavisd-milter-1.0.3.tar.gz) = 595cf90f782123cb30fb0c26d9bb05da
+SHA256 (amavisd-milter-1.0.3.tar.gz) = 72e50225972a2533365698cbadc3ea70775a764e4b1eeece75852ed56c2ca463
+SIZE (amavisd-milter-1.0.3.tar.gz) = 126822
diff --git a/security/amavisd-milter/files/amavisd-milter.sh.in b/security/amavisd-milter/files/amavisd-milter.sh.in
index cd0064d7db96..209963def1fb 100644
--- a/security/amavisd-milter/files/amavisd-milter.sh.in
+++ b/security/amavisd-milter/files/amavisd-milter.sh.in
@@ -14,19 +14,20 @@
 #amavisd_milter_enable="YES"
 #
 
-# Set defaults
-amavisd_milter_enable="NO"
-amavisd_milter_flags=""
-amavisd_milter_pidfile="%%AMAVISGROUP%%/amavisd-milter.pid"
-amavisd_milter_user="%%AMAVISUSER%%"
-
 . %%RC_SUBR%%
 
 name="amavisd_milter"
 rcvar=`set_rcvar`
 
+load_rc_config $name
+
+# Set defaults
+: ${amavisd_milter_enable:="NO"}
+: ${amavisd_milter_flags:=""}
+: ${amavisd_milter_pidfile:="%%AMAVISDIR%%/amavisd-milter.pid"}
+: ${amavisd_milter_user:="%%AMAVISUSER%%"}
+
 command="%%PREFIX%%/sbin/amavisd-milter"
 required_files="%%PREFIX%%/etc/amavisd.conf"
 
-load_rc_config $name
 run_rc_command "$1"
diff --git a/security/amavisd-milter/pkg-plist b/security/amavisd-milter/pkg-plist
index 9f2fceee97e1..8d09b4fb8fce 100644
--- a/security/amavisd-milter/pkg-plist
+++ b/security/amavisd-milter/pkg-plist
@@ -1,10 +1,3 @@
 @comment $FreeBSD$
 @unexec %%RC_DIR%%/etc/rc.d/amavisd-milter%%RC_SUFX%% stop 2>&1 >/dev/null || true
 sbin/amavisd-milter
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%