5 files changed, 53 insertions, 30 deletions
diff --git a/misc/gxmessage/README b/misc/gxmessage/README
index 30d65d4248..227cce0654 100644
--- a/misc/gxmessage/README
+++ b/misc/gxmessage/README
@@ -1,4 +1,3 @@
 gxmessage is a GTK based xmessage clone.
 
-Developed by Timothy Musson. 
-http://homepages.ihug.co.nz/~trmusson/programs.html 
+If you wish to disable NLS, pass 'NLS=disable' to the SlackBuild.
diff --git a/misc/gxmessage/doinst.sh b/misc/gxmessage/doinst.sh
new file mode 100644
index 0000000000..30eb690936
--- /dev/null
+++ b/misc/gxmessage/doinst.sh
@@ -0,0 +1,6 @@
+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/misc/gxmessage/gxmessage.SlackBuild b/misc/gxmessage/gxmessage.SlackBuild
index 0938feb9cb..3b546ce04b 100644
--- a/misc/gxmessage/gxmessage.SlackBuild
+++ b/misc/gxmessage/gxmessage.SlackBuild
@@ -27,14 +27,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by the SlackBuilds.org project.
-
-set -e
+# Modified by slakmagik
 
 PRGNAM=gxmessage
-VERSION=2.6.2
+VERSION=${VERSION:-2.12.4}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -42,44 +42,60 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP 
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
+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" \
 ./configure \
+  --${NLS:-enable}-nls \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    find . -type f -exec gzip -9 {} \;
-    for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-  )
-fi
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
+)
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog HACKING INSTALL README TODO examples \
+cp -a [ACHINRT]* examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
 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/misc/gxmessage/gxmessage.info b/misc/gxmessage/gxmessage.info
index 7899e5a0bf..c797ef31c2 100644
--- a/misc/gxmessage/gxmessage.info
+++ b/misc/gxmessage/gxmessage.info
@@ -1,8 +1,10 @@
 PRGNAM="gxmessage"
-VERSION="2.6.2"
+VERSION="2.12.4"
 HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
-DOWNLOAD="http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-2.6.2.tar.gz"
-MD5SUM="429c49006d2e1c2075f89f612b892b4f"
-MAINTAINER="koolniczka"
-EMAIL="koolniczka@szm.com"
-APPROVED="alien"
+DOWNLOAD="http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-2.12.4.tar.gz"
+MD5SUM="7c94c714ebedbfa2db2d645cc4a4092a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="slakmagik"
+EMAIL="jsunSYMBOLfreeshellSYMBOLorg"
+APPROVED="alien,rworkman"
diff --git a/misc/gxmessage/slack-desc b/misc/gxmessage/slack-desc
index 06917f81f5..9030e2e3ed 100644
--- a/misc/gxmessage/slack-desc
+++ b/misc/gxmessage/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------------------------------------------------------|
 gxmessage: gxmessage (GTK xmessage clone)
 gxmessage:
 gxmessage: gxmessage is a replacement for the xmessage athena-widget tool.
 gxmessage: It follows closely the original functionality and interface.
 gxmessage: It can be used in scripts  to provide simple graphical input
-gxmessage: or information. 
-gxmessage:
-gxmessage:
+gxmessage: or information.
 gxmessage:
+gxmessage: Homepage:
+gxmessage:   http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
 gxmessage:
 gxmessage: