1 files changed, 11 insertions, 29 deletions
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 09eccb54ff..b9a34ecb79 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -22,10 +22,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Thanks to Carlos Corbacho for the diff to support building on 64 bit
-
 PRGNAM=wine
-VERSION=${VERSION:-0.9.58}
+VERSION=1.0.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,28 +33,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Parallel compilation support
-JOBS=${JOBS:-1}
-
 # If you have a video card that supports hardware accelerated OpenGL,
 # then set the variable below to "YES" - otherwise, "NO"
 # This can be specified on the command line when calling the build script:
 #   OPENGL=NO ./wine.SlackBuild
 OPENGL=${OPENGL:-YES}
 
-# On x86_64, Wine is built as a 32 bit application, as Wine's 64 bit support
-# isn't much use at the moment (it's non functional, for developers only)
-# http://wiki.winehq.org/Wine64
-# (On Slamd64, you must have the c/ series installed to build Wine)
-
-DISTRO=${DISTRO:-slackware}
-
-if [ $DISTRO = slackware ]; then
-	PKGARCH=$ARCH
-else
-	PKGARCH=${ARCH}_${DISTRO}
-fi
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -92,18 +74,18 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-x \
   --disable-debug \
-  --${do_opengl}able-opengl
+  --${do_opengl}able-opengl \
+  --build=$ARCH-slackware-linux
 
-make -j${JOBS} depend
-make -j${JOBS}
+make depend
+make
 make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -111,8 +93,8 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ANNOUNCE AUTHORS COPYING.LIB ChangeLog LICENSE README VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION/$DOC 
+cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -120,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz