CVS commit: pkgsrc/lang/php74

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/php74
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Sat, 8 Feb 2025 02:58:55 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 02:58:55 UTC 2025

Modified Files:
        pkgsrc/lang/php74: MESSAGE Makefile Makefile.common Makefile.php PLIST
            buildlink3.mk distinfo options.mk
        pkgsrc/lang/php74/patches: patch-build_php.m4 patch-configure.ac
            patch-php.ini-development patch-php.ini-production
            patch-sapi_apache2handler_config.m4 patch-sapi_cgi_Makefile.frag
            patch-sapi_fpm_php-fpm.conf.in
Added Files:
        pkgsrc/lang/php74: ALTERNATIVES
        pkgsrc/lang/php74/patches: patch-build_Makefile.global
            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
Removed Files:
        pkgsrc/lang/php74/patches: patch-build_libtool.m4

Log Message:
lang/php74: 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/php74/ALTERNATIVES
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php74/MESSAGE
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php74/Makefile.common \
    pkgsrc/lang/php74/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php74/Makefile.php
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php74/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/php74/buildlink3.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/php74/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php74/patches/patch-build_Makefile.global \
    pkgsrc/lang/php74/patches/patch-sapi_fpm_fpm_fpm__conf.c \
    pkgsrc/lang/php74/patches/patch-sapi_fpm_www.conf.in \
    pkgsrc/lang/php74/patches/patch-scripts_Makefile.frag \
    pkgsrc/lang/php74/patches/patch-scripts_php-config.in \
    pkgsrc/lang/php74/patches/patch-scripts_phpize.in
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/php74/patches/patch-build_libtool.m4
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php74/patches/patch-build_php.m4 \
    pkgsrc/lang/php74/patches/patch-php.ini-development \
    pkgsrc/lang/php74/patches/patch-php.ini-production \
    pkgsrc/lang/php74/patches/patch-sapi_apache2handler_config.m4 \
    pkgsrc/lang/php74/patches/patch-sapi_cgi_Makefile.frag \
    pkgsrc/lang/php74/patches/patch-sapi_fpm_php-fpm.conf.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php74/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/lang/php74/MESSAGE
diff -u pkgsrc/lang/php74/MESSAGE:1.1 pkgsrc/lang/php74/MESSAGE:1.2
--- pkgsrc/lang/php74/MESSAGE:1.1       Sun Dec 15 17:56:34 2019
+++ pkgsrc/lang/php74/MESSAGE   Sat Feb  8 02:58:55 2025
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2019/12/15 17:56:34 taca Exp $
+$NetBSD: MESSAGE,v 1.2 2025/02/08 02:58:55 taca Exp $
 
 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/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.26 pkgsrc/lang/php74/Makefile:1.27
--- pkgsrc/lang/php74/Makefile:1.26     Sun Dec  1 16:13:14 2024
+++ pkgsrc/lang/php74/Makefile  Sat Feb  8 02:58:55 2025
@@ -1,32 +1,33 @@
-# $NetBSD: Makefile,v 1.26 2024/12/01 16:13:14 taca Exp $
+# $NetBSD: Makefile,v 1.27 2025/02/08 02:58:55 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
-PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
-PKGREVISION=           9
+PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
+CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 7.4
 LICENSE=               php
 
 TEST_TARGET=           test
 
-USE_TOOLS+=            autoconf gmake lex
+USE_TOOLS+=            autoconf269 gmake lex
 LIBTOOL_OVERRIDE=      # empty
-PHP_CHECK_INSTALLED=   No
 
-PHP_VERSIONS_ACCEPTED=         74
+PHP_VERSIONS_ACCEPTED= 74
+
+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_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}"
 
 # taken from devel/pkgconf/Makefile
