diff --git a/srcpkgs/runit/files/_sv b/srcpkgs/runit/files/_sv deleted file mode 100644 index 465fbfde640cc6..00000000000000 --- a/srcpkgs/runit/files/_sv +++ /dev/null @@ -1,44 +0,0 @@ -#compdef sv - -# completion for runit sv(1) -# Leah Neukirchen -# runit 2.1.1, services in /var/service are completed by default - -local ret=1 services - -_arguments \ - '-v[verbose]' \ - '-w[wait]:seconds' \ - '1: :->cmds' \ - '*:: :->args' && ret=0 - -case $state in -cmds) - _values "sv command" \ - status \ - up \ - down \ - once \ - pause cont hup alarm interrupt quit 1 2 term kill \ - exit - # above allow one-character shortcuts, complete these - [[ $words[CURRENT] = [sudopchaiq12tke] ]] || - _values "sv command" \ - start \ - stop \ - restart \ - shutdown \ - force-stop \ - force-reload \ - force-restart \ - force-shutdown \ - check - ret=0;; -args) - services=( /var/service/*(-/N:t) ) - (( $#services )) && _values services $services && ret=0 - [[ $words[CURRENT] = */* ]] && _directories && ret=0 - ;; -esac - -return $ret diff --git a/srcpkgs/runit/template b/srcpkgs/runit/template index 97c61ccbbaa692..db27367091c206 100644 --- a/srcpkgs/runit/template +++ b/srcpkgs/runit/template @@ -1,14 +1,14 @@ # Template file for 'runit' pkgname=runit version=2.1.2 -revision=14 +revision=15 build_wrksrc="${pkgname}-${version}/src" build_style="gnu-makefile" short_desc="UNIX init scheme with service supervision" maintainer="Orphaned " license="BSD-3-Clause" homepage="http://smarden.org/runit/" -distfiles="http://smarden.org/runit/runit-$version.tar.gz" +distfiles="http://smarden.org/runit/runit-${version}.tar.gz" checksum=6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 patch_args=-Np0 @@ -20,14 +20,14 @@ if [ "$build_option_static" ]; then fi pre_build() { - sed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h + vsed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld # set default service path to /var/service - sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c + vsed -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' -i sv.c # change type short to gid_t for getgroups(2) and setgroups(2) - sed -i -e 's:short x\[4\];$:gid_t x[4];:' chkshsgr.c + vsed -e 's:short x\[4\];$:gid_t x[4];:' -i chkshsgr.c } do_install() { @@ -48,6 +48,5 @@ do_install() { vman $f done - vinstall ${FILESDIR}/_sv 644 usr/share/zsh/site-functions vinstall ${FILESDIR}/sv 644 usr/share/bash-completion/completions }