Sun Feb 15 09:00:33 2015 UTC ()
Re-add part of revision 1.33 slighly different way; show "zend_extension"
instead of "extension".


(taca)
diff -r1.2 -r1.3 pkgsrc/lang/php/MESSAGE.module
diff -r1.34 -r1.35 pkgsrc/lang/php/ext.mk
cvs diff -r1.2 -r1.3 pkgsrc/lang/php/MESSAGE.module (expand / switch to unified diff)

--- pkgsrc/lang/php/MESSAGE.module 2004/11/05 21:50:11 1.2
+++ pkgsrc/lang/php/MESSAGE.module 2015/02/15 09:00:33 1.3
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE.module,v 1.2 2004/11/05 21:50:11 jdolecek Exp $ 2$NetBSD: MESSAGE.module,v 1.3 2015/02/15 09:00:33 taca Exp $
3 3
4To enable this module, add the following to ${PKG_SYSCONFDIR}/php.ini: 4To enable this module, add the following to ${PKG_SYSCONFDIR}/php.ini:
5 5
6 extension=${MODNAME}.so 6 ${EXTENSION_DIRECTIVE}=${MODNAME}.so
7 7
8and make sure extension_dir points to the dir where ${MODNAME}.so is. 8and make sure extension_dir points to the dir where ${MODNAME}.so is.
9 9
10Then restart your ${PKG_PHP}-enabled HTTP server to load this module. 10Then restart your ${PKG_PHP}-enabled HTTP server to load this module.
11=========================================================================== 11===========================================================================
cvs diff -r1.34 -r1.35 pkgsrc/lang/php/ext.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/ext.mk 2015/02/02 12:26:21 1.34
+++ pkgsrc/lang/php/ext.mk 2015/02/15 09:00:33 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ext.mk,v 1.34 2015/02/02 12:26:21 obache Exp $ 1# $NetBSD: ext.mk,v 1.35 2015/02/15 09:00:33 taca Exp $
2# 2#
3# PHP extension package framework, for both PECL and bundled PHP extensions. 3# PHP extension package framework, for both PECL and bundled PHP extensions.
4# 4#
5# Just include this file, define MODNAME, define PKGREVISION if necessary, 5# Just include this file, define MODNAME, define PKGREVISION if necessary,
6# add dependencies, and add the appropriate --with-configure-arg, then include 6# add dependencies, and add the appropriate --with-configure-arg, then include
7# bsd.pkg.mk. 7# bsd.pkg.mk.
8 8
9.if !defined(PHPEXT_MK) 9.if !defined(PHPEXT_MK)
10PHPEXT_MK= defined 10PHPEXT_MK= defined
11 11
12_VARGROUPS+= phpext 12_VARGROUPS+= phpext
13_USER_VARS.phpext= # none 13_USER_VARS.phpext= # none
14_PKG_VARS.phpext= MODNAME PECL_VERSION PKGMODNAME MODULESDIR \ 14_PKG_VARS.phpext= MODNAME PECL_VERSION PKGMODNAME MODULESDIR \
@@ -60,26 +60,31 @@ CONFIGURE_ARGS+= --with-php-config=${PHP @@ -60,26 +60,31 @@ CONFIGURE_ARGS+= --with-php-config=${PHP
60USE_CONFIG_WRAPPER= YES 60USE_CONFIG_WRAPPER= YES
61USE_LIBTOOL= YES 61USE_LIBTOOL= YES
62LIBTOOL_OVERRIDE= YES 62LIBTOOL_OVERRIDE= YES
63USE_TOOLS+= automake 63USE_TOOLS+= automake
64 64
65# Ensure we export symbols in the linked shared object. 65# Ensure we export symbols in the linked shared object.
66LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} 66LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
67MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" 67MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
68 68
69PLIST_SRC+= ${.CURDIR}/../../lang/php/PLIST.module 69PLIST_SRC+= ${.CURDIR}/../../lang/php/PLIST.module
70MESSAGE_SRC= ${.CURDIR}/../../lang/php/MESSAGE.module 70MESSAGE_SRC= ${.CURDIR}/../../lang/php/MESSAGE.module
71MESSAGE_SUBST+= MODNAME=${PKGMODNAME} 71MESSAGE_SUBST+= MODNAME=${PKGMODNAME}
72MESSAGE_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 72MESSAGE_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 73.if !empty(PHP_ZEND_EXTENSION:U:M[Yy][Ye][Ss])
 74MESSAGE_SUBST+= EXTENSION_DIRECTIVE=zend_extension
 75.else
 76MESSAGE_SUBST+= EXTENSION_DIRECTIVE=extension
 77.endif
73 78
74# Also include extension-specific message 79# Also include extension-specific message
75.if exists(${.CURDIR}/MESSAGE) 80.if exists(${.CURDIR}/MESSAGE)
76MESSAGE_SRC+= ${.CURDIR}/MESSAGE 81MESSAGE_SRC+= ${.CURDIR}/MESSAGE
77.endif 82.endif
78 83
79.if ${OBJECT_FMT} == "SOM" 84.if ${OBJECT_FMT} == "SOM"
80SHLIB_SUFFIX= sl 85SHLIB_SUFFIX= sl
81.else 86.else
82SHLIB_SUFFIX= so 87SHLIB_SUFFIX= so
83.endif 88.endif
84 89
85pre-configure: phpize-module 90pre-configure: phpize-module