From owner-svn-ports-all@freebsd.org Fri Dec 25 18:27:26 2015 Return-Path: Delivered-To: svn-ports-all@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 A64E6A51EB5; Fri, 25 Dec 2015 18:27:26 +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 814541D02; Fri, 25 Dec 2015 18:27:26 +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 tBPIRPMQ086832; Fri, 25 Dec 2015 18:27:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBPIRPq7086830; Fri, 25 Dec 2015 18:27:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512251827.tBPIRPq7086830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 25 Dec 2015 18:27:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404446 - head/mail/assp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Dec 2015 18:27:26 -0000 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@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 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 -@dirrmtry %%DATADIR%%/reports -@dirrmtry %%DATADIR%%/logs -@dirrmtry %%DATADIR%%/images -@dirrmtry %%DATADIR%%/files -@dirrmtry %%DATADIR%% -@dirrmtry etc/periodic/daily -@dirrmtry etc/periodic -@exec ln -sf %D/%%DATADIR%%/files %%ASSP_HOME%%/ -@unexec rm -f %%ASSP_HOME%%/files -@exec ln -sf %D/%%DATADIR%%/images %%ASSP_HOME%%/ -@unexec rm -f %%ASSP_HOME%%/images -@exec ln -sf %D/%%DATADIR%%/rebuildspamdb.pl %%ASSP_HOME%%/ -@unexec rm -f %%ASSP_HOME%%/rebuildspamdb.pl -@exec ln -sf %D/%%DATADIR%%/reports %%ASSP_HOME%%/ -@unexec rm -f %%ASSP_HOME%%/reports -@exec ln -sf %%ASSP_LOG%% %%ASSP_HOME%%/logs -@unexec rm -f %%ASSP_HOME%%/logs -@cwd / -@owner %%ASSP_USER%% -@group %%ASSP_GROUP%% -@mode 750 -@dirrmtry %%ASSP_LOG%% -@dirrmtry %%ASSP_HOME%% -@unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi -@unexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi -@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 +@dir %%DATADIR%%/logs +@dir(%%ASSP_USER%%,%%ASSP_GROUP%%,750) %%ASSP_LOG%% +@dir(%%ASSP_USER%%,%%ASSP_GROUP%%,750) %%ASSP_HOME%% +@postunexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi +@postunexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi +@postunexec echo "If you are deinstalling ASSP completely, delete the ASSP user and group."