4 files changed, 30 insertions, 30 deletions
diff --git a/libraries/libglademm/README b/libraries/libglademm/README
index a66f85c157ec..81b47e49131b 100644
--- a/libraries/libglademm/README
+++ b/libraries/libglademm/README
@@ -5,4 +5,4 @@ subpackage of the GTKmm project. The interface provides a convenient
 interface for C++ programmers to create Gnome GUIs with GTK+'s
 flexible object-oriented framework. 
 
-This requires gtkmm, which is also available from SlackBuilds.org.
+This requires gtkmm.
diff --git a/libraries/libglademm/libglademm.SlackBuild b/libraries/libglademm/libglademm.SlackBuild
index d0ed88a4db49..18da16bb7ca7 100644..100755
--- a/libraries/libglademm/libglademm.SlackBuild
+++ b/libraries/libglademm/libglademm.SlackBuild
@@ -22,15 +22,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-APP=libglademm
+PRGNAM=libglademm
 VERSION=2.6.7
-ARCH=${ARCH:-i486}
 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-$APP
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -42,16 +51,19 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$APP-$VERSION
+rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$APP-$VERSION.tar.bz2
-cd $APP-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -75,23 +87,11 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-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
-
-if [ -d $PKG/usr/info ]; then
-  gzip -9 $PKG/usr/info/*.info
-  rm -f $PKG/usr/info/dir
-fi
-
-mkdir -p $PKG/usr/doc/$APP-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$APP-$VERSION
-cat $CWD/$APP.SlackBuild > $PKG/usr/doc/$APP-$VERSION/$APP.SlackBuild
-find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 # We don't need all the reference docs - they're in the source
 rm -rf $PKG/usr/share/doc
 
@@ -99,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$APP-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libglademm/libglademm.info b/libraries/libglademm/libglademm.info
index df331bd9fd36..b5adacbcbeac 100644
--- a/libraries/libglademm/libglademm.info
+++ b/libraries/libglademm/libglademm.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Juan Valencia Escalante"
 EMAIL="jvalenciae@gmail.com"
-APPROVED="rworkman,pprkut"
+APPROVED="rworkman"
diff --git a/libraries/libglademm/slack-desc b/libraries/libglademm/slack-desc
index f4351a1460a0..1925b88c233b 100644
--- a/libraries/libglademm/slack-desc
+++ b/libraries/libglademm/slack-desc
@@ -7,13 +7,13 @@
 
           |-----handy-ruler------------------------------------------------------|
 libglademm: libglademm (C++ bindings for libglade using gtkmm)
-libglademm: 
+libglademm:
 libglademm: This package provides a C++ interface for libglademm. It is a
 libglademm: subpackage of the GTKmm project. The interface provides a convenient
 libglademm: interface for C++ programmers to create Gnome GUIs with GTK+'s
 libglademm: flexible object-oriented framework. 
-libglademm: 
+libglademm:
 libglademm: Homepage: http://www.gtkmm.org/
-libglademm: 
-libglademm: 
-libglademm: 
+libglademm:
+libglademm:
+libglademm: