Allow CVS and stable releases to be built

1 files changed, 27 insertions, 9 deletions

diff --git a/rt2500/build/rt2500.SlackBuild b/rt2500/build/rt2500.SlackBuild
index 38dfc0b7..4c7d6189 100755
--- a/rt2500/build/rt2500.SlackBuild
+++ b/rt2500/build/rt2500.SlackBuild
@@ -50,6 +50,7 @@
 #             * Added some leftover DOC files, many edits in the SlackBuild.
 # 20070724-1: 24/jul/2007 by Eric Hameleers <alien@slackware.com>
 #             * Using CVS version for Slackware 12.0 kernel support.
+#               The configuration is no longer built.
 # 
 # Run 'sh rt2500.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -60,15 +61,25 @@
 # Set initial variables:
 
 PRGNAM=rt2500
-VERSION=${VERSION:-20070724}
-SRCVER="cvs-daily"
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
-PREDOC="cp -a ./Module/README README.module"
 DOCS="CHANGELOG FAQ LICENSE THANKS ./Module/iwpriv_usage.txt  \
       ./Module/TESTING README.module"
 
+# If you use a CVS daily tarball, the VERSION string will be
+# determined from the tarball content. VERSION will look like YYYYMMDD
+# If USE_CVS == "no" then the script will use SRCVER and VERSION values below.
+USE_CVS=${USE_CVS:-"yes"}
+
+if [ "$USE_CVS" == "yes" ]; then
+  SRCVER="cvs-daily"
+  VERSION="cvs-daily"
+else
+  SRCVER=1.1.0-b4
+  VERSION=$( echo ${SRCVER} | tr '-' '.' )
+fi
+
 # Where do we look for sources?
 CWD=`pwd`
 SRCDIR=`dirname $0`
@@ -87,7 +98,11 @@ PATCHLEVEL=`echo $KVER|cut -f 2 -d '.'`
 
 # Input URL: http://rt2x00.serialmonkey.com/rt2500-cvs-daily.tar.gz
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL="http://rt2x00.serialmonkey.com/${PRGNAM}-${SRCVER}.tar.gz"
+if [ "$USE_CVS" == "yes" ]; then
+  SRCURL="http://rt2x00.serialmonkey.com/${PRGNAM}-${SRCVER}.tar.gz"
+else
+  SRCURL="http://dl.sourceforge.net/rt2400/${PRGNAM}-${SRCVER}.tar.gz"
+fi
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -159,6 +174,8 @@ if [ "$P1" == "--download" ]; then
   exit 0
 fi
 
+VERSION=$(tar -tf $SOURCE | head -1 | cut -d- -f3 | cut -c 1-8)
+
 # --- PACKAGE BUILDING ---
 
 echo "++"
@@ -167,10 +184,11 @@ echo "++"
 
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
-if `file ${SOURCE} | grep -q ": bzip2"`; then
-  tar -xjvf ${SOURCE}
-elif `file ${SOURCE} | grep -q ": gzip"`; then
-  tar -xzvf ${SOURCE}
+tar -xvf ${SOURCE}
+if [ -d ${PRGNAM}-${SRCVER} ]; then
+  mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
+else
+  mv ${PRGNAM}-cvs-${VERSION}* ${PRGNAM}-${VERSION}
 fi
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
@@ -221,7 +239,7 @@ cat <<-EEOOTT >> $PKG/install/doinst.sh
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-$PREDOC
+cp -a ./Module/README README.module
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*