2 files changed, 18 insertions, 28 deletions
diff --git a/source/l/babl/babl-0.1.0-build-fixes.patch b/source/l/babl/babl-0.1.0-build-fixes.patch
deleted file mode 100644
index 3cd055943..000000000
--- a/source/l/babl/babl-0.1.0-build-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- babl-0.1.0.orig/extensions/Makefile.am	2009-04-17 12:05:15.000000000 -0500
-+++ babl-0.1.0/extensions/Makefile.am	2009-08-19 00:53:21.435970261 -0500
-@@ -1,7 +1,7 @@
- if OS_WIN32
- AM_LDFLAGS = -module -no-undefined
- else
--AM_LDFLAGS = -module
-+AM_LDFLAGS = -module -avoid-version
- endif
- 
- noinst_HEADERS = util.h
-@@ -12,7 +12,7 @@
- 	-I$(top_srcdir)/babl		\
- 	-I$(top_srcdir)/extensions
- 
--extdir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@
-+extdir = $(libdir)/babl-@BABL_API_VERSION@
- ext_LTLIBRARIES = \
- 	CIE-Lab.la      \
- 	gegl-fixups.la  \
diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild
index 5e8f54afd..3f5e6c5d0 100755
--- a/source/l/babl/babl.SlackBuild
+++ b/source/l/babl/babl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2008, 2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
@@ -22,10 +22,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=0.1.0
-ARCH=${ARCH:-x86_64}
+PKGNAM=babl
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# 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
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
@@ -41,18 +51,18 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf babl-$VERSION
-tar xvf $CWD/babl-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/babl-$VERSION.tar.?z* || exit 1
 cd babl-$VERSION || exit 1
 
-zcat $CWD/babl-0.1.0-build-fixes.patch.gz | patch -p1 || exit 1
-sh autogen.sh
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -78,7 +88,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/babl-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS README* TODO \
   $PKG/usr/doc/babl-$VERSION
 
 mkdir -p $PKG/install