1 files changed, 27 insertions, 19 deletions
diff --git a/libraries/gtkmm/gtkmm.SlackBuild b/libraries/gtkmm/gtkmm.SlackBuild
index 5bd1dba899..898b9fa4ae 100644
--- a/libraries/gtkmm/gtkmm.SlackBuild
+++ b/libraries/gtkmm/gtkmm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for gtkmm 2.10.6
+# Slackware build script for gtkmm
 
 # Copyright (C) 2006 paul wisehart wise@lupulin.net
 # All rights reserved.
@@ -22,29 +22,35 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PKGNAME=gtkmm
-VERSION=${VERSION:-2.12.5}
+# Modified by Robby Workman <rworkman@slackbuilds.org>
+
+PRGNAM=gtkmm
+VERSION=${VERSION:-2.12.7}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)		
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAME
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $PKGNAME-$VERSION
-tar xvf $CWD/$PKGNAME-$VERSION.tar.bz2 || exit 1
-cd $PKGNAME-$VERSION || exit 1
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go-w+r .
 
@@ -54,25 +60,27 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  || exit 1
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
-mv $PKG/usr/share/doc/gtkmm-2.4/* $PKG/usr/doc/$PKGNAME-$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/$PKGNAME-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp \
-  $PKG/usr/doc/$PKGNAME-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share
-cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # Remove API docs
-rm -rf $PKG/usr/doc/$PKGNAME-$VERSION/docs/reference \
-  $PKG/usr/doc/$PKGNAME-$VERSION/examples
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/docs/reference \
+  $PKG/usr/doc/$PRGNAM-$VERSION/examples
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz