system/rxvt-unicode: Updated with various script improvements.

Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>

4 files changed, 26 insertions, 20 deletions

diff --git a/system/rxvt-unicode/README b/system/rxvt-unicode/README
index e90bef68f9..bb56f4dc38 100644
--- a/system/rxvt-unicode/README
+++ b/system/rxvt-unicode/README
@@ -1,9 +1,7 @@
-rxvt-unicode is an enhanced version of the rxvt terminal emulator.
-It has full unicode and Xft support, does font antialiasing and italics,
-and has the same transparency capabilities as ATerm.  It can be extended
-using Perl.
+rxvt-unicode is an enhanced version of the rxvt terminal emulator.  It has
+full unicode and Xft support, does font antialiasing and italics, and has
+the same transparency capabilities as ATerm.  It can be extended using Perl.
 
-NOTE: changing to --disable-perl will result in a much leaner package.
-
-libAfterImage is an optional dependency that will greatly enhance
-rxvt-unicode.
+The slackbuild uses environment variable called CONFIG_PERL to control whether
+the embedded perl interpreter will be built. Setting to anything other than YES
+during the build will disable it, which will result in a much leaner package.
diff --git a/system/rxvt-unicode/rxvt-unicode.SlackBuild b/system/rxvt-unicode/rxvt-unicode.SlackBuild
index 3714d22bfc..9225a8c3cd 100644
--- a/system/rxvt-unicode/rxvt-unicode.SlackBuild
+++ b/system/rxvt-unicode/rxvt-unicode.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=rxvt-unicode
 VERSION="9.10"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,15 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Changing to --disable-perl will provide a much lighter package
+# Option to enable/disable the embedded perl interpreter
+CONFIG_PERL=${CONFIG_PERL:-YES}
+
+if [ "${CONFIG_PERL}" == 'YES' ];then
+	CONFIG_PERL='--enable-perl'
+else
+	CONFIG_PERL='--disable-perl'
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -79,7 +87,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-everything \
-  --enable-frills \
   --enable-unicode3 \
   --enable-combining \
   --enable-xft \
@@ -87,11 +94,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-transparency \
   --enable-fading \
   --enable-frills \
-  --enable-afterimage \
+  --disable-afterimage \
+  --enable-pixbuf \
   --enable-rxvt-scroll \
   --enable-next-scroll \
   --enable-xterm-scroll \
-  --enable-perl \
+  ${CONFIG_PERL} \
   --enable-xim \
   --enable-iso14755 \
   --enable-keepscrolling \
diff --git a/system/rxvt-unicode/rxvt-unicode.info b/system/rxvt-unicode/rxvt-unicode.info
index ffd768f807..cd6a3ff55f 100644
--- a/system/rxvt-unicode/rxvt-unicode.info
+++ b/system/rxvt-unicode/rxvt-unicode.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Daniel LEVAI"
 EMAIL="leva@ecentrum.hu"
-APPROVED="Niels Horn"
+APPROVED="Michiel van Wessem"
diff --git a/system/rxvt-unicode/slack-desc b/system/rxvt-unicode/slack-desc
index a91f1c015c..9191e0b977 100644
--- a/system/rxvt-unicode/slack-desc
+++ b/system/rxvt-unicode/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-            |-----handy-ruler------------------------------------------------------|
+            |-----handy-ruler-----------------------------------------------|
 rxvt-unicode: rxvt-unicode (enhanced version of rxvt)
 rxvt-unicode:
-rxvt-unicode: This project is an enhanced version of the rxvt terminal emulator.
-rxvt-unicode: It has full unicode and Xft support, does font antialiasing and
-rxvt-unicode: italics, and has the same transparency capabilities as ATerm.  It can
-rxvt-unicode: be extended using Perl.
+rxvt-unicode: This project is an enhanced version of the rxvt terminal
+rxvt-unicode: emulator.  It has full unicode and Xft support, does font
+rxvt-unicode: antialiasing and italics, and has the same transparency 
+rxvt-unicode: capabilities as ATerm.  It can be extended using Perl.
 rxvt-unicode:
 rxvt-unicode: Visit the rxvt-unicode project online:
-rxvt-unicode: http://software.schmorp.de/pkg/rxvt-unicode/
+rxvt-unicode:    http://software.schmorp.de/pkg/rxvt-unicode/
 rxvt-unicode:
 rxvt-unicode: