Updated to 1.1.22

1 files changed, 20 insertions, 41 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index 6f0fab30..bbed74a2 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2006-2008 Eric Hameleers <alien@slackware.com>
+# Copyright 2006-2009  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -80,8 +80,9 @@
 # 1.1.9-1:    21/nov/2008 by Eric Hameleers <alien@slackware.com>
 # 1.1.10-1:   06/dec/2008 by Eric Hameleers <alien@slackware.com>
 # 1.1.11-1:   22/dec/2008 by Eric Hameleers <alien@slackware.com>
+# 1.1.22-1:   28/may/2009 by Eric Hameleers <alien@slackware.com>
 # 
-# Run 'sh wine.SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh wine.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
@@ -90,7 +91,7 @@
 # Set initial variables:
 
 PRGNAM=wine
-SRCVER=${SRCVER:-"1.1.11"}
+SRCVER=${SRCVER:-"1.1.22"}
 VERSION=$(echo $SRCVER | tr '-' '.')
 ARCH=${ARCH:-"i486"}
 BUILD=${BUILD:-1}
@@ -129,15 +130,8 @@ trap 'echo "$0 FAILED on line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 set -u
 P1=${1:-1}
 
-# Slackware 11 and up need other option (gcc > 3.3.x)
-if [ $(gcc -dumpversion | tr -d  '.' |cut -c 1-2) -gt 33 ]; then
-  MOPT=tune
-else
-  MOPT=cpu
-fi
-
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   s390)      SLKCFLAGS="-O2"
@@ -217,14 +211,10 @@ fi
 cd $TMP/tmp-$PRGNAM
 
 echo "Extracting the source archive(s) for $PRGNAM..."
-if $(file ${SOURCE} | grep -q ": bzip2"); then
-  tar -xjvf ${SOURCE}
-else
-  tar -xzvf ${SOURCE}
-fi
+tar -xvf ${SOURCE}
 [ "$SRCVER" != "$VERSION" ] && mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
 cd ${PRGNAM}-${VERSION}
-# Starting with openssl-0.9.8h, it has introduced a typedef named "X509_EXTENSIONS"
+# Starting with openssl-0.9.8h, a typedef was introduced named "X509_EXTENSIONS"
 # into openssl/x509.h.  Unfortunately, wine uses a define of the same name
 # in include/wincrypt.h. You may need this patch:
 #patch -p0 < $SRCDIR/wine_openssl.patch
@@ -238,27 +228,21 @@ echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --mandir=/usr/man \
-            --with-x \
-            --with${do_opengl}-opengl \
-            --program-prefix="" \
-            --program-suffix="" \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --with-x \
+  --with${do_opengl}-opengl \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-
-# Install all the needed stuff to the package dir
-# Use installwatch if available:
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
+make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Add a desktop menu for the winecfg program:
 mkdir -p $PKG/usr/share/pixmaps
@@ -316,8 +300,3 @@ if [ -f $PKG/install/slack-required ]; then
   cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 fi
 
-# Clean up the extra stuff:
-if [ "$P1" = "--cleanup" ]; then
-  rm -rf $TMP/tmp-$PRGNAM
-  rm -rf $PKG
-fi