Add TAG=alien ; better determination of SRCDIR ; copy of SlackBuild to docdir

1 files changed, 15 insertions, 45 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index 12bf3525..89af4b04 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -32,65 +32,38 @@
 # 0.9.23-1:   24/Oct/2006 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
 # 0.9.25-1:   14/nov/2006 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.30-1:   30/jan/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.31-1:   17/feb/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.32-1:   02/mar/2007 by Eric Hameleers <alien@slackware.com>
 #            * Update. I wasn't so happy with 0.9.31, it would not run HL2
 #              anywhere near reliably.
 # 0.9.33-1:   20/mar/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.34-1:   03/apr/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.35-1:   15/apr/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.36-1:   29/apr/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.37-1:   12/may/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.38-1:   04/jun/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.39-1:   17/jun/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.41-1:   24/jul/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.43-1:   14/aug/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.44-1:   25/aug/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.45-1:   15/sep/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.46-1:   03/oct/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.47-1:   13/oct/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.48-1:   29/oct/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.49-1:   13/nov/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.50-1:   02/dec/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.51-1:   19/dec/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.52-1:   30/dec/2007 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.53-1:   12/jan/2008 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.54-1:   28/jan/2008 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.55-1:  10/feb/2008 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.56-1:  23/feb/2008 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.57-1:  14/mar/2008 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.58-1:  22/mar/2008 by Eric Hameleers <alien@slackware.com>
-#            * Update.
 # 0.9.59-1:  05/apr/2008 by Eric Hameleers <alien@slackware.com>
 # 0.9.60-1:  21/apr/2008 by Eric Hameleers <alien@slackware.com>
-#            * Update.
+# 0.9.61-1:  06/may/2008 by Eric Hameleers <alien@slackware.com>
 # 
 # Run 'sh wine.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -101,9 +74,10 @@
 # Set initial variables:
 
 PRGNAM=wine
-VERSION=${VERSION:-"0.9.60"}
+VERSION=${VERSION:-"0.9.61"}
 ARCH=${ARCH:-"i486"}
 BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
 DOCS="ANNOUNCE AUTHORS COPYING.LIB ChangeLog LICENSE* README VERSION"
 
@@ -117,9 +91,7 @@ OPENGL=${OPENGL:-"YES"}    # Use 'YES' not 'yes' : case-sensitive!
 REQUIRE_FONTFORGE=${REQUIRE_FONTFORGE:-"YES"}
 
 # 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}
@@ -171,9 +143,9 @@ esac
 # Prepare a sane build environment:
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build and continue
-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/*             # We always erase old package's contents
+mkdir -p $OUTPUT          # place for the package to be saved
 
 # Source files availability:
 if ! [ -f ${SOURCE} ]; then
@@ -182,7 +154,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 -T 30 -O "${SOURCE}" "${SRCURL}" || true
+    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -266,7 +238,8 @@ fi
 # Add some documentation to thre package:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 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 {} \;
 
 # Move incorrectly installed man pages, if any
 [ -d $PKG/usr/share/man ] && \
@@ -284,10 +257,7 @@ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 cd -
 
-# Ownership, rights:
-chmod -R o-w $PKG
-
-# Add a package dfescription:
+# Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 if [ -f $SRCDIR/doinst.sh ]; then
@@ -299,13 +269,13 @@ 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
 if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
+  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 fi
 
 # Clean up the extra stuff: