1 files changed, 19 insertions, 15 deletions
diff --git a/development/xdebug/xdebug.SlackBuild b/development/xdebug/xdebug.SlackBuild
index 034ba6c893454..5be925b0afe4b 100644
--- a/development/xdebug/xdebug.SlackBuild
+++ b/development/xdebug/xdebug.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for xdebug
 
 # Copyright (c) 2010, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright 2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,16 +23,14 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xdebug
-VERSION=${VERSION:-2.0.5}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -83,15 +82,22 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-php-config=/usr/bin/php-config \
   --build=$ARCH-slackware-linux \
   --enable-xdebug
 
 # Build xdebug
 make
 
+# Prepare for installation
+EXTENSION_DIR="$PKG/$(/usr/bin/php-config --extension-dir)"
+mkdir -p $EXTENSION_DIR
+
+# Install xdebug
+make install DESTDIR=$PKG EXTENSION_DIR=$EXTENSION_DIR
+
 # Build and install debugclient
-( set -e
-  cd debugclient
+cd debugclient
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
@@ -104,28 +110,26 @@ make
     --build=$ARCH-slackware-linux \
     --with-libedit
   make
-  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/debugclient
-  cp -a INSTALL LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/debugclient
   make install DESTDIR=$PKG
-) || exit 1
+cd -
 
-# Prepare for installation
-EXTENSION_DIR=$PKG/$(/usr/bin/php-config --extension-dir)
-mkdir -p $EXTENSION_DIR
-
-# Install xdebug
-make install DESTDIR=$PKG EXTENSION_DIR=$EXTENSION_DIR
+mkdir -p $PKG/etc/php
+install -m 644 $CWD/xdebug.ini $PKG/etc/php/xdebug.ini.new
+sed -i "s/LIBDIR/lib$LIBDIRSUFFIX/g" $PKG/etc/php/xdebug.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
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/debugclient
 cp -a CREDITS Changelog LICENSE NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debugclient/INSTALL debugclient/LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION/debugclient
 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}