system/roxterm: Updated for version 1.17.1

4 files changed, 40 insertions, 12 deletions

diff --git a/system/roxterm/README b/system/roxterm/README
index db955081fb..b9714a61a2 100644
--- a/system/roxterm/README
+++ b/system/roxterm/README
@@ -6,7 +6,7 @@ configuration GUI. It can be used as a ROX application, as the name
 implies, or in any other X environment.
 
 ROXTerm uses the "session" bus, which should be started along with your
-desktop environment. Current versions of ROX, GNOME and KDE session
+desktop environment. Current versions of ROX, GNOME, and KDE session
 managers all launch D-BUS. If you use some other session/desktop/window
 manager which doesn't launch D-BUS you can start it by inserting something
 like this near the start of your .xinitrc or .xsession:
diff --git a/system/roxterm/doinst.sh b/system/roxterm/doinst.sh
index ff5dd6d547..1f8ff67ded 100644
--- a/system/roxterm/doinst.sh
+++ b/system/roxterm/doinst.sh
@@ -1,4 +1,10 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-    /usr/bin/update-desktop-database -q usr/share/applications
+  /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/system/roxterm/roxterm.SlackBuild b/system/roxterm/roxterm.SlackBuild
index ef898c6f6a..7d05834e46 100644
--- a/system/roxterm/roxterm.SlackBuild
+++ b/system/roxterm/roxterm.SlackBuild
@@ -1,16 +1,34 @@
 #!/bin/sh
-
+#
 # Slackware build script for ROXTerm
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, 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.
 
-# Modified by the slackbuilds.org project
 PRGNAM=roxterm
-VERSION=1.14.2
+VERSION=1.17.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,12 +66,14 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv  $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/
 rm -rf $PKG/usr/share/doc $PKG/usr/share/man
 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
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/roxterm/roxterm.info b/system/roxterm/roxterm.info
index 27d563623d..fc6a6f5708 100644
--- a/system/roxterm/roxterm.info
+++ b/system/roxterm/roxterm.info
@@ -1,8 +1,10 @@
 PRGNAM="roxterm"
-VERSION="1.14.2"
+VERSION="1.17.1"
 HOMEPAGE="http://roxterm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-1.14.2.tar.gz"
-MD5SUM="22b2696ecd7cd977a0c00e791a4451b8"
+DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-1.17.1.tar.gz"
+MD5SUM="e0c36f9e8ca7ae5283c1ec8ea35abed8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="dsomero"