[pkgsrc/trunk]: pkgsrc/lang/php rename EXT_CONF_DIR to PHP_EXT_CONF_DIR, adju...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83383d493e1b
branches:  trunk
changeset: 354014:83383d493e1b
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Tue Oct 18 19:09:10 2016 +0000

description:
rename EXT_CONF_DIR to PHP_EXT_CONF_DIR, adjust it so that it's overridable
in mk.conf, and adjust working in MESSAGE.module to say more clearly
what is happening

PR pkg/51456 by Joern Clausen

diffstat:

 lang/php/MESSAGE.module |  15 +++++++--------
 lang/php/ext.mk         |  12 ++++++------
 2 files changed, 13 insertions(+), 14 deletions(-)

diffs (57 lines):

diff -r a14a6b765c71 -r 83383d493e1b lang/php/MESSAGE.module
--- a/lang/php/MESSAGE.module   Tue Oct 18 17:14:48 2016 +0000
+++ b/lang/php/MESSAGE.module   Tue Oct 18 19:09:10 2016 +0000
@@ -1,12 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE.module,v 1.4 2016/07/17 15:49:44 jdolecek Exp $
-
-Module configuration file was created and module should be autoloaded:
-${EXT_CONF_DIR}/${MODNAME}.ini
+$NetBSD: MESSAGE.module,v 1.5 2016/10/18 19:09:10 jdolecek Exp $
 
-Make sure to update your ${PKG_SYSCONFDIR}/php.ini to not load this
-extension explicitely, remove:
+By default, example module configuration file was copied to following
+location, and module should be auto-loaded:
+${PHP_EXT_CONF_DIR}/${MODNAME}.ini
+
+If you use custom ${PKG_SYSCONFDIR}/php.ini, or nonstandard module
+configuration file location, you might need to add explicit load directive:
 ${EXTENSION_DIRECTIVE}=${EXTENSION_FILE}
-
-Restart your ${PKG_PHP}-enabled HTTP server to load this module.
 ===========================================================================
diff -r a14a6b765c71 -r 83383d493e1b lang/php/ext.mk
--- a/lang/php/ext.mk   Tue Oct 18 17:14:48 2016 +0000
+++ b/lang/php/ext.mk   Tue Oct 18 19:09:10 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ext.mk,v 1.42 2016/07/26 08:19:45 jdolecek Exp $
+# $NetBSD: ext.mk,v 1.43 2016/10/18 19:09:10 jdolecek Exp $
 #
 # PHP extension package framework, for both PECL and bundled PHP extensions.
 #
@@ -50,11 +50,11 @@
 .endif
 
 EGDIR=      ${PREFIX}/share/examples/php
-CONF_FILES= ${EGDIR}/${MODNAME}.ini ${EXT_CONF_DIR}/${MODNAME}.ini
+CONF_FILES= ${EGDIR}/${MODNAME}.ini ${PHP_EXT_CONF_DIR}/${MODNAME}.ini
 
-EXT_CONF_DIR=   ${PKG_SYSCONFDIR}/php.d
-MAKE_DIRS+=     ${EXT_CONF_DIR}
-MAKE_DIRS+=     ${EGDIR}
+PHP_EXT_CONF_DIR?=     ${PKG_SYSCONFDIR}/php.d
+MAKE_DIRS+=            ${PHP_EXT_CONF_DIR}
+MAKE_DIRS+=            ${EGDIR}
 
 SUBST_CLASSES+=     ext-ini
 SUBST_FILES.ext-ini=  ${MODNAME}.ini
@@ -82,7 +82,7 @@
 PLIST_SRC+=            ${.CURDIR}/../../lang/php/PLIST.module
 MESSAGE_SRC+=          ${.CURDIR}/../../lang/php/MESSAGE.module
 MESSAGE_SUBST+=                MODNAME=${PKGMODNAME}
-MESSAGE_SUBST+=                EXT_CONF_DIR=${EXT_CONF_DIR}
+MESSAGE_SUBST+=                PHP_EXT_CONF_DIR=${PHP_EXT_CONF_DIR}
 .if !empty(PHP_ZEND_EXTENSION:U:M[Yy][Ye][Ss])
 EXTENSION_DIRECTIVE=    zend_extension
 EXTENSION_FILE=         ${PREFIX}/${PHP_EXTENSION_DIR}/${PKGMODNAME}.${SHLIB_SUFFIX}