7 files changed, 55 insertions, 113 deletions
diff --git a/network/mozplugger/Makefile_i486.diff b/network/mozplugger/Makefile_i486.diff
deleted file mode 100644
index 5809552b30..0000000000
--- a/network/mozplugger/Makefile_i486.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile~	2007-04-23 10:29:25.000000000 +0200
-+++ Makefile	2007-04-23 10:43:02.000000000 +0200
-@@ -95,7 +95,7 @@
- RPM_OPT_FLAGS=-O2
- COMMON_CFLAGS=$(RPM_OPT_FLAGS) -Inpapi/include -I$(X11)/include -DXP_UNIX $(DEFINES)
- COMMON_LDFLAGS=
--NORM_CFLAGS=
-+NORM_CFLAGS=-O2 -march=i486 -mtune=i686
- NORM_LDFLAGS=
- XCFLAGS=-shared
- XLDFLAGS=-shared
-@@ -157,13 +157,13 @@
- install:
- 	-@mkdir -p $(root)$(prefix)/bin
- 	-@mkdir -p $(root)$(prefix)/lib/mozilla/plugins
--	-@mkdir -p $(root)$(prefix)/share/man/man7
-+	-@mkdir -p $(root)$(prefix)/man/man7
- 	-@mkdir -p $(root)/etc
- 	cp mozplugger-helper $(root)$(prefix)/bin/
- 	cp mozplugger-controller $(root)$(prefix)/bin/
- 	cp mozplugger.so $(root)$(prefix)/lib/mozilla/plugins/
- 	cp mozpluggerrc $(root)/etc/
--	cp mozplugger.7 $(root)$(prefix)/share/man/man7/
-+	cp mozplugger.7 $(root)$(prefix)/man/man7/
- 
- mozplugger.tar.gz: $(BASE_FILES) $(SOURCE_FILES)
- 	@( DIR=`pwd`;\
diff --git a/network/mozplugger/Makefile_i686.diff b/network/mozplugger/Makefile_i686.diff
deleted file mode 100644
index 1f7c11a7ac..0000000000
--- a/network/mozplugger/Makefile_i686.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile~	2007-04-23 10:29:25.000000000 +0200
-+++ Makefile	2007-04-23 10:43:42.000000000 +0200
-@@ -95,7 +95,7 @@
- RPM_OPT_FLAGS=-O2
- COMMON_CFLAGS=$(RPM_OPT_FLAGS) -Inpapi/include -I$(X11)/include -DXP_UNIX $(DEFINES)
- COMMON_LDFLAGS=
--NORM_CFLAGS=
-+NORM_CFLAGS=-O2 -march=i686 -mtune=i686
- NORM_LDFLAGS=
- XCFLAGS=-shared
- XLDFLAGS=-shared
-@@ -157,13 +157,13 @@
- install:
- 	-@mkdir -p $(root)$(prefix)/bin
- 	-@mkdir -p $(root)$(prefix)/lib/mozilla/plugins
--	-@mkdir -p $(root)$(prefix)/share/man/man7
-+	-@mkdir -p $(root)$(prefix)/man/man7
- 	-@mkdir -p $(root)/etc
- 	cp mozplugger-helper $(root)$(prefix)/bin/
- 	cp mozplugger-controller $(root)$(prefix)/bin/
- 	cp mozplugger.so $(root)$(prefix)/lib/mozilla/plugins/
- 	cp mozpluggerrc $(root)/etc/
--	cp mozplugger.7 $(root)$(prefix)/share/man/man7/
-+	cp mozplugger.7 $(root)$(prefix)/man/man7/
- 
- mozplugger.tar.gz: $(BASE_FILES) $(SOURCE_FILES)
- 	@( DIR=`pwd`;\
diff --git a/network/mozplugger/README b/network/mozplugger/README
index 9e60f61818..317e946e7c 100644
--- a/network/mozplugger/README
+++ b/network/mozplugger/README
@@ -1,12 +1,7 @@
 MozPlugger (Plugin to launch external viewers in Mozilla)
 
-It allows you to integrate external applications to view files
-that Mozilla can't handle itself.
-
-MozPlugger was branched out from Plugger 4.0 in 
-February 2003 by Louis Bavoili.
-
-Homepage: http://mozplugger.mozdev.org/
+It allows you to integrate external applications to view files that Mozilla 
+can't handle itself.
 
 You may need to delete your local $HOME/.mozilla/firefox/pluginreg.dat 
 file for mozplugger to be enabled correctly after you update it.
diff --git a/network/mozplugger/doinst.sh b/network/mozplugger/doinst.sh
index 6122924a10..13f06bd841 100644
--- a/network/mozplugger/doinst.sh
+++ b/network/mozplugger/doinst.sh
@@ -1,14 +1,15 @@
-# Handle configuration files
+
 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 # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-# List of configuration files (they should end in .new)
+
 config etc/mozpluggerrc.new
+
diff --git a/network/mozplugger/mozplugger.SlackBuild b/network/mozplugger/mozplugger.SlackBuild
index 866d7d9140..731cbc1c97 100644
--- a/network/mozplugger/mozplugger.SlackBuild
+++ b/network/mozplugger/mozplugger.SlackBuild
@@ -1,69 +1,70 @@
 #!/bin/sh
+
 # Slackware Build Script for mozplugger 
-# (C) 2007 Michael Wagner <lapinours@web.de>
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
+
+# (C) 2008 Michael Wagner <lapinours@web.de>
+# All rights reserved.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# 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.
 
-# Modified by the SlackBuild Project
-
-set -e
+# Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=mozplugger
-VERSION=1.8.1
-VERSION=$VERSION
+VERSION=1.10.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="COPYING ChangeLog README"
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP 
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*  || exit 1 
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 
+cd $PRGNAM-$VERSION 
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Patch Makefile ($ARCH, /usr/man)
-if [ $ARCH = i486 ]; then
-  patch -p0 < $CWD/Makefile_i486.diff || exit 1
-elif [ $ARCH = i686 ]; then
-  patch -p0 < $CWD/Makefile_i686.diff || exit 1
-fi 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+fi
+
 
-# Change installation prefix
-sed -i "s?\(root=\)?\1 $PKG?g" Makefile
-make linux || exit 1
-make install || exit 1
+make RPM_OPT_FLAGS="$SLKCFLAGS" X11=/usr linux 
+make root=$PKG install 
 
 ( 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
 )
 
-( cd $PKG/usr/man
-    find . -name "*.?" -type f 2> /dev/null | xargs gzip -9 2> /dev/null
-    for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+mv $PKG/usr/share/man $PKG/usr && rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man7/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -73,10 +74,9 @@ chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 # Don't override custom changes to muzpluggerrc
 mv $PKG/etc/mozpluggerrc /$PKG/etc/mozpluggerrc.new
 
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/mozplugger/mozplugger.info b/network/mozplugger/mozplugger.info
index cb6dcbb70e..7c8f2b353c 100644
--- a/network/mozplugger/mozplugger.info
+++ b/network/mozplugger/mozplugger.info
@@ -1,8 +1,8 @@
 PRGNAM="mozplugger"
-VERSION="1.8.1"
+VERSION="1.10.0"
 HOMEPAGE="http://mozplugger.mozdev.org/"
-DOWNLOAD="http://mozplugger.mozdev.org/files/mozplugger-1.8.1.tar.gz"
-MD5SUM="f3e6a65573e7e8a1d056d8e4d90b6f9a"
+DOWNLOAD="http://mozplugger.mozdev.org/files/mozplugger-1.10.0.tar.gz"
+MD5SUM="3376bd4c370647640f7eee768cbaffe8"
 MAINTAINER="Michael Wagner"
-MAIL="lapinours@web.de"
-APPROVED="BP{k}"
+EMAIL="lapinours@web.de"
+APPROVED="rworkman"
diff --git a/network/mozplugger/slack-desc b/network/mozplugger/slack-desc
index 3ff504a7db..c72be0068e 100644
--- a/network/mozplugger/slack-desc
+++ b/network/mozplugger/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-       |-----handy-ruler------------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 mozplugger: MozPlugger (Plugin to launch external viewers in Mozilla)
 mozplugger:
 mozplugger: It allows you to integrate external applications to view files
 mozplugger: that Mozilla can't handle itself.
 mozplugger:
-mozplugger: MozPlugger was branched out from Plugger 4.0 in 
-mozplugger: February 2003 by Louis Bavoili.
+mozplugger: Homepage: http://mozplugger.mozdev.org/ 
+mozplugger:
+mozplugger:
 mozplugger:
-mozplugger: Homepage: http://mozplugger.mozdev.org/
 mozplugger:
 mozplugger: