procps: updated to 3.3.3 and aligned with upstream. Cleaned cross patches.

[crossrootfs.git] / procps / Pkgfile

diff --git a/procps/Pkgfile b/procps/Pkgfile
index f1bd4086a50425539cbc4b612d9c656f83840574..eb3e07840ed59413b30d69c3f2fc9df5b1ac2308 100644 (file)
--- a/procps/Pkgfile
+++ b/procps/Pkgfile
@@ -1,29 +1,40 @@
 # Description: The /proc file system utilities
 # URL: http://procps.sourceforge.net/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, devel@crux-arm.nu
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: ncurses
 
 name=procps
-version=3.2.8
+version=3.3.3
 release=1
-source=(http://procps.sourceforge.net/$name-$version.tar.gz \
-       sysctl.conf)
+source=(http://ftp.de.debian.org/debian/pool/main/p/$name/${name}_$version.orig.tar.xz \
+        sysctl.conf)
 
 build() {
-  cd $name-$version
-  
+  cd $name-ng-$version
+
+  cat > config.cache << EOF
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_realloc_0_nonnull=yes
+EOF
+
+  ./configure --build=$CHOST \
+              --host=$CTARGET \
+              --prefix=/usr \
+              --exec-prefix=/ \
+              --libdir=/usr/lib \
+              --sysconfdir=/etc \
+              --mandir=/usr/man \
+              --disable-kill \
+              --cache-file=config.cache
+
   make
-  make DESTDIR=$PKG \
-       ldconfig=true \
-       man1=$PKG/usr/man/man1/ \
-       man5=$PKG/usr/man/man5/ \
-       man8=$PKG/usr/man/man8/ \
-       install
-  install -D -m644 ../sysctl.conf $PKG/etc/sysctl.conf
+  make DESTDIR=$PKG install
+
+  install -d $PKG/{lib,etc}
+  mv $PKG/usr/lib/libprocps.so.* $PKG/lib
+  ln -sf ../../lib/$(readlink $PKG/lib/libprocps.so.0) $PKG/usr/lib/libprocps.so
+  install -m 0644 $SRC/sysctl.conf $PKG/etc/sysctl.conf
 
-  rm -f $PKG/bin/kill $PKG/usr/man/man1/kill.1
-  ln -sf pgrep $PKG/usr/bin/pkill
-  ln -sf skill $PKG/usr/bin/snice
-  chmod +w -R $PKG
+  rm -r $PKG/usr/share
 }