@@ -43,16 +44,8 @@ PHP_PKGCONFIG_PATH=  ${PKGCONFIG_PATHS:ts
 
 REPLACE_PHP=           ext/phar/phar/phar.php run-tests.php
 
-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_VARS.path=       CGIDIR
-SUBST_VARS.path+=      PREFIX
-SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
-
-INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
+INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${PHP_EGDIR} \
+                       ${PHP_SHAREDIR}
 
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
@@ -70,7 +63,7 @@ pre-configure:
 
 post-install:
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
-               ${DESTDIR}${EGDIR}
+               ${DESTDIR}${PREFIX}/${PHP_EGDIR}
 
-.include "../../lang/php/replace.mk"
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/php74/Makefile.common
diff -u pkgsrc/lang/php74/Makefile.common:1.2 pkgsrc/lang/php74/Makefile.common:1.3
--- pkgsrc/lang/php74/Makefile.common:1.2       Sat May  6 14:02:13 2023
+++ pkgsrc/lang/php74/Makefile.common   Sat Feb  8 02:58:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2023/05/06 14:02:13 taca Exp $
+# $NetBSD: Makefile.common,v 1.3 2025/02/08 02:58:55 taca Exp $
 # used by lang/php74/Makefile.php
 # used by lang/php/ext.mk
 
@@ -11,7 +11,7 @@ MAINTAINER?=          pkgsrc-users%NetBSD.org@localhost
 
 USE_TOOLS+=            pkg-config
 
-# 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"
 
 .if ${OPSYS} == "NetBSD"
Index: pkgsrc/lang/php74/options.mk
diff -u pkgsrc/lang/php74/options.mk:1.2 pkgsrc/lang/php74/options.mk:1.3
--- pkgsrc/lang/php74/options.mk:1.2    Sun Dec 19 05:01:06 2021
+++ pkgsrc/lang/php74/options.mk        Sat Feb  8 02:58:55 2025
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2021/12/19 05:01:06 taca Exp $
+# $NetBSD: options.mk,v 1.3 2025/02/08 02:58:55 taca Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
+PKG_OPTIONS_VAR=       PKG_OPTIONS.php74
 PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2 php-embed
 PKG_SUPPORTED_OPTIONS+=        disable-filter-url
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
@@ -59,16 +59,14 @@ CFLAGS+=            -DDISABLE_FILTER_URL
 
 PLIST_VARS+=   embed
 
-.if !empty(PKGNAME:Mphp-[7-9]*)
-.if !empty(PKG_OPTIONS:Mphp-embed)
+.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/libphp7.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/php74/Makefile.php
diff -u pkgsrc/lang/php74/Makefile.php:1.5 pkgsrc/lang/php74/Makefile.php:1.6
--- pkgsrc/lang/php74/Makefile.php:1.5  Sat Jan  2 10:04:11 2021
+++ pkgsrc/lang/php74/Makefile.php      Sat Feb  8 02:58:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.5 2021/01/02 10:04:11 taca Exp $
+# $NetBSD: Makefile.php,v 1.6 2025/02/08 02:58:55 taca Exp $
 # used by lang/php74/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -24,8 +24,18 @@ PLIST_VARS+=         dtrace
 DISTINFO_FILE= ${.CURDIR}/../../lang/php74/distinfo
 PATCHDIR=      ${.CURDIR}/../../lang/php74/patches
 
+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}
 
@@ -46,8 +56,22 @@ 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 sapi/fpm/www.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
+SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
+
 .include "../../textproc/libxml2/buildlink3.mk"
 
 #CONFIGURE_ARGS+=      --with-pcre-regex=${BUILDLINK_PREFIX.pcre2}

