X-Git-Url: http://gitweb/?a=blobdiff_plain;f=sysvinit%2FPkgfile;h=ca39f04c59e5db3c5d123b41ec34624065b30f80;hb=7407a81f6071240b61f4c8ba08fb67368f22873c;hp=55eeab89bd9673fbb9437a110b7737b22ef6eeb2;hpb=6dca1d213a39ee6af51632926e8b7c8914215cd9;p=crossrootfs.git

diff --git a/sysvinit/Pkgfile b/sysvinit/Pkgfile
index 55eeab8..ca39f04 100644
--- a/sysvinit/Pkgfile
+++ b/sysvinit/Pkgfile
@@ -1,30 +1,31 @@
 # Description: The Linux System V Init
 # URL: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX ARM System Team
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on:
 
 name=sysvinit
-version=2.86
-release=5
-source=(ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/$name-$version.tar.gz \
-        http://svn.cross-lfs.org/svn/repos/cross-lfs/branches/clfs-sysroot/patches/$name-$version-fixes-1.patch)
+version=2.88
+release=4
+source=(http://download.savannah.gnu.org/releases/$name/$name-${version}dsf.tar.bz2)
 
 build() {
-  cd $name-$version
-  patch -p1 -i $SRC/$name-$version-fixes-1.patch
-  sed -e 's|/dev/initctl|$(ROOT)&|g' \
-      -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
-      -e '/^ifeq/s/$(ROOT)//' \
-      -e 's|/usr/lib|$(ROOT)&|' \
-      -i src/Makefile
-
+  cd $name-${version}dsf
   make -C src CC="$CC"
-  mkdir -p $PKG/{bin,sbin,dev,usr/{bin,sbin,include,share/man/{man1,man5,man8}}}
   make -C src ROOT=$PKG install
-  mv $PKG/usr/share/man $PKG/usr
-  rm -rf $PKG/usr/share
-  mkdir -p $PKG/var/log
+  
+  # Provided by util-linux 
+  rm $PKG/{bin/mountpoint,usr/bin/utmpdump}
+  rm $PKG/usr/share/man/man1/{mountpoint,utmpdump}.1
+  rm $PKG/usr/bin/{last,lastb,mesg,wall}
+  rm $PKG/usr/share/man/man1/{last,lastb,mesg,wall}.1
+  rmdir $PKG/usr/bin
+
+  # Provided by procps
+  rm $PKG/bin/pidof
+  rm $PKG/usr/share/man/man8/pidof.8
+
+  install -d $PKG/var/log
   touch $PKG/var/log/wtmp
   touch $PKG/var/log/btmp
   chmod 0600 $PKG/var/log/btmp