Support different installations of PHP package versions. Fix MESSAGE, PLIST

and bump PKGREVISION.

3 files changed, 67 insertions, 65 deletions

diff --git a/devel/php-xcache/MESSAGE b/devel/php-xcache/MESSAGE
index 7dae67b4dc6..ab4685eefa9 100644
--- a/devel/php-xcache/MESSAGE
+++ b/devel/php-xcache/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/03/14 18:52:30 rodent Exp $
+$NetBSD: MESSAGE,v 1.2 2015/03/21 21:35:07 rodent Exp $
 
   For details on configuring XCache, see:
   http://xcache.lighttpd.net/wiki/InstallingAsPhpExtension
@@ -9,6 +9,6 @@ $NetBSD: MESSAGE,v 1.1 2015/03/14 18:52:30 rodent Exp $
 
   The web-interface files have been installed in:
 
-      ${PREFIX}/share/php-xcache
+      ${PREFIX}/share/${PHP_PKG_PREFIX}-xcache
 
 ===========================================================================
diff --git a/devel/php-xcache/Makefile b/devel/php-xcache/Makefile
index ebf45bd6341..d1cd8d71703 100644
--- a/devel/php-xcache/Makefile
+++ b/devel/php-xcache/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2015/03/14 18:52:30 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2015/03/21 21:35:07 rodent Exp $
 
 MODNAME=	xcache
 PECL_VERSION=	3.2.0
+PKGREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://xcache.lighttpd.net/pub/Releases/${PECL_VERSION}/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,16 +19,18 @@ USE_TOOLS+=		gawk gm4 gsed pax
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 USE_LIBTOOL=		yes
 
-EGDIR=		share/examples/php-xcache
+EGDIR=		share/examples/${PHP_PKG_PREFIX}-xcache
 CONF_FILES=	${EGDIR}/xcache.ini ${PKG_SYSCONFDIR}/xcache.ini
 
-XCACHE_DIR=		share/php-xcache
+XCACHE_DIR=		share/${PHP_PKG_PREFIX}-xcache
 INSTALLATION_DIRS+=	${EGDIR} ${XCACHE_DIR}/cacher/lang
 INSTALLATION_DIRS+=	${XCACHE_DIR}/cacher/sub ${XCACHE_DIR}/common/lang
 INSTALLATION_DIRS+=	${XCACHE_DIR}/coverager/lang
 INSTALLATION_DIRS+=	${XCACHE_DIR}/diagnosis/lang
 
 PLIST_SRC+=		PLIST
+PLIST_SUBST=		PHP_PKG_PREFIX=${PHP_PKG_PREFIX}
+MESSAGE_SUBST=		PHP_PKG_PREFIX=${PHP_PKG_PREFIX}
 
 .include "options.mk"
 
diff --git a/devel/php-xcache/PLIST b/devel/php-xcache/PLIST
index 70f9d432264..de0786038c7 100644
--- a/devel/php-xcache/PLIST
+++ b/devel/php-xcache/PLIST
@@ -1,60 +1,59 @@
-@comment $NetBSD: PLIST,v 1.1 2015/03/14 18:52:30 rodent Exp $
-lib/php/20130620/xcache.so
-share/examples/php-xcache/xcache.ini
-share/php-xcache/cacher/cacher.css
-share/php-xcache/cacher/common.php
-share/php-xcache/cacher/config.default.php
-share/php-xcache/cacher/config.example.php
-share/php-xcache/cacher/edit.php
-share/php-xcache/cacher/edit.tpl.php
-share/php-xcache/cacher/index.php
-share/php-xcache/cacher/lang/en.php
-share/php-xcache/cacher/lang/en.po
-share/php-xcache/cacher/lang/zh-simplified.php
-share/php-xcache/cacher/lang/zh-simplified.po
-share/php-xcache/cacher/lang/zh-traditional.php
-share/php-xcache/cacher/lang/zh-traditional.po
-share/php-xcache/cacher/listentries.tpl.php
-share/php-xcache/cacher/mkpassword.php
-share/php-xcache/cacher/sub/entrylist.tpl.php
-share/php-xcache/cacher/sub/moduleinfo.tpl.php
-share/php-xcache/cacher/sub/summary.tpl.php
-share/php-xcache/cacher/sub/testcoredump.tpl.php
-share/php-xcache/cacher/summary.tpl.php
-share/php-xcache/common/common.css
-share/php-xcache/common/common.php
-share/php-xcache/common/footer.tpl.php
-share/php-xcache/common/header.tpl.php
-share/php-xcache/common/lang/en.php
-share/php-xcache/common/lang/en.po
-share/php-xcache/common/lang/zh-simplified.php
-share/php-xcache/common/lang/zh-simplified.po
-share/php-xcache/common/lang/zh-traditional.php
-share/php-xcache/common/lang/zh-traditional.po
-share/php-xcache/common/tablesort.js
-share/php-xcache/common/xcache.png
-share/php-xcache/config.default.php
-share/php-xcache/config.example.php
-share/php-xcache/coverager/common.php
-share/php-xcache/coverager/config.default.php
-share/php-xcache/coverager/config.example.php
-share/php-xcache/coverager/coverager.css
-share/php-xcache/coverager/coverager.tpl.php
-share/php-xcache/coverager/index.php
-share/php-xcache/coverager/lang/en.php
-share/php-xcache/coverager/lang/en.po
-share/php-xcache/coverager/lang/zh-simplified.php
-share/php-xcache/coverager/lang/zh-simplified.po
-share/php-xcache/coverager/lang/zh-traditional.php
-share/php-xcache/coverager/lang/zh-traditional.po
-share/php-xcache/diagnosis/diagnosis.css
-share/php-xcache/diagnosis/diagnosis.tpl.php
-share/php-xcache/diagnosis/index.php
-share/php-xcache/diagnosis/lang/en.php
-share/php-xcache/diagnosis/lang/en.po
-share/php-xcache/diagnosis/lang/zh-simplified.php
-share/php-xcache/diagnosis/lang/zh-simplified.po
-share/php-xcache/diagnosis/lang/zh-traditional.php
-share/php-xcache/diagnosis/lang/zh-traditional.po
-share/php-xcache/diagnosis/lang/zh-tranditional.php
-share/php-xcache/index.php
+@comment $NetBSD: PLIST,v 1.2 2015/03/21 21:35:07 rodent Exp $
+share/examples/${PHP_PKG_PREFIX}-xcache/xcache.ini
+share/${PHP_PKG_PREFIX}-xcache/cacher/cacher.css
+share/${PHP_PKG_PREFIX}-xcache/cacher/common.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/config.default.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/config.example.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/edit.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/edit.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/index.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/lang/en.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/lang/en.po
+share/${PHP_PKG_PREFIX}-xcache/cacher/lang/zh-simplified.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/lang/zh-simplified.po
+share/${PHP_PKG_PREFIX}-xcache/cacher/lang/zh-traditional.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/lang/zh-traditional.po
+share/${PHP_PKG_PREFIX}-xcache/cacher/listentries.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/mkpassword.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/sub/entrylist.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/sub/moduleinfo.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/sub/summary.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/sub/testcoredump.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/cacher/summary.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/common/common.css
+share/${PHP_PKG_PREFIX}-xcache/common/common.php
+share/${PHP_PKG_PREFIX}-xcache/common/footer.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/common/header.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/common/lang/en.php
+share/${PHP_PKG_PREFIX}-xcache/common/lang/en.po
+share/${PHP_PKG_PREFIX}-xcache/common/lang/zh-simplified.php
+share/${PHP_PKG_PREFIX}-xcache/common/lang/zh-simplified.po
+share/${PHP_PKG_PREFIX}-xcache/common/lang/zh-traditional.php
+share/${PHP_PKG_PREFIX}-xcache/common/lang/zh-traditional.po
+share/${PHP_PKG_PREFIX}-xcache/common/tablesort.js
+share/${PHP_PKG_PREFIX}-xcache/common/xcache.png
+share/${PHP_PKG_PREFIX}-xcache/config.default.php
+share/${PHP_PKG_PREFIX}-xcache/config.example.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/common.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/config.default.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/config.example.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/coverager.css
+share/${PHP_PKG_PREFIX}-xcache/coverager/coverager.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/index.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/lang/en.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/lang/en.po
+share/${PHP_PKG_PREFIX}-xcache/coverager/lang/zh-simplified.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/lang/zh-simplified.po
+share/${PHP_PKG_PREFIX}-xcache/coverager/lang/zh-traditional.php
+share/${PHP_PKG_PREFIX}-xcache/coverager/lang/zh-traditional.po
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/diagnosis.css
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/diagnosis.tpl.php
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/index.php
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/lang/en.php
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/lang/en.po
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/lang/zh-simplified.php
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/lang/zh-simplified.po
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/lang/zh-traditional.php
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/lang/zh-traditional.po
+share/${PHP_PKG_PREFIX}-xcache/diagnosis/lang/zh-tranditional.php
+share/${PHP_PKG_PREFIX}-xcache/index.php