4 files changed, 29 insertions, 18 deletions
diff --git a/system/chkconfig/README b/system/chkconfig/README
index ef98c9ccaa..d32f5f51fb 100644
--- a/system/chkconfig/README
+++ b/system/chkconfig/README
@@ -1,5 +1,3 @@
-Chkconfig
-
 Chkconfig is a tool for managing the collection of symbolic links found in
 the /etc/rc[0-6].d directories, on System V derived UNIX systems. It saves
 the system administrator from the tedium of manually managing the scores of
@@ -18,5 +16,3 @@ After which services can be administrated in the folowing manner:
 Note: Slackware uses a BSD UNIX derived 'rc' system to be found in
       /etc/rc.d (utilising 'pkgtool' for management), SysV-style init
       is however supported for 3th party programs to use.
-
-
diff --git a/system/chkconfig/chkconfig.SlackBuild b/system/chkconfig/chkconfig.SlackBuild
index 7b415fc168..bd7e002910 100644
--- a/system/chkconfig/chkconfig.SlackBuild
+++ b/system/chkconfig/chkconfig.SlackBuild
@@ -1,27 +1,37 @@
 #!/bin/sh
 
-# Slackware build script for chkconfig
-# Written by Menno E. Duursma <druiloor@zonnet.nl>
+# Slackware build script for Chkconfig
 
-# Exit on most errors
-set -e
+# Written by Menno Duursma <druiloor@zonnet.nl>
+
+# This program is free software. It comes without any warranty.
+# Granted WTFPL, Version 2, as published by Sam Hocevar. See
+# http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=chkconfig
-VERSION=1.3.30c
+VERSION=${VERSION:-1.3.30c}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -39,9 +49,12 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -52,13 +65,13 @@ make install-strip DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [A-Z][A-Z]* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Make the package; be sure to leave it in $OUTPUT
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/chkconfig/chkconfig.info b/system/chkconfig/chkconfig.info
index 45cbc00dd7..942d4f01f1 100644
--- a/system/chkconfig/chkconfig.info
+++ b/system/chkconfig/chkconfig.info
@@ -1,8 +1,10 @@
 PRGNAM="chkconfig"
 VERSION="1.3.30c"
 HOMEPAGE="http://www.fastcoder.net/software/chkconfig/"
-DOWNLOAD="http://www.fastcoder.net/downloads/chkconfig-1.3.30c.tar.gz"
+DOWNLOAD="http://www.sfr-fresh.com/unix/privat/chkconfig-1.3.30c.tar.gz"
 MD5SUM="592a1fe77f3844d7748adbab6357ee25"
-MAINTAINER="Menno E. Duursma"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/system/chkconfig/slack-desc b/system/chkconfig/slack-desc
index 77deb48f72..6e7d847d82 100644
--- a/system/chkconfig/slack-desc
+++ b/system/chkconfig/slack-desc
@@ -12,7 +12,7 @@ chkconfig: Chkconfig is a tool for managing the collection of symbolic links
 chkconfig: found in the /etc/rc[0-6].d directories, on System V derived UNIX
 chkconfig: systems. It saves the system administrator from the tedium of
 chkconfig: manually managing the scores of symbolic links.
-chkconfig: 
+chkconfig:
 chkconfig: Note: Slackware uses a BSD UNIX derived 'rc' system to be found in
 chkconfig: /etc/rc.d (utilising 'pkgtool' for management), SysV-style init
 chkconfig: is however supported for 3th party programs to use.