From e6995be69a633cc761fe632262881ba2cff5e34d Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 2 Oct 2018 21:27:57 +0200 Subject: [PATCH] runit: use 'gnu-makefile' build-style --- srcpkgs/runit/template | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/srcpkgs/runit/template b/srcpkgs/runit/template index 8fcf765e87e..4cd12f88761 100644 --- a/srcpkgs/runit/template +++ b/srcpkgs/runit/template @@ -1,25 +1,25 @@ # Template file for 'runit' pkgname=runit version=2.1.2 -revision=9 +revision=10 +build_style="gnu-makefile" wrksrc="admin" +build_wrksrc="${pkgname}-${version}/src" short_desc="A UNIX init scheme with service supervision" maintainer="Juan RP " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="http://smarden.org/runit/" distfiles="http://smarden.org/runit/runit-$version.tar.gz" checksum=6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 build_options="static" -do_build() { - cd ${pkgname}-${version}/src - - if [ "$build_option_static" ]; then - CFLAGS+=" -static" - LDFLAGS+=" -static" - fi +if [ "$build_option_static" ]; then + CFLAGS+=" -static" + LDFLAGS+=" -static" +fi +pre_build() { sed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc @@ -28,14 +28,10 @@ do_build() { sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' 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 - - make ${makejobs} } do_install() { - vlicense ${pkgname}-${version}/package/COPYING - - cd ${pkgname}-${version}/src + vlicense ../package/COPYING # default services vmkdir var