diff --git a/srcpkgs/procps-ng/procps-ng-3.3.5.tar.gz b/srcpkgs/procps-ng/procps-ng-3.3.5.tar.gz deleted file mode 100644 index c28fb5d17f..0000000000 Binary files a/srcpkgs/procps-ng/procps-ng-3.3.5.tar.gz and /dev/null differ diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index fe58ed488b..43436992c0 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -1,7 +1,7 @@ # Template file for 'procps-ng' pkgname=procps-ng version=3.3.5 -revision=3 +revision=4 wrksrc="procps-procps" build_style=gnu-configure configure_args="--exec-prefix=/ --prefix=/usr --libdir=/usr/lib --disable-static" @@ -14,6 +14,9 @@ checksum=d3ac6611af888ef8e4f32f4b60718af77d32d8e3abe07f63d985b3abca332d53 conf_files="/etc/sysctl.conf" replaces="procps>=0" +provides="procps-${version}" +conflicts="coreutils<8.21_3" + makedepends="automake gettext-devel pkg-config ncurses-devel" crossmakedepends="ncurses-devel" @@ -30,10 +33,9 @@ pre_configure() { post_install() { vinstall ${FILESDIR}/sysctl.conf 644 etc - # provided by coreutils + # provided by util-linux rm ${DESTDIR}/bin/kill - rm ${DESTDIR}/usr/bin/uptime - rm ${DESTDIR}/usr/share/man/man1/{uptime,kill}.1 + rm ${DESTDIR}/usr/share/man/man1/kill.1 vmove "bin/*" usr/bin vmkdir usr/sbin