Index: pkgsrc/lang/php74/PLIST
diff -u pkgsrc/lang/php74/PLIST:1.3 pkgsrc/lang/php74/PLIST:1.4
--- pkgsrc/lang/php74/PLIST:1.3 Fri Nov 20 15:13:31 2020
+++ pkgsrc/lang/php74/PLIST     Sat Feb  8 02:58:55 2025
@@ -1,283 +1,283 @@
-@comment $NetBSD: PLIST,v 1.3 2020/11/20 15:13:31 otis Exp $
-bin/phar
-bin/phar.phar
-bin/php
-bin/php-config
-bin/phpdbg
-bin/phpize
-include/php/TSRM/TSRM.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_alloc_sizes.h
-include/php/Zend/zend_arena.h
-include/php/Zend/zend_ast.h
-include/php/Zend/zend_bitset.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.w32.h
-include/php/Zend/zend_constants.h
-include/php/Zend/zend_cpuinfo.h
-include/php/Zend/zend_dtrace.h
-${PLIST.dtrace}include/php/Zend/zend_dtrace_gen.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_inheritance.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_long.h
-include/php/Zend/zend_map_ptr.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_portability.h
-include/php/Zend/zend_ptr_stack.h
-include/php/Zend/zend_range_check.h
-include/php/Zend/zend_signal.h
-include/php/Zend/zend_smart_str.h
-include/php/Zend/zend_smart_str_public.h
-include/php/Zend/zend_smart_string.h
-include/php/Zend/zend_smart_string_public.h
-include/php/Zend/zend_sort.h
-include/php/Zend/zend_stack.h
-include/php/Zend/zend_stream.h
-include/php/Zend/zend_string.h
-include/php/Zend/zend_strtod.h
-include/php/Zend/zend_strtod_int.h
-include/php/Zend/zend_ts_hash.h
-include/php/Zend/zend_type_info.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_handlers.h
-include/php/Zend/zend_vm_opcodes.h
-include/php/Zend/zend_vm_trace_handlers.h
-include/php/Zend/zend_vm_trace_map.h
-include/php/Zend/zend_weakrefs.h
-include/php/ext/date/lib/timelib.h
-include/php/ext/date/lib/timelib_config.h
-include/php/ext/date/php_date.h
-include/php/ext/dom/xml_common.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_sha3.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_auth.h
-include/php/ext/mysqlnd/mysqlnd_block_alloc.h
-include/php/ext/mysqlnd/mysqlnd_charset.h
-include/php/ext/mysqlnd/mysqlnd_commands.h
-include/php/ext/mysqlnd/mysqlnd_connection.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_plugin.h
-include/php/ext/mysqlnd/mysqlnd_portability.h
-include/php/ext/mysqlnd/mysqlnd_priv.h
-include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
-include/php/ext/mysqlnd/mysqlnd_ps.h
-include/php/ext/mysqlnd/mysqlnd_read_buffer.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_vio.h
-include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
-include/php/ext/mysqlnd/php_mysqlnd.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/hrtime.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_mt_rand.h
-include/php/ext/standard/php_net.h
-include/php/ext/standard/php_password.h
-include/php/ext/standard/php_rand.h
-include/php/ext/standard/php_random.h
-include/php/ext/standard/php_smart_string.h
-include/php/ext/standard/php_smart_string_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/fastcgi.h
-include/php/main/fopen_wrappers.h
-include/php/main/http_status_codes.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/sapi/cli/cli.h
-${PLIST.embed}include/php/sapi/embed/php_embed.h
-${PLIST.embed}lib/libphp7.so
-lib/php/build/Makefile.global
-lib/php/build/ax_check_compile_flag.m4
-lib/php/build/ax_gcc_func_attribute.m4
-lib/php/build/config.guess
-lib/php/build/config.sub
-lib/php/build/libtool.m4
-lib/php/build/ltmain.sh
-lib/php/build/php.m4
-lib/php/build/php_cxx_compile_stdcxx.m4
-lib/php/build/phpize.m4
-lib/php/build/pkg.m4
-lib/php/build/run-tests.php
-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/phpdbg.1
-man/man1/phpize.1
-share/examples/php/php.ini-development
-share/examples/php/php.ini-production
+@comment $NetBSD: PLIST,v 1.4 2025/02/08 02:58:55 taca Exp $
+bin/phar${PHP_VER}
+bin/phar${PHP_VER}.phar
+bin/php-config${PHP_VER}
+bin/php${PHP_VER}
+bin/phpdbg${PHP_VER}
+bin/phpize${PHP_VER}
+${PHP_INCDIR}/TSRM/TSRM.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_alloc_sizes.h
+${PHP_INCDIR}/Zend/zend_arena.h
+${PHP_INCDIR}/Zend/zend_ast.h
+${PHP_INCDIR}/Zend/zend_bitset.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.w32.h
+${PHP_INCDIR}/Zend/zend_constants.h
+${PHP_INCDIR}/Zend/zend_cpuinfo.h
+${PHP_INCDIR}/Zend/zend_dtrace.h
+${PLIST.dtrace}${PHP_INCDIR}/Zend/zend_dtrace_gen.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_inheritance.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_long.h
+${PHP_INCDIR}/Zend/zend_map_ptr.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_portability.h
+${PHP_INCDIR}/Zend/zend_ptr_stack.h
+${PHP_INCDIR}/Zend/zend_range_check.h
+${PHP_INCDIR}/Zend/zend_signal.h
+${PHP_INCDIR}/Zend/zend_smart_str.h
+${PHP_INCDIR}/Zend/zend_smart_str_public.h
+${PHP_INCDIR}/Zend/zend_smart_string.h
+${PHP_INCDIR}/Zend/zend_smart_string_public.h
+${PHP_INCDIR}/Zend/zend_sort.h
+${PHP_INCDIR}/Zend/zend_stack.h
+${PHP_INCDIR}/Zend/zend_stream.h
+${PHP_INCDIR}/Zend/zend_string.h
+${PHP_INCDIR}/Zend/zend_strtod.h
+${PHP_INCDIR}/Zend/zend_strtod_int.h
+${PHP_INCDIR}/Zend/zend_ts_hash.h
+${PHP_INCDIR}/Zend/zend_type_info.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_handlers.h
+${PHP_INCDIR}/Zend/zend_vm_opcodes.h
+${PHP_INCDIR}/Zend/zend_vm_trace_handlers.h
+${PHP_INCDIR}/Zend/zend_vm_trace_map.h
+${PHP_INCDIR}/Zend/zend_weakrefs.h
+${PHP_INCDIR}/ext/date/lib/timelib.h
+${PHP_INCDIR}/ext/date/lib/timelib_config.h
+${PHP_INCDIR}/ext/date/php_date.h
+${PHP_INCDIR}/ext/dom/xml_common.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_sha3.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_auth.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_block_alloc.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_charset.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_commands.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_connection.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_plugin.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_portability.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_priv.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_ps.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_read_buffer.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_vio.h
+${PHP_INCDIR}/ext/mysqlnd/mysqlnd_wireprotocol.h
+${PHP_INCDIR}/ext/mysqlnd/php_mysqlnd.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/hrtime.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_mt_rand.h
+${PHP_INCDIR}/ext/standard/php_net.h
+${PHP_INCDIR}/ext/standard/php_password.h
+${PHP_INCDIR}/ext/standard/php_rand.h
+${PHP_INCDIR}/ext/standard/php_random.h
+${PHP_INCDIR}/ext/standard/php_smart_string.h
+${PHP_INCDIR}/ext/standard/php_smart_string_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/fastcgi.h
+${PHP_INCDIR}/main/fopen_wrappers.h
+${PHP_INCDIR}/main/http_status_codes.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}/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/ax_check_compile_flag.m4
+${PHP_LIBDIR}/build/ax_gcc_func_attribute.m4
+${PHP_LIBDIR}/build/config.guess
+${PHP_LIBDIR}/build/config.sub
+${PHP_LIBDIR}/build/libtool.m4
+${PHP_LIBDIR}/build/ltmain.sh
+${PHP_LIBDIR}/build/php.m4
+${PHP_LIBDIR}/build/php_cxx_compile_stdcxx.m4
+${PHP_LIBDIR}/build/phpize.m4
+${PHP_LIBDIR}/build/pkg.m4
+${PHP_LIBDIR}/build/run-tests.php
+${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/phpdbg${PHP_VER}.1
+man/man1/phpize${PHP_VER}.1
+${PHP_EGDIR}/php.ini-development
+${PHP_EGDIR}/php.ini-production
 @pkgdir ${PHPEXTDIR}

Index: pkgsrc/lang/php74/buildlink3.mk
diff -u pkgsrc/lang/php74/buildlink3.mk:1.13 pkgsrc/lang/php74/buildlink3.mk:1.14
--- pkgsrc/lang/php74/buildlink3.mk:1.13        Thu Nov 14 22:20:30 2024
+++ pkgsrc/lang/php74/buildlink3.mk     Sat Feb  8 02:58:55 2025
@@ -1,18 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.13 2024/11/14 22:20:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2025/02/08 02:58:55 taca Exp $
 
-BUILDLINK_TREE+=       php
+BUILDLINK_TREE+=       php74
 
-.if !defined(PHP_BUILDLINK3_MK)
-PHP_BUILDLINK3_MK:=
+.if !defined(PHP74_BUILDLINK3_MK)
+PHP74_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.php+=    php>=7.4.0<7.5
-BUILDLINK_ABI_DEPENDS.php+=    php>=7.4.33nb8
-BUILDLINK_PKGSRCDIR.php?=      ../../lang/php74
+BUILDLINK_API_DEPENDS.php74+=  php${PHP_VER}>=7.4.0<7.5
+BUILDLINK_ABI_DEPENDS.php74+=  php${PHP_VER}>=7.4.33
+BUILDLINK_PKGSRCDIR.php74?=    ../../lang/php74
+BUILDLINK_INCDIRS.php74+=      ${PHP_INCDIR}
 
-pkgbase := php
+pkgbase := php74
 .include "../../mk/pkg-build-options.mk"
 
 .include "../../textproc/libxml2/buildlink3.mk"
-.endif # PHP_BUILDLINK3_MK
+.endif # PHP74_BUILDLINK3_MK
 
-BUILDLINK_TREE+=       -php
+BUILDLINK_TREE+=       -php74

Index: pkgsrc/lang/php74/distinfo
diff -u pkgsrc/lang/php74/distinfo:1.41 pkgsrc/lang/php74/distinfo:1.42
--- pkgsrc/lang/php74/distinfo:1.41     Sun Dec  1 16:13:14 2024
+++ pkgsrc/lang/php74/distinfo  Sat Feb  8 02:58:55 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.41 2024/12/01 16:13:14 taca Exp $
+$NetBSD: distinfo,v 1.42 2025/02/08 02:58:55 taca Exp $
 
 BLAKE2s (php-7.4.33.tar.xz) = 11ec78e0a566d33168e9867e60796f25b8edc4efa03868929251a6297021e79d
 SHA512 (php-7.4.33.tar.xz) = 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 Size (php-7.4.33.tar.xz) = 10420144 bytes
-SHA1 (patch-build_libtool.m4) = 3656eb516fb14defd4b0964fe21e117c630be856
-SHA1 (patch-build_php.m4) = ade566ac591442ed81a7e95f0c5c679cb148f8e5
-SHA1 (patch-configure.ac) = 1be1a9d15b1c4b602c1c21025e2eea1d09e511a8
+SHA1 (patch-build_Makefile.global) = 9776c936b982042d6a06c7a3e43c547fefb13c39
+SHA1 (patch-build_php.m4) = b134d33cd47dae37be011bb8dd0c0f2a6efe2a78
+SHA1 (patch-configure.ac) = 6c6158fdaddcf5b27c3967ff8e8a65b8d2fc4efd
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = b0ded220ffa42b77228d66696f00212caf37b4aa
 SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530
@@ -17,10 +17,15 @@ SHA1 (patch-ext_openssl_openssl.c) = bbd
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
-SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462
-SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
-SHA1 (patch-sapi_apache2handler_config.m4) = fe5699f21f10459200b75f5150b095bae693945d
-SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
+SHA1 (patch-php.ini-development) = 6dfedc2283b7efa9d47838a1bc57716f87557b22
+SHA1 (patch-php.ini-production) = 56dd18dc2e921765c25de26b6474d740bbf5f87c
+SHA1 (patch-sapi_apache2handler_config.m4) = 398b774f93044cac9f6cf15599c8b9eef1c97cf8
+SHA1 (patch-sapi_cgi_Makefile.frag) = e997903c360a4634285f9301bc58dd93152e5beb
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
 SHA1 (patch-sapi_fpm_fpm_events_port.c) = 9acd2a5eedb19d0d002e7dcbd705c84be91695fa
-SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0
+SHA1 (patch-sapi_fpm_fpm_fpm__conf.c) = 6bf5b3b1623a8872d410bed138e93b211367257c
+SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c0383bf78b7a153d9fddf135bacb44e879c6288
+SHA1 (patch-sapi_fpm_www.conf.in) = 73b928989c121ec309ee0b6667187ee40a0e1c5f
+SHA1 (patch-scripts_Makefile.frag) = 197a59b72c2344f9ea2d45bede7f737f8e0ab51d
+SHA1 (patch-scripts_php-config.in) = b82d62a4d5b2f55ecf9b1a7e3b93a265087f86c4
+SHA1 (patch-scripts_phpize.in) = bce4ca831a17ac3432db9ac62813d1a26850732b

Index: pkgsrc/lang/php74/patches/patch-build_php.m4
diff -u pkgsrc/lang/php74/patches/patch-build_php.m4:1.1 pkgsrc/lang/php74/patches/patch-build_php.m4:1.2
--- pkgsrc/lang/php74/patches/patch-build_php.m4:1.1    Sun Dec  1 16:13:14 2024
+++ pkgsrc/lang/php74/patches/patch-build_php.m4        Sat Feb  8 02:58:55 2025
@@ -1,9 +1,37 @@
-$NetBSD: patch-build_php.m4,v 1.1 2024/12/01 16:13:14 taca Exp $
+$NetBSD: patch-build_php.m4,v 1.2 2025/02/08 02:58:55 taca Exp $
 
+* Adjust PHP library name.
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 
 --- build/php.m4.orig  2022-10-31 10:36:05.000000000 +0000
 +++ build/php.m4
+@@ -768,7 +768,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
+@@ -785,7 +785,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
+ ])
+ 
+@@ -794,7 +794,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
+ ])
+ 
 @@ -2151,6 +2151,10 @@ EOF
     else
      break
