Date: Tue, 22 Sep 2015 21:20:42 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397593 - in head/mail/spmfilter: . files Message-ID: <201509222120.t8MLKgwa048482@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Sep 22 21:20:41 2015 New Revision: 397593 URL: https://svnweb.freebsd.org/changeset/ports/397593 Log: - Switch to @sample - Drop @dirrm* from plist - Modernize vardir handling Approved by: portmgr blanket Deleted: head/mail/spmfilter/files/pkg-install.in Modified: head/mail/spmfilter/Makefile head/mail/spmfilter/pkg-plist Modified: head/mail/spmfilter/Makefile ============================================================================== --- head/mail/spmfilter/Makefile Tue Sep 22 20:37:14 2015 (r397592) +++ head/mail/spmfilter/Makefile Tue Sep 22 21:20:41 2015 (r397593) @@ -34,13 +34,12 @@ DB4_DESC= DB4 backend # Default requirement for spmfilter rc script _REQUIRE= LOGIN -SUB_FILES= pkg-install pkg-deinstall +SUB_FILES= pkg-deinstall -SUB_LIST+= SMFUSER=${SMFUSER} \ +PLIST_SUB= LIB_VERSION=${PORTVERSION} \ + SMFUSER=${SMFUSER} \ SMFGROUP=${SMFGROUP} \ - SMFDIR=${SMFDIR} \ - -PLIST_SUB= LIB_VERSION=${PORTVERSION} + SMFDIR=${SMFDIR} .include <bsd.port.options.mk> @@ -92,6 +91,7 @@ post-patch: ${WRKSRC}/src/CMakeLists.txt post-install: - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/ + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/ + @${MKDIR} ${STAGEDIR}${SMFDIR} .include <bsd.port.mk> Modified: head/mail/spmfilter/pkg-plist ============================================================================== --- head/mail/spmfilter/pkg-plist Tue Sep 22 20:37:14 2015 (r397592) +++ head/mail/spmfilter/pkg-plist Tue Sep 22 21:20:41 2015 (r397593) @@ -28,9 +28,5 @@ libdata/pkgconfig/spmfilter.pc sbin/spmfilter man/man1/spmfilter.1.gz man/man5/spmfilter.conf.5.gz -@unexec if cmp -s %D/etc/spmfilter.conf.sample %D/etc/spmfilter.conf; then rm -f %D/etc/spmfilter.conf; fi -etc/spmfilter.conf.sample -@exec if [ ! -f %D/etc/spmfilter.conf ] ; then cp -p %D/%F %B/spmfilter.conf; fi -@dirrm include/spmfilter/smf -@dirrm include/spmfilter -@dirrmtry lib/spmfilter +@sample etc/spmfilter.conf.sample +@dir(%%SMFUSER%%,%%SMFGROUP%%,755) %%SMFDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509222120.t8MLKgwa048482>