Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1476817750290180"
MIME-Version: 1.0
Date: Tue, 18 Oct 2016 19:09:10 +0000
From: "Jaromir Dolecek" <jdolecek@netbsd.org>
Subject: CVS commit: pkgsrc/lang/php
To: pkgsrc-changes@NetBSD.org
Reply-To: jdolecek@netbsd.org
Message-Id: <20161018190910.DDB3FFBD2@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1476817750290180
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jdolecek
Date:		Tue Oct 18 19:09:10 UTC 2016

Modified Files:
	pkgsrc/lang/php: MESSAGE.module ext.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php/MESSAGE.module
cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/php/ext.mk

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


--_----------=_1476817750290180
Content-Disposition: inline
Content-Length: 2594
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/php/MESSAGE.module
diff -u pkgsrc/lang/php/MESSAGE.module:1.4 pkgsrc/lang/php/MESSAGE.module:1.5
--- pkgsrc/lang/php/MESSAGE.module:1.4	Sun Jul 17 15:49:44 2016
+++ pkgsrc/lang/php/MESSAGE.module	Tue Oct 18 19:09:10 2016
@@ -1,12 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE.module,v 1.4 2016/07/17 15:49:44 jdolecek Exp $
+$NetBSD: MESSAGE.module,v 1.5 2016/10/18 19:09:10 jdolecek Exp $
 
-Module configuration file was created and module should be autoloaded:
-${EXT_CONF_DIR}/${MODNAME}.ini
+By default, example module configuration file was copied to following
+location, and module should be auto-loaded:
+${PHP_EXT_CONF_DIR}/${MODNAME}.ini
 
-Make sure to update your ${PKG_SYSCONFDIR}/php.ini to not load this
-extension explicitely, remove:
+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.
 ===========================================================================

Index: pkgsrc/lang/php/ext.mk
diff -u pkgsrc/lang/php/ext.mk:1.42 pkgsrc/lang/php/ext.mk:1.43
--- pkgsrc/lang/php/ext.mk:1.42	Tue Jul 26 08:19:45 2016
+++ pkgsrc/lang/php/ext.mk	Tue Oct 18 19:09:10 2016
@@ -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 @@ EXTRACT_SUFX?=		.tgz
 .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 @@ MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EX
 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}


--_----------=_1476817750290180--