3 files changed, 13 insertions, 10 deletions
diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index e5a9c0719d24..e7397670d282 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for mjpegtools 11/01/2009
-# Updated for Slackware64 28/05/2009
-#
+
 # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 # All rights reserved.
 #
@@ -26,7 +25,7 @@
 PRGNAM=mjpegtools
 VERSION=1.9.0
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -56,6 +55,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
+# Fix for x86_64
+sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -91,12 +93,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS BUGS CHANGES COPYING ChangeLog HINTS INSTALL* \
   NEWS PLANS README TODO docs/FAQ.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
+    $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/mjpegtools/mjpegtools.info b/multimedia/mjpegtools/mjpegtools.info
index 8131081311f2..47ac66d86528 100644
--- a/multimedia/mjpegtools/mjpegtools.info
+++ b/multimedia/mjpegtools/mjpegtools.info
@@ -3,6 +3,8 @@ VERSION="1.9.0"
 HOMEPAGE="http://mjpeg.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-1.9.0.tar.gz"
 MD5SUM="309a6fcf0900a010d6a9c1e91afc2f5c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave {at} gmail {dot} com"
 APPROVED="dsomero"
diff --git a/multimedia/mjpegtools/slack-desc b/multimedia/mjpegtools/slack-desc
index 364f758663fc..b5b1650db49b 100644
--- a/multimedia/mjpegtools/slack-desc
+++ b/multimedia/mjpegtools/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-          |-----handy-ruler---------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 mjpegtools: mjpegtools (video recording/playback tools)
-mjpegtools: 
+mjpegtools:
 mjpegtools: The mjpeg programs are a set of tools that can do recording of videos
 mjpegtools: and playback, simple cut-and-paste editing and the MPEG compression 
 mjpegtools: of audio and video under Linux.
-mjpegtools: 
+mjpegtools:
 mjpegtools: The recorded videos can be converted to MPEG streams. The software 
 mjpegtools: playback of MPEG streams works with almost every player and every OS.
 mjpegtools: You can produce special forms of MPEG streams like VCD (Video CD) and 
 mjpegtools: SVCD for hardware playback. 
-mjpegtools: 
+mjpegtools: