Update for v 2.9.9.4.

Added TAG=alien, better SRCDIR determination, add SlackBuild to the docdir

1 files changed, 11 insertions, 14 deletions

diff --git a/dansguardian/build/dansguardian.SlackBuild b/dansguardian/build/dansguardian.SlackBuild
index f5095fd9..5c359e46 100755
--- a/dansguardian/build/dansguardian.SlackBuild
+++ b/dansguardian/build/dansguardian.SlackBuild
@@ -37,6 +37,8 @@
 # 2.9.9.3-1:  27/Feb/2008 by Eric Hameleers <alien@slackware.com>
 #             * Update. An existing (and modified) rc script or logrotate
 #               script will no longer be overwritten.
+# 2.9.9.4-1:  18/may/2008 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh dansguardian.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -50,16 +52,17 @@ PRGNAM=dansguardian
 VERSION=${VERSION:-2.9.9.3}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
+# If these user accounts do not exist on the target system, you will have
+# to create them before you install the resulting package!
 PROXY_USR=nobody
 PROXY_GRP=nobody
 
 # Where do we look for sources?
-CWD=$(pwd)
-SRCDIR=$(dirname $0)
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
@@ -88,9 +91,6 @@ else
 fi
 
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -113,11 +113,7 @@ mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 mkdir -p $PKG             # place for the package to be built
 rm -rf $PKG/*             # always erase old package's contents
-if [ "$P1" != "--oldbuild" ]; then
-  # Use the "--oldbuild" parameter to keep old build files and continue;
-  # By default we remove the remnants of previous build and continue.
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
@@ -250,6 +246,7 @@ EOINS
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -273,11 +270,11 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then