From 3dc0befb4fc92483766730d6237b146ad5274177 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Mon, 22 Jul 2013 16:11:45 -0500
Subject: multimedia/flashplayer-plugin: Renamed from flash-player-plugin

Thanks to Ricardo Felipe Klein for the suggestion.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 multimedia/flash-player-plugin/README              |  1 -
 multimedia/flash-player-plugin/doinst.sh           | 10 ---
 .../flash-player-plugin.SlackBuild                 | 86 ----------------------
 .../flash-player-plugin/flash-player-plugin.info   | 10 ---
 multimedia/flash-player-plugin/slack-desc          | 19 -----
 multimedia/flashplayer-plugin/README               |  1 +
 multimedia/flashplayer-plugin/doinst.sh            | 10 +++
 .../flashplayer-plugin.SlackBuild                  | 86 ++++++++++++++++++++++
 .../flashplayer-plugin/flashplayer-plugin.info     | 10 +++
 multimedia/flashplayer-plugin/slack-desc           | 19 +++++
 10 files changed, 126 insertions(+), 126 deletions(-)
 delete mode 100644 multimedia/flash-player-plugin/README
 delete mode 100644 multimedia/flash-player-plugin/doinst.sh
 delete mode 100644 multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
 delete mode 100644 multimedia/flash-player-plugin/flash-player-plugin.info
 delete mode 100644 multimedia/flash-player-plugin/slack-desc
 create mode 100644 multimedia/flashplayer-plugin/README
 create mode 100644 multimedia/flashplayer-plugin/doinst.sh
 create mode 100644 multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
 create mode 100644 multimedia/flashplayer-plugin/flashplayer-plugin.info
 create mode 100644 multimedia/flashplayer-plugin/slack-desc

diff --git a/multimedia/flash-player-plugin/README b/multimedia/flash-player-plugin/README
deleted file mode 100644
index 77a7add3012b1..0000000000000
--- a/multimedia/flash-player-plugin/README
+++ /dev/null
@@ -1 +0,0 @@
-flash-player-plugin (flash plugin for web browsers)
diff --git a/multimedia/flash-player-plugin/doinst.sh b/multimedia/flash-player-plugin/doinst.sh
deleted file mode 100644
index 1f8ff67dedb29..0000000000000
--- a/multimedia/flash-player-plugin/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
diff --git a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
deleted file mode 100644
index 75d16efdd0a43..0000000000000
--- a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Copyright 2010-2013  Robby Workman, Northport, Alabama, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=flash-player-plugin
-VERSION=${VERSION:-11.2.202.297}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-VERS_MAJ=$(printf $VERSION | cut -d. -f1)
-
-case "$( uname -m )" in
-  i?86) ARCH=i386 ;;
-  arm*) ARCH=arm ;;
-     *) ARCH=$( uname -m ) ;;
-esac
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "i386" ]; then
-  LIBDIRSUFFIX=""
-else
-  printf "\n\n$ARCH is unsupported...\n"
-  exit 1
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-
-tar xf $CWD/install_flash_player_${VERS_MAJ}_linux.${ARCH}.tar.gz -C $PKG
-
-if ! strings $PKG/libflashplayer.so | grep -wq "^${VERSION}$" 2>/dev/null ; then
-  printf "\n\tThis script is written for version $VERSION of the plugin,\n"
-  printf "\tbut you don't seem to have that version.  This is likely\n"
-  printf "\tokay, and it's almost surely not your fault - Adobe tends\n"
-  printf "\tto release new tarballs without changing the name.\n\n"
-  sleep 10
-fi
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-mv $PKG/libflashplayer.so $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-
-if [ "$ARCH" = "x86_64" ]; then
-  rm -rf $PKG/usr/lib
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/readme.txt $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-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
deleted file mode 100644
index fc5b5ed05595c..0000000000000
--- a/multimedia/flash-player-plugin/flash-player-plugin.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="flash-player-plugin"
-VERSION="11.2.202.297"
-HOMEPAGE="http://labs.adobe.com/downloads/flashplayer11.html"
-DOWNLOAD="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.297/install_flash_player_11_linux.i386.tar.gz"
-MD5SUM="686fc9363d94213460f389581ca7ba3b"
-DOWNLOAD_x86_64="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.297/install_flash_player_11_linux.x86_64.tar.gz"
-MD5SUM_x86_64="9685134de6de24ca9ebd40f14e2ebb01"
-REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/multimedia/flash-player-plugin/slack-desc b/multimedia/flash-player-plugin/slack-desc
deleted file mode 100644
index 3a93d9608b7a6..0000000000000
--- a/multimedia/flash-player-plugin/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                   |-----handy-ruler------------------------------------------------------|
-flash-player-plugin: flash-player-plugin (flash plugin for web browsers)
-flash-player-plugin:
-flash-player-plugin: Provides Adobe Flash plugin for browsers that recognize
-flash-player-plugin: /usr/lib(64)/mozilla/plugins as a valid plugin directory
-flash-player-plugin:
-flash-player-plugin: Plugin is subject to Adobe terms of use:
-flash-player-plugin:  https://www.adobe.com/misc/terms.html
-flash-player-plugin:
-flash-player-plugin:
-flash-player-plugin:
-flash-player-plugin:
diff --git a/multimedia/flashplayer-plugin/README b/multimedia/flashplayer-plugin/README
new file mode 100644
index 0000000000000..8bde0ef25cd3f
--- /dev/null
+++ b/multimedia/flashplayer-plugin/README
@@ -0,0 +1 @@
+flashplayer-plugin (flash plugin for web browsers)
diff --git a/multimedia/flashplayer-plugin/doinst.sh b/multimedia/flashplayer-plugin/doinst.sh
new file mode 100644
index 0000000000000..1f8ff67dedb29
--- /dev/null
+++ b/multimedia/flashplayer-plugin/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild b/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
new file mode 100644
index 0000000000000..77f9515f6e32d
--- /dev/null
+++ b/multimedia/flashplayer-plugin/flashplayer-plugin.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Copyright 2010-2013  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=flashplayer-plugin
+VERSION=${VERSION:-11.2.202.297}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+VERS_MAJ=$(printf $VERSION | cut -d. -f1)
+
+case "$( uname -m )" in
+  i?86) ARCH=i386 ;;
+  arm*) ARCH=arm ;;
+     *) ARCH=$( uname -m ) ;;
+esac
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "i386" ]; then
+  LIBDIRSUFFIX=""
+else
+  printf "\n\n$ARCH is unsupported...\n"
+  exit 1
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+tar xf $CWD/install_flash_player_${VERS_MAJ}_linux.${ARCH}.tar.gz -C $PKG
+
+if ! strings $PKG/libflashplayer.so | grep -wq "^${VERSION}$" 2>/dev/null ; then
+  printf "\n\tThis script is written for version $VERSION of the plugin,\n"
+  printf "\tbut you don't seem to have that version.  This is likely\n"
+  printf "\tokay, and it's almost surely not your fault - Adobe tends\n"
+  printf "\tto release new tarballs without changing the name.\n\n"
+  sleep 10
+fi
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+mv $PKG/libflashplayer.so $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+
+if [ "$ARCH" = "x86_64" ]; then
+  rm -rf $PKG/usr/lib
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/readme.txt $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+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/flashplayer-plugin/flashplayer-plugin.info b/multimedia/flashplayer-plugin/flashplayer-plugin.info
new file mode 100644
index 0000000000000..708b1c53c35d6
--- /dev/null
+++ b/multimedia/flashplayer-plugin/flashplayer-plugin.info
@@ -0,0 +1,10 @@
+PRGNAM="flashplayer-plugin"
+VERSION="11.2.202.297"
+HOMEPAGE="http://labs.adobe.com/downloads/flashplayer11.html"
+DOWNLOAD="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.297/install_flash_player_11_linux.i386.tar.gz"
+MD5SUM="686fc9363d94213460f389581ca7ba3b"
+DOWNLOAD_x86_64="https://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.297/install_flash_player_11_linux.x86_64.tar.gz"
+MD5SUM_x86_64="9685134de6de24ca9ebd40f14e2ebb01"
+REQUIRES=""
+MAINTAINER="Robby Workman"
+EMAIL="rworkman@slackbuilds.org"
diff --git a/multimedia/flashplayer-plugin/slack-desc b/multimedia/flashplayer-plugin/slack-desc
new file mode 100644
index 0000000000000..c2d19a6da6d3a
--- /dev/null
+++ b/multimedia/flashplayer-plugin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+flashplayer-plugin: flashplayer-plugin (flash plugin for web browsers)
+flashplayer-plugin:
+flashplayer-plugin: Provides Adobe Flash plugin for browsers that recognize
+flashplayer-plugin: /usr/lib(64)/mozilla/plugins as a valid plugin directory
+flashplayer-plugin:
+flashplayer-plugin: Plugin is subject to Adobe terms of use:
+flashplayer-plugin:  https://www.adobe.com/misc/terms.html
+flashplayer-plugin:
+flashplayer-plugin:
+flashplayer-plugin:
+flashplayer-plugin:
-- 
cgit v1.2.3