1 files changed, 19 insertions, 24 deletions
diff --git a/system/conserver/conserver.SlackBuild b/system/conserver/conserver.SlackBuild
index 439640f044..c416c0a4f8 100644
--- a/system/conserver/conserver.SlackBuild
+++ b/system/conserver/conserver.SlackBuild
@@ -3,35 +3,32 @@
 # Slackware build script for Conserver
 
 # Written by Menno Duursma <druiloor@zonnet.nl>
-# Modified by the SlackBuilds.org project
 
 PRGNAM=conserver
-VERSION=8.1.14
+VERSION=8.1.16
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Bail out if we have a problem
-set -e
-
-# Set compiler flags
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e # Bail out if we have a problem
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find . -type d -exec chmod 0755 {} \;
 chmod -R a-s,u+w,go+r-w .
@@ -75,27 +72,25 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Documentation :
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp CHANGES  FAQ  INSTALL  LICENSE  PROTOCOL  README  TODO  conserver.html \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-# We'll consider this a documentation here
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/contrib
+cp [A-Z][A-Z]*  conserver.html $PKG/usr/doc/$PRGNAM-$VERSION
+# We'll consider this to be documentation here
 cp -a autologin $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/conserver.cf
 cd conserver.cf
-cp INSTALL conserver.cf conserver.passwd label.ps test.cf \
-  $PKG/usr/doc/$PRGNAM-$VERSION/conserver.cf
-cp -a samples $PKG/usr/doc/$PRGNAM-$VERSION/conserver.cf
-
+  cp INSTALL conserver.cf conserver.passwd label.ps test.cf \
+    $PKG/usr/doc/$PRGNAM-$VERSION/conserver.cf
+  cp -a samples $PKG/usr/doc/$PRGNAM-$VERSION/conserver.cf
 cd ../conserver
-cp Sun-serial $PKG/usr/doc/$PRGNAM-$VERSION
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/contrib
+  cp Sun-serial $PKG/usr/doc/$PRGNAM-$VERSION
 cd ../contrib
-cp README maketestcerts $PKG/usr/doc/$PRGNAM-$VERSION/contrib
-# We'll consider this a documentation here too
-cp -a chat $PKG/usr/doc/$PRGNAM-$VERSION/contrib
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  cp README maketestcerts $PKG/usr/doc/$PRGNAM-$VERSION/contrib
+  # We'll consider this a documentation here too
+  cp -a chat $PKG/usr/doc/$PRGNAM-$VERSION/contrib
+  cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
+cd -
 
 # Toss redundant example config files included with source
 rm -rf $PKG/usr/share