Date: Sun, 2 Jun 2019 12:04:48 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503307 - in head/sysutils/runit-faster: . files Message-ID: <201906021204.x52C4mfO005355@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Jun 2 12:04:47 2019 New Revision: 503307 URL: https://svnweb.freebsd.org/changeset/ports/503307 Log: sysutils/runit-faster: Update to 2.1.3 Runit and all patches have been imported into the upstream repository. Simplify the port accordingly. Pet portclippy while here. Changes: https://github.com/t6/freebsd-runit/releases/tag/v2.1.3 Deleted: head/sysutils/runit-faster/files/patch-src_chkshsgr.c head/sysutils/runit-faster/files/patch-src_pathexec__run.c head/sysutils/runit-faster/files/patch-src_prot.c head/sysutils/runit-faster/files/patch-src_prot.h head/sysutils/runit-faster/files/patch-src_runit.c head/sysutils/runit-faster/files/patch-src_svlogd.c head/sysutils/runit-faster/files/patch-utmpx Modified: head/sysutils/runit-faster/Makefile head/sysutils/runit-faster/distinfo head/sysutils/runit-faster/pkg-plist Modified: head/sysutils/runit-faster/Makefile ============================================================================== --- head/sysutils/runit-faster/Makefile Sun Jun 2 11:39:56 2019 (r503306) +++ head/sysutils/runit-faster/Makefile Sun Jun 2 12:04:47 2019 (r503307) @@ -2,93 +2,47 @@ # $FreeBSD$ PORTNAME= runit -DISTVERSION= ${RUNITVERSION}-${CONFVERSION} -RUNITVERSION= 2.1.2 -CONFVERSION= 0.1.36 +DISTVERSION= 2.1.3 CATEGORIES= sysutils -MASTER_SITES= http://smarden.org/runit/ \ - http://www.bayofrum.net/dist/runit/ \ - https://github.com/t6/freebsd-runit/releases/download/v${CONFVERSION}/:config \ - LOCAL/tobik:config \ - https://pkg.tobik.me/distfiles/:config +MASTER_SITES= https://github.com/t6/freebsd-runit/releases/download/v${DISTVERSION}/ \ + LOCAL/tobik PKGNAMESUFFIX= -faster -DISTFILES= runit-${RUNITVERSION}${EXTRACT_SUFX} \ - freebsd-runit-${CONFVERSION}${EXTRACT_SUFX}:config +DISTNAME= freebsd-runit-${DISTVERSION} MAINTAINER= tobik@FreeBSD.org COMMENT= Runit based init replacement for ${OPSYS} LICENSE= BSD3CLAUSE CC0-1.0 LICENSE_COMB= multi -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/package/COPYING -LICENSE_FILE_CC0-1.0= ${WRKDIR}/freebsd-runit-${CONFVERSION}/README.md +LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= snooze:sysutils/snooze +USE_RC_SUBR= runsvdir + +MAKE_ENV= RUNITDIR=${RUNITDIR} \ + SBINDIR=${SBINDIR} \ + SVDIR=${PREFIX}/etc/sv + CONFLICTS_INSTALL= runit -PLIST_SUB= RUNITDIR=${RUNITDIR} SUB_FILES= pkg-message SUB_LIST= RUNITDIR=${RUNITDIR} -USE_RC_SUBR= runsvdir -WRKSRC= ${WRKDIR}/admin/runit-${RUNITVERSION} +PLIST_SUB= RUNITDIR=${RUNITDIR} +PORTDOCS= * + OPTIONS_DEFINE= DOCS ROOT OPTIONS_SUB= yes ROOT_DESC= Install bootstrap files into /etc/runit and /sbin -PORTDOCS= * - -ROOT_VARS= RUNITDIR=/etc/runit SBINDIR=/sbin ROOT_VARS_OFF= RUNITDIR=${ETCDIR} SBINDIR=${PREFIX}/sbin +ROOT_VARS= RUNITDIR=/etc/runit SBINDIR=/sbin post-patch: - @${REINPLACE_CMD} -e 's,/service/,/var/service,' \ - -e 's,/etc/runit,${RUNITDIR},' \ - -e 's,/sbin/runit,${SBINDIR}/runit,' \ - ${WRKSRC}/man/* ${WRKSRC}/doc/*.html \ - ${WRKSRC}/src/sv.c \ - ${WRKSRC}/src/runsvchdir.c \ - ${WRKSRC}/src/runit.c \ - ${WRKSRC}/src/runit.h + @${REINPLACE_CMD} 's,all: docs,all:,' ${WRKSRC}/Makefile -do-configure: - @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc - @${ECHO_CMD} "${CC}" > ${WRKSRC}/src/conf-ld - -do-build: - @cd ${WRKSRC} && package/compile - -do-install: - @${MKDIR} ${STAGEDIR}${RUNITDIR} ${STAGEDIR}${SBINDIR} - cd ${WRKSRC}/command && ${INSTALL_PROGRAM} runit runit-init \ - ${STAGEDIR}${SBINDIR} - cd ${WRKSRC}/command && ${INSTALL_PROGRAM} \ - chpst runsv runsvchdir runsvdir sv svlogd utmpset \ - ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${PREFIX}/man/man8 - @${DO_MAKE_BUILD} -C ${WRKDIR}/freebsd-runit-${CONFVERSION} \ - DESTDIR=${STAGEDIR} \ - LOCALBASE=${LOCALBASE} \ - PREFIX=${PREFIX} \ - RUNITDIR=${RUNITDIR} \ - SVDIR=${PREFIX}/etc/sv \ - install -# Point runit to the run directory (a necessity to let runit work on -# read-only root filesystems) and make sure rebooting and powering off -# can work correctly. - @${LN} -s /var/run/runit/reboot ${STAGEDIR}${RUNITDIR}/reboot - @${LN} -s /var/run/runit/stopit ${STAGEDIR}${RUNITDIR}/stopit - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} \ - package/CHANGES package/README package/THANKS doc/*.html \ - ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/freebsd-runit-${CONFVERSION}/docs/runit-faster.md \ - ${STAGEDIR}${DOCSDIR} - post-install: # Micromanaging pkg-plist is no fun here... Generate it on the fly # instead. @@ -97,6 +51,6 @@ post-install: >> ${TMPPLIST} do-test: - @cd ${WRKSRC} && package/check + @cd ${WRKSRC}/runit && package/check .include <bsd.port.mk> Modified: head/sysutils/runit-faster/distinfo ============================================================================== --- head/sysutils/runit-faster/distinfo Sun Jun 2 11:39:56 2019 (r503306) +++ head/sysutils/runit-faster/distinfo Sun Jun 2 12:04:47 2019 (r503307) @@ -1,5 +1,3 @@ -TIMESTAMP = 1554109612 -SHA256 (runit-2.1.2.tar.gz) = 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 -SIZE (runit-2.1.2.tar.gz) = 110916 -SHA256 (freebsd-runit-0.1.36.tar.gz) = 38dd91d6b92517eb0b4ad1c8be2c21037024e124f843e781ad415641103cf034 -SIZE (freebsd-runit-0.1.36.tar.gz) = 34592 +TIMESTAMP = 1559475686 +SHA256 (freebsd-runit-2.1.3.tar.gz) = 26721897eeb778cebe129f2520c502183e354270fc204b61cc0d038b8e26137e +SIZE (freebsd-runit-2.1.3.tar.gz) = 141256 Modified: head/sysutils/runit-faster/pkg-plist ============================================================================== --- head/sysutils/runit-faster/pkg-plist Sun Jun 2 11:39:56 2019 (r503306) +++ head/sysutils/runit-faster/pkg-plist Sun Jun 2 12:04:47 2019 (r503307) @@ -36,6 +36,7 @@ bin/svmod %%RUNITDIR%%/core-services/95-mount-late.sh %%RUNITDIR%%/core-services/95-swap-late.sh %%RUNITDIR%%/core-services/99-binmisc.sh +%%RUNITDIR%%/core-services/99-linux.sh %%RUNITDIR%%/core-services/99-ports-env.sh %%RUNITDIR%%/core-services/99-start-jails.sh %%RUNITDIR%%/ctrlaltdel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906021204.x52C4mfO005355>