CVS commit: pkgsrc/devel/php-xcache

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Mon Aug 14 15:25:20 UTC 2017

Modified Files:
        pkgsrc/devel/php-xcache: Makefile

Log Message:
devel/php-xcache: Fix errors during stage-install.

The package Makefile redefines ${EGDIR}, which was already defined
and used in lang/php/ext.mk.  Rename the package variable to
"XCACHE_EGDIR" to avoid a symbol clash.

Arguably, the EGDIR in lang/php/ext.mk should have been namespaced
a bit better to avoid conflicts with likely variable names used in
package Makefiles, e.g., PHP_EGDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/php-xcache/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/php-xcache/Makefile
diff -u pkgsrc/devel/php-xcache/Makefile:1.5 pkgsrc/devel/php-xcache/Makefile:1.6
--- pkgsrc/devel/php-xcache/Makefile:1.5        Sun Sep 11 17:03:26 2016
+++ pkgsrc/devel/php-xcache/Makefile    Mon Aug 14 15:25:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/09/11 17:03:26 taca Exp $
+# $NetBSD: Makefile,v 1.6 2017/08/14 15:25:20 jlam Exp $
 
 MODNAME=       xcache
 PECL_VERSION=  3.2.0
@@ -21,11 +21,11 @@ USE_TOOLS+=         gawk gm4 gsed pax
 CONFIGURE_ARGS+=       --enable-${MODNAME}
 USE_LIBTOOL=           yes
 
-EGDIR=         share/examples/${PHP_PKG_PREFIX}-xcache
-CONF_FILES=    ${EGDIR}/xcache.ini ${PKG_SYSCONFDIR}/xcache.ini
+XCACHE_EGDIR=          share/examples/${PHP_PKG_PREFIX}-xcache
+CONF_FILES=            ${XCACHE_EGDIR}/xcache.ini ${PKG_SYSCONFDIR}/xcache.ini
 
 XCACHE_DIR=            share/${PHP_PKG_PREFIX}-xcache
-INSTALLATION_DIRS+=    ${EGDIR} ${XCACHE_DIR}/cacher/lang
+INSTALLATION_DIRS+=    ${XCACHE_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