3 files changed, 24 insertions, 18 deletions
diff --git a/libraries/gtkmm/gtkmm.SlackBuild b/libraries/gtkmm/gtkmm.SlackBuild
index 5a4c8706a3..4a7ba08a16 100644..100755
--- a/libraries/gtkmm/gtkmm.SlackBuild
+++ b/libraries/gtkmm/gtkmm.SlackBuild
@@ -25,11 +25,20 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=gtkmm
-VERSION=${VERSION:-2.14.3}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-2.18.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)		
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -68,20 +80,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-make
-make install-strip DESTDIR=$PKG
+make libdocdir=/usr/doc/$PRGNAM-$VERSION
+make install-strip DESTDIR=$PKG libdocdir=/usr/doc/$PRGNAM-$VERSION
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/gtkmm-2.4/* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES COPYING ChangeLog INSTALL NEWS PORTING README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS PORTING README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Remove API docs
-rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/docs/reference \
-  $PKG/usr/doc/$PRGNAM-$VERSION/examples
+## Remove API docs
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/docs/{reference,examples}
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/gtkmm/gtkmm.info b/libraries/gtkmm/gtkmm.info
index 7a955a51ac..6cc6b60aad 100644
--- a/libraries/gtkmm/gtkmm.info
+++ b/libraries/gtkmm/gtkmm.info
@@ -1,8 +1,8 @@
 PRGNAM="gtkmm"
-VERSION="2.14.3"
+VERSION="2.18.2"
 HOMEPAGE="http://www.gtkmm.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/gtkmm-2.14.3.tar.bz2"
-MD5SUM="10039f35d7f815d47f926a13cefe65d6"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-2.18.2.tar.bz2"
+MD5SUM="3e43e9eef1da8988a76a2815d6b31c91"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="paul wisehart"
diff --git a/libraries/gtkmm/slack-desc b/libraries/gtkmm/slack-desc
index bcb70d24ef..ef7bbdd735 100644
--- a/libraries/gtkmm/slack-desc
+++ b/libraries/gtkmm/slack-desc
@@ -14,6 +14,6 @@ gtkmm: of widgets that are easily extensible via inheritance. You can create
 gtkmm: user interfaces either in code or with the Glade User Interface
 gtkmm: designer, using libglademm. There's extensive documentation,
 gtkmm: including API reference and a tutorial.
-gtkmm: 
+gtkmm:
 gtkmm: Homepage: http://www.gtkmm.org/
-gtkmm: 
+gtkmm: