4 files changed, 30 insertions, 27 deletions
diff --git a/system/roxterm/README b/system/roxterm/README
index 6ce636d3d74a8..9456ea1be7882 100644
--- a/system/roxterm/README
+++ b/system/roxterm/README
@@ -4,14 +4,3 @@ footprint and quicker start-up time. It achieves this by not using
 the Gnome libraries and by using a separate applet to provide the
 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, XFCE, 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:
-
-  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    eval `dbus-launch --sh-syntax --exit-with-session`
-    export DBUS_SESSION_BUS_ADDRESS
-  fi
diff --git a/system/roxterm/README.Slackware b/system/roxterm/README.Slackware
new file mode 100644
index 0000000000000..9b2463553dc8e
--- /dev/null
+++ b/system/roxterm/README.Slackware
@@ -0,0 +1,10 @@
+ROXTerm uses the "session" bus, which should be started along with your
+desktop environment. Current versions of ROX, GNOME, XFCE, 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:
+
+  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+    eval `dbus-launch --sh-syntax --exit-with-session`
+    export DBUS_SESSION_BUS_ADDRESS
+  fi
diff --git a/system/roxterm/roxterm.SlackBuild b/system/roxterm/roxterm.SlackBuild
index e169dcf7b7748..2ffd484dff74c 100644
--- a/system/roxterm/roxterm.SlackBuild
+++ b/system/roxterm/roxterm.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=roxterm
-VERSION=1.22.1
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,25 +60,29 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
-./configure \
+./mscript.py configure \
+  --no-lock \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --mandir=/usr/man \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux
+  --disable-gtk3 \
+  CFLAGS="$SLKCFLAGS -g -Wall -I. -I${CWD} -D_GNU_SOURCE -DHAVE_CONFIG_H"
 
-make
-make install-strip DESTDIR=$PKG
+./mscript.py build --no-lock
+./mscript.py install --no-lock --destdir=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-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
diff --git a/system/roxterm/roxterm.info b/system/roxterm/roxterm.info
index 50265f377bee1..497c947d4e4ef 100644
--- a/system/roxterm/roxterm.info
+++ b/system/roxterm/roxterm.info
@@ -1,10 +1,10 @@
 PRGNAM="roxterm"
-VERSION="1.22.1"
+VERSION="2.3.1"
 HOMEPAGE="http://roxterm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-1.22.1.tar.gz"
-MD5SUM="522067d466545753cb3df369b582ce60"
+DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-2.3.1.tar.bz2"
+MD5SUM="72e22b6d6a027cada24ace94c6193fed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED="Niels Horn"