From owner-svn-ports-head@freebsd.org  Sat Jan  9 14:01:36 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 606BEA69E23;
 Sat,  9 Jan 2016 14:01:36 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1651012D0;
 Sat,  9 Jan 2016 14:01:36 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u09E1Z9C091857;
 Sat, 9 Jan 2016 14:01:35 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u09E1Zsp091855;
 Sat, 9 Jan 2016 14:01:35 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601091401.u09E1Zsp091855@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 9 Jan 2016 14:01:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405631 - head/security/clamsmtp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jan 2016 14:01:36 -0000

Author: amdmi3
Date: Sat Jan  9 14:01:34 2016
New Revision: 405631
URL: https://svnweb.freebsd.org/changeset/ports/405631

Log:
  - Switch to options helpers

Modified:
  head/security/clamsmtp/Makefile
  head/security/clamsmtp/pkg-plist

Modified: head/security/clamsmtp/Makefile
==============================================================================
--- head/security/clamsmtp/Makefile	Sat Jan  9 14:01:02 2016	(r405630)
+++ head/security/clamsmtp/Makefile	Sat Jan  9 14:01:34 2016	(r405631)
@@ -14,24 +14,20 @@ GNU_CONFIGURE=	yes
 USES=		gmake
 USE_RC_SUBR=	clamsmtpd
 SUB_LIST=	CLAMAV_PID_DIR=${CLAMAV_PID_DIR}
-SUB_FILES+=	pkg-message
+SUB_FILES=	pkg-message
 
-CLAMAV_PID_DIR?=	/var/run/clamav
+CLAMAV_PID_DIR?=/var/run/clamav
 
 PORTDOCS=	README
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS LOCAL_CLAMAV
+OPTIONS_DEFINE=		DOCS LOCAL_CLAMAV EXAMPLES
 OPTIONS_DEFAULT=	LOCAL_CLAMAV
-LOCAL_CLAMAV_DESC=		RUN_DEPEND on security/clamav
-
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MLOCAL_CLAMAV}
-RUN_DEPENDS+=	clamav>=0:${PORTSDIR}/security/clamav
-SUB_LIST+=	CLAMD=clamd
-.else
-SUB_LIST+=	CLAMD=
-.endif
+LOCAL_CLAMAV_DESC=		RUN_DEPEND on security/clamav
+LOCAL_CLAMAV_RUN_DEPENDS=	clamav>=0:${PORTSDIR}/security/clamav
+LOCAL_CLAMAV_SUB_LIST=		CLAMD=clamd
+LOCAL_CLAMAV_SUB_LIST_OFF=	CLAMD=
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/var/run/clamav/clamd,/var/run/clamav/clamd.sock," \
@@ -40,11 +36,13 @@ post-patch:
 		${WRKSRC}/src/clamsmtpd.c
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${STAGEDIR}${PREFIX}/etc/clamsmtpd.conf-sample
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${STAGEDIR}${PREFIX}/etc/clamsmtpd.conf.sample
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/virus_action.sh ${STAGEDIR}${EXAMPLESDIR}
 

Modified: head/security/clamsmtp/pkg-plist
==============================================================================
--- head/security/clamsmtp/pkg-plist	Sat Jan  9 14:01:02 2016	(r405630)
+++ head/security/clamsmtp/pkg-plist	Sat Jan  9 14:01:34 2016	(r405631)
@@ -1,6 +1,5 @@
 @unexec [ ! -f %%CLAMAV_PID_DIR%%/clamsmtpd.pid ] || %%PREFIX%%/etc/rc.d/clamsmtpd.sh stop || true
+etc/clamsmtpd.conf.sample
 man/man5/clamsmtpd.conf.5.gz
 man/man8/clamsmtpd.8.gz
 sbin/clamsmtpd
-etc/clamsmtpd.conf-sample
-%%EXAMPLESDIR%%/virus_action.sh