2 files changed, 52 insertions, 52 deletions
diff --git a/dev/cpp/glibmm/glibmm.SlackBuild b/dev/cpp/glibmm/glibmm.SlackBuild
index 6e314eee..fc59ab5f 100644
--- a/dev/cpp/glibmm/glibmm.SlackBuild
+++ b/dev/cpp/glibmm/glibmm.SlackBuild
@@ -1,21 +1,22 @@
 #!/bin/bash
 #
-#  glibmm.SlackBuild is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
+#  glibmm.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
 #
-#  glibmm.SlackBuild is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#  glibmm.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+#  Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License along with
 #  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
-# SlackBuild for glibmm
-# http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/
-#
-# Author: Rudson Ribeiro Alves
+# slackbuild for glibmm, by Silvio Rhatto
+# requires: libsigc++ glib 
+# tested: glibmm-2.12.10
 #
 
 # Look for slackbuildrc
@@ -32,13 +33,15 @@ PKG_NAME="glibmm"
 ARCH=${ARCH:=i486}
 SRC_VERSION=${VERSION:=2.12.10}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
-BUILD=${BUILD:=1rra}
+BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
-PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:=""}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
@@ -52,7 +55,7 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
 fi
 
@@ -63,48 +66,42 @@ ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf "$PKG_SRC" 2> /dev/null
+rm -rf "$PKG_WORK" 2> /dev/null
 rm -rf "$PKG" 2> /dev/null
 
 # Create directories if necessary
 mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
 mkdir -p "$PKG" || exit $ERROR_MKDIR
 mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="$SRC_NAME-$SRC_VERSION.tar.bz2"
-URL="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/$SRC"
+SRC="$SRC_NAME-$VERSION.tar.bz2"
+URL="http://ftp.acc.umu.se/pub/GNOME/sources/glibmm/2.12/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
-# Md5sum check
-MD5SUM_FILE=${SRC//.tar.bz2}.md5sum
-#MD5SUM_FILE=$SRC.md5sum
-if [ ! -s "$SRC_DIR/$MD5SUM_FILE" ]; then
-  wget http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/$MD5SUM_FILE -O $SRC_DIR/$MD5SUM_FILE
-fi
-
-MD5SUM_SRC=`md5sum $SRC_DIR/$SRC | awk '{print $1}'`
-MD5SUM_EXT=`eval "grep '$SRC[ \t]*$' $SRC_DIR/$MD5SUM_FILE" | awk '{print $1}'`
+MD5SUM_SRC="$(md5sum "$SRC_DIR/$SRC" | cut -d " " -f 1)"
+MD5SUM_URL="85830693d669f0d86d6e64db3b57f581"
 
-[ "$MD5SUM_SRC" != "$MD5SUM_EXT" ] && exit $ERROR_MD5
+[ "$MD5SUM_SRC" == "$MD5SUM_URL" ] || exit $ERROR_MD5
 
 # Untar
-cd "$TMP"
+cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
 cd "$PKG_SRC"
 
 # Configure
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR"  || exit $ERROR_CONF
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
 
 # Compile
-make || exit $ERROR_MAKE
+make $NUMJOBS || exit $ERROR_MAKE
 
 # Install
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
@@ -118,9 +115,13 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 )
 
 # Install documentation
-DOCS="NEWS README AUTHORS INSTALL CHANGES ChangeLog COPYING"
-mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
+DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING readme.*"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
 
 # Add package description (slack-desc)
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -132,18 +133,18 @@ cat << EODESC > "$PKG/install/slack-desc"
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
-glibmm: 
+      |-----handy-ruler-------------------------------------------------------|
+glibmm: glibmm (A set of C++ bindings for glib)
+glibmm:
+glibmm: glibmm is a set of C++ bindings for glib, including cross-
+glibmm: platform APIs such as a std::string-like UTF8 string class,
+glibmm: string utility methods, such as a text encoding converter
+glibmm: API, file access, and threads.
+glibmm:
+glibmm:
+glibmm:
+glibmm:
+glibmm:
 EODESC
 
 # Build the package
@@ -152,6 +153,5 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf "$PKG_SRC" "$PKG"
+  rm -rf "$PKG_WORK" "$PKG"
 fi
-
diff --git a/dev/cpp/glibmm/slack-required b/dev/cpp/glibmm/slack-required
index 2829f100..ad6ac2a8 100644
--- a/dev/cpp/glibmm/slack-required
+++ b/dev/cpp/glibmm/slack-required
@@ -1,7 +1,7 @@
 # Dependency list to glibmm
-# 
+#
 # dependency [condition] [version]]
-libsigc++        >=          2.0.0
-glib             >=          2.9.0
-#gobject         >=          2.9.0 
-#gmodule         >=          2.9.0
+libsigc++		>=		2.0.0
+glib		>=		2.9.0
+#gobject		>=		2.9.0
+#gmodule		>=		2.9.0