Updated for 20080518

Add TAG=alien; add SlackBuild to docdir; better SRCDIR determination

1 files changed, 17 insertions, 16 deletions

diff --git a/rt61/build/rt61.SlackBuild b/rt61/build/rt61.SlackBuild
index d70a685f..4f19d326 100755
--- a/rt61/build/rt61.SlackBuild
+++ b/rt61/build/rt61.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2007-2008 Eric Hameleers <alien@slackware.com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -36,6 +36,8 @@
 #             * Much needed upgrade.
 # 20071014-1: 14/oct/2007 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 20080518-1: 18/may/2008 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh rt61.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -46,18 +48,17 @@
 # Set initial variables:
 
 PRGNAM=rt61
-VERSION=${VERSION:-20071014}
+VERSION=${VERSION:-20080518}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
 DOCS="CHANGELOG FAQ LICENSE THANKS Module/README Module/ReleaseNote \
       Module/STA_iwpriv_ATE_usage.txt Module/TESTING Module/iwpriv_usage.txt \
       WPA_Supplicant"
 
 # 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}
@@ -92,9 +93,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=""
              ;;
@@ -115,9 +113,9 @@ esac
 # Create working directories:
 mkdir -p $TMP/tmp-$PRGNAM # Location to build the source
 rm -rf $TMP/tmp-$PRGNAM/* # Remove the remnants of previous build
-mkdir -p $PKG     # Place for the package to be built
-rm -rf $PKG/*     # We always erase old package's contents:
-mkdir -p $OUTPUT  # Place for the package to be saved
+mkdir -p $PKG             # Place for the package to be built
+rm -rf $PKG/*             # Erase old package's contents
+mkdir -p $OUTPUT          # Place for the package to be saved
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
@@ -126,7 +124,7 @@ if ! [ -f ${SOURCE} ]; then
     [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`"
     echo "Source '`basename ${SOURCE}`' not available yet..."
     echo "Will download file to `dirname $SOURCE`"
-    wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true
+    wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -162,6 +160,7 @@ if ! cd ${PRGNAM}-cvs-${VERSION}* ; then
   echo "** This does not match the version '${VERSION}' of the package you're trying to build!"
   echo "** Please remove '$(basename ${SOURCE})',"
   echo "** and (let the script) download '${SRCURL}' again!"
+  echo "**  - or change the VERSION value of the script."
   echo "**"
   exit 1
 fi
@@ -171,6 +170,7 @@ chmod -R u+w,go+r-w,a-s .
 echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
 export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
 (cd Module
  make KERNDIR=$KSRC PATCHLEVEL=$PATCHLEVEL \
    2>&1 | tee $OUTPUT/make-${PRGNAM}.log
@@ -206,8 +206,9 @@ cat <<-EEOOTT >> $PKG/install/doinst.sh
 # 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/$PRGNAM-$VERSION -type d -name CVS -exec rm -rf {} \; || true
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the kernel modules:
 [ $PATCHLEVEL -eq 4 ] && \
@@ -222,11 +223,11 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.tgz.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.txt
 
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then