updated patches/imagemagick

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1204 370017ae-e619-0410-ac65-c121f96126d4

1 files changed, 34 insertions, 22 deletions

diff --git a/patches/imagemagick/imagemagick.SlackBuild b/patches/imagemagick/imagemagick.SlackBuild
index b83f664e..294730df 100755
--- a/patches/imagemagick/imagemagick.SlackBuild
+++ b/patches/imagemagick/imagemagick.SlackBuild
@@ -1,9 +1,21 @@
 #!/bin/bash
 #
-# Got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/imagemagick/imagemagick.SlackBuild
-# Small changes by rhatto.
+# got it from ftp://ftp.slackware.com/pub/slackware/slackware-10.2/patches/source/imagemagick/imagemagick.SlackBuild
+# small changes by rhatto.
 #
 
+if [ -s "slack-required" ]; then
+  echo Recomended and required packages for building cairo are:
+  cat slack-required | sed -e 's/^/\t/'
+  if [ "$INTERACT" != "no" ]; then
+    echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER.
+    read crap
+#  else
+#    echo Sleeping 3 seconds...
+#    sleep 3
+  fi
+fi
+
 CWD="`pwd`"
 
 if [ -f ~/.slackbuildrc ]; then
@@ -25,8 +37,15 @@ else
   LIBDIR=/usr/lib
 fi
 
+# -------  error codes for createpkg  --------------
+ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
+ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
+ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
+ERROR_PATCH=40
+
+TMP="$TMP/$PACKAGE"
 PKG=$TMP/package-imagemagick
-rm -rf $PKG
+rm -rf $TMP
 mkdir -p $PKG
 
 # NOTE:  This is to cope with ImageMagick version numbers such as 5.4.7-4,
@@ -36,31 +55,25 @@ mkdir -p $PKG
 # This is a bit messy, so we'll explain it well.  :-)
 
 # This is the base version number, which is needed to cd into the source tree
-BASEVER=6.2.3
+BASEVER=6.3.3
 
 # This is the version number used in the source tarball filename
-FILEVER=6.2.3-3
+FILEVER=6.3.3-0
 
 # This is the version number used in the package, where a version number cannot
 # contain a '-'
-PKGVER=6.2.3_3
+PKGVER=6.3.3_0
 
 RTOOL="wget"
 PACKAGE_EXT="bz2"
 SRC="ImageMagick-$FILEVER.tar.$PACKAGE_EXT"
-URL="http://slamd64.he.net/slamd64-10.2b/source/xap/imagemagick/ImageMagick-6.2.3-3.tar.bz2"
-
-if [ "$PACKAGE_EXT" == "bz2" ]; then
-  tarflag="j"
-else
-  tarflag="z"
-fi
+URL="http://slack.sarava.org/slackware/slackware-11.0/patches/source/imagemagick/ImageMagick-6.3.3-0.tar.bz2"
 
 SRC_DIR="$SRC_DIR/$PACKAGE"
 mkdir -p $SRC_DIR
 
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
-  wget "$URL" -O "$SRC_DIR/$SRC"
+  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
 if [ "$ARCH" = "i386" ]; then
@@ -80,15 +93,14 @@ fi
 # I've heard a few reports of compile failures when this isn't in /usr.
 # Everyone else does it -- time to follow the path of least resistance.
 
-TMP="$TMP/$PACKAGE"
-rm -rf $TMP
-mkdir -p $TMP
 cd $TMP
 
-tar xvf$tarflag $SRC_DIR/$SRC
+tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR
 cd ImageMagick-$BASEVER
 
-zcat $CWD/imagemagick.CVE-2005-4601.CVE-2006-0082.diff.gz | patch -p1 --verbose || exit
+if [ "$BASEVER" == "6.2.3" ]; then
+  zcat $CWD/imagemagick.CVE-2005-4601.CVE-2006-0082.diff.gz | patch -p1 --verbose || exit $ERROR_PATCH
+fi
 
 chown -R root.root .
 find . -perm 664 -exec chmod 644 {} \;
@@ -113,8 +125,8 @@ CXXFLAGS="$SLKCFLAGS" \
             --enable-shared \
             --with-perl \
             $ARCH-slackware-linux
-make || exit 32
-make install DESTDIR=$PKG
+make || exit $ERROR_MAKE
+make install DESTDIR=$PKG || exit $ERROR_INSTALL
 
 # Lately ImageMagick has been smoking crack:
 rm -f $PKG/usr/lib/libltdl.*
@@ -152,7 +164,7 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-makepkg -l y -c n $REPOS/imagemagick-$PKGVER-$ARCH-$BUILD.tgz
+makepkg -l y -c n $REPOS/imagemagick-$PKGVER-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
 
 if [ "$CLEANUP" == "yes" ]; then
   rm -rf $TMP