9 files changed, 164 insertions, 99 deletions
diff --git a/libraries/imagick/README b/libraries/imagick/README
deleted file mode 100644
index fb82f69b3d..0000000000
--- a/libraries/imagick/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Imagick is a native php extension to create and modify images 
-using the ImageMagick API.
diff --git a/libraries/imagick/imagick.SlackBuild b/libraries/imagick/imagick.SlackBuild
deleted file mode 100644
index 6d8f8a6cb6..0000000000
--- a/libraries/imagick/imagick.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for imagick php module
-# Written by sl@not-only-pixel.de
-
-PRGNAM=imagick
-VERSION=${VERSION:-3.1.0RC2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG $TMP/$PRGNAM-$VERSION
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-phpize
-
-CFLAGS="$SLKCFLAGS" \
-   ./configure \
-   --prefix=/usr \
-   --libdir=/usr/lib$LIBDIRSUFFIX \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --build=$ARCH-slackware-linux
-
-make
-make test
-
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/php/extensions
-cp -a modules/imagick.so $PKG/usr/lib$LIBDIRSUFFIX/php/extensions/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a CREDITS INSTALL TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a examples/*.php $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/imagick/slack-desc b/libraries/imagick/slack-desc
deleted file mode 100644
index cf740afc7e..0000000000
--- a/libraries/imagick/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-imagick: imagick (ImageMagick php wrapper)
-imagick:
-imagick: Imagick is a native php extension to create and modify images using 
-imagick: the ImageMagick API.
-imagick:
-imagick: Homepage: http://pecl.php.net/package/imagick
-imagick:
-imagick:
-imagick:
-imagick:
-imagick:
diff --git a/libraries/php-imagick/README b/libraries/php-imagick/README
new file mode 100644
index 0000000000..a7818a5fc3
--- /dev/null
+++ b/libraries/php-imagick/README
@@ -0,0 +1,6 @@
+Imagick is a native php extension to create and modify images using
+the ImageMagick API.
+
+To enable the imagick extension for php, go to /etc/php/imagick.ini
+and uncomment the line:
+  ; extension=imagick.so
diff --git a/libraries/php-imagick/doinst.sh b/libraries/php-imagick/doinst.sh
new file mode 100644
index 0000000000..154d08871e
--- /dev/null
+++ b/libraries/php-imagick/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/php/imagick.ini.new
+
diff --git a/libraries/php-imagick/imagick.ini b/libraries/php-imagick/imagick.ini
new file mode 100644
index 0000000000..fb4904641c
--- /dev/null
+++ b/libraries/php-imagick/imagick.ini
@@ -0,0 +1,8 @@
+; Enable imagick extension module
+; extension=imagick.so
+
+; Fixes a drawing bug with locales that use ',' as float separators.
+; imagick.locale_fix = Off
+
+; Used to enable the image progress monitor.
+; imagick.progress_monitor = Off
diff --git a/libraries/php-imagick/php-imagick.SlackBuild b/libraries/php-imagick/php-imagick.SlackBuild
new file mode 100644
index 0000000000..c7cf1d3d59
--- /dev/null
+++ b/libraries/php-imagick/php-imagick.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# Slackware build script for imagick php module
+# Originally written by sl@not-only-pixel.de
+
+# Copyright 2012 Heinz Wiesinger, Amsterdam, The Netherlands
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+SRCNAM=imagick
+PRGNAM=php-$SRCNAM
+VERSION=3.1.0RC2
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+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
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+rm package.xml
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+PHP_CONFIG=/usr/bin/php-config
+
+/usr/bin/phpize
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-php-config=$PHP_CONFIG \
+  --build=$ARCH-slackware-linux
+
+make
+
+EXTENSION_DIR="$PKG/$($PHP_CONFIG --extension-dir)"
+mkdir -p $EXTENSION_DIR $PKG/etc/php
+
+make install DESTDIR=$PKG EXTENSION_DIR=$EXTENSION_DIR
+
+install -m 644 $CWD/imagick.ini $PKG/etc/php/imagick.ini.new
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cp ChangeLog CREDITS INSTALL TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a examples/*.php \
+  $PKG/usr/doc/$PRGNAM-$VERSION/examples/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/imagick/imagick.info b/libraries/php-imagick/php-imagick.info
index 837adb1d79..0ce53879fb 100644
--- a/libraries/imagick/imagick.info
+++ b/libraries/php-imagick/php-imagick.info
@@ -1,4 +1,4 @@
-PRGNAM="imagick"
+PRGNAM="php-imagick"
 VERSION="3.1.0RC2"
 HOMEPAGE="http://pecl.php.net/package/imagick"
 DOWNLOAD="http://pecl.php.net/get/imagick-3.1.0RC2.tgz"
diff --git a/libraries/php-imagick/slack-desc b/libraries/php-imagick/slack-desc
new file mode 100644
index 0000000000..29600df829
--- /dev/null
+++ b/libraries/php-imagick/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+php-imagick: php-imagick (PHP Wrapper for ImageMagick)
+php-imagick:
+php-imagick: Imagick is a native php extension to create and modify images using
+php-imagick: the ImageMagick API.
+php-imagick:
+php-imagick: Homepage: http://pecl.php.net/package/imagick/
+php-imagick:
+php-imagick:
+php-imagick:
+php-imagick:
+php-imagick: