5 files changed, 24 insertions, 26 deletions

diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index bc1ecd2feeba..78624474a332 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamsmtp
-PORTVERSION=	0.7
+PORTVERSION=	0.9.6
 CATEGORIES=	security
 MASTER_SITES=	http://memberwebs.com/nielsen/software/clamsmtp/
 
@@ -15,29 +15,23 @@ COMMENT=	An ClamAV anti-virus SMTP Filter
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} CLAMAV_USER=${CLAMAV_USER} \
-		CLAMAV_PID_DIR=${CLAMAV_PID_DIR} CLAMAV_GROUP=${CLAMAV_GROUP} \
-		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET}
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} CLAMAV_PID_DIR=${CLAMAV_PID_DIR}
 STARTUP_FILE=	${PREFIX}/etc/rc.d/clamsmtpd.sh
 
-CLAMAV_USER?=	clamav
-CLAMAV_GROUP?=	clamav
 CLAMAV_PID_DIR?=	/var/run/clamav
-CLAMAV_CLAMD_SOCKET?=	/var/run/clamav/clamd
 
+MAN5=		clamsmtpd.conf.5
 MAN8=		clamsmtpd.8
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,10025,10026,g' ${WRKSRC}/src/clamsmtpd.c ${WRKSRC}/src/clamsmtpd.8
-
 post-install:
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/clamsmtpd.sh.tmpl > ${STARTUP_FILE}
+	@${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${PREFIX}/etc/clamsmtpd.conf-sample
 	@${CHMOD} 755 ${STARTUP_FILE}
-	@${CAT} ${PKGMESSAGE}
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/security/clamsmtp/distinfo b/security/clamsmtp/distinfo
index 5b2abcbc0f16..31ed047d2581 100644
--- a/security/clamsmtp/distinfo
+++ b/security/clamsmtp/distinfo
@@ -1,2 +1,2 @@
-MD5 (clamsmtp-0.7.tar.gz) = 9b81184888160df824667b60d3a6401d
-SIZE (clamsmtp-0.7.tar.gz) = 121807
+MD5 (clamsmtp-0.9.6.tar.gz) = f9eae7fd8ce1b5ecabd0e680b1cfb6d3
+SIZE (clamsmtp-0.9.6.tar.gz) = 138446
diff --git a/security/clamsmtp/files/clamsmtpd.sh.tmpl b/security/clamsmtp/files/clamsmtpd.sh.tmpl
index 3f0c1468c6c2..e328177449d3 100644
--- a/security/clamsmtp/files/clamsmtpd.sh.tmpl
+++ b/security/clamsmtp/files/clamsmtpd.sh.tmpl
@@ -22,14 +22,11 @@ sig_stop=-KILL
 load_rc_config ${name}
 
 clamsmtpd_enable=${clamsmtpd_enable-"NO"}
-clamsmtpd_smtp=${clamsmtpd_smtp-"mysmtp.com:25"}
+clamsmtpd_conf=${clamsmtpd_conf-"%%PREFIX%%/etc/clamsmtpd.conf"}
 clamsmtpd_pid=${clamsmtpd_pid-"%%CLAMAV_PID_DIR%%/clamsmtpd.pid"}
-clamsmtpd_socket=${clamsmtpd_socket-"%%CLAMAV_CLAMD_SOCKET%%"}
-clamsmtpd_user=${clamsmtpd_user-"%%CLAMAV_USER%%"}
-clamsmtpd_group=${clamsmtpd_group-"%%CLAMAV_GROUP%%"}
-clamsmtpd_tmpdir=${clamsmtpd_tmpdir-"/var/tmp"}
+clamsmtpd_debug=${clamsmtpd_debug-"0"}
 
-command_args="-c ${clamsmtpd_socket} -D ${clamsmtpd_tmpdir} -p ${clamsmtpd_pid} ${clamsmtpd_smtp}"
+command_args="-f ${clamsmtpd_conf} -d ${clamsmtpd_debug} -p ${clamsmtpd_pid}"
 
 pidfile=${clamsmtpd_pid}
 
diff --git a/security/clamsmtp/pkg-message b/security/clamsmtp/pkg-message
index 94e0853362d5..bebb646e02cf 100644
--- a/security/clamsmtp/pkg-message
+++ b/security/clamsmtp/pkg-message
@@ -1,17 +1,23 @@
-Remember to modify /etc/rc.conf, change entry
+/* ================================================================= */
+Edit /etc/rc.conf and set
 
-clamsmtpd_smtp="mysmtp.com:25"
+clamsmtpd_enable="YES"
 
-to your smtp server setting, and set
+to enable clamsmtpd. 
 
-clamsmtpd_enable="YES"
+Also, there is a clamsmtpd.conf-sample in %%PREFIX%%/etc/, 
+rename to clamsmtpd.conf, otherwise specify -f option to your
+config file. Add the following in the config file or 
+comment them out.
 
-to enable clamsmtpd.
+OutAddress: 127.0.0.1:10026
+Listen: 127.0.0.1:10025
 
 To work with postfix, put following lines in Postfix' main.cf:
 
-content_filter = scan:127.0.0.1:10026
+content_filter = scan:127.0.0.1:10025
 receive_override_options = no_address_mappings
 
 And modify master.cf to active it. See also
 http://memberwebs.com/nielsen/software/clamsmtp/postfix.html
+/* ================================================================= */
diff --git a/security/clamsmtp/pkg-plist b/security/clamsmtp/pkg-plist
index fc0f503f82b2..e492f7d3b397 100644
--- a/security/clamsmtp/pkg-plist
+++ b/security/clamsmtp/pkg-plist
@@ -2,3 +2,4 @@
 @unexec [ ! -f %%CLAMAV_PID_DIR%%/clamsmtpd.pid ] || %%PREFIX%%/etc/rc.d/clamsmtpd.sh stop || true
 sbin/clamsmtpd
 etc/rc.d/clamsmtpd.sh
+etc/clamsmtpd.conf-sample