4 files changed, 168 insertions, 0 deletions
diff --git a/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch b/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch
new file mode 100644
index 000000000..a41b11648
--- /dev/null
+++ b/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch
@@ -0,0 +1,23 @@
+--- diffutils-2.8.4/src/sdiff.c.orig	2002-06-17 00:55:42.000000000 -0500
++++ diffutils-2.8.4/src/sdiff.c	2003-01-08 03:04:02.000000000 -0600
+@@ -692,7 +692,7 @@
+       ck_fclose (out);
+ 
+       {
+-	int wstatus;
++	int wstatus = 0;
+ 	int werrno = 0;
+ 
+ #if ! (HAVE_WORKING_FORK || HAVE_WORKING_VFORK)
+@@ -701,11 +701,6 @@
+ 	  werrno = errno;
+ #else
+ 	ck_fclose (diffout);
+-	while (waitpid (diffpid, &wstatus, 0) < 0)
+-	  if (errno == EINTR)
+-	    checksigs ();
+-	  else
+-	    perror_fatal ("waitpid");
+ 	diffpid = 0;
+ #endif
+ 
diff --git a/source/ap/diffutils/diffutils.SlackBuild b/source/ap/diffutils/diffutils.SlackBuild
new file mode 100755
index 000000000..50ac985d3
--- /dev/null
+++ b/source/ap/diffutils/diffutils.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+VERSION=2.8.1
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-3}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-diffutils
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf diffutils-$VERSION
+tar xzvf $CWD/diffutils-$VERSION.tar.gz
+cd diffutils-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+zcat $CWD/diffutils-sdiff-no-waitpid.patch.gz | patch -p1 || exit 1
+# Prevent ruining sdiff.1 by touching it so it won't "regenerate":
+touch man/sdiff.1
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --program-prefix="" \
+  --program-suffix="" \
+  $ARCH-slackware-linux
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+# Compress info pages and purge "dir" file from the package:
+if [ -d $PKG/usr/info ]; then
+  ( cd $PKG/usr/info
+    rm -f dir
+    gzip -9 *
+  )
+fi
+
+mkdir -p $PKG/usr/doc/diffutils-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING INSTALLME NEWS README THANKS \
+  $PKG/usr/doc/diffutils-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+
+cd $PKG
+makepkg -l y -c n $TMP/diffutils-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/ap/diffutils/doinst.sh b/source/ap/diffutils/doinst.sh
new file mode 100644
index 000000000..cf23d0928
--- /dev/null
+++ b/source/ap/diffutils/doinst.sh
@@ -0,0 +1,16 @@
+if [ -x /usr/bin/install-info ] ; then
+  install-info --info-dir=/usr/info /usr/info/diff.info.gz 2>/dev/null
+elif ! grep "diff3" usr/info/dir 1> /dev/null 2> /dev/null ; then
+cat << EOF >> usr/info/dir
+
+GNU packages
+* Diff: (diff).                 Comparing and merging files.
+
+Individual utilities
+* cmp: (diff)Invoking cmp.                      Compare 2 files byte by byte.
+* diff3: (diff)Invoking diff3.                  Compare 3 files line by line.
+* diff: (diff)Invoking diff.                    Compare 2 files line by line.
+* patch: (diff)Invoking patch.                  Apply a patch to a file.
+* sdiff: (diff)Invoking sdiff.                  Merge 2 files side-by-side.
+EOF
+fi
diff --git a/source/ap/diffutils/slack-desc b/source/ap/diffutils/slack-desc
new file mode 100644
index 000000000..79873c066
--- /dev/null
+++ b/source/ap/diffutils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+diffutils: diffutils (finds differences between files)
+diffutils:
+diffutils: The GNU diff utilities finds differences between files.  A major use
+diffutils: for this package is to make source code patches.
+diffutils:
+diffutils:
+diffutils:
+diffutils:
+diffutils:
+diffutils:
+diffutils: