svn commit: r398228 - in head/security/amavisd-new: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Sep 30 18:31:34 UTC 2015
Author: amdmi3
Date: Wed Sep 30 18:31:32 2015
New Revision: 398228
URL: https://svnweb.freebsd.org/changeset/ports/398228
Log:
- Convert pkg-install script to @dir
- Use options helpers
- Remove unneeded @dir's from plist
PR: 203045
Submitted by: amdmi3
Approved by: maintainer timeout (gabor, 2 weeks)
Deleted:
head/security/amavisd-new/files/pkg-install.in
Modified:
head/security/amavisd-new/Makefile
head/security/amavisd-new/pkg-plist
Modified: head/security/amavisd-new/Makefile
==============================================================================
--- head/security/amavisd-new/Makefile Wed Sep 30 18:21:12 2015 (r398227)
+++ head/security/amavisd-new/Makefile Wed Sep 30 18:31:32 2015 (r398228)
@@ -74,7 +74,7 @@ P7ZIP_DESC= P7ZIP support with archiver
MSWORD_DESC= Ms Word support with textproc/ripole
TNEF_DESC= Add external tnef decoder converters/tnef
-SUB_FILES= pkg-install pkg-deinstall pkg-message
+SUB_FILES= pkg-deinstall pkg-message
SUB_LIST+= AMAVISUSER=${AMAVISUSER} \
AMAVISGROUP=${AMAVISGROUP} \
@@ -83,7 +83,11 @@ SUB_LIST+= AMAVISUSER=${AMAVISUSER} \
DAEMON="${DAEMON}" \
PERL=${PERL}
-PLIST_SUB+= AMAVIS_NOP0F=${AMAVIS_NOP0F}
+PLIST_SUB+= AMAVISUSER=${AMAVISUSER} \
+ AMAVISGROUP=${AMAVISGROUP} \
+ AMAVISDIR=${AMAVISDIR} \
+ AMAVISQUARANTINE=${AMAVISQUARANTINE} \
+ AMAVIS_NOP0F=${AMAVIS_NOP0F}
.include <bsd.port.options.mk>
@@ -240,22 +244,26 @@ post-patch:
${WRKSRC}/amavisd
do-install:
-.if ${PORT_OPTIONS:MP0F}
- ${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin
-.endif
.for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent
${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin
.endfor
${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf.sample
${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default
${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf.sample
-.if ${PORT_OPTIONS:MDOCS}
+ ${LN} -s ${PREFIX}/sbin/amavisd-release ${STAGEDIR}${PREFIX}/sbin/amavisd-requeue
+ ${MKDIR} ${STAGEDIR}${AMAVISDIR}/var
+ ${MKDIR} ${STAGEDIR}${AMAVISDIR}/tmp
+ ${MKDIR} ${STAGEDIR}${AMAVISDIR}/db
+ ${MKDIR} ${STAGEDIR}${AMAVISQUARANTINE}
+
+do-install-P0F-on:
+ ${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
.for i in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor
@${CP} -pr ${WRKSRC}/README_FILES/images/ ${STAGEDIR}${DOCSDIR}/images
-.endif
- ${LN} -s ${PREFIX}/sbin/amavisd-release ${STAGEDIR}${PREFIX}/sbin/amavisd-requeue
.include <bsd.port.post.mk>
Modified: head/security/amavisd-new/pkg-plist
==============================================================================
--- head/security/amavisd-new/pkg-plist Wed Sep 30 18:21:12 2015 (r398227)
+++ head/security/amavisd-new/pkg-plist Wed Sep 30 18:31:32 2015 (r398228)
@@ -61,9 +61,6 @@
%%PORTDOCS%%%%DOCSDIR%%/images/toc-plus.png
%%PORTDOCS%%%%DOCSDIR%%/images/up.png
%%PORTDOCS%%%%DOCSDIR%%/images/warning.png
-%%PORTDOCS%%@dir %%DOCSDIR%%/images/callouts
-%%PORTDOCS%%@dir %%DOCSDIR%%/images
-%%PORTDOCS%%@dir %%DOCSDIR%%
@sample etc/amavisd-custom.conf.sample
etc/amavisd.conf-default
@sample etc/amavisd.conf.sample
@@ -74,3 +71,8 @@ sbin/amavisd-nanny
sbin/amavisd-release
sbin/amavisd-requeue
sbin/amavisd-snmp-subagent
+ at dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISQUARANTINE%%
+ at dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/var
+ at dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/tmp
+ at dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%/db
+ at dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%AMAVISDIR%%
More information about the svn-ports-head
mailing list