3 files changed, 15 insertions, 9 deletions
diff --git a/accessibility/xdotool/README b/accessibility/xdotool/README
index a587318f8416d..7dae652ddf273 100644
--- a/accessibility/xdotool/README
+++ b/accessibility/xdotool/README
@@ -1,8 +1,8 @@
 xdotool - fake keyboard/mouse input
 
-This tool lets you programatically (or manually) simulate keyboard input
-and mouse activity, move and resize windows, etc. It does this using
-X11's XTEST extension and other Xlib functions.
+This tool lets you programatically (or manually) simulate keyboard input and 
+mouse activity, move and resize windows, etc. It does this using X11's XTEST 
+extension and other Xlib functions.
 
 Example: focus the firefox url bar
 
diff --git a/accessibility/xdotool/xdotool.SlackBuild b/accessibility/xdotool/xdotool.SlackBuild
index 8161b042e0c17..1300e01bc1f3f 100644
--- a/accessibility/xdotool/xdotool.SlackBuild
+++ b/accessibility/xdotool/xdotool.SlackBuild
@@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -34,21 +37,22 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
-sed -i -e "/^CFLAGS/s/-/$SLKCFLAGS -/" Makefile
-make PREFIX=/usr
+make WARNFLAGS="$SLKCFLAGS" PREFIX=/usr
 
 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-strip $PRGNAM
 make install PREFIX=$PKG/usr
+
+strip --strip-unneeded $PKG/usr/bin/$PRGNAM 2>/dev/null || true
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -r README COPYRIGHT COPYRIGHT examples xdotool.pod \
-		$PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README COPYRIGHT examples xdotool.pod \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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/accessibility/xdotool/xdotool.info b/accessibility/xdotool/xdotool.info
index fff8edbcf87b2..88bedd39458dc 100644
--- a/accessibility/xdotool/xdotool.info
+++ b/accessibility/xdotool/xdotool.info
@@ -3,6 +3,8 @@ VERSION="20090126"
 HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
 DOWNLOAD="http://semicomplete.googlecode.com/files/xdotool-20090126.tar.gz"
 MD5SUM="a520d6a3175c3b55582998cbeef81688"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
 APPROVED="dsomero"