pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/php56
Module Name: pkgsrc
Committed By: taca
Date: Sat Feb 8 02:58:00 UTC 2025
Modified Files:
pkgsrc/lang/php56: MESSAGE Makefile Makefile.common Makefile.php PLIST
buildlink3.mk distinfo options.mk
pkgsrc/lang/php56/patches: patch-acinclude.m4 patch-ext_gd_config.m4
patch-ext_imap_config.m4 patch-ext_intl_collator_collator__error.c
patch-ext_intl_collator_collator__locale.c
patch-ext_intl_collator_collator__sort.c
patch-ext_intl_common_common__error.c
patch-ext_intl_dateformat_dateformat__attr.c
patch-ext_intl_locale_locale__methods.c
patch-ext_intl_normalizer_normalizer__normalize.c
patch-ext_intl_timezone_timezone__class.cpp
patch-ext_intl_timezone_timezone__methods.cpp
patch-ext_mssql_php__mssql.c patch-ext_pcre_pcrelib_config.h
patch-ext_pdo__mysql_config.m4 patch-ext_pdo_config.m4
patch-ext_phar_Makefile.frag patch-ext_phar_phar_phar.php
patch-ext_standard_basic__functions.c patch-ext_standard_php__dns.h
patch-ext_tidy_tidy.c patch-makedist patch-php.ini-development
patch-php.ini-production patch-run-tests.php
patch-sapi_cgi_Makefile.frag patch-sapi_fpm_fpm_events_port.c
patch-sapi_fpm_php-fpm.conf.in
Added Files:
pkgsrc/lang/php56: ALTERNATIVES
pkgsrc/lang/php56/patches: patch-Makefile.global patch-aclocal.m4
patch-configure.in patch-sapi_apache_apMakefile.tmpl
patch-sapi_apache_config.m4 patch-sapi_fpm_fpm_fpm__conf.c
patch-sapi_fpm_www.conf.in patch-scripts_Makefile.frag
patch-scripts_php-config.in patch-scripts_phpize.in
Log Message:
lang/php56: multiple PHP support
With some clean up removing obsolete description in comment.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php56/ALTERNATIVES
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php56/MESSAGE \
pkgsrc/lang/php56/options.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php56/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/php56/Makefile.php
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php56/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/php56/buildlink3.mk
cvs rdiff -u -r1.62 -r1.63 pkgsrc/lang/php56/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php56/patches/patch-Makefile.global \
pkgsrc/lang/php56/patches/patch-configure.in \
pkgsrc/lang/php56/patches/patch-sapi_apache_apMakefile.tmpl \
pkgsrc/lang/php56/patches/patch-sapi_apache_config.m4 \
pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_fpm__conf.c \
pkgsrc/lang/php56/patches/patch-sapi_fpm_www.conf.in \
pkgsrc/lang/php56/patches/patch-scripts_Makefile.frag \
pkgsrc/lang/php56/patches/patch-scripts_php-config.in \
pkgsrc/lang/php56/patches/patch-scripts_phpize.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php56/patches/patch-acinclude.m4 \
pkgsrc/lang/php56/patches/patch-ext_gd_config.m4 \
pkgsrc/lang/php56/patches/patch-ext_standard_php__dns.h
cvs rdiff -u -r0 -r1.3 pkgsrc/lang/php56/patches/patch-aclocal.m4
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php56/patches/patch-ext_imap_config.m4 \
pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__error.c \
pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__locale.c \
pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__sort.c \
pkgsrc/lang/php56/patches/patch-ext_intl_common_common__error.c \
pkgsrc/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c \
pkgsrc/lang/php56/patches/patch-ext_intl_locale_locale__methods.c \
pkgsrc/lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c \
pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp \
pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp \
pkgsrc/lang/php56/patches/patch-ext_mssql_php__mssql.c \
pkgsrc/lang/php56/patches/patch-ext_pcre_pcrelib_config.h \
pkgsrc/lang/php56/patches/patch-ext_pdo__mysql_config.m4 \
pkgsrc/lang/php56/patches/patch-ext_pdo_config.m4 \
pkgsrc/lang/php56/patches/patch-ext_phar_phar_phar.php \
pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c \
pkgsrc/lang/php56/patches/patch-ext_tidy_tidy.c \
pkgsrc/lang/php56/patches/patch-makedist \
pkgsrc/lang/php56/patches/patch-php.ini-development \
pkgsrc/lang/php56/patches/patch-php.ini-production \
pkgsrc/lang/php56/patches/patch-run-tests.php \
pkgsrc/lang/php56/patches/patch-sapi_cgi_Makefile.frag \
pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c \
pkgsrc/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/lang/php56/patches/patch-ext_phar_Makefile.frag
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/php56/MESSAGE
diff -u pkgsrc/lang/php56/MESSAGE:1.2 pkgsrc/lang/php56/MESSAGE:1.3
--- pkgsrc/lang/php56/MESSAGE:1.2 Sun Feb 4 11:35:39 2018
+++ pkgsrc/lang/php56/MESSAGE Sat Feb 8 02:57:59 2025
@@ -1,8 +1,7 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2018/02/04 11:35:39 jdolecek Exp $
+$NetBSD: MESSAGE,v 1.3 2025/02/08 02:57:59 taca Exp $
-NOTE: This PHP version is on extended Security fixes only support,
-with End of Live planned on December 31 2018. For details, see
+NOTE: This PHP version is End of Life on December 31 2018.
http://php.net/supported-versions.php
@@ -11,7 +10,7 @@ with End of Live planned on December 31
To process PHP scripts, you will need a PHP-enabled HTTP server. You may
either configure the HTTP server to use the PHP CGI binary located in
- ${CGIDIR}/php
+ ${CGIDIR}/php${PHP_VER}
or you may install a PHP module for your HTTP server, e.g. www/ap-php.
Index: pkgsrc/lang/php56/options.mk
diff -u pkgsrc/lang/php56/options.mk:1.2 pkgsrc/lang/php56/options.mk:1.3
--- pkgsrc/lang/php56/options.mk:1.2 Sun Dec 1 16:11:56 2024
+++ pkgsrc/lang/php56/options.mk Sat Feb 8 02:57:59 2025
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2024/12/01 16:11:56 taca Exp $
+# $NetBSD: options.mk,v 1.3 2025/02/08 02:57:59 taca Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
+PKG_OPTIONS_VAR= PKG_OPTIONS.php56
PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline disable-filter-url php-embed
PKG_SUGGESTED_OPTIONS+= inet6 ssl
@@ -36,7 +36,6 @@ CONFIGURE_ARGS+= --enable-maintainer-zts
.endif
.if !empty(PKG_OPTIONS:Mreadline)
-USE_GNU_READLINE= yes
.include "../../devel/readline/buildlink3.mk"
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
.else
@@ -57,17 +56,15 @@ CFLAGS+= -DDISABLE_FILTER_URL
PLIST_VARS+= embed
-.if !empty(PKGNAME:Mphp-5*)
-
-.if !empty(PKG_OPTIONS:Mphp-embed)
+# PHP 5.6 dose not support multiple sapi at the same time.
+.if empty(.CURDIR:C/.*\///:Map-php) && empty(.CURDIR:C/.*\///:Mphp-fpm) && !empty(PKG_OPTIONS:Mphp-embed)
CONFIGURE_ARGS+= --enable-embed
-INSTALLATION_DIRS+= include/php/sapi/embed
+INSTALLATION_DIRS+= ${PHP_INCDIR}/sapi/embed
PLIST.embed= yes
.PHONY: post-install-embed
post-install: post-install-embed
post-install-embed:
- ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/
- ${INSTALL_LIB} ${WRKSRC}/libs/libphp5.so ${DESTDIR}${PREFIX}/lib/
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/${PHP_INCDIR}/sapi/embed/
+ ${INSTALL_LIB} ${WRKSRC}/libs/libphp${PHP_VER}.so ${DESTDIR}${PREFIX}/lib/
.endif
Index: pkgsrc/lang/php56/Makefile
diff -u pkgsrc/lang/php56/Makefile:1.39 pkgsrc/lang/php56/Makefile:1.40
--- pkgsrc/lang/php56/Makefile:1.39 Sun Dec 1 16:11:56 2024
+++ pkgsrc/lang/php56/Makefile Sat Feb 8 02:57:59 2025
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.39 2024/12/01 16:11:56 taca Exp $
+# $NetBSD: Makefile,v 1.40 2025/02/08 02:57:59 taca Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
-PKGNAME= php-${PHP_VERSION}
-PKGREVISION= 16
+PKGNAME= ${PHP_PKG_PREFIX}-${PHP_VERSION}
CATEGORIES= lang
-HOMEPAGE= https://www.php.net/
COMMENT= PHP Hypertext Preprocessor version 5.6
LICENSE= php
@@ -15,33 +13,29 @@ TEST_TARGET= test
USE_TOOLS+= autoconf269 gmake lex pkg-config
LIBTOOL_OVERRIDE= # empty
-PHP_CHECK_INSTALLED= No
-PHP_VERSIONS_ACCEPTED= 56
+PHP_VERSIONS_ACCEPTED= 56
+
+CONFLICTS+= php-[0-9]*
+SUPERSEDES+= php-[0-9]*
.include "Makefile.php"
CGIDIR= ${PREFIX}/libexec/cgi-bin
-EGDIR= ${PREFIX}/share/examples/php
-MESSAGE_SUBST+= CGIDIR=${CGIDIR}
+MESSAGE_SUBST+= CGIDIR=${CGIDIR} PHP_VER=${PHP_VER}
CONFIGURE_ARGS+= --enable-cgi
CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
-CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
+CONF_FILES= ${PHP_EGDIR}/php.ini-production \
+ ${PKG_SYSCONFDIR}/php.ini
PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
-SUBST_CLASSES+= path
-SUBST_MESSAGE.path= Fixing common paths.
-SUBST_STAGE.path= pre-configure
-SUBST_FILES.path= ext/phar/phar/phar.php
-SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
-SUBST_FILES.path+= sapi/cgi/Makefile.frag
-SUBST_VARS.path= CGIDIR
-SUBST_VARS.path+= PREFIX
+REPLACE_PHP+= ext/phar/phar/phar.php run-tests.php
-INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
+INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${PHP_EGDIR} \
+ ${PHP_SHAREDIR}
# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
# and lacks the zone memory allocator
@@ -53,12 +47,9 @@ pre-configure:
cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
post-install:
-# ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
-# ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
-# ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
-# ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
- ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
+ ${DESTDIR}${PREFIX}/${PHP_EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/php.gif \
+ ${DESTDIR}${PREFIX}/${PHP_SHAREDIR}
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/php56/Makefile.common
diff -u pkgsrc/lang/php56/Makefile.common:1.3 pkgsrc/lang/php56/Makefile.common:1.4
--- pkgsrc/lang/php56/Makefile.common:1.3 Sat May 6 14:02:13 2023
+++ pkgsrc/lang/php56/Makefile.common Sat Feb 8 02:57:59 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2023/05/06 14:02:13 taca Exp $
+# $NetBSD: Makefile.common,v 1.4 2025/02/08 02:57:59 taca Exp $
# used by lang/php56/Makefile.php
# used by lang/php/ext.mk
@@ -9,7 +9,7 @@ PHP_VERSION_REQD= 56
CATEGORIES+= www
MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
-# needed due to (broken?) configure checks in php-xmlrpc and php5-dom
+# needed due to (broken?) configure checks in php-xmlrpc
CONFIGURE_ENV+= PHP_LIBXML_SHARED="1"
.include "../../mk/compiler.mk"
Index: pkgsrc/lang/php56/Makefile.php
diff -u pkgsrc/lang/php56/Makefile.php:1.9 pkgsrc/lang/php56/Makefile.php:1.10
--- pkgsrc/lang/php56/Makefile.php:1.9 Sun Dec 1 16:11:56 2024
+++ pkgsrc/lang/php56/Makefile.php Sat Feb 8 02:57:59 2025
@@ -1,25 +1,31 @@
-# $NetBSD: Makefile.php,v 1.9 2024/12/01 16:11:56 taca Exp $
+# $NetBSD: Makefile.php,v 1.10 2025/02/08 02:57:59 taca Exp $
# used by lang/php56/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
-.include "../../lang/php56/Makefile.common"
-
-DISTINFO_FILE= ${.CURDIR}/../../lang/php56/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/php56/patches
-
USE_LIBTOOL= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
BUILD_DEFS+= VARBASE
PLIST_VARS+= dtrace
-CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
+.include "../../lang/php56/Makefile.common"
+
+DISTINFO_FILE= ${.CURDIR}/../../lang/php56/distinfo
+PATCHDIR= ${.CURDIR}/../../lang/php56/patches
-.include "../../mk/bsd.prefs.mk"
+PLIST_SUBST+= PHP_VER="${PHP_VER}"
+PRINT_PLIST_AWK+= /${PHP_EXTENSION_DIR:S/\//\\\//g}/ \
+ { sub(/${PHP_EXTENSION_DIR:S/\//\\\//g}/, \
+ "$${PHP_EXTENSION_DIR}") }
+PRINT_PLIST_AWK+= /${PHP_VER}/ { sub(/${PHP_VER}/, "$${PHP_VER}") }
+
+CONFIGURE_ARGS+= --program-suffix=${PHP_VER}
CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
+CONFIGURE_ARGS+= --with-pear=${PREFIX}/${PHP_LIBDIR}
+
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
@@ -29,7 +35,6 @@ CONFIGURE_ARGS+= --without-mysql
CONFIGURE_ARGS+= --without-iconv
CONFIGURE_ARGS+= --without-pear
CONFIGURE_ARGS+= --without-sqlite3
-#CONFIGURE_ARGS+= --without-intl
CONFIGURE_ARGS+= --disable-posix
CONFIGURE_ARGS+= --disable-opcache
@@ -39,6 +44,22 @@ CONFIGURE_ARGS+= --disable-json
CONFIGURE_ARGS+= --enable-mysqlnd
CONFIGURE_ARGS+= --enable-xml
CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
+
+CONFIGURE_ENV+= PHP_VER=${PHP_VER}
+CONFIGURE_ENV+= PHP_VAR_SUBST=PHP_VER
+CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
+
+SUBST_CLASSES+= path
+SUBST_MESSAGE.path= Fixing common paths.
+SUBST_STAGE.path= pre-configure
+SUBST_FILES.path+= php.ini-development php.ini-production
+SUBST_FILES.path+= sapi/cgi/Makefile.frag
+SUBST_FILES.path+= sapi/fpm/php-fpm.conf.in
+SUBST_FILES.path+= sapi/fpm/fpm/fpm_conf.c
+SUBST_FILES.path+= scripts/php-config.in scripts/phpize.in
+SUBST_VARS.path+= PREFIX CGIDIR PHP_VER PHP_API_VERS
+SUBST_VARS.path+= PHP_EGDIR PHP_INCDIR PHP_LIBDIR
+
.include "../../textproc/libxml2/buildlink3.mk"
.include "options.mk"
Index: pkgsrc/lang/php56/PLIST
diff -u pkgsrc/lang/php56/PLIST:1.4 pkgsrc/lang/php56/PLIST:1.5
--- pkgsrc/lang/php56/PLIST:1.4 Sat Aug 1 09:52:51 2020
+++ pkgsrc/lang/php56/PLIST Sat Feb 8 02:57:59 2025
@@ -1,267 +1,267 @@
-@comment $NetBSD: PLIST,v 1.4 2020/08/01 09:52:51 wiz Exp $
-bin/phar
-bin/phar.phar
-bin/php
-bin/php-config
-bin/phpize
-include/php/TSRM/TSRM.h
-include/php/TSRM/readdir.h
-include/php/TSRM/tsrm_config.h
-include/php/TSRM/tsrm_config.w32.h
-include/php/TSRM/tsrm_config_common.h
-include/php/TSRM/tsrm_nw.h
-include/php/TSRM/tsrm_strtok_r.h
-include/php/TSRM/tsrm_win32.h
-include/php/Zend/zend.h
-include/php/Zend/zend_API.h
-include/php/Zend/zend_alloc.h
-include/php/Zend/zend_ast.h
-include/php/Zend/zend_build.h
-include/php/Zend/zend_builtin_functions.h
-include/php/Zend/zend_closures.h
-include/php/Zend/zend_compile.h
-include/php/Zend/zend_config.h
-include/php/Zend/zend_config.nw.h
-include/php/Zend/zend_config.w32.h
-include/php/Zend/zend_constants.h
-include/php/Zend/zend_dtrace.h
-${PLIST.dtrace}include/php/Zend/zend_dtrace_gen.h
-include/php/Zend/zend_dynamic_array.h
-include/php/Zend/zend_errors.h
-include/php/Zend/zend_exceptions.h
-include/php/Zend/zend_execute.h
-include/php/Zend/zend_extensions.h
-include/php/Zend/zend_float.h
-include/php/Zend/zend_gc.h
-include/php/Zend/zend_generators.h
-include/php/Zend/zend_globals.h
-include/php/Zend/zend_globals_macros.h
-include/php/Zend/zend_hash.h
-include/php/Zend/zend_highlight.h
-include/php/Zend/zend_indent.h
-include/php/Zend/zend_ini.h
-include/php/Zend/zend_ini_parser.h
-include/php/Zend/zend_ini_scanner.h
-include/php/Zend/zend_ini_scanner_defs.h
-include/php/Zend/zend_interfaces.h
-include/php/Zend/zend_istdiostream.h
-include/php/Zend/zend_iterators.h
-include/php/Zend/zend_language_parser.h
-include/php/Zend/zend_language_scanner.h
-include/php/Zend/zend_language_scanner_defs.h
-include/php/Zend/zend_list.h
-include/php/Zend/zend_llist.h
-include/php/Zend/zend_modules.h
-include/php/Zend/zend_multibyte.h
-include/php/Zend/zend_multiply.h
-include/php/Zend/zend_object_handlers.h
-include/php/Zend/zend_objects.h
-include/php/Zend/zend_objects_API.h
-include/php/Zend/zend_operators.h
-include/php/Zend/zend_ptr_stack.h
-include/php/Zend/zend_qsort.h
-include/php/Zend/zend_signal.h
-include/php/Zend/zend_stack.h
-include/php/Zend/zend_static_allocator.h
-include/php/Zend/zend_stream.h
-include/php/Zend/zend_string.h
-include/php/Zend/zend_strtod.h
-include/php/Zend/zend_ts_hash.h
-include/php/Zend/zend_types.h
-include/php/Zend/zend_variables.h
-include/php/Zend/zend_virtual_cwd.h
-include/php/Zend/zend_vm.h
-include/php/Zend/zend_vm_def.h
-include/php/Zend/zend_vm_execute.h
-include/php/Zend/zend_vm_opcodes.h
-include/php/ext/date/lib/timelib.h
-include/php/ext/date/lib/timelib_config.h
-include/php/ext/date/lib/timelib_structs.h
-include/php/ext/date/php_date.h
-include/php/ext/dom/xml_common.h
-include/php/ext/ereg/php_ereg.h
-include/php/ext/ereg/php_regex.h
-include/php/ext/filter/php_filter.h
-include/php/ext/hash/php_hash.h
-include/php/ext/hash/php_hash_adler32.h
-include/php/ext/hash/php_hash_crc32.h
-include/php/ext/hash/php_hash_fnv.h
-include/php/ext/hash/php_hash_gost.h
-include/php/ext/hash/php_hash_haval.h
-include/php/ext/hash/php_hash_joaat.h
-include/php/ext/hash/php_hash_md.h
-include/php/ext/hash/php_hash_ripemd.h
-include/php/ext/hash/php_hash_sha.h
-include/php/ext/hash/php_hash_snefru.h
-include/php/ext/hash/php_hash_tiger.h
-include/php/ext/hash/php_hash_whirlpool.h
-include/php/ext/libxml/php_libxml.h
-include/php/ext/mysqlnd/config-win.h
-include/php/ext/mysqlnd/mysql_float_to_double.h
-include/php/ext/mysqlnd/mysqlnd.h
-include/php/ext/mysqlnd/mysqlnd_alloc.h
-include/php/ext/mysqlnd/mysqlnd_block_alloc.h
-include/php/ext/mysqlnd/mysqlnd_charset.h
-include/php/ext/mysqlnd/mysqlnd_debug.h
-include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
-include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
-include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
-include/php/ext/mysqlnd/mysqlnd_net.h
-include/php/ext/mysqlnd/mysqlnd_portability.h
-include/php/ext/mysqlnd/mysqlnd_priv.h
-include/php/ext/mysqlnd/mysqlnd_result.h
-include/php/ext/mysqlnd/mysqlnd_result_meta.h
-include/php/ext/mysqlnd/mysqlnd_reverse_api.h
-include/php/ext/mysqlnd/mysqlnd_statistics.h
-include/php/ext/mysqlnd/mysqlnd_structs.h
-include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
-include/php/ext/mysqlnd/php_mysqlnd.h
-include/php/ext/pcre/pcrelib/config.h
-include/php/ext/pcre/pcrelib/pcre.h
-include/php/ext/pcre/pcrelib/pcre_internal.h
-include/php/ext/pcre/pcrelib/pcreposix.h
-include/php/ext/pcre/pcrelib/ucp.h
-include/php/ext/pcre/php_pcre.h
-include/php/ext/phar/php_phar.h
-include/php/ext/session/mod_files.h
-include/php/ext/session/mod_user.h
-include/php/ext/session/php_session.h
-include/php/ext/simplexml/php_simplexml.h
-include/php/ext/simplexml/php_simplexml_exports.h
-include/php/ext/spl/php_spl.h
-include/php/ext/spl/spl_array.h
-include/php/ext/spl/spl_directory.h
-include/php/ext/spl/spl_dllist.h
-include/php/ext/spl/spl_engine.h
-include/php/ext/spl/spl_exceptions.h
-include/php/ext/spl/spl_fixedarray.h
-include/php/ext/spl/spl_functions.h
-include/php/ext/spl/spl_heap.h
-include/php/ext/spl/spl_iterators.h
-include/php/ext/spl/spl_observer.h
-include/php/ext/standard/base64.h
-include/php/ext/standard/basic_functions.h
-include/php/ext/standard/crc32.h
-include/php/ext/standard/credits.h
-include/php/ext/standard/credits_ext.h
-include/php/ext/standard/credits_sapi.h
-include/php/ext/standard/crypt_blowfish.h
-include/php/ext/standard/crypt_freesec.h
-include/php/ext/standard/css.h
-include/php/ext/standard/cyr_convert.h
-include/php/ext/standard/datetime.h
-include/php/ext/standard/dl.h
-include/php/ext/standard/exec.h
-include/php/ext/standard/file.h
-include/php/ext/standard/flock_compat.h
-include/php/ext/standard/fsock.h
-include/php/ext/standard/head.h
-include/php/ext/standard/html.h
-include/php/ext/standard/html_tables.h
-include/php/ext/standard/info.h
-include/php/ext/standard/md5.h
-include/php/ext/standard/microtime.h
-include/php/ext/standard/pack.h
-include/php/ext/standard/pageinfo.h
-include/php/ext/standard/php_array.h
-include/php/ext/standard/php_assert.h
-include/php/ext/standard/php_browscap.h
-include/php/ext/standard/php_crypt.h
-include/php/ext/standard/php_crypt_r.h
-include/php/ext/standard/php_dir.h
-include/php/ext/standard/php_dns.h
-include/php/ext/standard/php_ext_syslog.h
-include/php/ext/standard/php_filestat.h
-include/php/ext/standard/php_fopen_wrappers.h
-include/php/ext/standard/php_ftok.h
-include/php/ext/standard/php_http.h
-include/php/ext/standard/php_image.h
-include/php/ext/standard/php_incomplete_class.h
-include/php/ext/standard/php_iptc.h
-include/php/ext/standard/php_lcg.h
-include/php/ext/standard/php_link.h
-include/php/ext/standard/php_mail.h
-include/php/ext/standard/php_math.h
-include/php/ext/standard/php_metaphone.h
-include/php/ext/standard/php_password.h
-include/php/ext/standard/php_rand.h
-include/php/ext/standard/php_smart_str.h
-include/php/ext/standard/php_smart_str_public.h
-include/php/ext/standard/php_standard.h
-include/php/ext/standard/php_string.h
-include/php/ext/standard/php_type.h
-include/php/ext/standard/php_uuencode.h
-include/php/ext/standard/php_var.h
-include/php/ext/standard/php_versioning.h
-include/php/ext/standard/proc_open.h
-include/php/ext/standard/quot_print.h
-include/php/ext/standard/scanf.h
-include/php/ext/standard/sha1.h
-include/php/ext/standard/streamsfuncs.h
-include/php/ext/standard/uniqid.h
-include/php/ext/standard/url.h
-include/php/ext/standard/url_scanner_ex.h
-include/php/ext/standard/winver.h
-include/php/ext/xml/expat_compat.h
-include/php/ext/xml/php_xml.h
-include/php/main/SAPI.h
-include/php/main/build-defs.h
-include/php/main/fopen_wrappers.h
-include/php/main/php.h
-include/php/main/php_compat.h
-include/php/main/php_config.h
-include/php/main/php_content_types.h
-include/php/main/php_getopt.h
-include/php/main/php_globals.h
-include/php/main/php_ini.h
-include/php/main/php_main.h
-include/php/main/php_memory_streams.h
-include/php/main/php_network.h
-include/php/main/php_open_temporary_file.h
-include/php/main/php_output.h
-include/php/main/php_reentrancy.h
-include/php/main/php_scandir.h
-include/php/main/php_stdint.h
-include/php/main/php_streams.h
-include/php/main/php_syslog.h
-include/php/main/php_ticks.h
-include/php/main/php_variables.h
-include/php/main/php_version.h
-include/php/main/rfc1867.h
-include/php/main/snprintf.h
-include/php/main/spprintf.h
-include/php/main/streams/php_stream_context.h
-include/php/main/streams/php_stream_filter_api.h
-include/php/main/streams/php_stream_glob_wrapper.h
-include/php/main/streams/php_stream_mmap.h
-include/php/main/streams/php_stream_plain_wrapper.h
-include/php/main/streams/php_stream_transport.h
-include/php/main/streams/php_stream_userspace.h
-include/php/main/streams/php_streams_int.h
-include/php/main/win32_internal_function_disabled.h
-include/php/main/win95nt.h
-include/php/sapi/cli/cli.h
-${PLIST.embed}include/php/sapi/embed/php_embed.h
-${PLIST.embed}lib/libphp5.so
-lib/php/build/Makefile.global
-lib/php/build/acinclude.m4
-lib/php/build/config.guess
-lib/php/build/config.sub
-lib/php/build/libtool.m4
-lib/php/build/ltmain.sh
-lib/php/build/mkdep.awk
-lib/php/build/phpize.m4
-lib/php/build/run-tests.php
-lib/php/build/scan_makefile_in.awk
-lib/php/build/shtool
-libexec/cgi-bin/php
-man/man1/phar.1
-man/man1/phar.phar.1
-man/man1/php-cgi.1
-man/man1/php-config.1
-man/man1/php.1
-man/man1/phpize.1
-share/examples/php/php.ini-development
-share/examples/php/php.ini-production
-share/php/php.gif
-@pkgdir ${PHPEXTDIR}
+@comment $NetBSD: PLIST,v 1.5 2025/02/08 02:57:59 taca Exp $
+bin/phar${PHP_VER}
+bin/phar${PHP_VER}.phar
+bin/php-config${PHP_VER}
+bin/php${PHP_VER}
+bin/phpize${PHP_VER}
+${PHP_INCDIR}/TSRM/TSRM.h
+${PHP_INCDIR}/TSRM/readdir.h
+${PHP_INCDIR}/TSRM/tsrm_config.h
+${PHP_INCDIR}/TSRM/tsrm_config.w32.h
+${PHP_INCDIR}/TSRM/tsrm_config_common.h
+${PHP_INCDIR}/TSRM/tsrm_nw.h
+${PHP_INCDIR}/TSRM/tsrm_strtok_r.h
+${PHP_INCDIR}/TSRM/tsrm_win32.h
+${PHP_INCDIR}/Zend/zend.h
+${PHP_INCDIR}/Zend/zend_API.h
+${PHP_INCDIR}/Zend/zend_alloc.h
+${PHP_INCDIR}/Zend/zend_ast.h
+${PHP_INCDIR}/Zend/zend_build.h
+${PHP_INCDIR}/Zend/zend_builtin_functions.h
+${PHP_INCDIR}/Zend/zend_closures.h
+${PHP_INCDIR}/Zend/zend_compile.h
+${PHP_INCDIR}/Zend/zend_config.h
+${PHP_INCDIR}/Zend/zend_config.nw.h
+${PHP_INCDIR}/Zend/zend_config.w32.h
+${PHP_INCDIR}/Zend/zend_constants.h
+${PHP_INCDIR}/Zend/zend_dtrace.h
+${PLIST.dtrace}${PHP_INCDIR}/Zend/zend_dtrace_gen.h
+${PHP_INCDIR}/Zend/zend_dynamic_array.h
+${PHP_INCDIR}/Zend/zend_errors.h
+${PHP_INCDIR}/Zend/zend_exceptions.h
+${PHP_INCDIR}/Zend/zend_execute.h
+${PHP_INCDIR}/Zend/zend_extensions.h
+${PHP_INCDIR}/Zend/zend_float.h
+${PHP_INCDIR}/Zend/zend_gc.h
+${PHP_INCDIR}/Zend/zend_generators.h
+${PHP_INCDIR}/Zend/zend_globals.h
+${PHP_INCDIR}/Zend/zend_globals_macros.h
+${PHP_INCDIR}/Zend/zend_hash.h
+${PHP_INCDIR}/Zend/zend_highlight.h
+${PHP_INCDIR}/Zend/zend_indent.h
+${PHP_INCDIR}/Zend/zend_ini.h
+${PHP_INCDIR}/Zend/zend_ini_parser.h
+${PHP_INCDIR}/Zend/zend_ini_scanner.h
+${PHP_INCDIR}/Zend/zend_ini_scanner_defs.h
+${PHP_INCDIR}/Zend/zend_interfaces.h
+${PHP_INCDIR}/Zend/zend_istdiostream.h
+${PHP_INCDIR}/Zend/zend_iterators.h
+${PHP_INCDIR}/Zend/zend_language_parser.h
+${PHP_INCDIR}/Zend/zend_language_scanner.h
+${PHP_INCDIR}/Zend/zend_language_scanner_defs.h
+${PHP_INCDIR}/Zend/zend_list.h
+${PHP_INCDIR}/Zend/zend_llist.h
+${PHP_INCDIR}/Zend/zend_modules.h
+${PHP_INCDIR}/Zend/zend_multibyte.h
+${PHP_INCDIR}/Zend/zend_multiply.h
+${PHP_INCDIR}/Zend/zend_object_handlers.h
+${PHP_INCDIR}/Zend/zend_objects.h
+${PHP_INCDIR}/Zend/zend_objects_API.h
+${PHP_INCDIR}/Zend/zend_operators.h
+${PHP_INCDIR}/Zend/zend_ptr_stack.h
+${PHP_INCDIR}/Zend/zend_qsort.h
+${PHP_INCDIR}/Zend/zend_signal.h
+${PHP_INCDIR}/Zend/zend_stack.h
+${PHP_INCDIR}/Zend/zend_static_allocator.h
+${PHP_INCDIR}/Zend/zend_stream.h
+${PHP_INCDIR}/Zend/zend_string.h
+${PHP_INCDIR}/Zend/zend_strtod.h
+${PHP_INCDIR}/Zend/zend_ts_hash.h
+${PHP_INCDIR}/Zend/zend_types.h
+${PHP_INCDIR}/Zend/zend_variables.h
+${PHP_INCDIR}/Zend/zend_virtual_cwd.h
+${PHP_INCDIR}/Zend/zend_vm.h
+${PHP_INCDIR}/Zend/zend_vm_def.h
+${PHP_INCDIR}/Zend/zend_vm_execute.h
+${PHP_INCDIR}/Zend/zend_vm_opcodes.h
+${PHP_INCDIR}/ext/date/lib/timelib.h
+${PHP_INCDIR}/ext/date/lib/timelib_config.h
+${PHP_INCDIR}/ext/date/lib/timelib_structs.h
+${PHP_INCDIR}/ext/date/php_date.h
+${PHP_INCDIR}/ext/dom/xml_common.h
+${PHP_INCDIR}/ext/ereg/php_ereg.h
+${PHP_INCDIR}/ext/ereg/php_regex.h
+${PHP_INCDIR}/ext/filter/php_filter.h
+${PHP_INCDIR}/ext/hash/php_hash.h
+${PHP_INCDIR}/ext/hash/php_hash_adler32.h
+${PHP_INCDIR}/ext/hash/php_hash_crc32.h
+${PHP_INCDIR}/ext/hash/php_hash_fnv.h
+${PHP_INCDIR}/ext/hash/php_hash_gost.h
+${PHP_INCDIR}/ext/hash/php_hash_haval.h
+${PHP_INCDIR}/ext/hash/php_hash_joaat.h
+${PHP_INCDIR}/ext/hash/php_hash_md.h
+${PHP_INCDIR}/ext/hash/php_hash_ripemd.h
+${PHP_INCDIR}/ext/hash/php_hash_sha.h
+${PHP_INCDIR}/ext/hash/php_hash_snefru.h
+${PHP_INCDIR}/ext/hash/php_hash_tiger.h
+${PHP_INCDIR}/ext/hash/php_hash_whirlpool.h
+${PHP_INCDIR}/ext/libxml/php_libxml.h
+${PHP_INCDIR}/ext/mysqlnd/config-win.h
+${PHP_INCDIR}/ext/mysqlnd/mysql_float_to_double.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_alloc.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_block_alloc.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_charset.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_debug.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_enum_n_def.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_ext_plugin.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_libmysql_compat.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_net.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_portability.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_priv.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_result.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_result_meta.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_reverse_api.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_statistics.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_structs.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_wireprotocol.h
+${PHP_INCDIR}/ext/mysqlnd/php_mysqlnd.h
+${PHP_INCDIR}/ext/pcre/pcrelib/config.h
+${PHP_INCDIR}/ext/pcre/pcrelib/pcre.h
+${PHP_INCDIR}/ext/pcre/pcrelib/pcre_internal.h
+${PHP_INCDIR}/ext/pcre/pcrelib/pcreposix.h
+${PHP_INCDIR}/ext/pcre/pcrelib/ucp.h
+${PHP_INCDIR}/ext/pcre/php_pcre.h
+${PHP_INCDIR}/ext/phar/php_phar.h
+${PHP_INCDIR}/ext/session/mod_files.h
+${PHP_INCDIR}/ext/session/mod_user.h
+${PHP_INCDIR}/ext/session/php_session.h
+${PHP_INCDIR}/ext/simplexml/php_simplexml.h
+${PHP_INCDIR}/ext/simplexml/php_simplexml_exports.h
+${PHP_INCDIR}/ext/spl/php_spl.h
+${PHP_INCDIR}/ext/spl/spl_array.h
+${PHP_INCDIR}/ext/spl/spl_directory.h
+${PHP_INCDIR}/ext/spl/spl_dllist.h
+${PHP_INCDIR}/ext/spl/spl_engine.h
+${PHP_INCDIR}/ext/spl/spl_exceptions.h
+${PHP_INCDIR}/ext/spl/spl_fixedarray.h
+${PHP_INCDIR}/ext/spl/spl_functions.h
+${PHP_INCDIR}/ext/spl/spl_heap.h
+${PHP_INCDIR}/ext/spl/spl_iterators.h
+${PHP_INCDIR}/ext/spl/spl_observer.h
+${PHP_INCDIR}/ext/standard/base64.h
+${PHP_INCDIR}/ext/standard/basic_functions.h
+${PHP_INCDIR}/ext/standard/crc32.h
+${PHP_INCDIR}/ext/standard/credits.h
+${PHP_INCDIR}/ext/standard/credits_ext.h
+${PHP_INCDIR}/ext/standard/credits_sapi.h
+${PHP_INCDIR}/ext/standard/crypt_blowfish.h
+${PHP_INCDIR}/ext/standard/crypt_freesec.h
+${PHP_INCDIR}/ext/standard/css.h
+${PHP_INCDIR}/ext/standard/cyr_convert.h
+${PHP_INCDIR}/ext/standard/datetime.h
+${PHP_INCDIR}/ext/standard/dl.h
+${PHP_INCDIR}/ext/standard/exec.h
+${PHP_INCDIR}/ext/standard/file.h
+${PHP_INCDIR}/ext/standard/flock_compat.h
+${PHP_INCDIR}/ext/standard/fsock.h
+${PHP_INCDIR}/ext/standard/head.h
+${PHP_INCDIR}/ext/standard/html.h
+${PHP_INCDIR}/ext/standard/html_tables.h
+${PHP_INCDIR}/ext/standard/info.h
+${PHP_INCDIR}/ext/standard/md5.h
+${PHP_INCDIR}/ext/standard/microtime.h
+${PHP_INCDIR}/ext/standard/pack.h
+${PHP_INCDIR}/ext/standard/pageinfo.h
+${PHP_INCDIR}/ext/standard/php_array.h
+${PHP_INCDIR}/ext/standard/php_assert.h
+${PHP_INCDIR}/ext/standard/php_browscap.h
+${PHP_INCDIR}/ext/standard/php_crypt.h
+${PHP_INCDIR}/ext/standard/php_crypt_r.h
+${PHP_INCDIR}/ext/standard/php_dir.h
+${PHP_INCDIR}/ext/standard/php_dns.h
+${PHP_INCDIR}/ext/standard/php_ext_syslog.h
+${PHP_INCDIR}/ext/standard/php_filestat.h
+${PHP_INCDIR}/ext/standard/php_fopen_wrappers.h
+${PHP_INCDIR}/ext/standard/php_ftok.h
+${PHP_INCDIR}/ext/standard/php_http.h
+${PHP_INCDIR}/ext/standard/php_image.h
+${PHP_INCDIR}/ext/standard/php_incomplete_class.h
+${PHP_INCDIR}/ext/standard/php_iptc.h
+${PHP_INCDIR}/ext/standard/php_lcg.h
+${PHP_INCDIR}/ext/standard/php_link.h
+${PHP_INCDIR}/ext/standard/php_mail.h
+${PHP_INCDIR}/ext/standard/php_math.h
+${PHP_INCDIR}/ext/standard/php_metaphone.h
+${PHP_INCDIR}/ext/standard/php_password.h
+${PHP_INCDIR}/ext/standard/php_rand.h
+${PHP_INCDIR}/ext/standard/php_smart_str.h
+${PHP_INCDIR}/ext/standard/php_smart_str_public.h
+${PHP_INCDIR}/ext/standard/php_standard.h
+${PHP_INCDIR}/ext/standard/php_string.h
+${PHP_INCDIR}/ext/standard/php_type.h
+${PHP_INCDIR}/ext/standard/php_uuencode.h
+${PHP_INCDIR}/ext/standard/php_var.h
+${PHP_INCDIR}/ext/standard/php_versioning.h
+${PHP_INCDIR}/ext/standard/proc_open.h
+${PHP_INCDIR}/ext/standard/quot_print.h
+${PHP_INCDIR}/ext/standard/scanf.h
+${PHP_INCDIR}/ext/standard/sha1.h
+${PHP_INCDIR}/ext/standard/streamsfuncs.h
+${PHP_INCDIR}/ext/standard/uniqid.h
+${PHP_INCDIR}/ext/standard/url.h
+${PHP_INCDIR}/ext/standard/url_scanner_ex.h
+${PHP_INCDIR}/ext/standard/winver.h
+${PHP_INCDIR}/ext/xml/expat_compat.h
+${PHP_INCDIR}/ext/xml/php_xml.h
+${PHP_INCDIR}/main/SAPI.h
+${PHP_INCDIR}/main/build-defs.h
+${PHP_INCDIR}/main/fopen_wrappers.h
+${PHP_INCDIR}/main/php.h
+${PHP_INCDIR}/main/php_compat.h
+${PHP_INCDIR}/main/php_config.h
+${PHP_INCDIR}/main/php_content_types.h
+${PHP_INCDIR}/main/php_getopt.h
+${PHP_INCDIR}/main/php_globals.h
+${PHP_INCDIR}/main/php_ini.h
+${PHP_INCDIR}/main/php_main.h
+${PHP_INCDIR}/main/php_memory_streams.h
+${PHP_INCDIR}/main/php_network.h
+${PHP_INCDIR}/main/php_open_temporary_file.h
+${PHP_INCDIR}/main/php_output.h
+${PHP_INCDIR}/main/php_reentrancy.h
+${PHP_INCDIR}/main/php_scandir.h
+${PHP_INCDIR}/main/php_stdint.h
+${PHP_INCDIR}/main/php_streams.h
+${PHP_INCDIR}/main/php_syslog.h
+${PHP_INCDIR}/main/php_ticks.h
+${PHP_INCDIR}/main/php_variables.h
+${PHP_INCDIR}/main/php_version.h
+${PHP_INCDIR}/main/rfc1867.h
+${PHP_INCDIR}/main/snprintf.h
+${PHP_INCDIR}/main/spprintf.h
+${PHP_INCDIR}/main/streams/php_stream_context.h
+${PHP_INCDIR}/main/streams/php_stream_filter_api.h
+${PHP_INCDIR}/main/streams/php_stream_glob_wrapper.h
+${PHP_INCDIR}/main/streams/php_stream_mmap.h
+${PHP_INCDIR}/main/streams/php_stream_plain_wrapper.h
+${PHP_INCDIR}/main/streams/php_stream_transport.h
+${PHP_INCDIR}/main/streams/php_stream_userspace.h
+${PHP_INCDIR}/main/streams/php_streams_int.h
+${PHP_INCDIR}/main/win32_internal_function_disabled.h
+${PHP_INCDIR}/main/win95nt.h
+${PHP_INCDIR}/sapi/cli/cli.h
+${PLIST.embed}${PHP_INCDIR}/sapi/embed/php_embed.h
+${PLIST.embed}lib/libphp${PHP_VER}.so
+${PHP_LIBDIR}/build/Makefile.global
+${PHP_LIBDIR}/build/acinclude.m4
+${PHP_LIBDIR}/build/config.guess
+${PHP_LIBDIR}/build/config.sub
+${PHP_LIBDIR}/build/libtool.m4
+${PHP_LIBDIR}/build/ltmain.sh
+${PHP_LIBDIR}/build/mkdep.awk
+${PHP_LIBDIR}/build/phpize.m4
+${PHP_LIBDIR}/build/run-tests.php
+${PHP_LIBDIR}/build/scan_makefile_in.awk
+${PHP_LIBDIR}/build/shtool
+libexec/cgi-bin/php${PHP_VER}
+man/man1/phar${PHP_VER}.1
+man/man1/phar${PHP_VER}.phar.1
+man/man1/php-cgi${PHP_VER}.1
+man/man1/php-config${PHP_VER}.1
+man/man1/php${PHP_VER}.1
+man/man1/phpize${PHP_VER}.1
+${PHP_EGDIR}/php.ini-development
+${PHP_EGDIR}/php.ini-production
+${PHP_SHAREDIR}/php.gif
+@pkgdir ${PHP_EXTENSION_DIR}
Index: pkgsrc/lang/php56/buildlink3.mk
diff -u pkgsrc/lang/php56/buildlink3.mk:1.12 pkgsrc/lang/php56/buildlink3.mk:1.13
--- pkgsrc/lang/php56/buildlink3.mk:1.12 Thu Nov 14 22:20:30 2024
+++ pkgsrc/lang/php56/buildlink3.mk Sat Feb 8 02:57:59 2025
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.12 2024/11/14 22:20:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2025/02/08 02:57:59 taca Exp $
-BUILDLINK_TREE+= php
+BUILDLINK_TREE+= php56
-.if !defined(PHP_BUILDLINK3_MK)
-PHP_BUILDLINK3_MK:=
+.if !defined(PHP56_BUILDLINK3_MK)
+PHP56_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.php+= php>=5.6.0<5.7
-BUILDLINK_ABI_DEPENDS.php+= php>=5.6.40nb15
-BUILDLINK_PKGSRCDIR.php?= ../../lang/php56
+BUILDLINK_API_DEPENDS.php56+= php${PHP_VER}>=5.6.0<5.7
+BUILDLINK_ABI_DEPENDS.php56+= php${PHP_VER}>=5.6.40
+BUILDLINK_PKGSRCDIR.php56?= ../../lang/php56
+BUILDLINK_INCDIRS.php56+= ${PHP_INCDIR}
-# XXX php?? use PKG_OPTIONS.${PHP_PKG_PREFIX}, but PKGBASE is php
-pkgbase := php
+pkgbase := php56
.include "../../mk/pkg-build-options.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # PHP_BUILDLINK3_MK
+.endif # PHP56_BUILDLINK3_MK
-BUILDLINK_TREE+= -php
+BUILDLINK_TREE+= -php56
Index: pkgsrc/lang/php56/distinfo
diff -u pkgsrc/lang/php56/distinfo:1.62 pkgsrc/lang/php56/distinfo:1.63
--- pkgsrc/lang/php56/distinfo:1.62 Sun Dec 1 16:11:56 2024
+++ pkgsrc/lang/php56/distinfo Sat Feb 8 02:57:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2024/12/01 16:11:56 taca Exp $
+$NetBSD: distinfo,v 1.63 2025/02/08 02:57:59 taca Exp $
BLAKE2s (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 9eaf6505d80e90147fd0b993fb501620030eea24ccd69e42c49d8faf50d47775
SHA512 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = bbe39ad27a5a82c705692c921b214c5630227ed9852f0432340f74533b5e618d9bea01bff75a4b7a1f1b72876b6d092d2db4533758d9a927f274cff7361f3eb4
@@ -6,42 +6,52 @@ Size (PHP-5.6.31-OpenSSL-1.1.0-compatibi
BLAKE2s (php-5.6.40.tar.xz) = f2355f12a336fe65b3ebeb904ed1899c82c065477533d0c34a23293e901a877a
SHA512 (php-5.6.40.tar.xz) = 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
Size (php-5.6.40.tar.xz) = 12472236 bytes
+SHA1 (patch-Makefile.global) = cf4dec0e4adf4ceceffb498919c1b463db9c6e66
SHA1 (patch-TSRM_threads.m4) = 83c51ef32371598689f2610726a2902e503b1d55
-SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0
+SHA1 (patch-acinclude.m4) = 46ee41b151927673b0d17fbd13a3159b2f7aab0a
+SHA1 (patch-aclocal.m4) = 25908282ba74c7c592d913573c2945aa20717d51
+SHA1 (patch-configure.in) = 67ed9f97785ba4bf3f6405d4af07fc32b972ba4e
SHA1 (patch-disable-filter-url) = bfb8e968062d848e7496aeaaf2347a0341f0f468
-SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
-SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
+SHA1 (patch-ext_gd_config.m4) = 28e2551602ef0150ab8010a800aac4d1d421271e
+SHA1 (patch-ext_imap_config.m4) = a61bc2287e8b114099da93a1ce8cb5c5459a5473
SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = 98ff92cbc5e4a92310a168e9959dd702b18e0783
SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.h) = 01424bd7758505d9800b7f7e9e09d153b908506f
SHA1 (patch-ext_intl_collator_collator__convert.c) = 91f5b8458eebc0c2f3871f76a522f627e4cf4fbf
-SHA1 (patch-ext_intl_collator_collator__error.c) = 94a26ee166506f7f77dd762e9c789d0e803f2b3c
-SHA1 (patch-ext_intl_collator_collator__locale.c) = ab48d5fac5a80b1c4c25fef61993a889a8014e3f
-SHA1 (patch-ext_intl_collator_collator__sort.c) = f21e117180a7c8d999e13e77ff078e55c3481562
-SHA1 (patch-ext_intl_common_common__error.c) = 2afa6a5c908de7347e49030b7d4b5e8f41b6eda5
-SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 4567753a7f6d4a6229ab8ab67f16f668aeb8bf6f
-SHA1 (patch-ext_intl_locale_locale__methods.c) = 10e946194686539178e52116303951e3a1c8397c
-SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 8031fa56c927781f3094d484a2cf15d365f9e1f6
-SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = b76ba1df02e854b9fae27c4c3dd554fba91aadfa
-SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = fc3a99380f1c29553621cb864493d6d79b4d737a
-SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
+SHA1 (patch-ext_intl_collator_collator__error.c) = 50f94807390aecc4faa60b9e6c135b278564a817
+SHA1 (patch-ext_intl_collator_collator__locale.c) = 204379b71842c80fa09323eaefb65c28dd53ba43
+SHA1 (patch-ext_intl_collator_collator__sort.c) = 98c7a37c275d8857bbe0121a783f4ea3b0d419b2
+SHA1 (patch-ext_intl_common_common__error.c) = c6d2279d0473f37f596871bfb32df40d6172aadb
+SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 50eca3301baa6be1c7da817e6ff898da78cb7e34
+SHA1 (patch-ext_intl_locale_locale__methods.c) = 780c5ce26265060c9ff819ef9a130bf6f7c38ee4
+SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 29e7a678907f9a3bb53de7bcfef4ed3d873417f4
+SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = 6bcf41c01dd1002cc0e070fad296ae5e433ed660
+SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = 897eeff65c07d44c35dae38ebb209c03328be6ee
+SHA1 (patch-ext_mssql_php__mssql.c) = e141500e7eda31f568c0b43625db08131e7ef2c5
SHA1 (patch-ext_openssl_openssl.c) = 4f232bbad8a32e0cb5457f788bc3da4c58072f41
-SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8
-SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
-SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
-SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
-SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
+SHA1 (patch-ext_pcre_pcrelib_config.h) = 2fd0bf6e33cbf227850b2347ddd8327ba8429d50
+SHA1 (patch-ext_pdo__mysql_config.m4) = f1af35478b5817bee17f6c530be782474988a368
+SHA1 (patch-ext_pdo_config.m4) = 2cd85e7a6583d549c9fb60cee9ce46b34860a8e4
+SHA1 (patch-ext_phar_Makefile.frag) = b39927055edd6fd3a02fb1d954e8fc69089ef01c
+SHA1 (patch-ext_phar_phar_phar.php) = 159f7934c3ca35e036739aa446f84fe2b7f72026
SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
SHA1 (patch-ext_sqlite3_config0.m4) = 2435e1518a88c7d05eb93cf3c8e716fe4ea0748b
-SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
-SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda
-SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8
+SHA1 (patch-ext_standard_basic__functions.c) = ca1de427a3d793c3a3e99581fbd2d1fcf99aeb30
+SHA1 (patch-ext_standard_php__dns.h) = 8e544eb637044e9428a0becb7402336f64a3a23d
+SHA1 (patch-ext_tidy_tidy.c) = 8f075f17ac913f21e65f4b704574c0ae5ffdfc84
SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
-SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
-SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
-SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
-SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807
+SHA1 (patch-makedist) = 091d5c0ba3e890ade475faa33446c8f97bcb7bc3
+SHA1 (patch-php.ini-development) = e1a187070a9dfc28762d7476d9acc796a93c7fac
+SHA1 (patch-php.ini-production) = f978e200175a161893669391f784f8072488ff24
+SHA1 (patch-run-tests.php) = eff7e25f58aee86e0b4555c29fafc45f53574831
SHA1 (patch-sapi_apache2handler_config.m4) = fea8c89a6b1d357f966b95d7ff80189fb85394a0
-SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f
-SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a
+SHA1 (patch-sapi_apache_apMakefile.tmpl) = ed1f727d0f2d1cd9afa5d793f29126d96122087c
+SHA1 (patch-sapi_apache_config.m4) = f652333407497fc7a8bed98378b629a8030c4d4c
+SHA1 (patch-sapi_cgi_Makefile.frag) = 7bbe1cd3c5fc1d8a2bd6a4177598a5b93139986c
+SHA1 (patch-sapi_fpm_fpm_events_port.c) = e445f1a12381ffeb9db47655519d62f574334494
+SHA1 (patch-sapi_fpm_fpm_fpm__conf.c) = a9f5aa3c194a812d3a9a6d90dd480c3ad929534e
SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0
-SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354
+SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 3f348355f031dcbcfb343cb7cbc3428d26cc0bfd
+SHA1 (patch-sapi_fpm_www.conf.in) = d7942a5c60bc0ca84574cff37f0baff3399d42b6
+SHA1 (patch-scripts_Makefile.frag) = 0d3757283fe4a96ae2356b2cc1919929657daeea
+SHA1 (patch-scripts_php-config.in) = 15a76e79c16990c9e74b2097ee7d928eeee87e20
+SHA1 (patch-scripts_phpize.in) = ce40fd752d23c4c9d31452f6d74cec64f1fc5dce
Index: pkgsrc/lang/php56/patches/patch-acinclude.m4
diff -u pkgsrc/lang/php56/patches/patch-acinclude.m4:1.2 pkgsrc/lang/php56/patches/patch-acinclude.m4:1.3
--- pkgsrc/lang/php56/patches/patch-acinclude.m4:1.2 Mon Dec 5 18:17:11 2016
+++ pkgsrc/lang/php56/patches/patch-acinclude.m4 Sat Feb 8 02:57:59 2025
@@ -1,18 +1,47 @@
-$NetBSD: patch-acinclude.m4,v 1.2 2016/12/05 18:17:11 adam Exp $
+$NetBSD: patch-acinclude.m4,v 1.3 2025/02/08 02:57:59 taca Exp $
-On Darwin, allow native iconv when Command Line Tools are not installed.
+* Adjust PHP directories.
+* Adjust PHP library name.
+* On Darwin, allow native iconv when Command Line Tools are not installed.
---- acinclude.m4.orig 2016-11-09 01:22:57.000000000 +0000
+--- acinclude.m4.orig 2019-01-09 09:54:13.000000000 +0000
+++ acinclude.m4
-@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
- if test "$found_openssl" = "no"; then
+@@ -143,7 +143,7 @@ test -d include || $php_shtool mkdir inc
+ > Makefile.fragments
+ dnl We need to play tricks here to avoid matching the grep line itself
+ pattern=define
+-$EGREP $pattern'.*include/php' $srcdir/configure|$SED 's/.*>//'|xargs touch 2>/dev/null
++$EGREP $pattern'.*'${PHP_INCDIR} $srcdir/configure|$SED 's/.*>//'|xargs touch 2>/dev/null
+ ])
+
+ dnl
+@@ -772,7 +772,7 @@ dnl PHP_BUILD_SHARED
+ dnl
+ AC_DEFUN([PHP_BUILD_SHARED],[
+ PHP_BUILD_PROGRAM
+- OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
++ OVERALL_TARGET=libphp[]$PHP_VER[.la]
+ php_sapi_module=shared
- if test "$PHP_OPENSSL_DIR" = "yes"; then
-- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
-+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
- fi
+ php_c_pre=$shared_c_pre
+@@ -789,7 +789,7 @@ dnl PHP_BUILD_STATIC
+ dnl
+ AC_DEFUN([PHP_BUILD_STATIC],[
+ PHP_BUILD_PROGRAM
+- OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
++ OVERALL_TARGET=libphp[]$PHP_VER[.la]
+ php_sapi_module=static
+ ])
+
+@@ -798,7 +798,7 @@ dnl PHP_BUILD_BUNDLE
+ dnl
+ AC_DEFUN([PHP_BUILD_BUNDLE],[
+ PHP_BUILD_PROGRAM
+- OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
++ OVERALL_TARGET=libs/libphp[]$PHP_VER[.bundle]
+ php_sapi_module=static
+ ])
- for i in $PHP_OPENSSL_DIR; do
@@ -2488,7 +2488,15 @@ AC_DEFUN([PHP_SETUP_ICONV], [
done
@@ -29,3 +58,14 @@ On Darwin, allow native iconv when Comma
fi
if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
+@@ -2771,8 +2779,8 @@ AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
+ pdo_cv_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$abs_srcdir/ext
+- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+- pdo_cv_inc_path=$prefix/include/php/ext
++ elif test -f $prefix/${PHP_INCDIR}/ext/pdo/php_pdo_driver.h; then
++ pdo_cv_inc_path=$prefix/${PHP_INCDIR}/ext
+ fi
+ ])
+ if test -n "$pdo_cv_inc_path"; then
Index: pkgsrc/lang/php56/patches/patch-ext_gd_config.m4
diff -u pkgsrc/lang/php56/patches/patch-ext_gd_config.m4:1.2 pkgsrc/lang/php56/patches/patch-ext_gd_config.m4:1.3
--- pkgsrc/lang/php56/patches/patch-ext_gd_config.m4:1.2 Sat Aug 13 17:34:41 2016
+++ pkgsrc/lang/php56/patches/patch-ext_gd_config.m4 Sat Feb 8 02:57:59 2025
@@ -1,4 +1,7 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.2 2016/08/13 17:34:41 taca Exp $
+$NetBSD: patch-ext_gd_config.m4,v 1.3 2025/02/08 02:57:59 taca Exp $
+
+* Make sure to use external gd (graphics/gd package).
+* Use the same PKG_OPTIONS as graphics/gd.
--- ext/gd/config.m4.orig 2016-07-21 00:23:03.000000000 +0000
+++ ext/gd/config.m4
Index: pkgsrc/lang/php56/patches/patch-ext_standard_php__dns.h
diff -u pkgsrc/lang/php56/patches/patch-ext_standard_php__dns.h:1.2 pkgsrc/lang/php56/patches/patch-ext_standard_php__dns.h:1.3
--- pkgsrc/lang/php56/patches/patch-ext_standard_php__dns.h:1.2 Mon May 2 13:08:00 2016
+++ pkgsrc/lang/php56/patches/patch-ext_standard_php__dns.h Sat Feb 8 02:57:59 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_standard_php__dns.h,v 1.2 2016/05/02 13:08:00 taca Exp $
+$NetBSD: patch-ext_standard_php__dns.h,v 1.3 2025/02/08 02:57:59 taca Exp $
-Fix memory leak.
+* Fix memory leak.
--- ext/standard/php_dns.h.orig 2016-04-28 00:33:49.000000000 +0000
+++ ext/standard/php_dns.h
Index: pkgsrc/lang/php56/patches/patch-ext_imap_config.m4
diff -u pkgsrc/lang/php56/patches/patch-ext_imap_config.m4:1.1 pkgsrc/lang/php56/patches/patch-ext_imap_config.m4:1.2
--- pkgsrc/lang/php56/patches/patch-ext_imap_config.m4:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-ext_imap_config.m4 Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_imap_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_imap_config.m4,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* necessary to build php-imap with PHP5.
--- ext/imap/config.m4.orig 2014-11-12 13:52:21.000000000 +0000
+++ ext/imap/config.m4
Index: pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__error.c
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__error.c:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__error.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__error.c:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__error.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_collator_collator__error.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_collator_collator__error.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/collator/collator_error.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/collator/collator_error.c
Index: pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__locale.c
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__locale.c:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__locale.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__locale.c:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__locale.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_collator_collator__locale.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_collator_collator__locale.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/collator/collator_locale.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/collator/collator_locale.c
Index: pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__sort.c
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__sort.c:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__sort.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__sort.c:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_collator_collator__sort.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_collator_collator__sort.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_collator_collator__sort.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/collator/collator_sort.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/collator/collator_sort.c
Index: pkgsrc/lang/php56/patches/patch-ext_intl_common_common__error.c
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_common_common__error.c:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_common_common__error.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_common_common__error.c:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_common_common__error.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_common_common__error.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_common_common__error.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/common/common_error.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/common/common_error.c
Index: pkgsrc/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_dateformat_dateformat__attr.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_dateformat_dateformat__attr.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_dateformat_dateformat__attr.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/dateformat/dateformat_attr.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/dateformat/dateformat_attr.c
Index: pkgsrc/lang/php56/patches/patch-ext_intl_locale_locale__methods.c
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_locale_locale__methods.c:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_locale_locale__methods.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_locale_locale__methods.c:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_locale_locale__methods.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_locale_locale__methods.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_locale_locale__methods.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/locale/locale_methods.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/locale/locale_methods.c
Index: pkgsrc/lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_normalizer_normalizer__normalize.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_normalizer_normalizer__normalize.c,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_normalizer_normalizer__normalize.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/normalizer/normalizer_normalize.c.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/normalizer/normalizer_normalize.c
Index: pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__class.cpp Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_timezone_timezone__class.cpp,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_timezone_timezone__class.cpp,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/timezone/timezone_class.cpp.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/timezone/timezone_class.cpp
Index: pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp
diff -u pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp:1.1 pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp:1.2
--- pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp:1.1 Mon Nov 16 12:10:05 2020
+++ pkgsrc/lang/php56/patches/patch-ext_intl_timezone_timezone__methods.cpp Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_intl_timezone_timezone__methods.cpp,v 1.1 2020/11/16 12:10:05 ryoon Exp $
+$NetBSD: patch-ext_intl_timezone_timezone__methods.cpp,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with textproc/icu-68.1.
--- ext/intl/timezone/timezone_methods.cpp.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/intl/timezone/timezone_methods.cpp
Index: pkgsrc/lang/php56/patches/patch-ext_mssql_php__mssql.c
diff -u pkgsrc/lang/php56/patches/patch-ext_mssql_php__mssql.c:1.1 pkgsrc/lang/php56/patches/patch-ext_mssql_php__mssql.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_mssql_php__mssql.c:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-ext_mssql_php__mssql.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,9 @@
-$NetBSD: patch-ext_mssql_php__mssql.c,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_mssql_php__mssql.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+Fix with newer freetds:
+
+* cast pointer => long => int, hoping values are ranges in int.
+* Don't pass unsigned char ** to spprintf().
--- ext/mssql/php_mssql.c.orig 2014-11-12 13:52:21.000000000 +0000
+++ ext/mssql/php_mssql.c
Index: pkgsrc/lang/php56/patches/patch-ext_pcre_pcrelib_config.h
diff -u pkgsrc/lang/php56/patches/patch-ext_pcre_pcrelib_config.h:1.1 pkgsrc/lang/php56/patches/patch-ext_pcre_pcrelib_config.h:1.2
--- pkgsrc/lang/php56/patches/patch-ext_pcre_pcrelib_config.h:1.1 Wed Feb 17 01:17:16 2016
+++ pkgsrc/lang/php56/patches/patch-ext_pcre_pcrelib_config.h Sat Feb 8 02:57:59 2025
@@ -1,4 +1,9 @@
-$NetBSD: patch-ext_pcre_pcrelib_config.h,v 1.1 2016/02/17 01:17:16 jklos Exp $
+$NetBSD: patch-ext_pcre_pcrelib_config.h,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* selectively enable just-in-time support in PCRE for supported
+ architectures.
+
+ https://mail-index.netbsd.org/pkgsrc-bugs/2015/09/13/msg057792.html
--- ext/pcre/pcrelib/config.h.orig 2016-02-03 08:38:08.000000000 +0000
+++ ext/pcre/pcrelib/config.h
Index: pkgsrc/lang/php56/patches/patch-ext_pdo__mysql_config.m4
diff -u pkgsrc/lang/php56/patches/patch-ext_pdo__mysql_config.m4:1.1 pkgsrc/lang/php56/patches/patch-ext_pdo__mysql_config.m4:1.2
--- pkgsrc/lang/php56/patches/patch-ext_pdo__mysql_config.m4:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-ext_pdo__mysql_config.m4 Sat Feb 8 02:57:59 2025
@@ -1,7 +1,20 @@
-$NetBSD: patch-ext_pdo__mysql_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_pdo__mysql_config.m4,v 1.2 2025/02/08 02:57:59 taca Exp $
---- ext/pdo_mysql/config.m4.orig 2014-11-12 13:52:21.000000000 +0000
+* Do not append empty -I arguments.
+
+--- ext/pdo_mysql/config.m4.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/pdo_mysql/config.m4
+@@ -130,8 +130,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then
+ pdo_cv_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$abs_srcdir/ext
+- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+- pdo_cv_inc_path=$prefix/include/php/ext
++ elif test -f $prefix/${PHP_INCDIR}/ext/pdo/php_pdo_driver.h; then
++ pdo_cv_inc_path=$prefix/${PHP_INCDIR}/php/ext
+ else
+ AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+ fi
@@ -144,7 +144,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
fi
Index: pkgsrc/lang/php56/patches/patch-ext_pdo_config.m4
diff -u pkgsrc/lang/php56/patches/patch-ext_pdo_config.m4:1.1 pkgsrc/lang/php56/patches/patch-ext_pdo_config.m4:1.2
--- pkgsrc/lang/php56/patches/patch-ext_pdo_config.m4:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-ext_pdo_config.m4 Sat Feb 8 02:57:59 2025
@@ -1,4 +1,8 @@
-$NetBSD: patch-ext_pdo_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_pdo_config.m4,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* make databases/php-pdo compiles and works as shared module on Mac OS
+ X after the package has been modified to use modules shipped with
+ PHP instead of (obsolete) PCRE versions.
--- ext/pdo/config.m4.orig 2014-11-12 13:52:21.000000000 +0000
+++ ext/pdo/config.m4
Index: pkgsrc/lang/php56/patches/patch-ext_phar_phar_phar.php
diff -u pkgsrc/lang/php56/patches/patch-ext_phar_phar_phar.php:1.1 pkgsrc/lang/php56/patches/patch-ext_phar_phar_phar.php:1.2
--- pkgsrc/lang/php56/patches/patch-ext_phar_phar_phar.php:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-ext_phar_phar_phar.php Sat Feb 8 02:57:59 2025
@@ -1,10 +1,12 @@
-$NetBSD: patch-ext_phar_phar_phar.php,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_phar_phar_phar.php,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix shbang line.
--- ext/phar/phar/phar.php.orig 2014-11-12 13:52:21.000000000 +0000
+++ ext/phar/phar/phar.php
@@ -1,4 +1,4 @@
-#!/usr/local/bin/php
-+#!@PREFIX@/bin/php
++#!@PREFIX@/bin/php@PHP_VER@
<?php
/** @file phar.php
Index: pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c
diff -u pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c:1.1 pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c Sat Feb 8 02:57:59 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_standard_basic__functions.c,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_standard_basic__functions.c,v 1.2 2025/02/08 02:57:59 taca Exp $
-Work around VAX FP lack of INF
+* Work around VAX FP lack of INF
--- ext/standard/basic_functions.c.orig 2014-11-12 13:52:21.000000000 +0000
+++ ext/standard/basic_functions.c
Index: pkgsrc/lang/php56/patches/patch-ext_tidy_tidy.c
diff -u pkgsrc/lang/php56/patches/patch-ext_tidy_tidy.c:1.1 pkgsrc/lang/php56/patches/patch-ext_tidy_tidy.c:1.2
--- pkgsrc/lang/php56/patches/patch-ext_tidy_tidy.c:1.1 Mon Feb 20 09:35:17 2017
+++ pkgsrc/lang/php56/patches/patch-ext_tidy_tidy.c Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_tidy_tidy.c,v 1.1 2017/02/20 09:35:17 wiz Exp $
+$NetBSD: patch-ext_tidy_tidy.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix build with tidy-5.x.
--- ext/tidy/tidy.c.orig 2017-01-19 00:17:47.000000000 +0000
+++ ext/tidy/tidy.c
Index: pkgsrc/lang/php56/patches/patch-makedist
diff -u pkgsrc/lang/php56/patches/patch-makedist:1.1 pkgsrc/lang/php56/patches/patch-makedist:1.2
--- pkgsrc/lang/php56/patches/patch-makedist:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-makedist Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-makedist,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-makedist,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+* Fix shell portability problem.
--- makedist.orig 2014-11-12 13:52:21.000000000 +0000
+++ makedist
Index: pkgsrc/lang/php56/patches/patch-php.ini-development
diff -u pkgsrc/lang/php56/patches/patch-php.ini-development:1.1 pkgsrc/lang/php56/patches/patch-php.ini-development:1.2
--- pkgsrc/lang/php56/patches/patch-php.ini-development:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-php.ini-development Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-php.ini-development,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+Set proper default configuration values.
--- php.ini-development.orig 2014-11-12 13:52:21.000000000 +0000
+++ php.ini-development
@@ -7,7 +9,7 @@ $NetBSD: patch-php.ini-development,v 1.1
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
Index: pkgsrc/lang/php56/patches/patch-php.ini-production
diff -u pkgsrc/lang/php56/patches/patch-php.ini-production:1.1 pkgsrc/lang/php56/patches/patch-php.ini-production:1.2
--- pkgsrc/lang/php56/patches/patch-php.ini-production:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-php.ini-production Sat Feb 8 02:57:59 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-php.ini-production,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.2 2025/02/08 02:57:59 taca Exp $
+
+Set proper default configuration values.
--- php.ini-production.orig 2014-11-12 13:52:21.000000000 +0000
+++ php.ini-production
@@ -7,7 +9,7 @@ $NetBSD: patch-php.ini-production,v 1.1
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
Index: pkgsrc/lang/php56/patches/patch-run-tests.php
diff -u pkgsrc/lang/php56/patches/patch-run-tests.php:1.1 pkgsrc/lang/php56/patches/patch-run-tests.php:1.2
--- pkgsrc/lang/php56/patches/patch-run-tests.php:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-run-tests.php Sat Feb 8 02:57:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-run-tests.php,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-run-tests.php,v 1.2 2025/02/08 02:57:59 taca Exp $
Use proper shbang line.
@@ -6,7 +6,7 @@ Use proper shbang line.
+++ run-tests.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php
-+#!@PREFIX@/bin/php
++#!@PREFIX@/bin/php@PHP_VER@
<?php
/*
+----------------------------------------------------------------------+
Index: pkgsrc/lang/php56/patches/patch-sapi_cgi_Makefile.frag
diff -u pkgsrc/lang/php56/patches/patch-sapi_cgi_Makefile.frag:1.1 pkgsrc/lang/php56/patches/patch-sapi_cgi_Makefile.frag:1.2
--- pkgsrc/lang/php56/patches/patch-sapi_cgi_Makefile.frag:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-sapi_cgi_Makefile.frag Sat Feb 8 02:57:59 2025
@@ -1,15 +1,18 @@
-$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.2 2025/02/08 02:57:59 taca Exp $
---- sapi/cgi/Makefile.frag.orig 2014-11-12 13:52:21.000000000 +0000
+* Install php-cgi to ${PREFIX}/${CGIDIR}.
+
+--- sapi/cgi/Makefile.frag.orig 2019-01-09 09:54:13.000000000 +0000
+++ sapi/cgi/Makefile.frag
@@ -4,9 +4,9 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
$(BUILD_CGI)
install-cgi: $(SAPI_CGI_PATH)
- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
-+ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)@CGIDIR@/"
- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
++ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)@CGIDIR@/"
++ @$(mkinstalldirs) $(INSTALL_ROOT)@CGIDIR@
+ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/$(program_prefix)php$(program_suffix)$(EXEEXT)
@echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
Index: pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c
diff -u pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c:1.1 pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c:1.2
--- pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_events_port.c Sat Feb 8 02:57:59 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.2 2025/02/08 02:57:59 taca Exp $
Fix code to make FPM intercept signals properly even with pipes (via catch_workers_output=yes).
See https://bugs.php.net/bug.php?id=65800.
+
--- sapi/fpm/fpm/events/port.c.orig 2014-11-12 13:52:21.000000000 +0000
+++ sapi/fpm/fpm/events/port.c
@@ -124,6 +124,7 @@ static int fpm_event_port_wait(struct fp
Index: pkgsrc/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in
diff -u pkgsrc/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in:1.1 pkgsrc/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in:1.2
--- pkgsrc/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in:1.1 Mon Nov 24 15:37:08 2014
+++ pkgsrc/lang/php56/patches/patch-sapi_fpm_php-fpm.conf.in Sat Feb 8 02:57:59 2025
@@ -1,16 +1,32 @@
-$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.2 2025/02/08 02:57:59 taca Exp $
-Uncomment the pid parameter so the pidfile is created and rc.d script
-can really start / stop php-fpm
+Set proper default configuration values.
---- sapi/fpm/php-fpm.conf.in.orig 2014-11-12 13:52:21.000000000 +0000
+--- sapi/fpm/php-fpm.conf.in.orig 2019-01-09 09:54:13.000000000 +0000
+++ sapi/fpm/php-fpm.conf.in
-@@ -22,7 +22,7 @@
+@@ -22,14 +22,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: none
-;pid = run/php-fpm.pid
-+pid = run/php-fpm.pid
++pid = run/php-fpm@PHP_VER@.pid
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
+ ; in a local file.
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++;error_log = log/php-fpm@PHP_VER@.log
+
+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
+@@ -161,7 +161,7 @@ group = @php_fpm_group@
+ ; (IPv6 and IPv4-mapped) on a specific port;
+ ; '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+-listen = 127.0.0.1:9000
++listen = @php_fpm_localstatedir@/run/php-fpm@PHP_VER@
+
+ ; Set listen(2) backlog.
+ ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
Index: pkgsrc/lang/php56/patches/patch-ext_phar_Makefile.frag
diff -u pkgsrc/lang/php56/patches/patch-ext_phar_Makefile.frag:1.3 pkgsrc/lang/php56/patches/patch-ext_phar_Makefile.frag:1.4
--- pkgsrc/lang/php56/patches/patch-ext_phar_Makefile.frag:1.3 Fri Jun 12 00:47:03 2015
+++ pkgsrc/lang/php56/patches/patch-ext_phar_Makefile.frag Sat Feb 8 02:57:59 2025
@@ -1,6 +1,8 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.3 2015/06/12 00:47:03 taca Exp $
+$NetBSD: patch-ext_phar_Makefile.frag,v 1.4 2025/02/08 02:57:59 taca Exp $
---- ext/phar/Makefile.frag.orig 2015-06-10 07:42:27.000000000 +0000
+Set shbang for phar correctly.
+
+--- ext/phar/Makefile.frag.orig 2019-01-09 09:54:13.000000000 +0000
+++ ext/phar/Makefile.frag
@@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
else \
@@ -11,3 +13,19 @@ $NetBSD: patch-ext_phar_Makefile.frag,v
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
+@@ -37,10 +37,9 @@ $(builddir)/phar.phar: $(builddir)/phar.
+
+ install-pharcmd: pharcmd
+ -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+- $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
+- -@rm -f $(INSTALL_ROOT)$(bindir)/phar
+- $(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar
++ $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar$(PHP_VER).phar
++ -@rm -f $(INSTALL_ROOT)$(bindir)/phar$(PHP_VER)
++ $(LN_S) -f phar$(PHP_VER).phar $(INSTALL_ROOT)$(bindir)/phar$(PHP_VER)
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+- @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
+- @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1
+-
++ @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar$(PHP_VER).1
++ @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar$(PHP_VER).phar.1
Added files:
Index: pkgsrc/lang/php56/ALTERNATIVES
diff -u /dev/null pkgsrc/lang/php56/ALTERNATIVES:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/ALTERNATIVES Sat Feb 8 02:57:58 2025
@@ -0,0 +1,5 @@
+bin/phar @PREFIX@/bin/phar@PHP_VER@
+bin/phar.phar @PREFIX@/bin/phar@PHP_VER@.phar
+bin/php-config @PREFIX@/bin/php-config@PHP_VER@
+bin/php @PREFIX@/bin/php@PHP_VER@
+bin/phpize @PREFIX@/bin/phpize@PHP_VER@
Index: pkgsrc/lang/php56/patches/patch-Makefile.global
diff -u /dev/null pkgsrc/lang/php56/patches/patch-Makefile.global:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-Makefile.global Sat Feb 8 02:57:59 2025
@@ -0,0 +1,48 @@
+$NetBSD: patch-Makefile.global,v 1.1 2025/02/08 02:57:59 taca Exp $
+
+* Adjust PHP library name.
+
+--- Makefile.global.orig 2019-01-09 09:54:13.000000000 +0000
++++ Makefile.global
+@@ -15,22 +15,22 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
+
+ build-binaries: $(PHP_BINARIES)
+
+-libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
++libphp$(PHP_VER).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+
+-libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+- $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
&& cp $@ libs/libphp$(PHP_MAJOR_VERSION).so
++libs/libphp$(PHP_VER).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
++ $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
&& cp $@ libs/libphp$(PHP_VER).so
+
+ install: $(all_targets) $(install_targets)
+
+ install-sapi: $(OVERALL_TARGET)
+ @echo "Installing PHP SAPI module: $(PHP_SAPI)"
+ -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+- -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
++ -@if test ! -r $(phptempdir)/libphp$(PHP_VER).$(SHLIB_DL_SUFFIX_NAME); then \
+ for i in 0.0.0 0.0 0; do \
+- if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+- $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
++ if test -r $(phptempdir)/libphp$(PHP_VER).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
++ $(LN_S) $(phptempdir)/libphp$(PHP_VER).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_VER).$(SHLIB_DL_SUFFIX_NAME); \
+ break; \
+ fi; \
+ done; \
+@@ -115,10 +115,10 @@ clean:
+ find . -name \*.la -o -name \*.a | xargs rm -f
+ find . -name \*.so | xargs rm -f
+ find . -name .libs -a -type d|xargs rm -rf
+- rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
++ rm -f libphp$(PHP_VER).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+
+ distclean: clean
+- rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h
sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
++ rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h
sapi/apache/libphp$(PHP_VER).module sapi/apache_hooks/libphp$(PHP_VER).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+ rm -f php5.spec main/build-defs.h scripts/phpize
+ rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
+ rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
Index: pkgsrc/lang/php56/patches/patch-configure.in
diff -u /dev/null pkgsrc/lang/php56/patches/patch-configure.in:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-configure.in Sat Feb 8 02:57:59 2025
@@ -0,0 +1,63 @@
+$NetBSD: patch-configure.in,v 1.1 2025/02/08 02:57:59 taca Exp $
+
+* Adjust PHP directories.
+* Adjust PHP library name.
+* Do not create extra "include" sub directory.
+
+--- configure.in.orig 2019-01-09 09:54:13.000000000 +0000
++++ configure.in
+@@ -381,9 +381,9 @@ dnl SAPI configuration.
+ dnl -------------------------------------------------------------------------
+
+ dnl paths to the targets are relative to the build directory
+-SAPI_SHARED=libs/libphp[]$PHP_MAJOR_VERSION[.]$SHLIB_DL_SUFFIX_NAME
+-SAPI_STATIC=libs/libphp[]$PHP_MAJOR_VERSION[.a]
+-SAPI_LIBTOOL=libphp[]$PHP_MAJOR_VERSION[.la]
++SAPI_SHARED=libs/libphp[]${PHP_VER}[.]$SHLIB_DL_SUFFIX_NAME
++SAPI_STATIC=libs/libphp[]${PHP_VER}[.a]
++SAPI_LIBTOOL=libphp[]${PHP_VER}[.la]
+
+ PHP_CONFIGURE_PART(Configuring SAPI modules)
+
+@@ -1115,7 +1115,7 @@ dnl
+ if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
+ case $PHP_LAYOUT in
+ GNU) PEAR_INSTALLDIR=$datadir/pear;;
+- *) PEAR_INSTALLDIR=$libdir/php;;
++ *) PEAR_INSTALLDIR=$libdir/php${PHP_API_VERS};;
+ esac
+ fi
+
+@@ -1170,12 +1170,12 @@ test "$program_suffix" = "NONE" && progr
+
+ case $libdir in
+ '${exec_prefix}/lib')
+- libdir=$libdir/php
++ libdir=$libdir/php/${PHP_API_VERS}
+ ;;
+ esac
+ case `eval echo $datadir` in
+ '${prefix}/share')
+- datadir=$datadir/php
++ datadir=$datadir/php/${PHP_API_VERS}
+ ;;
+ esac
+
+@@ -1226,7 +1226,7 @@ case $PHP_LAYOUT in
+ datarootdir=$prefix/share
+ ;;
+ *)
+- datarootdir=$prefix/php
++ datarootdir=$prefix/${PHP_SHAREDIR}
+ ;;
+ esac
+
+@@ -1452,7 +1452,7 @@ PHP_SUBST(all_targets)
+ PHP_SUBST(install_targets)
+ PHP_SUBST(install_binary_targets)
+
+-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
++PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
+
+ PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c)
+
Index: pkgsrc/lang/php56/patches/patch-sapi_apache_apMakefile.tmpl
diff -u /dev/null pkgsrc/lang/php56/patches/patch-sapi_apache_apMakefile.tmpl:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-sapi_apache_apMakefile.tmpl Sat Feb 8 02:57:59 2025
@@ -0,0 +1,39 @@
+$NetBSD: patch-sapi_apache_apMakefile.tmpl,v 1.1 2025/02/08 02:57:59 taca Exp $
+
+* Adjust PHP library name.
+
+--- sapi/apache/apMakefile.tmpl.orig 2019-01-09 09:54:13.000000000 +0000
++++ sapi/apache/apMakefile.tmpl
+@@ -4,7 +4,7 @@
+ ##
+
+ # the parametrized target
+-LIB=libphp5.$(LIBEXT)
++LIB=libphp$(PHP_VER).$(LIBEXT)
+
+ # objects for building the static library
+ OBJS=mod_php5.o
+@@ -19,20 +19,20 @@ all: lib
+ lib: $(LIB)
+
+ # build the static library by merging the object files
+-libphp5.a: $(OBJS) $(OBJS_LIB)
++libphp$(PHP_VER).a: $(OBJS) $(OBJS_LIB)
+ cp $(OBJS_LIB) $@
+ ar r $@ $(OBJS)
+ $(RANLIB) $@
+
+ # ugly hack to support older Apache-1.3 betas that don't set $LIBEXT
+-libphp5.: $(OBJS) $(OBJS_LIB)
++libphp$(PHP_VER).: $(OBJS) $(OBJS_LIB)
+ cp $(OBJS_LIB) $@
+ ar r $@ $(OBJS)
+ $(RANLIB) $@
+ cp libphp5. libphp5.a
+
+ # build the shared object library by linking the object files
+-libphp5.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
++libphp$(PHP_VER).so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
+ rm -f $@
+ $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) $(LIBS) $(PHP_LIBS)
+
Index: pkgsrc/lang/php56/patches/patch-sapi_apache_config.m4
diff -u /dev/null pkgsrc/lang/php56/patches/patch-sapi_apache_config.m4:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-sapi_apache_config.m4 Sat Feb 8 02:57:59 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-sapi_apache_config.m4,v 1.1 2025/02/08 02:57:59 taca Exp $
+
+* Adjust PHP library name.
+
+--- sapi/apache/config.m4.orig 2019-01-09 09:54:13.000000000 +0000
++++ sapi/apache/config.m4
+@@ -78,7 +78,7 @@ if test "$PHP_APXS" != "no"; then
+ *darwin*)
+ MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
+ PHP_SUBST(MH_BUNDLE_FLAGS)
+- SAPI_SHARED=libs/libphp5.so
++ SAPI_SHARED=libs/libphp$PHP_VER.so
+ build_type=bundle
+ ;;
+ *)
+@@ -135,7 +135,7 @@ if test "$PHP_SAPI" != "apache" && test
+ PHP_APACHE=/usr/local/apache
+ fi
+
+- APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module"
++ APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp$PHP_VER.module"
+
+ AC_DEFINE(HAVE_APACHE,1,[ ])
+ APACHE_MODULE=yes
+@@ -247,7 +247,7 @@ dnl Build as static module
+ if test "$APACHE_MODULE" = "yes"; then
+ PHP_TARGET_RDYNAMIC
+ $php_shtool mkdir -p sapi/apache
+- PHP_OUTPUT(sapi/apache/libphp5.module)
++ PHP_OUTPUT(sapi/apache/libphp$PHP_VER.module)
+ fi
+
+ dnl General
Index: pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_fpm__conf.c
diff -u /dev/null pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_fpm__conf.c:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-sapi_fpm_fpm_fpm__conf.c Sat Feb 8 02:57:59 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-sapi_fpm_fpm_fpm__conf.c,v 1.1 2025/02/08 02:57:59 taca Exp $
+
+Set proper default configuration values with PHP version.
+
+--- sapi/fpm/fpm/fpm_conf.c.orig 2019-01-09 09:54:13.000000000 +0000
++++ sapi/fpm/fpm/fpm_conf.c
+@@ -1180,7 +1180,7 @@ static int fpm_conf_post_process(int for
+ }
+
+ if (!fpm_global_config.error_log) {
+- fpm_global_config.error_log = strdup("log/php-fpm.log");
++ fpm_global_config.error_log = strdup("log/php-fpm@PHP_VER@.log");
+ }
+
+ #ifdef HAVE_SYSTEMD
Index: pkgsrc/lang/php56/patches/patch-sapi_fpm_www.conf.in
diff -u /dev/null pkgsrc/lang/php56/patches/patch-sapi_fpm_www.conf.in:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-sapi_fpm_www.conf.in Sat Feb 8 02:57:59 2025
@@ -0,0 +1,47 @@
+$NetBSD: patch-sapi_fpm_www.conf.in,v 1.1 2025/02/08 02:57:59 taca Exp $
+
+* Use UNIX domain socket default and create with default group.
+* Set proper default configuration values with PHP version.
+
+--- sapi/fpm/www.conf.in.orig 2019-01-09 09:54:13.000000000 +0000
++++ sapi/fpm/www.conf.in
+@@ -33,7 +33,8 @@ group = @php_fpm_group@
+ ; (IPv6 and IPv4-mapped) on a specific port;
+ ; '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+-listen = 127.0.0.1:9000
++;listen = 127.0.0.1:9000
++listen = @php_fpm_localstatedir@/run/php-fpm@PHP_VER@
+
+ ; Set listen(2) backlog.
+ ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+@@ -45,8 +46,9 @@ listen = 127.0.0.1:9000
+ ; Default Values: user and group are set as the running user
+ ; mode is set to 0660
+ ;listen.owner = @php_fpm_user@
+-;listen.group = @php_fpm_group@
+-;listen.mode = 0660
++listen.group = @php_fpm_group@
++listen.mode = 0660
++
+ ; When POSIX Access Control Lists are supported you can set them using
+ ; these options, value is a comma separated list of user/group names.
+ ; When set, listen.owner and listen.group are ignored
+@@ -250,7 +252,7 @@ pm.max_spare_servers = 3
+
+ ; The access log file
+ ; Default: not set
+-;access.log = log/$pool.access.log
++;access.log = @php_fpm_localstatedir@/log/php-fpm@PHP_VER@.$pool.access.log
+
+ ; The access log format.
+ ; The following syntax is allowed
+@@ -314,7 +316,7 @@ pm.max_spare_servers = 3
+ ; The log file for slow requests
+ ; Default Value: not set
+ ; Note: slowlog is mandatory if request_slowlog_timeout is set
+-;slowlog = log/$pool.log.slow
++;slowlog = @php_fpm_localstatedir@/log/php-fpm@PHP_VER@.$pool.log.slow
+
+ ; The timeout for serving a single request after which a PHP backtrace will be
+ ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
Index: pkgsrc/lang/php56/patches/patch-scripts_Makefile.frag
diff -u /dev/null pkgsrc/lang/php56/patches/patch-scripts_Makefile.frag:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-scripts_Makefile.frag Sat Feb 8 02:58:00 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-scripts_Makefile.frag,v 1.1 2025/02/08 02:58:00 taca Exp $
+
+* Adjust PHP directories.
+
+--- scripts/Makefile.frag.orig 2019-01-09 09:54:13.000000000 +0000
++++ scripts/Makefile.frag
+@@ -3,8 +3,8 @@
+ # Build environment install
+ #
+
+-phpincludedir = $(includedir)/php
+-phpbuilddir = $(libdir)/build
++phpincludedir = $(includedir)/php/$(PHP_API_VERS)
++phpbuilddir = $(prefix)/$(PHP_LIBDIR)/build
+
+ BUILD_FILES = \
+ scripts/phpize.m4 \
Index: pkgsrc/lang/php56/patches/patch-scripts_php-config.in
diff -u /dev/null pkgsrc/lang/php56/patches/patch-scripts_php-config.in:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-scripts_php-config.in Sat Feb 8 02:58:00 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_php-config.in,v 1.1 2025/02/08 02:58:00 taca Exp $
+
+* Adjust PHP directories.
+
+--- scripts/php-config.in.orig 2019-01-09 09:54:13.000000000 +0000
++++ scripts/php-config.in
+@@ -6,7 +6,7 @@ datarootdir="@datarootdir@"
+ exec_prefix="@exec_prefix@"
+ version="@PHP_VERSION@"
+ vernum="@PHP_VERSION_ID@"
+-include_dir="@includedir@/php"
++include_dir="@includedir@/php/@PHP_API_VERS@"
+ includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
+ ldflags="@PHP_LDFLAGS@"
+ libs="@EXTRA_LIBS@"
Index: pkgsrc/lang/php56/patches/patch-scripts_phpize.in
diff -u /dev/null pkgsrc/lang/php56/patches/patch-scripts_phpize.in:1.1
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-scripts_phpize.in Sat Feb 8 02:58:00 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-scripts_phpize.in,v 1.1 2025/02/08 02:58:00 taca Exp $
+
+* Adjust PHP directories.
+
+--- scripts/phpize.in.orig 2019-01-09 09:54:13.000000000 +0000
++++ scripts/phpize.in
+@@ -4,8 +4,8 @@
+ prefix='@prefix@'
+ datarootdir='@datarootdir@'
+ exec_prefix="`eval echo @exec_prefix@`"
+-phpdir="`eval echo @libdir@`/build"
+-includedir="`eval echo @includedir@`/php"
++phpdir="@prefix@/@PHP_LIBDIR@/build"
++includedir="@prefix@/@PHP_INCDIR@"
+ builddir="`pwd`"
+ SED="@SED@"
+
Index: pkgsrc/lang/php56/patches/patch-aclocal.m4
diff -u /dev/null pkgsrc/lang/php56/patches/patch-aclocal.m4:1.3
--- /dev/null Sat Feb 8 02:58:00 2025
+++ pkgsrc/lang/php56/patches/patch-aclocal.m4 Sat Feb 8 02:57:59 2025
@@ -0,0 +1,45 @@
+$NetBSD: patch-aclocal.m4,v 1.3 2025/02/08 02:57:59 taca Exp $
+
+* Adjust PHP directories.
+* Adjust PHP library name.
+
+--- aclocal.m4.orig 2019-01-09 10:25:55.000000000 +0000
++++ aclocal.m4
+@@ -772,7 +772,7 @@ dnl PHP_BUILD_SHARED
+ dnl
+ AC_DEFUN([PHP_BUILD_SHARED],[
+ PHP_BUILD_PROGRAM
+- OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
++ OVERALL_TARGET=libphp[]$PHP_VER[.la]
+ php_sapi_module=shared
+
+ php_c_pre=$shared_c_pre
+@@ -789,7 +789,7 @@ dnl PHP_BUILD_STATIC
+ dnl
+ AC_DEFUN([PHP_BUILD_STATIC],[
+ PHP_BUILD_PROGRAM
+- OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
++ OVERALL_TARGET=libphp[]$PHP_VER[.la]
+ php_sapi_module=static
+ ])
+
+@@ -798,7 +798,7 @@ dnl PHP_BUILD_BUNDLE
+ dnl
+ AC_DEFUN([PHP_BUILD_BUNDLE],[
+ PHP_BUILD_PROGRAM
+- OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
++ OVERALL_TARGET=libs/libphp[]$PHP_VER[.bundle]
+ php_sapi_module=static
+ ])
+
+@@ -2771,8 +2771,8 @@ AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
+ pdo_cv_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+ pdo_cv_inc_path=$abs_srcdir/ext
+- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+- pdo_cv_inc_path=$prefix/include/php/ext
++ elif test -f $prefix/${PHP_INCDIR}/ext/pdo/php_pdo_driver.h; then
++ pdo_cv_inc_path=$prefix/${PHP_INCDIR}/ext
+ fi
+ ])
+ if test -n "$pdo_cv_inc_path"; then
Home |
Main Index |
Thread Index |
Old Index