Mon Aug 14 15:25:20 2017 UTC ()
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.


(jlam)
diff -r1.5 -r1.6 pkgsrc/devel/php-xcache/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/devel/php-xcache/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/php-xcache/Makefile 2016/09/11 17:03:26 1.5
+++ pkgsrc/devel/php-xcache/Makefile 2017/08/14 15:25:20 1.6
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.5 2016/09/11 17:03:26 taca Exp $ 1# $NetBSD: Makefile,v 1.6 2017/08/14 15:25:20 jlam Exp $
2 2
3MODNAME= xcache 3MODNAME= xcache
4PECL_VERSION= 3.2.0 4PECL_VERSION= 3.2.0
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel www 6CATEGORIES= devel www
7MASTER_SITES= http://xcache.lighttpd.net/pub/Releases/${PECL_VERSION}/ 7MASTER_SITES= http://xcache.lighttpd.net/pub/Releases/${PECL_VERSION}/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= vs@nifelheim.info 10MAINTAINER= vs@nifelheim.info
11HOMEPAGE= http://xcache.lighttpd.net/ 11HOMEPAGE= http://xcache.lighttpd.net/
12COMMENT= Fast and stable PHP opcode cacher 12COMMENT= Fast and stable PHP opcode cacher
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15BUILD_DEPENDS+= re2c>=0.13.0.4:../../devel/re2c 15BUILD_DEPENDS+= re2c>=0.13.0.4:../../devel/re2c
16 16
17PHP_VERSIONS_ACCEPTED= 56 17PHP_VERSIONS_ACCEPTED= 56
18 18
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_TOOLS+= gawk gm4 gsed pax 20USE_TOOLS+= gawk gm4 gsed pax
21CONFIGURE_ARGS+= --enable-${MODNAME} 21CONFIGURE_ARGS+= --enable-${MODNAME}
22USE_LIBTOOL= yes 22USE_LIBTOOL= yes
23 23
24EGDIR= share/examples/${PHP_PKG_PREFIX}-xcache 24XCACHE_EGDIR= share/examples/${PHP_PKG_PREFIX}-xcache
25CONF_FILES= ${EGDIR}/xcache.ini ${PKG_SYSCONFDIR}/xcache.ini 25CONF_FILES= ${XCACHE_EGDIR}/xcache.ini ${PKG_SYSCONFDIR}/xcache.ini
26 26
27XCACHE_DIR= share/${PHP_PKG_PREFIX}-xcache 27XCACHE_DIR= share/${PHP_PKG_PREFIX}-xcache
28INSTALLATION_DIRS+= ${EGDIR} ${XCACHE_DIR}/cacher/lang 28INSTALLATION_DIRS+= ${XCACHE_EGDIR} ${XCACHE_DIR}/cacher/lang
29INSTALLATION_DIRS+= ${XCACHE_DIR}/cacher/sub ${XCACHE_DIR}/common/lang 29INSTALLATION_DIRS+= ${XCACHE_DIR}/cacher/sub ${XCACHE_DIR}/common/lang
30INSTALLATION_DIRS+= ${XCACHE_DIR}/coverager/lang 30INSTALLATION_DIRS+= ${XCACHE_DIR}/coverager/lang
31INSTALLATION_DIRS+= ${XCACHE_DIR}/diagnosis/lang 31INSTALLATION_DIRS+= ${XCACHE_DIR}/diagnosis/lang
32 32
33PLIST_SRC+= PLIST 33PLIST_SRC+= PLIST
34PLIST_SUBST= PHP_PKG_PREFIX=${PHP_PKG_PREFIX} 34PLIST_SUBST= PHP_PKG_PREFIX=${PHP_PKG_PREFIX}
35MESSAGE_SUBST= PHP_PKG_PREFIX=${PHP_PKG_PREFIX} 35MESSAGE_SUBST= PHP_PKG_PREFIX=${PHP_PKG_PREFIX}
36 36
37.include "options.mk" 37.include "options.mk"
38 38
39post-install: 39post-install:
40 ${INSTALL_DATA} ${WRKSRC}/htdocs/*.php ${DESTDIR}${PREFIX}/${XCACHE_DIR} 40 ${INSTALL_DATA} ${WRKSRC}/htdocs/*.php ${DESTDIR}${PREFIX}/${XCACHE_DIR}
41 for i in cacher common coverager diagnosis; do \ 41 for i in cacher common coverager diagnosis; do \