svn commit: r404446 - head/mail/assp

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Dec 25 18:27:25 2015
New Revision: 404446
URL: https://svnweb.freebsd.org/changeset/ports/404446

Log:
  - Add NO_ARCH
  - Style nits
  - Switch to options helpers
  - Drop dirrm's from plist
  - Handle links properly
  - Switch to @postunexec
  
  PR:		205570
  Submitted by:	amdmi3
  Approved by:	rnejdl at ringofsaturn.com (maintainer)

Modified:
  head/mail/assp/Makefile
  head/mail/assp/pkg-plist

Modified: head/mail/assp/Makefile
==============================================================================
--- head/mail/assp/Makefile	Fri Dec 25 17:49:26 2015	(r404445)
+++ head/mail/assp/Makefile	Fri Dec 25 18:27:25 2015	(r404446)
@@ -18,6 +18,7 @@ RUN_DEPENDS=	p5-Net-DNS>=0.68:${PORTSDIR
 USES=		perl5 zip:infozip shebangfix
 SHEBANG_FILES=	*.pl
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_PERL5=	run
 
 ASSP_USER=	assp
@@ -138,14 +139,17 @@ do-install:
 
 	${INSTALL_MAN} ${WRKDIR}/assp.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKDIR}/assplog.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/510.assp ${STAGEDIR}${PREFIX}/etc/periodic/daily/
-	${MKDIR} ${STAGEDIR}${ASSP_HOME}
-	${MKDIR} ${STAGEDIR}${ASSP_LOG}
+	@${MKDIR} ${STAGEDIR}${ASSP_HOME}
+	@${MKDIR} ${STAGEDIR}${ASSP_LOG}
+.for f in files images rebuildspamdb.pl reports
+	${LN} -sf ${DATADIR}/${f} ${STAGEDIR}${ASSP_HOME}/
+.endfor
+	${LN} -sf ${ASSP_LOG} ${STAGEDIR}${ASSP_HOME}/logs
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/mail/assp/pkg-plist
==============================================================================
--- head/mail/assp/pkg-plist	Fri Dec 25 17:49:26 2015	(r404445)
+++ head/mail/assp/pkg-plist	Fri Dec 25 18:27:25 2015	(r404446)
@@ -98,32 +98,16 @@ sbin/assplog
 %%DATADIR%%/stat.pl
 %%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm
 %%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 man/man8/assp.8.gz
 man/man8/assplog.8.gz
- at dirrmtry %%DATADIR%%/reports
- at dirrmtry %%DATADIR%%/logs
- at dirrmtry %%DATADIR%%/images
- at dirrmtry %%DATADIR%%/files
- at dirrmtry %%DATADIR%%
- at dirrmtry etc/periodic/daily
- at dirrmtry etc/periodic
- at exec ln -sf %D/%%DATADIR%%/files %%ASSP_HOME%%/
- at unexec rm -f %%ASSP_HOME%%/files
- at exec ln -sf %D/%%DATADIR%%/images %%ASSP_HOME%%/
- at unexec rm -f %%ASSP_HOME%%/images
- at exec ln -sf %D/%%DATADIR%%/rebuildspamdb.pl %%ASSP_HOME%%/
- at unexec rm -f %%ASSP_HOME%%/rebuildspamdb.pl
- at exec ln -sf %D/%%DATADIR%%/reports %%ASSP_HOME%%/
- at unexec rm -f %%ASSP_HOME%%/reports
- at exec ln -sf %%ASSP_LOG%% %%ASSP_HOME%%/logs
- at unexec rm -f %%ASSP_HOME%%/logs
- at cwd /
- at owner %%ASSP_USER%%
- at group %%ASSP_GROUP%%
- at mode 750
- at dirrmtry %%ASSP_LOG%%
- at dirrmtry %%ASSP_HOME%%
- at unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi
- at unexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi
- at unexec echo "If you are deinstalling ASSP completely, delete the ASSP user and group."
+%%ASSP_HOME%%/files
+%%ASSP_HOME%%/images
+%%ASSP_HOME%%/rebuildspamdb.pl
+%%ASSP_HOME%%/reports
+%%ASSP_HOME%%/logs
+ at dir %%DATADIR%%/logs
+ at dir(%%ASSP_USER%%,%%ASSP_GROUP%%,750) %%ASSP_LOG%%
+ at dir(%%ASSP_USER%%,%%ASSP_GROUP%%,750) %%ASSP_HOME%%
+ at postunexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi
+ at postunexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi
+ at postunexec echo "If you are deinstalling ASSP completely, delete the ASSP user and group."