jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

procps: switch to /usr.

Browse source
This commit is contained in:
Juan RP 2012-07-09 15:30:31 +02:00
parent a6cbd76b0d
commit 19535bdff8
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/procps/patches/fix_Makefile.diff
View file

@ -41,8 +41,8 @@
+ $(install) -m644 $< $@
-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz
--- a/Makefile.orig 2009-05-10 20:50:48.000000000 +0200
+++ b/Makefile 2010-10-28 04:09:31.000000000 +0200
@@ -24,10 +24,10 @@ TARVERSION := $(VERSION).$(SUBVERSION)
+++ b/Makefile 2012-07-09 15:29:24.887255955 +0200
@@ -24,35 +24,35 @@ TARVERSION := $(VERSION).$(SUBVERSION)
############ vars
# so you can disable them or choose alternates
@ -55,13 +55,19 @@
# Lame x86-64 /lib64 and /usr/lib64 abomination:
lib64 := lib$(shell [ -d /lib64 ] && echo 64)
@@ -39,20 +39,20 @@ usr/proc/bin := $(DESTDIR)/u
usr/bin := $(DESTDIR)/usr/bin/
-bin := $(DESTDIR)/bin/
-sbin := $(DESTDIR)/sbin/
+bin := $(DESTDIR)/usr/bin/
+sbin := $(DESTDIR)/usr/sbin/
usr/proc/bin := $(DESTDIR)/usr/bin/
man1 := $(DESTDIR)/usr/share/man/man1/
man5 := $(DESTDIR)/usr/share/man/man5/
man8 := $(DESTDIR)/usr/share/man/man8/
-lib := $(DESTDIR)/$(lib64)/
-usr/lib := $(DESTDIR)/usr/$(lib64)/
+lib := $(DESTDIR)/lib/
+lib := $(DESTDIR)/usr/lib/
+usr/lib := $(DESTDIR)/usr/lib/
usr/include := $(DESTDIR)/usr/include/

6
srcpkgs/procps/template
View file

@ -1,13 +1,15 @@
# Template file for 'procps'
pkgname=procps
version=3.2.8
revision=6
distfiles="http://procps.sf.net/$pkgname-$version.tar.gz"
revision=7
patch_args="-Np1"
build_style=gnu-makefile
makedepends="ncurses-devel"
short_desc="The /proc file system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
homepage="http://procps.sourceforge.net"
distfiles="http://procps.sf.net/$pkgname-$version.tar.gz"
checksum=11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
long_desc="
procps is the package that has a bunch of small useful utilities that give