Thu Jul 29 01:45:40 UTC 2010

a/aaa_terminfo-5.7-x86_64-2.txz:  Rebuilt.
a/dialog-1.1_20100428-x86_64-1.txz:  Upgraded.
a/ed-1.4-x86_64-1.txz:  Upgraded.
a/grep-2.6.3-x86_64-1.txz:  Upgraded.
a/hdparm-9.29-x86_64-1.txz:  Upgraded.
a/mtx-1.3.12-x86_64-1.txz:  Upgraded.
a/ncompress-4.2.4.3-x86_64-1.txz:  Upgraded.
a/patch-2.6.1-x86_64-1.txz:  Upgraded.
a/procps-3.2.8-x86_64-1.txz:  Upgraded.
a/sharutils-4.9-x86_64-1.txz:  Upgraded.
a/tcsh-6.17.00-x86_64-1.txz:  Upgraded.
a/tree-1.5.3-x86_64-1.txz:  Upgraded.
a/utempter-1.1.5-x86_64-1.txz:  Upgraded.
a/zoo-2.10_22-x86_64-1.txz:  Upgraded.
ap/a2ps-4.14-x86_64-5.txz:  Rebuilt.
ap/acct-6.5.4-x86_64-1.txz:  Upgraded.
ap/at-3.1.12-x86_64-1.txz:  Upgraded.
ap/aumix-2.9.1-x86_64-1.txz:  Upgraded.
ap/cdrdao-1.2.3-x86_64-1.txz:  Upgraded.
ap/diffstat-1.53-x86_64-1.txz:  Upgraded.
ap/enscript-1.6.5.2-x86_64-1.txz:  Upgraded.
ap/groff-1.20.1-x86_64-2.txz:  Rebuilt.
  Patched a bug in doc.tmac.  Thanks to Willy Sudiarto Raharjo.
ap/joe-3.7-x86_64-1.txz:  Upgraded.
ap/jove-4.16.0.73-x86_64-1.txz:  Upgraded.
ap/ksh93-2010_06_21-x86_64-1.txz:  Upgraded.
ap/linuxdoc-tools-0.9.66-x86_64-3.txz:  Rebuilt.
ap/lsscsi-0.24b1-x86_64-1.txz:  Upgraded.
ap/sc-7.16-x86_64-3.txz:  Rebuilt.
ap/texinfo-4.13a-x86_64-4.txz:  Rebuilt.
ap/sox-14.3.1-x86_64-1.txz:  Upgraded.
ap/vorbis-tools-1.4.0-x86_64-1.txz:  Upgraded.
ap/workbone-2.40-x86_64-4.txz:  Rebuilt.
d/gperf-3.0.4-x86_64-1.txz:  Upgraded.
d/make-3.82-x86_64-1.txz:  Upgraded.
d/pkg-config-0.25-x86_64-1.txz:  Upgraded.
d/strace-4.5.20-x86_64-1.txz:  Upgraded.
l/jre-6u21-x86_64-1.txz:  Upgraded.
  Upgraded to Java(TM) 2 Platform Standard Edition Runtime Environment
  Version 6.0 update 20.
l/libao-1.0.0-x86_64-1.txz:  Upgraded.
l/libvorbis-1.3.1-x86_64-1.txz:  Upgraded.
l/libogg-1.2.0-x86_64-1.txz:  Upgraded.
n/samba-3.5.4-x86_64-1.txz:  Upgraded.
extra/jdk-6/jdk-6u21-x86_64-1.txz:  Upgraded.
  Upgraded to Java(TM) 2 Platform Standard Edition Development Kit
  Version 6.0 update 21.

4 files changed, 65 insertions, 15 deletions

diff --git a/slackware64-current/source/a/patch/patch-2.5.4.tar.gz b/slackware64-current/source/a/patch/patch-2.5.4.tar.gz
deleted file mode 100644
index 002111132..000000000
--- a/slackware64-current/source/a/patch/patch-2.5.4.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-a12d520eba0dc35d1c4d50ec75b7684451a40de9
diff --git a/slackware64-current/source/a/patch/patch-2.6.1.tar.xz b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz
new file mode 100644
index 000000000..e2ab8972c
--- /dev/null
+++ b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz
@@ -0,0 +1 @@
+8cc3485aa433b8feb70f6783efb766554230fee8
diff --git a/slackware64-current/source/a/patch/patch-2.6.1.tar.xz.sig b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz.sig
new file mode 100644
index 000000000..a32025ea9
--- /dev/null
+++ b/slackware64-current/source/a/patch/patch-2.6.1.tar.xz.sig
@@ -0,0 +1 @@
+4b4451083146d86a3dd01658d136b49b824568b6
diff --git a/slackware64-current/source/a/patch/patch.SlackBuild b/slackware64-current/source/a/patch/patch.SlackBuild
index fb0c06d98..1175620b6 100755
--- a/slackware64-current/source/a/patch/patch.SlackBuild
+++ b/slackware64-current/source/a/patch/patch.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=2.5.4
-ARCH=${ARCH:-x86_64}
+VERSION=2.6.1
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-patch
@@ -31,23 +40,35 @@ PKG=$TMP/package-patch
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
 cd $TMP
 rm -rf patch-${VERSION}
-tar xzvf $CWD/patch-${VERSION}.tar.gz
+tar xvf $CWD/patch-${VERSION}.tar.xz || exit 1
 cd patch-${VERSION}
 chown -R root:root .
-mkdir -p $PKG/usr/doc/patch-${VERSION}
-cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/patch-${VERSION}
-chmod 644 $PKG/usr/doc/patch-${VERSION}/*
+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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  $ARCH-slackware-linux
-make CFLAGS=-O2  || exit 1
-mkdir -p $PKG/usr/bin
-cat patch > $PKG/usr/bin/patch
-chmod 755 $PKG/usr/bin/patch
-mkdir -p $PKG/usr/man/man1
-cat patch.man  | gzip -9c > $PKG/usr/man/man1/patch.1.gz
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make -j4 || make || exit 1
+make install DESTDIR=$PKG
 
 # Strip everything for good measure:
 ( cd $PKG
@@ -55,6 +76,34 @@ cat patch.man  | gzip -9c > $PKG/usr/man/man1/patch.1.gz
   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
+
+mkdir -p $PKG/usr/doc/patch-${VERSION}
+cp -a \
+  AUTHORS COPYING* NEWS README* \
+  $PKG/usr/doc/patch-${VERSION}
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc