From efe1f0a791d065e840f826761ddb0225db0972f7 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@slackbuilds.org>
Date: Sat, 6 Feb 2016 23:00:55 +0100
Subject: libraries/php-memcache: Fix php ini file location.

Also added missing pecl registration.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 libraries/php-memcache/README                  |  2 +-
 libraries/php-memcache/doinst.sh               |  5 ++++-
 libraries/php-memcache/php-memcache.SlackBuild | 11 +++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'libraries')

diff --git a/libraries/php-memcache/README b/libraries/php-memcache/README
index c0ef2a0571..a5468ef87e 100644
--- a/libraries/php-memcache/README
+++ b/libraries/php-memcache/README
@@ -1,5 +1,5 @@
 This extension enables PHP to work with memcached.
 
 To enable the memcache extension for php, go to
-/etc/php/memcache.ini and uncomment the line:
+/etc/php.d/memcache.ini and uncomment the line:
   ; extension=memcache.so
diff --git a/libraries/php-memcache/doinst.sh b/libraries/php-memcache/doinst.sh
index 6996948b32..0da4698b79 100644
--- a/libraries/php-memcache/doinst.sh
+++ b/libraries/php-memcache/doinst.sh
@@ -11,5 +11,8 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/php/memcache.ini.new
+config etc/php.d/memcache.ini.new
+
+/usr/bin/pecl install --nodeps --soft --force --register-only --nobuild \
+  usr/libLIBDIRSUFFIX/php/.pkgxml/memcache.xml > /dev/null
 
diff --git a/libraries/php-memcache/php-memcache.SlackBuild b/libraries/php-memcache/php-memcache.SlackBuild
index a63b9c7b97..b59144e219 100644
--- a/libraries/php-memcache/php-memcache.SlackBuild
+++ b/libraries/php-memcache/php-memcache.SlackBuild
@@ -25,7 +25,7 @@
 SRCNAM=memcache
 PRGNAM=php-memcache
 VERSION=${VERSION:-3.0.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -89,11 +89,14 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 
 EXTENSION_DIR="$PKG/$($PHP_CONFIG --extension-dir)"
-mkdir -p $EXTENSION_DIR $PKG/etc/php
+mkdir -p $EXTENSION_DIR $PKG/etc/php.d
 
 make install DESTDIR=$PKG EXTENSION_DIR=$EXTENSION_DIR
 
-install -m 644 $CWD/memcache.ini $PKG/etc/php/memcache.ini.new
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/php/.pkgxml
+install -m 644 $TMP/package.xml $PKG/usr/lib$LIBDIRSUFFIX/php/.pkgxml/memcache.xml
+
+install -m 644 $CWD/memcache.ini $PKG/etc/php.d/memcache.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
@@ -105,7 +108,7 @@ 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
+sed "s|LIBDIRSUFFIX|$LIBDIRSUFFIX|" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-- 
cgit v1.2.3