X-Git-Url: http://gitweb/?a=blobdiff_plain;f=procps%2FPkgfile;h=eebb9e8469e73f4adfdf0a7aaf288bd322f71eff;hb=a07eae877ba6ad2572912730950a7778a5517f67;hp=05d5ec56972ebf0af99152f369a26894c1e93f74;hpb=1414c7e3138bd9ac1440ed9f2d79e2514d251afd;p=crossrootfs.git

diff --git a/procps/Pkgfile b/procps/Pkgfile
index 05d5ec5..eebb9e8 100644
--- a/procps/Pkgfile
+++ b/procps/Pkgfile
@@ -5,26 +5,38 @@
 # Depends on: ncurses
 
 name=procps
-version=3.2.8
-release=2
-source=(http://procps.sourceforge.net/$name-$version.tar.gz \
-  sysctl.conf \
-  procps-3.2.8-priorities.patch)
+version=3.3.11
+release=1
+source=(http://downloads.sourceforge.net/project/procps-ng/Production/$name-ng-$version.tar.xz
+        sysctl.conf)
 
 build() {
-  cd $name-$version
-  patch -p1 -i $SRC/procps-3.2.8-priorities.patch
+  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 \
+              --sbindir=/sbin \
+              --libdir=/usr/lib \
+              --sysconfdir=/etc \
+              --disable-nls \
+              --disable-kill \
+              --disable-modern-top \
+              --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/{bin,lib,etc}
+  mv $PKG/usr/bin/{ps,pidof} $PKG/bin/
+  mv $PKG/usr/lib/libprocps.so.* $PKG/lib
+  ln -sf ../../lib/$(readlink $PKG/lib/libprocps.so.5) $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/doc
 }