1 files changed, 22 insertions, 14 deletions
diff --git a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
index 34cec90e54..35fb7f34d1 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
+++ b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
@@ -5,17 +5,19 @@
 # Script maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=flash-player-plugin
-VERSION=10.0_r32
-ARCH=i386
+VERSION=10.0_r45
+ARCH=${ARCH:-i386}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRC_VERSION=10.0.45.2
+
 # If you use or intend to use Opera at some point, and you want
 # this plugin available to it, then pass "yes" as the value to this
 # variable:    USE_OPERA=yes ./flash-player-plugin.SlackBuild
 # Note that this should *NOT* be needed if you installed Opera using
 # the SlackBuilds.org build script, as we do a simple patch there to
-# make it look in /usr/lib/mozilla/plugins
+# make it look in /usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 USE_OPERA=${USE_OPERA:-no}
 
 CWD=$(pwd)
@@ -26,11 +28,17 @@ OUTPUT=${OUTPUT:-/tmp}
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP/install_flash_player_10_linux $PKG $OUTPUT
-cd $TMP/install_flash_player_10_linux
-tar xvf $CWD/install_flash_player_10_linux.tar.gz
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+  tar xvf $CWD/libflashplayer-${SRC_VERSION}.linux-x86_64.so.tar.gz
+else
+  ARCH=i386
+  LIBDIRSUFFIX=""
+  tar xvf $CWD/install_flash_player_10_linux.tar.gz
+fi
 
 # Check to make sure we're packaging the same version that this script
 # was written to handle:
@@ -48,14 +56,14 @@ if [ ! "$(echo $_REALVERS | tr ' ' _)" = "$(echo $VERSION)" ]; then
   sleep 5
 fi
 
-mkdir -p $PKG/usr/lib/mozilla/plugins
-install -m 0755 libflashplayer.so $PKG/usr/lib/mozilla/plugins
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+install -m 0755 libflashplayer.so $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 
 # If the user wants an opera plugin installed, then we'll do that too.
 if [ ! "$USE_OPERA" = "no" ]; then
-  mkdir -p $PKG/usr/lib/opera/plugins
-  cd $PKG/usr/lib/opera/plugins
-    ln -s /usr/lib/mozilla/plugins/libflashplayer.so .
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/opera/plugins
+  cd $PKG/usr/lib${LIBDIRSUFFIX}/opera/plugins
+    ln -s /usr/lib${LIBDIRSUFFIX}/mozilla/plugins/libflashplayer.so .
   cd -
 fi
 
@@ -66,4 +74,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}