main/procps: upgrade to 3.3.4

2 files changed, 12 insertions, 75 deletions

diff --git a/main/procps/01-fix-install-options-for-busybox.patch b/main/procps/01-fix-install-options-for-busybox.patch
deleted file mode 100644
index 792a78155b..0000000000
--- a/main/procps/01-fix-install-options-for-busybox.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- orig/procps-3.2.8/Makefile
-+++ src/procps-3.2.8/Makefile
-@@ -27,7 +27,7 @@
- ldconfig := ldconfig
- ln_f     := ln -f
- ln_sf    := ln -sf
--install  := install -D --owner 0 --group 0
-+install  := install -D -o 0 -g 0
- 
- # Lame x86-64 /lib64 and /usr/lib64 abomination:
- lib64    := lib$(shell [ -d /lib64 ] && echo 64)
-@@ -222,10 +222,10 @@
- ###### install
- 
- $(BINFILES) : all
--	$(install) --mode a=rx $(notdir $@) $@
-+	$(install) -m a=rx $(notdir $@) $@
- 
- $(MANFILES) : all
--	$(install) --mode a=r $(notdir $@) $@
-+	$(install) -m a=r $(notdir $@) $@
- 
- install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
- 	cd $(usr/bin) && $(ln_f) skill snice
---- orig/procps-3.2.8/proc/module.mk
-+++ src/procps-3.2.8/proc/module.mk
-@@ -96,7 +96,7 @@
- #################### install rules ###########################
- 
- $(lib)$(SOFILE) : proc/$(SONAME)
--	$(install) --mode a=rx $< $@
-+	$(install) -m a=rx $< $@
- 
- ifneq ($(SOLINK),$(SOFILE))
- .PHONY: $(lib)$(SOLINK)
-@@ -115,14 +115,14 @@
- 	$(ldconfig)
- 
- $(usr/lib)$(ANAME) : proc/$(ANAME)
--	$(install) --mode a=r $< $@
-+	$(install) -m a=r $< $@
- 
- # Junk anyway... supposed to go in /usr/include/$(NAME)
- #INSTALL += $(addprefix $(include),$(HDRFILES))
- #
- #$(addprefix $(include),$(HDRFILES)): $(include)% : proc/%
- #$(include)% : proc/%
--#	$(install) --mode a=r $< $@
-+#	$(install) -m a=r $< $@
- 
- ##################################################################
- 
---- orig/procps-3.2.8/ps/module.mk
-+++ src/procps-3.2.8/ps/module.mk
-@@ -33,8 +33,8 @@
- 
- 
- $(bin)ps: ps/ps
--	$(install) --mode a=rx $< $@
-+	$(install) -m a=rx $< $@
- 
- $(man1)ps.1 : ps/ps.1
--	$(install) --mode a=r $< $@
-+	$(install) -m a=r $< $@
- 	-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz
diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD
index 41a28c0fa9..e5af5f80df 100644
--- a/main/procps/APKBUILD
+++ b/main/procps/APKBUILD
@@ -1,34 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=procps
-pkgver=3.2.8
-pkgrel=2
+pkgver=3.3.4
+pkgrel=0
 pkgdesc="Utilities for monitoring your system and processes on your system"
-url="http://procps.sourceforge.net/"
+url="http://gitorious.org/procps"
 arch="all"
 license="GPL LGPL"
 depends=
 # needs fancy install
 makedepends="ncurses-dev coreutils"
 subpackages="$pkgname-dev $pkgname-doc libproc"
-source="http://$pkgname.sourceforge.net/$pkgname-$pkgver.tar.gz
-	01-fix-install-options-for-busybox.patch"
+source="http://ftp.us.debian.org/debian/pool/main/p/procps/${pkgname}_${pkgver}.orig.tar.xz"
 
 prepare() {
 	cd "$srcdir"
-	patch -p1 -i "$srcdir"/01-fix-install-options-for-busybox.patch || return 1
+#	patch -p1 -i "$srcdir"/01-fix-install-options-for-busybox.patch || return 1
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$srcdir"/$pkgname-ng-$pkgver
+	./configure --prefix=/usr \
+		--libdir=/lib \
+		--with-ncurses
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$srcdir"/$pkgname-ng-$pkgver
 	make DESTDIR="$pkgdir" ldconfig=true install="install -D" \
 		install || return 1
 	install -d "$pkgdir"/usr/include/proc || return 1
 	install -m644 proc/*.h "$pkgdir"/usr/include/proc/ || return 1
+	rm "$pkgdir"/lib/*.la
 }
 
 libproc() {
@@ -38,5 +41,4 @@ libproc() {
 	ln -s libproc-$pkgver.so "$subpkgdir"/lib/libproc.so
 }
 
-md5sums="9532714b6846013ca9898984ba4cd7e0  procps-3.2.8.tar.gz
-2b821e841acd08620789d5ffd19d58e9  01-fix-install-options-for-busybox.patch"
+md5sums="85efd032ad6514689d8dcadfac239008  procps_3.3.4.orig.tar.xz"