Index: pkgsrc/lang/php74/patches/patch-php.ini-development
diff -u pkgsrc/lang/php74/patches/patch-php.ini-development:1.1 pkgsrc/lang/php74/patches/patch-php.ini-development:1.2
--- pkgsrc/lang/php74/patches/patch-php.ini-development:1.1     Sun Dec 15 17:56:34 2019
+++ pkgsrc/lang/php74/patches/patch-php.ini-development Sat Feb  8 02:58:55 2025
@@ -1,19 +1,19 @@
-$NetBSD: patch-php.ini-development,v 1.1 2019/12/15 17:56:34 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.2 2025/02/08 02:58:55 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-development.orig   2018-12-04 16:12:20.000000000 +0000
+--- php.ini-development.orig   2022-10-31 10:36:05.000000000 +0000
 +++ php.ini-development
-@@ -722,7 +722,7 @@ default_charset = "UTF-8"
+@@ -733,7 +733,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php"
++include_path = ".:@PREFIX@/lib/php@PHP_VER@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -743,7 +743,8 @@ doc_root =
+@@ -754,7 +754,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -23,7 +23,7 @@ Set proper default configuration values.
  ; http://php.net/extension-dir
  ;extension_dir = "./"
  ; On windows:
-@@ -828,7 +829,7 @@ file_uploads = On
+@@ -839,7 +840,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir
Index: pkgsrc/lang/php74/patches/patch-php.ini-production
diff -u pkgsrc/lang/php74/patches/patch-php.ini-production:1.1 pkgsrc/lang/php74/patches/patch-php.ini-production:1.2
--- pkgsrc/lang/php74/patches/patch-php.ini-production:1.1      Sun Dec 15 17:56:34 2019
+++ pkgsrc/lang/php74/patches/patch-php.ini-production  Sat Feb  8 02:58:55 2025
@@ -1,19 +1,19 @@
-$NetBSD: patch-php.ini-production,v 1.1 2019/12/15 17:56:34 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.2 2025/02/08 02:58:55 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-production.orig    2018-12-04 16:12:20.000000000 +0000
+--- php.ini-production.orig    2022-10-31 10:36:05.000000000 +0000
 +++ php.ini-production
-@@ -729,7 +729,7 @@ default_charset = "UTF-8"
+@@ -733,7 +733,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php"
++include_path = ".:@PREFIX@/lib/php@PHP_VER@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -750,7 +750,8 @@ doc_root =
+@@ -754,7 +754,8 @@ doc_root =
  ; http://php.net/user-dir
  user_dir =
  
@@ -23,7 +23,7 @@ Set proper default configuration values.
  ; http://php.net/extension-dir
  ;extension_dir = "./"
  ; On windows:
-@@ -835,7 +836,7 @@ file_uploads = On
+@@ -839,7 +840,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; http://php.net/upload-tmp-dir
Index: pkgsrc/lang/php74/patches/patch-sapi_apache2handler_config.m4
diff -u pkgsrc/lang/php74/patches/patch-sapi_apache2handler_config.m4:1.1 pkgsrc/lang/php74/patches/patch-sapi_apache2handler_config.m4:1.2
--- pkgsrc/lang/php74/patches/patch-sapi_apache2handler_config.m4:1.1   Tue Jul 23 09:18:17 2024
+++ pkgsrc/lang/php74/patches/patch-sapi_apache2handler_config.m4       Sat Feb  8 02:58:55 2025
@@ -1,9 +1,36 @@
-$NetBSD: patch-sapi_apache2handler_config.m4,v 1.1 2024/07/23 09:18:17 jperkin Exp $
+$NetBSD: patch-sapi_apache2handler_config.m4,v 1.2 2025/02/08 02:58:55 taca Exp $
 
 * Don't autodetect maintainer-zts.
+* Adjust PHP library name.
 
---- sapi/apache2handler/config.m4.orig 2024-07-23 08:43:06.845104420 +0000
+--- sapi/apache2handler/config.m4.orig 2022-10-31 10:36:05.000000000 +0000
 +++ sapi/apache2handler/config.m4
+@@ -67,14 +67,14 @@ if test "$PHP_APXS2" != "no"; then
+   if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+-                       -i -n php7"
++                       -i -n php$PHP_VER"
+   else
+     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+-                       -i -a -n php7"
++                       -i -a -n php$PHP_VER"
+   fi
+ 
+   case $host_alias in
+@@ -96,7 +96,7 @@ if test "$PHP_APXS2" != "no"; then
+     MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
+     PHP_SUBST(MH_BUNDLE_FLAGS)
+     PHP_SELECT_SAPI(apache2handler, bundle, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
+-    SAPI_SHARED=libs/libphp7.so
++    SAPI_SHARED=libs/libphp$PHP_VER.so
+     INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
+     ;;
+   *)
 @@ -105,17 +105,6 @@ if test "$PHP_APXS2" != "no"; then
      ;;
    esac
Index: pkgsrc/lang/php74/patches/patch-sapi_cgi_Makefile.frag
diff -u pkgsrc/lang/php74/patches/patch-sapi_cgi_Makefile.frag:1.1 pkgsrc/lang/php74/patches/patch-sapi_cgi_Makefile.frag:1.2
--- pkgsrc/lang/php74/patches/patch-sapi_cgi_Makefile.frag:1.1  Sun Dec 15 17:56:34 2019
+++ pkgsrc/lang/php74/patches/patch-sapi_cgi_Makefile.frag      Sat Feb  8 02:58:55 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1 2019/12/15 17:56:34 taca Exp $
+$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.2 2025/02/08 02:58:55 taca Exp $
 
-Install to CGI directory.
+* Install php-cgi to ${PREFIX}/${CGIDIR}.
 
 --- sapi/cgi/Makefile.frag.orig        2015-06-23 17:33:33.000000000 +0000
 +++ sapi/cgi/Makefile.frag
