Date: Tue, 8 Sep 2015 11:31:19 +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: r396371 - head/sysutils/runit Message-ID: <201509081131.t88BVJ5V050561@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Sep 8 11:31:18 2015 New Revision: 396371 URL: https://svnweb.freebsd.org/changeset/ports/396371 Log: - Unsilence install - Pet stage-qa - Switch to @sample Approved by: portmgr blanket Modified: head/sysutils/runit/Makefile head/sysutils/runit/pkg-plist Modified: head/sysutils/runit/Makefile ============================================================================== --- head/sysutils/runit/Makefile Tue Sep 8 11:30:22 2015 (r396370) +++ head/sysutils/runit/Makefile Tue Sep 8 11:31:18 2015 (r396371) @@ -27,7 +27,7 @@ CONFIG= etc/freebsd/1 etc/2 etc/freebsd etc/freebsd/getty-ttyv4/run etc/freebsd/getty-ttyv4/finish post-patch: - ${REINPLACE_CMD} 's!/service/!${SERVICE_DIR}!' \ + ${REINPLACE_CMD} -i '' 's!/service/!${SERVICE_DIR}!' \ ${WRKSRC}/man/* ${WRKSRC}/src/sv.c do-configure: @@ -45,15 +45,15 @@ do-build: .endfor do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/sbin - @${INSTALL_MAN} ${WRKSRC}/man/* ${STAGEDIR}${PREFIX}/man/man8/ + ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/man/* ${STAGEDIR}${PREFIX}/man/man8/ @${MKDIR} ${STAGEDIR}${ETCDIR}/getty-ttyv4 - @${INSTALL_SCRIPT} ${WRKDIR}/etc/[123c]* ${STAGEDIR}${ETCDIR} - @${INSTALL_SCRIPT} ${WRKDIR}/etc/getty-ttyv4/* \ + ${INSTALL_SCRIPT} ${WRKDIR}/etc/[123c]* ${STAGEDIR}${ETCDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/etc/getty-ttyv4/* \ ${STAGEDIR}${ETCDIR}/getty-ttyv4 @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for doc in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} -. endfor +.for doc in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} +.endfor .include <bsd.port.mk> Modified: head/sysutils/runit/pkg-plist ============================================================================== --- head/sysutils/runit/pkg-plist Tue Sep 8 11:30:22 2015 (r396370) +++ head/sysutils/runit/pkg-plist Tue Sep 8 11:31:18 2015 (r396371) @@ -1,21 +1,9 @@ -@unexec cmp -s %D/%%ETCDIR%%/1 %D/%%ETCDIR%%/1.sample && rm -f %D/%%ETCDIR%%/1 -%%ETCDIR%%/1.sample -@exec [ ! -f %D/%%ETCDIR%%/1 ] && cp -p %D/%F %B/1 -@unexec cmp -s %D/%%ETCDIR%%/2 %D/%%ETCDIR%%/2.sample && rm -f %D/%%ETCDIR%%/2 -%%ETCDIR%%/2.sample -@exec [ ! -f %D/%%ETCDIR%%/2 ] && cp -p %D/%F %B/2 -@unexec cmp -s %D/%%ETCDIR%%/3 %D/%%ETCDIR%%/3.sample && rm -f %D/%%ETCDIR%%/3 -%%ETCDIR%%/3.sample -@exec [ ! -f %D/%%ETCDIR%%/3 ] && cp -p %D/%F %B/3 -@unexec cmp -s %D/%%ETCDIR%%/ctrlaltdel %D/%%ETCDIR%%/ctrlaltdel.sample && rm -f %D/%%ETCDIR%%/ctrlaltdel -%%ETCDIR%%/ctrlaltdel.sample -@exec [ ! -f %D/%%ETCDIR%%/ctrlaltdel ] && cp -p %D/%F %B/ctrlaltdel -@unexec cmp -s %D/%%ETCDIR%%/getty-ttyv4/run %D/%%ETCDIR%%/getty-ttyv4/run.sample && rm -f %D/%%ETCDIR%%/getty-ttyv4/run -%%ETCDIR%%/getty-ttyv4/run.sample -@exec [ ! -f %D/%%ETCDIR%%/getty-ttyv4/run ] && cp -p %D/%F %B/run -@unexec cmp -s %D/%%ETCDIR%%/getty-ttyv4/finish %D/%%ETCDIR%%/getty-ttyv4/finish.sample && rm -f %D/%%ETCDIR%%/getty-ttyv4/finish -%%ETCDIR%%/getty-ttyv4/finish.sample -@exec [ ! -f %D/%%ETCDIR%%/getty-ttyv4/finish ] && cp -p %D/%F %B/finish +@sample %%ETCDIR%%/1.sample +@sample %%ETCDIR%%/2.sample +@sample %%ETCDIR%%/3.sample +@sample %%ETCDIR%%/ctrlaltdel.sample +@sample %%ETCDIR%%/getty-ttyv4/run.sample +@sample %%ETCDIR%%/getty-ttyv4/finish.sample man/man8/chpst.8.gz man/man8/runit-init.8.gz man/man8/runit.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509081131.t88BVJ5V050561>