diff --git a/srcpkgs/sysvinit/patches/install_perms.diff b/srcpkgs/sysvinit/patches/install_perms.diff deleted file mode 100644 index 25b6523f77..0000000000 --- a/srcpkgs/sysvinit/patches/install_perms.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.orig 2010-04-22 17:57:23.262171640 +0200 -+++ src/Makefile 2010-04-22 17:59:06.662188054 +0200 -@@ -46,7 +46,7 @@ endif - BIN_OWNER = root - BIN_GROUP = root - BIN_COMBO = $(BIN_OWNER):$(BIN_GROUP) --INSTALL = install -o $(BIN_OWNER) -g $(BIN_GROUP) -+INSTALL = install - MANDIR = /usr/share/man - - # Additional libs for GNU libc. diff --git a/srcpkgs/sysvinit/template b/srcpkgs/sysvinit/template index 9d92144ce1..052ec12a1d 100644 --- a/srcpkgs/sysvinit/template +++ b/srcpkgs/sysvinit/template @@ -1,43 +1,27 @@ # Template file for 'sysvinit' pkgname=sysvinit -version=2.86 -revision=1 -distfiles=" -ftp://ftp.cistron.nl/pub/people/miquels/$pkgname/$pkgname-$version.tar.gz" -build_style=custom-install +version=2.88 +wrksrc="${pkgname}-${version}dsf" +distfiles="http://download.savannah.gnu.org/releases/$pkgname/${pkgname}-${version}dsf.tar.bz2" +build_style=gnu_makefile +make_install_args="ROOT=${XBPS_DESTDIR}/${pkgname}-${version}" short_desc="Linux System V Init" maintainer="Juan RP " -checksum=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8 +checksum=60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 long_desc=" System V style init programs for booting a GNU/Linux system." -Add_dependency full glibc +Add_dependency run glibc Add_dependency full shadow Add_dependency full util-linux-ng Add_dependency full coreutils Add_dependency full gawk -do_build() +post_install() { - cd ${wrksrc} || return 1 - sed -i -e 's/utmpdump wall/utmpdump/' \ - -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile - sed -i 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \ - src/init.c - make -C src || return 1 -} - -do_install() -{ - cd ${wrksrc} || return 1 - - install -d ${DESTDIR}/bin ${DESTDIR}/sbin \ - ${DESTDIR}/usr/bin ${DESTDIR}/usr/include \ - ${DESTDIR}/usr/share/man/man1 \ - ${DESTDIR}/usr/share/man/man5 \ - ${DESTDIR}/usr/share/man/man8 - - make -C src MANDIR=/usr/share/man ROOT=${DESTDIR} install # Remove unneeded stuff rm -rf ${DESTDIR}/usr/include + # wall(1) comes from util-linux-ng. + rm -f ${DESTDIR}/usr/bin/wall + rm -f ${DESTDIR}/usr/share/man/man1/wall.1 }