2 files changed, 20 insertions, 32 deletions
diff --git a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
index 8553ddc04c..332f3f180d 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
+++ b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flash-player-plugin
-VERSION=10.3_r181
-BUILD=${BUILD:-2}
+VERSION=11b1
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 case "$( uname -m )" in
@@ -33,10 +33,10 @@ esac
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
-  SRC_ARCH=64bit
+  SRC_ARCH=64
 elif [ "$ARCH" = "i386" ]; then
   LIBDIRSUFFIX=""
-  SRC_ARCH=32bit
+  SRC_ARCH=32
 else
   printf "\n\n$ARCH is unsupported...\n"
   exit 1
@@ -45,7 +45,7 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}  
+OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
@@ -53,34 +53,22 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-if [ "$SRC_ARCH" = "32bit" ];then
-  tar xf $CWD/install_flash_player_10_linux.tar.gz -C $PKG
-  mv $PKG/libflashplayer.so $TMP
-  find $PKG -type d -exec chmod 0755 {} \;
-  find $PKG/usr/lib -type f -name "*.so" -exec chmod 0755 {} \;
-  find $PKG/usr/bin -type f -exec chmod 0755 {} \;
-  find $PKG/usr/share -type f -exec chmod 0644 {} \;
-elif [ "$SRC_ARCH" = "64bit" ]; then
-  tar xf $CWD/flashplayer10_2_p3_64bit_linux_111710.tar.gz
-fi
-
-# Adobe's versioning scheme is maddening...
-REALVERS=$(strings libflashplayer.so | grep -e "^Shockwave Flash [.\d+]*" | sed -e "s/Shockwave Flash //g")
-VERSION=$(echo "$REALVERS" | tr ' ' _)
+tar xvf $CWD/flashplayer11_b1_install_lin_${SRC_ARCH}_071311.tar.gz -C $PKG
+[ "$SRC_ARCH" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib64
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-install -m 0755 libflashplayer.so $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+mv $PKG/libflashplayer.so $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 
 mkdir -p $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
-
-if [ "$SRC_ARCH" = "32bit" ];then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
-fi
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-chown -R root:root .
+chown -R root:root $PKG
+chmod -R g-w $PKG
+find $PKG -type f -name "*.so" -exec chmod 0755 {} \;
+
 /sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/flash-player-plugin/flash-player-plugin.info b/multimedia/flash-player-plugin/flash-player-plugin.info
index 5e25eafec4..373367bbb4 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.info
+++ b/multimedia/flash-player-plugin/flash-player-plugin.info
@@ -1,10 +1,10 @@
 PRGNAM="flash-player-plugin"
-VERSION="10.3_r181"
-HOMEPAGE="http://labs.adobe.com/technologies/flashplayer10/"
-DOWNLOAD="http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz"
-MD5SUM="f057d0dc4b6239c447410dc99797e270"
-DOWNLOAD_x86_64="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz"
-MD5SUM_x86_64="49b55c7eb8044453e5f6f2e4b3cb4084"
+VERSION="11b1"
+HOMEPAGE="http://labs.adobe.com/downloads/flashplayer11.html"
+DOWNLOAD="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b1_install_lin_32_071311.tar.gz"
+MD5SUM="8816dfa0bbb4210df5a37e061834c24a"
+DOWNLOAD_x86_64="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b1_install_lin_64_071311.tar.gz"
+MD5SUM_x86_64="806b348cfb27054568d9f63d13bee3fd"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="pprkut"
+APPROVED="dsomero"