network/opera: Updated for version 9.26

5 files changed, 23 insertions, 15 deletions

diff --git a/network/opera/README b/network/opera/README
index 5c5b777063..a2467939d9 100644
--- a/network/opera/README
+++ b/network/opera/README
@@ -1,4 +1,3 @@
 Opera is a lightweight and free multiplatform web browser.
 
 This should create a menu entry in most desktop environments.
-
diff --git a/network/opera/doinst.sh b/network/opera/doinst.sh
index 52bf912e91..72f86c9a69 100644
--- a/network/opera/doinst.sh
+++ b/network/opera/doinst.sh
@@ -1,10 +1,10 @@
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     # toss the redundant copy
     rm $NEW
   fi
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index 9243952bea..cdb946e845 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -22,26 +22,27 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
-set -e
+# Modified by Robby Workman <rworkman@slackbuilds.org> for version 9.25
 
 PRGNAM=opera
-VERSION=9.21
-DATESTRING='20070510.6'
+VERSION=9.26
+DATESTRING='20080218.6'
 ARCH=i386	# Leave this alone for opera
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 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 
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION-$DATESTRING-shared-qt.i386-en.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-$DATESTRING-shared-qt.i386-en.tar.bz2
 cd $(tar -tf $CWD/$PRGNAM-$VERSION-$DATESTRING-shared-qt.i386-en.tar.bz2 |head -1|tr -d \/)
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -69,7 +70,7 @@ mv $PKG/usr/doc/opera $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
diff --git a/network/opera/opera.info b/network/opera/opera.info
index de47edd760..afe55dd1d6 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,8 +1,8 @@
 PRGNAM="opera"
-VERSION="9.21"
+VERSION="9.26"
 HOMEPAGE="http://www.opera.com"
-DOWNLOAD="ftp://ftp.opera.com/pub/opera/linux/921/final/en/i386/shared/opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2"
-MD5SUM="de48ec6a3c2e4804477d1d38982aeb10"
+DOWNLOAD="ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/926/final/en/i386/shared/opera-9.26-20080218.6-shared-qt.i386-en.tar.bz2"
+MD5SUM="e29856b248f503b5a724c7c548c42483"
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
-APPROVED="rworkman, BP{k}"
+APPROVED="David Somero"
diff --git a/network/opera/slack-desc b/network/opera/slack-desc
index c1b7ee0aa7..90fadca07d 100644
--- a/network/opera/slack-desc
+++ b/network/opera/slack-desc
@@ -1,4 +1,12 @@
-opera: Opera Web Browser
+# 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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+opera: opera (Opera Web Browser)
 opera: 
 opera: Opera is a lightweight, free, multiplatform, and
 opera: standards-compliant web browser.