Index: pkgsrc/lang/php74/patches/patch-sapi_fpm_php-fpm.conf.in
diff -u pkgsrc/lang/php74/patches/patch-sapi_fpm_php-fpm.conf.in:1.1 pkgsrc/lang/php74/patches/patch-sapi_fpm_php-fpm.conf.in:1.2
--- pkgsrc/lang/php74/patches/patch-sapi_fpm_php-fpm.conf.in:1.1        Sun Dec 15 17:56:34 2019
+++ pkgsrc/lang/php74/patches/patch-sapi_fpm_php-fpm.conf.in    Sat Feb  8 02:58:55 2025
@@ -1,15 +1,23 @@
-$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.1 2019/12/15 17:56:34 taca Exp $
+$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.2 2025/02/08 02:58:55 taca Exp $
 
 Set proper default configuration values.
 
---- sapi/fpm/php-fpm.conf.in.orig      2015-06-23 17:33:33.000000000 +0000
+--- sapi/fpm/php-fpm.conf.in.orig      2022-10-31 10:36:05.000000000 +0000
 +++ sapi/fpm/php-fpm.conf.in
-@@ -14,7 +14,7 @@
+@@ -14,14 +14,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
+ ; into 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

Index: pkgsrc/lang/php74/patches/patch-configure.ac
diff -u pkgsrc/lang/php74/patches/patch-configure.ac:1.2 pkgsrc/lang/php74/patches/patch-configure.ac:1.3
--- pkgsrc/lang/php74/patches/patch-configure.ac:1.2    Sun Dec  1 16:13:14 2024
+++ pkgsrc/lang/php74/patches/patch-configure.ac        Sat Feb  8 02:58:55 2025
@@ -1,10 +1,27 @@
-$NetBSD: patch-configure.ac,v 1.2 2024/12/01 16:13:14 taca Exp $
+$NetBSD: patch-configure.ac,v 1.3 2025/02/08 02:58:55 taca Exp $
 
+* Adjust PHP directories.
+* Adjust PHP library name.
 * Don't automatically add libgcc on SunOS. Reported upstream as #75941.
 
---- configure.ac.orig  2024-07-23 08:44:26.300593600 +0000
+--- configure.ac.orig  2022-10-31 10:36:04.000000000 +0000
 +++ configure.ac
