svn commit: r405631 - head/security/clamsmtp

[Dmitry Marakasov]

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