5 files changed, 36 insertions, 33 deletions
diff --git a/system/xarchiver/README b/system/xarchiver/README
index de9c2012e2..21ca60bdf8 100644
--- a/system/xarchiver/README
+++ b/system/xarchiver/README
@@ -1,5 +1,5 @@
-Xarchiver is a Desktop Environment independent archiver frontend. All common 
-archive types are supported. RPM and ISO are handled without rpm or isodump 
-executables. To run it, you only need GTK+2 libraries and obviously the 
-various rar, arj and 7z for these archive types. All the others necessary 
-archivers should be installed by default.
+Xarchiver is a Desktop Environment independent archiver frontend.
+All common archive types are supported. RPM and DEB packages are
+handled without their package managers. To run it you only need
+GTK+2 libraries and obviously the various rar, arj and 7z for
+these archive types.
diff --git a/system/xarchiver/doinst.sh b/system/xarchiver/doinst.sh
index 65fd352418..f364075896 100644
--- a/system/xarchiver/doinst.sh
+++ b/system/xarchiver/doinst.sh
@@ -1,4 +1,4 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database -q usr/share/applications
 fi
 
diff --git a/system/xarchiver/slack-desc b/system/xarchiver/slack-desc
index 1ddb37570d..e4df51c81d 100644
--- a/system/xarchiver/slack-desc
+++ b/system/xarchiver/slack-desc
@@ -1,19 +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 ':'.
+# 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------------------------------------------------------|
-xarchiver: Xarchiver (Archive Manager)
+         |-----handy-ruler------------------------------------------------------|
+xarchiver: Xarchiver (A GTK+2 only Archive Manager)
 xarchiver:
-xarchiver: Xarchiver is a Desktop Environment independent archiver
-xarchiver: frontend. All common archive types are supported. RPM and
-xarchiver: ISO are handled without rpm or isodump executables. To run
-xarchiver: it you only need GTK+2 libraries and obviously the various
-xarchiver: rar, arj and 7z for these archives types. All the others
-xarchiver: archivers are installed by default in most distro.
+xarchiver: Xarchiver is a Desktop Environment independent archiver frontend.
+xarchiver: All common archive types are supported. RPM and DEB packages are
+xarchiver: handled without their package managers. To run it you only need
+xarchiver: GTK+2 libraries and obviously the various rar, arj and 7z for
+xarchiver: these archive types.
 xarchiver:
 xarchiver: Homepage: http://xarchiver.xfce.org/
 xarchiver:
+xarchiver:
diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild
index 04597f6d83..5782957744 100644
--- a/system/xarchiver/xarchiver.SlackBuild
+++ b/system/xarchiver/xarchiver.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Xarchiver
 
-# Copyright 2007  Frank Caraballo  fecaraballo[AT]gmail.com 
+# Copyright 2007, 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +22,10 @@
 # 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
-
 PRGNAM=xarchiver
-VERSION=0.5.2
+VERSION=${VERSION:-0.5.2}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -52,7 +50,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -60,24 +62,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-debug=no \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# Move doc files to correct location:
 mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
-( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
+( cd $PKG/usr/doc
+  ln -s xarchiver-$VERSION xarchiver
+)
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/system/xarchiver/xarchiver.info b/system/xarchiver/xarchiver.info
index 07ae57509e..c3f07d48ed 100644
--- a/system/xarchiver/xarchiver.info
+++ b/system/xarchiver/xarchiver.info
@@ -4,5 +4,5 @@ HOMEPAGE="http://xarchiver.xfce.org/"
 DOWNLOAD="http://downloads.sourceforge.net/xarchiver/xarchiver-0.5.2.tar.bz2"
 MD5SUM="2bc7f06403cc6582dd4a8029ec9d038d"
 MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo[AT]gmail.com"
-APPROVED="dsomero"
+EMAIL="fecaraballo{at}gmail{dot}com"
+APPROVED="rworkman"