-@@ -264,9 +264,6 @@ AX_CHECK_COMPILE_FLAG([-fvisibility=hidd
+@@ -117,12 +117,14 @@ PHP_RELEASE_VERSION=[$]3
+ PHP_EXTRA_VERSION=[$]4
+ PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
+ PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
++PHP_VER=[$]1[$]2
+ 
+ dnl Allow version values to be used in Makefile.
+ PHP_SUBST(PHP_MAJOR_VERSION)
+ PHP_SUBST(PHP_MINOR_VERSION)
+ PHP_SUBST(PHP_RELEASE_VERSION)
+ PHP_SUBST(PHP_EXTRA_VERSION)
++PHP_SUBST(PHP_VER)
+ 
+ dnl Define where extension directories are located in the configure context.
+ AC_DEFUN([PHP_EXT_BUILDDIR],[$config_m4_dir])dnl
+@@ -264,9 +266,6 @@ AX_CHECK_COMPILE_FLAG([-fvisibility=hidd
  case $host_alias in
    *solaris*)
      CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
@@ -14,3 +31,57 @@ $NetBSD: patch-configure.ac,v 1.2 2024/1
      ;;
    *dgux*)
      CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
+@@ -323,9 +322,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_VERS[.la]
+ 
+ PHP_CONFIGURE_PART(Configuring SAPI modules)
+ 
+@@ -1212,12 +1211,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
+ 
+@@ -1267,7 +1266,7 @@ case $PHP_LAYOUT in
+     datarootdir=$prefix/share
+     ;;
+   *)
+-    datarootdir=$prefix/php
++    datarootdir=$prefix/${PHP_SHAREDIR}
+     ;;
+ esac
+ 
+@@ -1394,6 +1393,7 @@ PHP_SUBST(PHP_RPATHS)
+ PHP_SUBST(PHP_SAPI)
+ PHP_SUBST_OLD(PHP_VERSION)
+ PHP_SUBST_OLD(PHP_VERSION_ID)
++PHP_SUBST_OLD(PHP_VER)
+ PHP_SUBST(SHELL)
+ PHP_SUBST(SHARED_LIBTOOL)
+ PHP_SUBST(PHP_FRAMEWORKS)
+@@ -1469,7 +1469,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, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ 

Added files:

Index: pkgsrc/lang/php74/ALTERNATIVES
diff -u /dev/null pkgsrc/lang/php74/ALTERNATIVES:1.1
--- /dev/null   Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/ALTERNATIVES      Sat Feb  8 02:58:54 2025
@@ -0,0 +1,6 @@
+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/phpdbg @PREFIX@/bin/phpdbg@PHP_VER@
+bin/phpize @PREFIX@/bin/phpize@PHP_VER@

Index: pkgsrc/lang/php74/patches/patch-build_Makefile.global
diff -u /dev/null pkgsrc/lang/php74/patches/patch-build_Makefile.global:1.1
--- /dev/null   Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-build_Makefile.global       Sat Feb  8 02:58:55 2025
@@ -0,0 +1,53 @@
+$NetBSD: patch-build_Makefile.global,v 1.1 2025/02/08 02:58:55 taca Exp $
+
+* Adjust PHP library name.
+
+--- build/Makefile.global.orig 2022-10-31 10:36:05.000000000 +0000
++++ build/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,7 +115,7 @@ 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_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
++      rm -f libphp$(PHP_VER).la $(SAPI_CLI_PATH) $(SAPI_CGI_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 
Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
+@@ -137,7 +137,7 @@ prof-clean:
+       find . -name \*.lo -o -name \*.o | xargs rm -f
+       find . -name \*.la -o -name \*.a | xargs rm -f
+       find . -name \*.so | xargs rm -f
+-      rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
++      rm -f libphp$(PHP_VER).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+ 
+ prof-use:
+       CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all
Index: pkgsrc/lang/php74/patches/patch-sapi_fpm_fpm_fpm__conf.c
diff -u /dev/null pkgsrc/lang/php74/patches/patch-sapi_fpm_fpm_fpm__conf.c:1.1
--- /dev/null   Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-sapi_fpm_fpm_fpm__conf.c    Sat Feb  8 02:58:55 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-sapi_fpm_fpm_fpm__conf.c,v 1.1 2025/02/08 02:58:55 taca Exp $
+
+Set proper default configuration values with PHP version.
+
+--- sapi/fpm/fpm/fpm_conf.c.orig       2022-10-31 10:36:05.000000000 +0000
++++ sapi/fpm/fpm/fpm_conf.c
+@@ -1212,7 +1212,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/php74/patches/patch-sapi_fpm_www.conf.in
diff -u /dev/null pkgsrc/lang/php74/patches/patch-sapi_fpm_www.conf.in:1.1
--- /dev/null   Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-sapi_fpm_www.conf.in        Sat Feb  8 02:58:55 2025
@@ -0,0 +1,46 @@
+$NetBSD: patch-sapi_fpm_www.conf.in,v 1.1 2025/02/08 02:58:55 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  2022-10-31 10:36:05.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)
+@@ -46,8 +47,8 @@ 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
+@@ -257,7 +258,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
+@@ -321,7 +322,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/php74/patches/patch-scripts_Makefile.frag
diff -u /dev/null pkgsrc/lang/php74/patches/patch-scripts_Makefile.frag:1.1
--- /dev/null   Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-scripts_Makefile.frag       Sat Feb  8 02:58:55 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-scripts_Makefile.frag,v 1.1 2025/02/08 02:58:55 taca Exp $
+
+* Adjust PHP directories.
+
+--- scripts/Makefile.frag.orig 2022-10-31 10:36:05.000000000 +0000
++++ scripts/Makefile.frag
+@@ -2,8 +2,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/php74/patches/patch-scripts_php-config.in
diff -u /dev/null pkgsrc/lang/php74/patches/patch-scripts_php-config.in:1.1
--- /dev/null   Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-scripts_php-config.in       Sat Feb  8 02:58:55 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_php-config.in,v 1.1 2025/02/08 02:58:55 taca Exp $
+
+* Adjust PHP directories.
+
+--- scripts/php-config.in.orig 2022-10-31 10:36:05.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/php74/patches/patch-scripts_phpize.in
diff -u /dev/null pkgsrc/lang/php74/patches/patch-scripts_phpize.in:1.1
--- /dev/null   Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-scripts_phpize.in   Sat Feb  8 02:58:55 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-scripts_phpize.in,v 1.1 2025/02/08 02:58:55 taca Exp $
+
+* Adjust PHP directories.
+
+--- scripts/phpize.in.orig     2022-10-31 10:36:05.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@"
+

Prev by Date: CVS commit: pkgsrc/lang/php56
Next by Date: CVS commit: pkgsrc/lang/php81
Previous by Thread: CVS commit: pkgsrc/lang/php56
Next by Thread: CVS commit: pkgsrc/lang/php81
Indexes:

Home | Main Index | Thread Index | Old Index