Updated to 2.9.8

1 files changed, 23 insertions, 29 deletions

diff --git a/mkvtoolnix/build/mkvtoolnix.SlackBuild b/mkvtoolnix/build/mkvtoolnix.SlackBuild
index fe92a12c..9aaab3c8 100755
--- a/mkvtoolnix/build/mkvtoolnix.SlackBuild
+++ b/mkvtoolnix/build/mkvtoolnix.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2009 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2009  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -32,6 +32,8 @@
 # Changelog:  
 # 2.8.0-1:    14/May/2009 by Eric Hameleers <alien@slackware.com>
 #             * Initial build.
+# 2.9.8-1:    09/oct/2009 by Eric Hameleers <alien@slackware.com>
+#             * Update. The 64-bit package was missing the GUI.
 # 
 # Run 'sh mkvtoolnix.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -42,13 +44,14 @@
 # Set initial variables:
 
 PRGNAM=mkvtoolnix
-VERSION=${VERSION:-2.8.0}
+VERSION=${VERSION:-2.9.8}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
-DOCS="AUTHORS COPYING README ChangeLog TODO doc/mkvmerge-gui.html"
+DOCS="AUTHORS COPYING ChangeLog NEWS README ChangeLog TODO \
+      doc/mkvmerge-gui.html doc/images"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -85,9 +88,6 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
 esac
 
 # Create working directories:
@@ -140,29 +140,23 @@ echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --mandir=/usr/man \
-            --docdir=/usr/doc/$PRGNAM-$VERSION \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --enable-gui \
-            --enable-wxwidgets \
-            --enable-qt \
-            --program-prefix= \
-            --program-suffix= \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --enable-gui \
+  --enable-wxwidgets \
+  --enable-qt \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
-# Install all the needed stuff to the package dir
-# Use installwatch if available, to produce a logfile of the installation
-# process that is more easily readable:
-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 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Add menu entries for the GUIs:
 mkdir -p $PKG/usr/share/pixmaps
@@ -195,7 +189,7 @@ EOT
 cat <<EOT >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1
+  chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
 fi
 
 EOT