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

Also added missing pecl registration.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 libraries/php-memcached/doinst.sh                |  6 +++++-
 libraries/php-memcached/php-memcached.SlackBuild | 18 ++++++++++++------
 libraries/php-memcached/php-memcached.info       |  4 ++--
 3 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'libraries/php-memcached')

diff --git a/libraries/php-memcached/doinst.sh b/libraries/php-memcached/doinst.sh
index 320ae2b528..ffc0d8147a 100644
--- a/libraries/php-memcached/doinst.sh
+++ b/libraries/php-memcached/doinst.sh
@@ -11,4 +11,8 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/php/memcached.ini.new
+config etc/php.d/memcached.ini.new
+
+/usr/bin/pecl install --nodeps --soft --force --register-only --nobuild \
+  usr/libLIBDIRSUFFIX/php/.pkgxml/memcached.xml > /dev/null
+
diff --git a/libraries/php-memcached/php-memcached.SlackBuild b/libraries/php-memcached/php-memcached.SlackBuild
index 9be3f5183b..590012d6a1 100644
--- a/libraries/php-memcached/php-memcached.SlackBuild
+++ b/libraries/php-memcached/php-memcached.SlackBuild
@@ -24,9 +24,10 @@
 # (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=memcached
 PRGNAM=php-memcached
 VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -59,11 +60,11 @@ fi
 set -e
 
 rm -rf $PKG
-rm -rf $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION package.xml
+tar xvf $CWD/$SRCNAM-$VERSION.tgz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -85,8 +86,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make install-modules INSTALL_ROOT=$PKG
-mkdir -p $PKG/etc/php/
-install -m 644 memcached.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/memcached.xml
+
+mkdir -p $PKG/etc/php.d/
+install -m 644 memcached.ini $PKG/etc/php.d/memcached.ini.new
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -97,6 +102,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+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}
diff --git a/libraries/php-memcached/php-memcached.info b/libraries/php-memcached/php-memcached.info
index 7c2eb76cea..d695e211de 100644
--- a/libraries/php-memcached/php-memcached.info
+++ b/libraries/php-memcached/php-memcached.info
@@ -1,8 +1,8 @@
 PRGNAM="php-memcached"
 VERSION="2.2.0"
 HOMEPAGE="https://github.com/php-memcached-dev/php-memcached/"
-DOWNLOAD="https://github.com/php-memcached-dev/php-memcached/archive/2.2.0.tar.gz"
-MD5SUM="687fb47e4a5ac323d85eb323ac5eb8d1"
+DOWNLOAD="https://pecl.php.net/get/memcached-2.2.0.tgz"
+MD5SUM="28937c6144f734e000c6300242f44ce6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmemcached"
-- 
cgit v1.2.3