Date: Wed, 30 Oct 2013 16:25:29 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332148 - in head/sysutils/runit: . files Message-ID: <201310301625.r9UGPTMn051081@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Wed Oct 30 16:25:29 2013 New Revision: 332148 URL: http://svnweb.freebsd.org/changeset/ports/332148 Log: Fix link without gcc Reported by: pointyhat While here, stageify and tidy rc script Modified: head/sysutils/runit/Makefile head/sysutils/runit/files/runsvdir.in head/sysutils/runit/pkg-descr head/sysutils/runit/pkg-plist Modified: head/sysutils/runit/Makefile ============================================================================== --- head/sysutils/runit/Makefile Wed Oct 30 16:22:48 2013 (r332147) +++ head/sysutils/runit/Makefile Wed Oct 30 16:25:29 2013 (r332148) @@ -20,16 +20,14 @@ SERVICE_DIR?= /var/service SUB_LIST= SERVICE_DIR="${SERVICE_DIR}" PORTDOCS= * -MAN8= chpst.8 runit-init.8 runit.8 runsv.8 runsvchdir.8 \ - runsvdir.8 sv.8 svlogd.8 utmpset.8 DOCS= package/CHANGES package/README \ package/THANKS doc/*.html CONFIG= etc/freebsd/1 etc/2 etc/freebsd/3 etc/freebsd/ctrlaltdel \ etc/freebsd/getty-ttyv4/run etc/freebsd/getty-ttyv4/finish -NO_STAGE= yes do-configure: ${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc + ${ECHO_CMD} "${CC}" > ${WRKSRC}/src/conf-ld do-build: cd ${WRKSRC} && package/compile && package/check @@ -42,25 +40,15 @@ do-build: .endfor do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/command/* ${PREFIX}/sbin -.for man in ${MAN8} - @${INSTALL_MAN} ${WRKSRC}/man/${man} ${MAN8PREFIX}/man/man8 -.endfor - @${MKDIR} ${ETCDIR}/getty-ttyv4 - @${INSTALL_SCRIPT} ${WRKDIR}/etc/[123c]* ${ETCDIR} + @${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/* \ - ${ETCDIR}/getty-ttyv4 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + ${STAGEDIR}${ETCDIR}/getty-ttyv4 + @${MKDIR} ${STAGEDIR}${DOCSDIR} . for doc in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} . endfor -.endif - -post-install: - @for file in ${ETCDIR}/*.sample ${ETCDIR}/getty-ttyv4/*.sample ; \ - do [ ! -f ${ETCDIR}/$${file%.sample} ] \ - && ${CP} -p $${file} $${file%.sample} ; \ - done .include <bsd.port.mk> Modified: head/sysutils/runit/files/runsvdir.in ============================================================================== --- head/sysutils/runit/files/runsvdir.in Wed Oct 30 16:22:48 2013 (r332147) +++ head/sysutils/runit/files/runsvdir.in Wed Oct 30 16:25:29 2013 (r332148) @@ -14,13 +14,17 @@ . /etc/rc.subr -name="runsvdir" +name=runsvdir rcvar=runsvdir_enable -command="%%PREFIX%%/sbin/runsvdir" +load_rc_config runsvdir + +: ${runsvdir_enable:=NO} +: ${runsvdir_path=%%SERVICE_DIR%%} +command="%%PREFIX%%/sbin/runsvdir" start_cmd=runsvdir_start -stop_postcmd=runsvdir_post_stop +stop_postcmd="%%PREFIX%%/sbin/sv exit ${runsvdir_path}/*" runsvdir_start() { @@ -31,14 +35,4 @@ runsvdir_start() ${command} ${runsvdir_path} } -runsvdir_post_stop() -{ - %%PREFIX%%/sbin/sv exit ${runsvdir_path}/* -} - -# read configuration and set defaults -load_rc_config "$name" -: ${runsvdir_enable="NO"} -: ${runsvdir_path="%%SERVICE_DIR%%"} - -run_rc_command "$1" +run_rc_command $1 Modified: head/sysutils/runit/pkg-descr ============================================================================== --- head/sysutils/runit/pkg-descr Wed Oct 30 16:22:48 2013 (r332147) +++ head/sysutils/runit/pkg-descr Wed Oct 30 16:25:29 2013 (r332148) @@ -8,4 +8,4 @@ runit is daemontools replacement: It can optionally replace init(8) as process 1. -WWW: http://smarden.org/runit/ +WWW: http://smarden.org/runit/ Modified: head/sysutils/runit/pkg-plist ============================================================================== --- head/sysutils/runit/pkg-plist Wed Oct 30 16:22:48 2013 (r332147) +++ head/sysutils/runit/pkg-plist Wed Oct 30 16:25:29 2013 (r332148) @@ -13,10 +13,19 @@ @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/getty-ttyv4/run +@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/getty-ttyv4/finish +@exec [ ! -f %D/%%ETCDIR%%/getty-ttyv4/finish ] && cp -p %D/%F %B/finish +man/man8/chpst.8.gz +man/man8/runit-init.8.gz +man/man8/runit.8.gz +man/man8/runsv.8.gz +man/man8/runsvchdir.8.gz +man/man8/runsvdir.8.gz +man/man8/sv.8.gz +man/man8/svlogd.8.gz +man/man8/utmpset.8.gz sbin/chpst sbin/runit sbin/runit-init
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310301625.r9UGPTMn051081>