Add TAG=alien, other SRCDIR, add SlackBuild to docdir, remove ARCH=i386

1 files changed, 18 insertions, 17 deletions

diff --git a/rt2500/build/rt2500.SlackBuild b/rt2500/build/rt2500.SlackBuild
index a0c5b435..bf92a08d 100755
--- a/rt2500/build/rt2500.SlackBuild
+++ b/rt2500/build/rt2500.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2006,2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2006-2008 Eric Hameleers <alien@slackware.com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -57,6 +57,9 @@
 #             * A newer CVS snapshot.
 # 20070818-1: 18/aug/2007 by Eric Hameleers <alien@slackware.com>
 #             * A newer CVS snapshot (previous one did not work for me).
+# 20080517-1: 17/may/2008 by Eric Hameleers <alien@slackware.com>
+#             * A newer CVS snapshot (still needed in Slackware 12.1
+#               unfortunately)
 # 
 # Run 'sh rt2500.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -69,6 +72,7 @@
 PRGNAM=rt2500
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
 # If you use a CVS daily tarball, the VERSION string will be
 # determined from the tarball content. VERSION will look like YYYYMMDD
@@ -87,9 +91,7 @@ DOCS="CHANGELOG FAQ LICENSE THANKS ./Module/iwpriv_usage.txt  \
       ./Module/TESTING README.module"
 
 # 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}
@@ -107,7 +109,7 @@ SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.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"
+  SRCURL="http://downloads.sourceforge.net/rt2400/${PRGNAM}-${SRCVER}.tar.gz"
 fi
 
 ##
@@ -129,9 +131,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=""
              ;;
@@ -151,10 +150,10 @@ esac
 
 # Create working directories:
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-rm -rf $TMP/tmp-$PRGNAM/* # By default we 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
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+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
@@ -163,7 +162,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
@@ -204,6 +203,7 @@ chmod -R u+w,go+r-w,a-s .
 echo Building ...
 ( cd Module
   CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
   LDFLAGS="$SLKLDFLAGS" \
   make debug KERNDIR=$KSRC PATCHLEVEL=$PATCHLEVEL \
     2>&1 | tee $OUTPUT/make-${PRGNAM}.log
@@ -248,7 +248,8 @@ cat <<-EEOOTT >> $PKG/install/doinst.sh
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ./Module/README README.module
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+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):
 if [ -d $PKG/usr/man ]; then
@@ -265,11 +266,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