Tue Jul 26 08:19:45 2016 UTC ()
further tweak the generated ini files - they are now named according to MODNAME, but use PKGMODNAME as the base for extension file to load; this deals with modules like apcu_bc, which has extension name 'apc', but needs to be loaded after 'apcu' since it uses it's symbols


(jdolecek)
diff -r1.2 -r1.3 pkgsrc/lang/php/PLIST.module
diff -r1.41 -r1.42 pkgsrc/lang/php/ext.mk
cvs diff -r1.2 -r1.3 pkgsrc/lang/php/PLIST.module (expand / switch to unified diff)

--- pkgsrc/lang/php/PLIST.module 2016/07/17 15:49:44 1.2
+++ pkgsrc/lang/php/PLIST.module 2016/07/26 08:19:45 1.3
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1@comment $NetBSD: PLIST.module,v 1.2 2016/07/17 15:49:44 jdolecek Exp $ 1@comment $NetBSD: PLIST.module,v 1.3 2016/07/26 08:19:45 jdolecek Exp $
2share/examples/php/${MODNAME}.ini 2share/examples/php/${MODNAME}.ini
3${PHP_EXTENSION_DIR}/${MODNAME}.${SHLIB_SUFFIX} 3${PHP_EXTENSION_DIR}/${PKGMODNAME}.${SHLIB_SUFFIX}
cvs diff -r1.41 -r1.42 pkgsrc/lang/php/ext.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/ext.mk 2016/07/24 14:01:55 1.41
+++ pkgsrc/lang/php/ext.mk 2016/07/26 08:19:45 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ext.mk,v 1.41 2016/07/24 14:01:55 jdolecek Exp $ 1# $NetBSD: ext.mk,v 1.42 2016/07/26 08:19:45 jdolecek 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 \
@@ -18,55 +18,56 @@ _SYS_VARS.phpext= DISTINFO_FILE PATCHDIR @@ -18,55 +18,56 @@ _SYS_VARS.phpext= DISTINFO_FILE PATCHDIR
18.if defined(PECL_VERSION) 18.if defined(PECL_VERSION)
19HOMEPAGE?= http://pecl.php.net/package/${MODNAME} 19HOMEPAGE?= http://pecl.php.net/package/${MODNAME}
20.endif 20.endif
21 21
22.include "../../lang/php/phpversion.mk" 22.include "../../lang/php/phpversion.mk"
23 23
24.if defined(PHPPKGSRCDIR) 24.if defined(PHPPKGSRCDIR)
25.include "${PHPPKGSRCDIR}/Makefile.common" 25.include "${PHPPKGSRCDIR}/Makefile.common"
26.endif 26.endif
27 27
28PKGMODNAME?= ${MODNAME:S/-/_/} 28PKGMODNAME?= ${MODNAME:S/-/_/}
29PHPSETUPSUBDIR?= #empty 29PHPSETUPSUBDIR?= #empty
30MODULESDIR?= ${WRKSRC}/modules 30MODULESDIR?= ${WRKSRC}/modules
31PLIST_SUBST+= MODNAME=${PKGMODNAME} 31PLIST_SUBST+= MODNAME=${MODNAME}
 32PLIST_SUBST+= PKGMODNAME=${PKGMODNAME}
32PLIST_SUBST+= SHLIB_SUFFIX=${SHLIB_SUFFIX} 33PLIST_SUBST+= SHLIB_SUFFIX=${SHLIB_SUFFIX}
33PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 34PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
34 35
35.if !defined(PECL_VERSION) 36.if !defined(PECL_VERSION)
36# bundled extension 37# bundled extension
37PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_VERSION} 38PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_VERSION}
38EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME} 39EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME}
39WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS} 40WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS}
40DISTINFO_FILE= ${.CURDIR}/${PHPPKGSRCDIR}/distinfo 41DISTINFO_FILE= ${.CURDIR}/${PHPPKGSRCDIR}/distinfo
41.else 42.else
42# PECL extension 43# PECL extension
43PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PECL_VERSION} 44PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PECL_VERSION}
44MASTER_SITES?= http://pecl.php.net/get/ 45MASTER_SITES?= http://pecl.php.net/get/
45PECL_DISTNAME?= ${MODNAME}-${PECL_VERSION} 46PECL_DISTNAME?= ${MODNAME}-${PECL_VERSION}
46DISTNAME= ${PECL_DISTNAME} 47DISTNAME= ${PECL_DISTNAME}
47DIST_SUBDIR?= php-${MODNAME} 48DIST_SUBDIR?= php-${MODNAME}
48EXTRACT_SUFX?= .tgz 49EXTRACT_SUFX?= .tgz
49.endif 50.endif
50 51
51EGDIR= ${PREFIX}/share/examples/php 52EGDIR= ${PREFIX}/share/examples/php
52CONF_FILES= ${EGDIR}/${PKGMODNAME}.ini ${EXT_CONF_DIR}/${PKGMODNAME}.ini 53CONF_FILES= ${EGDIR}/${MODNAME}.ini ${EXT_CONF_DIR}/${MODNAME}.ini
53 54
54EXT_CONF_DIR= ${PKG_SYSCONFDIR}/php.d 55EXT_CONF_DIR= ${PKG_SYSCONFDIR}/php.d
55MAKE_DIRS+= ${EXT_CONF_DIR} 56MAKE_DIRS+= ${EXT_CONF_DIR}
56MAKE_DIRS+= ${EGDIR} 57MAKE_DIRS+= ${EGDIR}
57 58
58SUBST_CLASSES+= ext-ini 59SUBST_CLASSES+= ext-ini
59SUBST_FILES.ext-ini= ${PKGMODNAME}.ini 60SUBST_FILES.ext-ini= ${MODNAME}.ini
60SUBST_MESSAGE.ext-ini=Creating module ini file  61SUBST_MESSAGE.ext-ini=Creating module ini file
61SUBST_SED.ext-ini+= -e 's,@MODNAME@,${PKGMODNAME},g' 62SUBST_SED.ext-ini+= -e 's,@MODNAME@,${PKGMODNAME},g'
62SUBST_SED.ext-ini+= -e 's,@EXTENSION_FILE@,${EXTENSION_FILE},g' 63SUBST_SED.ext-ini+= -e 's,@EXTENSION_FILE@,${EXTENSION_FILE},g'
63SUBST_SED.ext-ini+= -e 's,@EXTENSION_DIRECTIVE@,${EXTENSION_DIRECTIVE},g' 64SUBST_SED.ext-ini+= -e 's,@EXTENSION_DIRECTIVE@,${EXTENSION_DIRECTIVE},g'
64SUBST_STAGE.ext-ini= post-build 65SUBST_STAGE.ext-ini= post-build
65 66
66PHPIZE?= ${BUILDLINK_PREFIX.php}/bin/phpize 67PHPIZE?= ${BUILDLINK_PREFIX.php}/bin/phpize
67PHP_CONFIG?= ${BUILDLINK_PREFIX.php}/bin/php-config 68PHP_CONFIG?= ${BUILDLINK_PREFIX.php}/bin/php-config
68 69
69GNU_CONFIGURE= YES 70GNU_CONFIGURE= YES
70CONFIGURE_ARGS+= --with-php-config=${PHP_CONFIG} 71CONFIGURE_ARGS+= --with-php-config=${PHP_CONFIG}
71 72
72USE_CONFIG_WRAPPER= YES 73USE_CONFIG_WRAPPER= YES
@@ -109,37 +110,37 @@ phpize-module: @@ -109,37 +110,37 @@ phpize-module:
109 @cookie=${WRKDIR}/.phpize_module_done; \ 110 @cookie=${WRKDIR}/.phpize_module_done; \
110 if [ ! -f $${cookie} ]; then \ 111 if [ ! -f $${cookie} ]; then \
111 cd ${WRKSRC}/${PHPSETUPSUBDIR} && \ 112 cd ${WRKSRC}/${PHPSETUPSUBDIR} && \
112 ${SETENV} \ 113 ${SETENV} \
113 AUTOCONF=${TOOLS_DIR:Q}/bin/autoconf \ 114 AUTOCONF=${TOOLS_DIR:Q}/bin/autoconf \
114 AUTOHEADER=${TOOLS_DIR:Q}/bin/autoheader \ 115 AUTOHEADER=${TOOLS_DIR:Q}/bin/autoheader \
115 ACLOCAL=${TOOLS_DIR:Q}/bin/aclocal \ 116 ACLOCAL=${TOOLS_DIR:Q}/bin/aclocal \
116 LIBTOOLIZE=${LOCALBASE:Q}/bin/libtoolize \ 117 LIBTOOLIZE=${LOCALBASE:Q}/bin/libtoolize \
117 ${PHPIZE} && \ 118 ${PHPIZE} && \
118 ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \ 119 ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \
119 fi 120 fi
120 121
121pre-build: 122pre-build:
122 ${CP} ${.CURDIR}/../../lang/php/ext.ini ${WRKSRC}/${PKGMODNAME}.ini 123 ${CP} ${.CURDIR}/../../lang/php/ext.ini ${WRKSRC}/${MODNAME}.ini
123 124
124do-install: do-module-install 125do-install: do-module-install
125 126
126do-module-install: 127do-module-install:
127 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${PHP_EXTENSION_DIR} 128 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${PHP_EXTENSION_DIR}
128 ${INSTALL_LIB} ${MODULESDIR}/${PKGMODNAME}.${SHLIB_SUFFIX} \ 129 ${INSTALL_LIB} ${MODULESDIR}/${PKGMODNAME}.${SHLIB_SUFFIX} \
129 ${DESTDIR}${PREFIX}/${PHP_EXTENSION_DIR} 130 ${DESTDIR}${PREFIX}/${PHP_EXTENSION_DIR}
130 131
131 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 132 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
132 ${INSTALL_DATA} ${WRKSRC}/${PKGMODNAME}.ini ${DESTDIR}${EGDIR} 133 ${INSTALL_DATA} ${WRKSRC}/${MODNAME}.ini ${DESTDIR}${EGDIR}
133 134
134.if defined(USE_PHP_EXT_PATCHES) 135.if defined(USE_PHP_EXT_PATCHES)
135PATCHDIR= ${.CURDIR}/${PHPPKGSRCDIR}/patches 136PATCHDIR= ${.CURDIR}/${PHPPKGSRCDIR}/patches
136do-patch: 137do-patch:
137 ${_PKG_SILENT}${_PKG_DEBUG} \ 138 ${_PKG_SILENT}${_PKG_DEBUG} \
138 cd ${WRKSRC}; \ 139 cd ${WRKSRC}; \
139 for p in `${EGREP} -l '^\+\+\+ ext/${MODNAME}/' ${PATCHDIR}/patch-*`;do\ 140 for p in `${EGREP} -l '^\+\+\+ ext/${MODNAME}/' ${PATCHDIR}/patch-*`;do\
140 ${SED} -e 's,^+++ ext/${MODNAME}/,+++ ,' $$p | ${PATCH} ${PATCH_ARGS}; \ 141 ${SED} -e 's,^+++ ext/${MODNAME}/,+++ ,' $$p | ${PATCH} ${PATCH_ARGS}; \
141 done || ${TRUE} 142 done || ${TRUE}
142.endif 143.endif
143 144
144.if defined(PHPPKGSRCDIR) 145.if defined(PHPPKGSRCDIR)
145.include "${PHPPKGSRCDIR}/buildlink3.mk" 146.include "${PHPPKGSRCDIR}/buildlink3.mk"