From 6f8c1894b88221618185b5ed9c2076a28dd76cfd Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 21 Nov 2024 18:24:06 +0000 Subject: [PATCH] drop php 8.1 and associated pecl81-*, set @pkgpath to merge into php/8.2 --- archivers/Makefile | 1 - archivers/pecl-lzf/Makefile | 2 +- archivers/pecl-lzf/pkg/PLIST | 1 + databases/Makefile | 1 - databases/pecl-redis/Makefile | 1 + databases/pecl-redis/pkg/PLIST | 1 + devel/Makefile | 1 - devel/pecl-xdebug/Makefile | 4 +- devel/pecl-xdebug/pkg/PLIST | 1 + graphics/Makefile | 1 - graphics/pecl-imagick/Makefile | 2 +- graphics/pecl-imagick/pkg/PLIST | 1 + lang/php/8.1/Makefile | 7 - lang/php/8.1/distinfo | 2 - ...patch-Zend_asm_jump_sparc64_sysv_elf_gas_S | 55 --- .../patch-Zend_asm_make_mips64_n64_elf_gas_S | 13 - ...patch-Zend_asm_make_sparc64_sysv_elf_gas_S | 73 ---- lang/php/8.1/patches/patch-build_php_m4 | 33 -- lang/php/8.1/patches/patch-configure_ac | 48 --- lang/php/8.1/patches/patch-ext_imap_config_m4 | 22 - .../php/8.1/patches/patch-ext_imap_php_imap_c | 30 -- lang/php/8.1/patches/patch-ext_intl_config_m4 | 31 -- .../8.1/patches/patch-ext_mysqlnd_config9_m4 | 11 - .../8.1/patches/patch-ext_openssl_openssl_c | 16 - .../8.1/patches/patch-ext_standard_crc32_c | 14 - lang/php/8.1/patches/patch-main_php_h | 13 - lang/php/8.1/patches/patch-main_php_ini_c | 12 - .../php/8.1/patches/patch-php_ini-development | 42 -- lang/php/8.1/patches/patch-php_ini-production | 51 --- .../php/8.1/patches/patch-sapi_cgi_cgi_main_c | 25 -- .../patches/patch-sapi_fpm_fpm_fpm_atomic_h | 70 ---- .../8.1/patches/patch-sapi_fpm_www_conf_in | 35 -- .../8.1/patches/patch-scripts_Makefile_frag | 14 - .../8.1/patches/patch-scripts_php-config_in | 31 -- lang/php/8.1/patches/patch-scripts_phpize_in | 18 - lang/php/8.1/pkg/PLIST-apache | 15 - lang/php/8.1/pkg/PLIST-bz2 | 13 - lang/php/8.1/pkg/PLIST-cgi | 12 - lang/php/8.1/pkg/PLIST-curl | 16 - lang/php/8.1/pkg/PLIST-dba | 13 - lang/php/8.1/pkg/PLIST-dbg | 12 - lang/php/8.1/pkg/PLIST-embed | 8 - lang/php/8.1/pkg/PLIST-enchant | 10 - lang/php/8.1/pkg/PLIST-gd | 18 - lang/php/8.1/pkg/PLIST-gmp | 15 - lang/php/8.1/pkg/PLIST-imap | 15 - lang/php/8.1/pkg/PLIST-intl | 13 - lang/php/8.1/pkg/PLIST-ldap | 13 - lang/php/8.1/pkg/PLIST-main | 393 ------------------ lang/php/8.1/pkg/PLIST-mysqli | 16 - lang/php/8.1/pkg/PLIST-odbc | 13 - lang/php/8.1/pkg/PLIST-pcntl | 13 - lang/php/8.1/pkg/PLIST-pdo_dblib | 13 - lang/php/8.1/pkg/PLIST-pdo_mysql | 13 - lang/php/8.1/pkg/PLIST-pdo_odbc | 13 - lang/php/8.1/pkg/PLIST-pdo_pgsql | 13 - lang/php/8.1/pkg/PLIST-pdo_sqlite | 13 - lang/php/8.1/pkg/PLIST-pgsql | 13 - lang/php/8.1/pkg/PLIST-pspell | 13 - lang/php/8.1/pkg/PLIST-shmop | 13 - lang/php/8.1/pkg/PLIST-snmp | 13 - lang/php/8.1/pkg/PLIST-soap | 13 - lang/php/8.1/pkg/PLIST-sqlite3 | 13 - lang/php/8.1/pkg/PLIST-tidy | 13 - lang/php/8.1/pkg/PLIST-xsl | 13 - lang/php/8.1/pkg/PLIST-zip | 13 - lang/php/8.1/pkg/php81_fpm.rc | 10 - lang/php/8.2/Makefile | 3 + lang/php/8.2/pkg/PLIST-apache | 8 + lang/php/8.2/pkg/PLIST-bz2 | 8 + lang/php/8.2/pkg/PLIST-cgi | 8 + lang/php/8.2/pkg/PLIST-curl | 8 + lang/php/8.2/pkg/PLIST-dba | 8 + lang/php/8.2/pkg/PLIST-dbg | 8 + lang/php/8.2/pkg/PLIST-embed | 3 + lang/php/8.2/pkg/PLIST-enchant | 5 + lang/php/8.2/pkg/PLIST-gd | 8 + lang/php/8.2/pkg/PLIST-gmp | 8 + lang/php/8.2/pkg/PLIST-imap | 8 + lang/php/8.2/pkg/PLIST-intl | 8 + lang/php/8.2/pkg/PLIST-ldap | 8 + lang/php/8.2/pkg/PLIST-main | 5 + lang/php/8.2/pkg/PLIST-mysqli | 8 + lang/php/8.2/pkg/PLIST-odbc | 8 + lang/php/8.2/pkg/PLIST-pcntl | 8 + lang/php/8.2/pkg/PLIST-pdo_dblib | 8 + lang/php/8.2/pkg/PLIST-pdo_mysql | 8 + lang/php/8.2/pkg/PLIST-pdo_odbc | 8 + lang/php/8.2/pkg/PLIST-pdo_pgsql | 8 + lang/php/8.2/pkg/PLIST-pdo_sqlite | 8 + lang/php/8.2/pkg/PLIST-pgsql | 8 + lang/php/8.2/pkg/PLIST-pspell | 8 + lang/php/8.2/pkg/PLIST-shmop | 8 + lang/php/8.2/pkg/PLIST-snmp | 8 + lang/php/8.2/pkg/PLIST-soap | 8 + lang/php/8.2/pkg/PLIST-sqlite3 | 8 + lang/php/8.2/pkg/PLIST-tidy | 8 + lang/php/8.2/pkg/PLIST-xsl | 8 + lang/php/8.2/pkg/PLIST-zip | 8 + lang/php/Makefile | 2 - lang/php/pecl/pecl.port.mk | 3 +- lang/php/php.port.mk | 5 +- mail/Makefile | 1 - mail/pecl-mailparse/Makefile | 1 + mail/pecl-mailparse/pkg/PLIST | 1 + security/Makefile | 1 - security/pecl-mcrypt/Makefile | 4 +- security/pecl-mcrypt/pkg/PLIST | 1 + textproc/Makefile | 1 - textproc/pecl-yaml/Makefile | 1 + textproc/pecl-yaml/pkg/PLIST | 1 + www/Makefile | 4 - www/pecl-memcached/Makefile | 1 + www/pecl-memcached/pkg/PLIST | 1 + www/pecl-pledge/Makefile | 2 +- www/pecl-pledge/pkg/PLIST | 1 + www/pecl-raphf/Makefile | 2 +- www/pecl-raphf/pkg/PLIST | 1 + www/pecl-ssh2/Makefile | 2 +- www/pecl-ssh2/pkg/PLIST | 1 + www/unit/Makefile | 1 - www/unit/unit-php/Makefile | 2 +- 122 files changed, 268 insertions(+), 1495 deletions(-) delete mode 100644 lang/php/8.1/Makefile delete mode 100644 lang/php/8.1/distinfo delete mode 100644 lang/php/8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S delete mode 100644 lang/php/8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S delete mode 100644 lang/php/8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S delete mode 100644 lang/php/8.1/patches/patch-build_php_m4 delete mode 100644 lang/php/8.1/patches/patch-configure_ac delete mode 100644 lang/php/8.1/patches/patch-ext_imap_config_m4 delete mode 100644 lang/php/8.1/patches/patch-ext_imap_php_imap_c delete mode 100644 lang/php/8.1/patches/patch-ext_intl_config_m4 delete mode 100644 lang/php/8.1/patches/patch-ext_mysqlnd_config9_m4 delete mode 100644 lang/php/8.1/patches/patch-ext_openssl_openssl_c delete mode 100644 lang/php/8.1/patches/patch-ext_standard_crc32_c delete mode 100644 lang/php/8.1/patches/patch-main_php_h delete mode 100644 lang/php/8.1/patches/patch-main_php_ini_c delete mode 100644 lang/php/8.1/patches/patch-php_ini-development delete mode 100644 lang/php/8.1/patches/patch-php_ini-production delete mode 100644 lang/php/8.1/patches/patch-sapi_cgi_cgi_main_c delete mode 100644 lang/php/8.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h delete mode 100644 lang/php/8.1/patches/patch-sapi_fpm_www_conf_in delete mode 100644 lang/php/8.1/patches/patch-scripts_Makefile_frag delete mode 100644 lang/php/8.1/patches/patch-scripts_php-config_in delete mode 100644 lang/php/8.1/patches/patch-scripts_phpize_in delete mode 100644 lang/php/8.1/pkg/PLIST-apache delete mode 100644 lang/php/8.1/pkg/PLIST-bz2 delete mode 100644 lang/php/8.1/pkg/PLIST-cgi delete mode 100644 lang/php/8.1/pkg/PLIST-curl delete mode 100644 lang/php/8.1/pkg/PLIST-dba delete mode 100644 lang/php/8.1/pkg/PLIST-dbg delete mode 100644 lang/php/8.1/pkg/PLIST-embed delete mode 100644 lang/php/8.1/pkg/PLIST-enchant delete mode 100644 lang/php/8.1/pkg/PLIST-gd delete mode 100644 lang/php/8.1/pkg/PLIST-gmp delete mode 100644 lang/php/8.1/pkg/PLIST-imap delete mode 100644 lang/php/8.1/pkg/PLIST-intl delete mode 100644 lang/php/8.1/pkg/PLIST-ldap delete mode 100644 lang/php/8.1/pkg/PLIST-main delete mode 100644 lang/php/8.1/pkg/PLIST-mysqli delete mode 100644 lang/php/8.1/pkg/PLIST-odbc delete mode 100644 lang/php/8.1/pkg/PLIST-pcntl delete mode 100644 lang/php/8.1/pkg/PLIST-pdo_dblib delete mode 100644 lang/php/8.1/pkg/PLIST-pdo_mysql delete mode 100644 lang/php/8.1/pkg/PLIST-pdo_odbc delete mode 100644 lang/php/8.1/pkg/PLIST-pdo_pgsql delete mode 100644 lang/php/8.1/pkg/PLIST-pdo_sqlite delete mode 100644 lang/php/8.1/pkg/PLIST-pgsql delete mode 100644 lang/php/8.1/pkg/PLIST-pspell delete mode 100644 lang/php/8.1/pkg/PLIST-shmop delete mode 100644 lang/php/8.1/pkg/PLIST-snmp delete mode 100644 lang/php/8.1/pkg/PLIST-soap delete mode 100644 lang/php/8.1/pkg/PLIST-sqlite3 delete mode 100644 lang/php/8.1/pkg/PLIST-tidy delete mode 100644 lang/php/8.1/pkg/PLIST-xsl delete mode 100644 lang/php/8.1/pkg/PLIST-zip delete mode 100755 lang/php/8.1/pkg/php81_fpm.rc diff --git a/archivers/Makefile b/archivers/Makefile index cc0148de7e6..7e8b5abcf4e 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -53,7 +53,6 @@ SUBDIR += p7zip SUBDIR += par1cmdline SUBDIR += par2cmdline - SUBDIR += pecl-lzf,php81 SUBDIR += pecl-lzf,php82 SUBDIR += pecl-lzf,php83 SUBDIR += pecl-lzf,php84 diff --git a/archivers/pecl-lzf/Makefile b/archivers/pecl-lzf/Makefile index a7790f5161d..6b83662a660 100644 --- a/archivers/pecl-lzf/Makefile +++ b/archivers/pecl-lzf/Makefile @@ -1,7 +1,7 @@ COMMENT = PHP support for LZF de/compression DISTNAME = LZF-1.7.0 -REVISION = 1 +REVISION = 2 CATEGORIES = archivers diff --git a/archivers/pecl-lzf/pkg/PLIST b/archivers/pecl-lzf/pkg/PLIST index a2553b3ed73..ef6b77b0b60 100644 --- a/archivers/pecl-lzf/pkg/PLIST +++ b/archivers/pecl-lzf/pkg/PLIST @@ -7,6 +7,7 @@ ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php72 ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php73 ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php74 ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php80 +${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini diff --git a/databases/Makefile b/databases/Makefile index 0cdc6236939..4ab386e1851 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -134,7 +134,6 @@ SUBDIR += p5-ldap SUBDIR += p5-pgsql SUBDIR += patroni - SUBDIR += pecl-redis,php81 SUBDIR += pecl-redis,php82 SUBDIR += pecl-redis,php83 SUBDIR += pecl-redis,php84 diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile index 82edb44e527..a849ca8fb11 100644 --- a/databases/pecl-redis/Makefile +++ b/databases/pecl-redis/Makefile @@ -1,6 +1,7 @@ COMMENT= PHP interface to redis DISTNAME= redis-6.1.0 +REVISION= 0 CATEGORIES= databases diff --git a/databases/pecl-redis/pkg/PLIST b/databases/pecl-redis/pkg/PLIST index 6d1b0655ee9..951862a92b3 100644 --- a/databases/pecl-redis/pkg/PLIST +++ b/databases/pecl-redis/pkg/PLIST @@ -7,6 +7,7 @@ ${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php72 ${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php73 ${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php74 ${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php80 +${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini diff --git a/devel/Makefile b/devel/Makefile index 0eb261ea6b6..15a5b49ba50 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1317,7 +1317,6 @@ SUBDIR += pcre SUBDIR += pcre++ SUBDIR += pcre2 - SUBDIR += pecl-xdebug,php81 SUBDIR += pecl-xdebug,php82 SUBDIR += pecl-xdebug,php83 #SUBDIR += pecl-xdebug,php84 diff --git a/devel/pecl-xdebug/Makefile b/devel/pecl-xdebug/Makefile index 88255092ccf..d7aa2b59fb1 100644 --- a/devel/pecl-xdebug/Makefile +++ b/devel/pecl-xdebug/Makefile @@ -3,9 +3,9 @@ COMMENT= debug and development tools for PHP GH_ACCOUNT= xdebug GH_PROJECT= xdebug GH_TAGNAME= 3.3.2 -REVISION= 0 +REVISION= 1 -FLAVORS= php81 php82 php83 +FLAVORS= php82 php83 CATEGORIES= devel diff --git a/devel/pecl-xdebug/pkg/PLIST b/devel/pecl-xdebug/pkg/PLIST index b24ab3091d6..ddcd53ac1e9 100644 --- a/devel/pecl-xdebug/pkg/PLIST +++ b/devel/pecl-xdebug/pkg/PLIST @@ -1,4 +1,5 @@ ${MODPECL_DEFAULTV}@pkgpath www/pecl-xdebug,php80 +${MODPECL_DEFAULTV}@pkgpath www/pecl-xdebug,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini diff --git a/graphics/Makefile b/graphics/Makefile index 6249a3bb0b5..36f5e5a1f0b 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -243,7 +243,6 @@ SUBDIR += p5-SVG-Graph SUBDIR += p5-Sane SUBDIR += pdfsandwich - SUBDIR += pecl-imagick,php81 SUBDIR += pecl-imagick,php82 SUBDIR += pecl-imagick,php83 SUBDIR += pecl-imagick,php84 diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index 3569519967a..d01605857a9 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -2,7 +2,7 @@ COMMENT= PHP support for the ImageMagick library DISTNAME= imagick-3.7.0 CATEGORIES= graphics -REVISION= 3 +REVISION= 4 # PHP PERMIT_PACKAGE= Yes diff --git a/graphics/pecl-imagick/pkg/PLIST b/graphics/pecl-imagick/pkg/PLIST index 7211973cf29..097707f935e 100644 --- a/graphics/pecl-imagick/pkg/PLIST +++ b/graphics/pecl-imagick/pkg/PLIST @@ -7,6 +7,7 @@ ${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php72 ${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php73 ${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php74 ${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php80 +${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php81 @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini diff --git a/lang/php/8.1/Makefile b/lang/php/8.1/Makefile deleted file mode 100644 index f4295444712..00000000000 --- a/lang/php/8.1/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -PHP_VERSION= 8.1.31 -PHP_PKGSPEC= >=8.1,<8.2 - -PHP_EXTENSIONS+= -imap -pspell -AUTOCONF_VERSION= 2.72 - -.include diff --git a/lang/php/8.1/distinfo b/lang/php/8.1/distinfo deleted file mode 100644 index 0cfa01c07c7..00000000000 --- a/lang/php/8.1/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (php-8.1.31.tar.xz) = xPJE1GulHHL30T1PZs5qnpqNa2acUb414Bdluljnr8o= -SIZE (php-8.1.31.tar.xz) = 11916684 diff --git a/lang/php/8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S b/lang/php/8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S deleted file mode 100644 index aeea995c724..00000000000 --- a/lang/php/8.1/patches/patch-Zend_asm_jump_sparc64_sysv_elf_gas_S +++ /dev/null @@ -1,55 +0,0 @@ -Index: Zend/asm/jump_sparc64_sysv_elf_gas.S ---- Zend/asm/jump_sparc64_sysv_elf_gas.S.orig -+++ Zend/asm/jump_sparc64_sysv_elf_gas.S -@@ -0,0 +1,51 @@ -+/* -+ Copyright Claudio Jeker 2024 -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/* -+ * typedef struct { -+ * void *handle; -+ * zend_fiber_transfer *transfer; -+ * } boost_context_data; -+ * -+ * boost_context_data jump_fcontext(void *to, zend_fiber_transfer *transfer); -+ */ -+#define FRAMESIZE 176 -+#define BIAS 2047 -+#define SP 128 -+#define I7 136 -+ -+.file "jump_sparc64_sysv_elf_gas.S" -+.text -+.align 4 -+.global jump_fcontext -+.type jump_fcontext, %function -+jump_fcontext: -+ # prepare stack -+ save %sp, -FRAMESIZE, %sp -+ -+ # store framepointer and return address in slots reserved -+ # for arguments -+ stx %fp, [%sp + BIAS + SP] -+ stx %i7, [%sp + BIAS + I7] -+ mov %sp, %o0 -+ # force flush register windows to stack and with that save context -+ flushw -+ # get SP (pointing to new context-data) from %i0 param -+ mov %i0, %sp -+ # load framepointer and return address from context -+ ldx [%sp + BIAS + SP], %fp -+ ldx [%sp + BIAS + I7], %i7 -+ -+ # store old %sp (pointing to old context-data) in %i0 as return -+ # *data stored in %i1 is unmodified -+ mov %o0, %i0 -+ -+ ret -+ restore -+.size jump_fcontext,.-jump_fcontext -+# Mark that we don't need executable stack. -+.section .note.GNU-stack,"",%progbits diff --git a/lang/php/8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S b/lang/php/8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S deleted file mode 100644 index 8be4aa86b53..00000000000 --- a/lang/php/8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S +++ /dev/null @@ -1,13 +0,0 @@ -Avoid an incorrect R_MIPS_CALL16 relocation with a local symbol. - -Index: Zend/asm/make_mips64_n64_elf_gas.S ---- Zend/asm/make_mips64_n64_elf_gas.S.orig -+++ Zend/asm/make_mips64_n64_elf_gas.S -@@ -70,6 +70,7 @@ make_fcontext: - sd $gp, 136($v0) - - # psudo instruction compute abs address of label finish based on GP -+ .local finish - dla $t9, finish - - # save address of finish as return-address for context-function diff --git a/lang/php/8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S b/lang/php/8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S deleted file mode 100644 index 9f0f7b78523..00000000000 --- a/lang/php/8.1/patches/patch-Zend_asm_make_sparc64_sysv_elf_gas_S +++ /dev/null @@ -1,73 +0,0 @@ -Index: Zend/asm/make_sparc64_sysv_elf_gas.S ---- Zend/asm/make_sparc64_sysv_elf_gas.S.orig -+++ Zend/asm/make_sparc64_sysv_elf_gas.S -@@ -0,0 +1,69 @@ -+/* -+ Copyright Claudio Jeker 2024 -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/* -+ * void *make_fcontext(void *sp, size_t size, void (*fn)(boost_context_data)); -+ */ -+#define FRAMESIZE 176 -+#define BIAS 2047 -+#define FP 112 -+#define SP 128 -+#define I7 136 -+ -+.file "make_sparc64_sysv_elf_gas.S" -+.text -+.align 4 -+.global make_fcontext -+.type make_fcontext, %function -+make_fcontext: -+ save %sp, -FRAMESIZE, %sp -+ -+ # shift address in %i0 (allocated stack) to lower 16 byte boundary -+ and %i0, -0xf, %i0 -+ -+ # reserve space for two frames on the stack -+ # the first frame is for the call the second one holds the data -+ # for jump_fcontext -+ sub %i0, 2 * FRAMESIZE, %i0 -+ -+ # third argument of make_fcontext() is the context-function to call -+ # store it in the first stack frame, also clear %fp there to indicate -+ # the end of the stack. -+ stx %i2, [%i0 + FRAMESIZE + I7] -+ stx %g0, [%i0 + FRAMESIZE + FP] -+ -+ # On OpenBSD stackghost prevents overriding the return address on -+ # a stack frame. So this code uses an extra trampoline to load -+ # to call the context-function and then do the _exit(0) dance. -+ # Extract the full address of the trampoline via pc relative addressing -+1: -+ rd %pc, %l0 -+ add %l0, (trampoline - 1b - 8), %l0 -+ stx %l0, [%i0 + I7] -+ -+ # Save framepointer to first stack frame but first substract the BIAS -+ add %i0, FRAMESIZE - BIAS, %l0 -+ stx %l0, [%i0 + SP] -+ -+ # Return context-data which is also includes the BIAS -+ sub %i0, BIAS, %i0 -+ ret -+ restore -+ -+trampoline: -+ ldx [%sp + BIAS + I7], %l0 -+ -+ # no need to setup boost_context_data, already in %o0 and %o1 -+ jmpl %l0, %o7 -+ nop -+ -+ call _exit -+ clr %o0 -+ unimp -+.size make_fcontext,.-make_fcontext -+# Mark that we don't need executable stack. -+.section .note.GNU-stack,"",%progbits diff --git a/lang/php/8.1/patches/patch-build_php_m4 b/lang/php/8.1/patches/patch-build_php_m4 deleted file mode 100644 index 54d804f2ea2..00000000000 --- a/lang/php/8.1/patches/patch-build_php_m4 +++ /dev/null @@ -1,33 +0,0 @@ -- don't hardcode libstdc++ - -From 4e21a26db24cfeb0c8a3ba43dba2d7d5599d2ee5 Mon Sep 17 00:00:00 2001 -From: Calvin Buckley -Date: Fri, 10 May 2024 14:20:17 -0300 -Subject: [PATCH] Fix check for newer versions of ICU (#14186) - -Index: build/php.m4 ---- build/php.m4.orig -+++ build/php.m4 -@@ -742,7 +742,9 @@ AC_DEFUN([PHP_REQUIRE_CXX],[ - if test -z "$php_cxx_done"; then - AC_PROG_CXX - AC_PROG_CXXCPP -- PHP_ADD_LIBRARY(stdc++) -+ for i in $LIBCXX; do -+ PHP_ADD_LIBRARY($i) -+ done - php_cxx_done=yes - fi - ]) -@@ -1929,9 +1931,8 @@ AC_DEFUN([PHP_SETUP_ICU],[ - ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" - ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" - -- if test "$PKG_CONFIG icu-io --atleast-version=60"; then -- ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" -- fi -+ AS_IF([$PKG_CONFIG icu-io --atleast-version=60], -+ [ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"]) - ]) - - dnl diff --git a/lang/php/8.1/patches/patch-configure_ac b/lang/php/8.1/patches/patch-configure_ac deleted file mode 100644 index d5961d5fc75..00000000000 --- a/lang/php/8.1/patches/patch-configure_ac +++ /dev/null @@ -1,48 +0,0 @@ -Index: configure.ac ---- configure.ac.orig -+++ configure.ac -@@ -1118,16 +1118,16 @@ case $php_sapi_module in - fi - case $with_pic in - yes) -- standard_libtool_flag='-prefer-pic' -+ standard_libtool_flag='' - ;; - no) -- standard_libtool_flag='-prefer-non-pic' -+ standard_libtool_flag='' - ;; - esac - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" - ;; - *[)] -- standard_libtool_flag='-prefer-non-pic -static' -+ standard_libtool_flag='' - if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then - enable_shared=no - fi -@@ -1216,6 +1216,7 @@ AS_CASE([$host_cpu], - [s390x*], [fiber_cpu="s390x"], - [mips64*], [fiber_cpu="mips64"], - [mips*], [fiber_cpu="mips32"], -+ [sparc64], [fiber_cpu="sparc64"], - [fiber_cpu="unknown"] - ) - -@@ -1237,6 +1238,7 @@ AS_CASE([$fiber_cpu], - [s390x], [fiber_asm_file_prefix="s390x_sysv"], - [mips64], [fiber_asm_file_prefix="mips64_n64"], - [mips32], [fiber_asm_file_prefix="mips32_o32"], -+ [sparc64], [fiber_asm_file_prefix="sparc64_sysv"], - [fiber_asm_file_prefix="unknown"] - ) - -@@ -1383,7 +1385,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` - EXPANDED_DATADIR=$datadir - EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` - EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` --INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR -+INCLUDE_PATH=.:$libdir - - exec_prefix=$old_exec_prefix - libdir=$old_libdir diff --git a/lang/php/8.1/patches/patch-ext_imap_config_m4 b/lang/php/8.1/patches/patch-ext_imap_config_m4 deleted file mode 100644 index 2e93c37b761..00000000000 --- a/lang/php/8.1/patches/patch-ext_imap_config_m4 +++ /dev/null @@ -1,22 +0,0 @@ -Cope with newer alpine/c-client, from slackware -https://git.slackware.nl/current/diff/source/n/php/php.imap.api.diff?id=4f9273afa49a94b04bccc088fb87fec9d80a3fc6 - -Index: ext/imap/config.m4 ---- ext/imap/config.m4.orig -+++ ext/imap/config.m4 -@@ -46,6 +46,7 @@ AC_DEFUN([PHP_IMAP_TEST_BUILD], [ - PHP_IMAP_EXPORT void mm_nocritical(void){} - PHP_IMAP_EXPORT void mm_notify(void){} - PHP_IMAP_EXPORT void mm_login(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} - PHP_IMAP_EXPORT void mm_diskerror(void){} - PHP_IMAP_EXPORT void mm_status(void){} - PHP_IMAP_EXPORT void mm_lsub(void){} -@@ -282,6 +283,7 @@ if test "$PHP_IMAP" != "no"; then - PHP_IMAP_EXPORT void mm_nocritical(void){} - PHP_IMAP_EXPORT void mm_notify(void){} - PHP_IMAP_EXPORT void mm_login(void){} -+ PHP_IMAP_EXPORT void mm_login_method(void){} - PHP_IMAP_EXPORT void mm_diskerror(void){} - PHP_IMAP_EXPORT void mm_status(void){} - PHP_IMAP_EXPORT void mm_lsub(void){} diff --git a/lang/php/8.1/patches/patch-ext_imap_php_imap_c b/lang/php/8.1/patches/patch-ext_imap_php_imap_c deleted file mode 100644 index d7b48fdad64..00000000000 --- a/lang/php/8.1/patches/patch-ext_imap_php_imap_c +++ /dev/null @@ -1,30 +0,0 @@ -Cope with newer alpine/c-client, from slackware -https://git.slackware.nl/current/diff/source/n/php/php.imap.api.diff?id=4f9273afa49a94b04bccc088fb87fec9d80a3fc6 - -Index: ext/imap/php_imap.c ---- ext/imap/php_imap.c.orig -+++ ext/imap/php_imap.c -@@ -4654,7 +4654,7 @@ PHP_IMAP_EXPORT void mm_dlog(char *str) - php debugger? */ - } - --PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial) -+PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char **pwd, long trial) - { - - if (*mb->user) { -@@ -4662,7 +4662,13 @@ PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, - } else { - strlcpy (user, IMAPG(imap_user), MAILTMPLEN); - } -- strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); -+ *pwd = cpystr(IMAPG(imap_password)); /* alpine-2.22 c-client.a */ -+} -+ -+/* alpine-2.22 c-client.a workaround */ -+PHP_IMAP_EXPORT void mm_login_method(NETMBX *mb, char *user, void *pwd, long trial, char *method) -+{ -+ pwd = NULL; - } - - PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream) diff --git a/lang/php/8.1/patches/patch-ext_intl_config_m4 b/lang/php/8.1/patches/patch-ext_intl_config_m4 deleted file mode 100644 index bef0a60d4f4..00000000000 --- a/lang/php/8.1/patches/patch-ext_intl_config_m4 +++ /dev/null @@ -1,31 +0,0 @@ -From 4e21a26db24cfeb0c8a3ba43dba2d7d5599d2ee5 Mon Sep 17 00:00:00 2001 -From: Calvin Buckley -Date: Fri, 10 May 2024 14:20:17 -0300 -Subject: [PATCH] Fix check for newer versions of ICU (#14186) - -From cc46a4e6b5a413bab3e264c1dcaaf7052f54fbc4 Mon Sep 17 00:00:00 2001 -From: David Carlier -Date: Sat, 17 Feb 2024 21:38:21 +0000 -Subject: [PATCH] ext/intl: level up c++ runtime std for icu 74 and onwards. - -Index: ext/intl/config.m4 ---- ext/intl/config.m4.orig -+++ ext/intl/config.m4 -@@ -85,7 +85,16 @@ if test "$PHP_INTL" != "no"; then - breakiterator/codepointiterator_methods.cpp" - - PHP_REQUIRE_CXX() -- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) -+ -+ AC_MSG_CHECKING([if intl requires -std=gnu++17]) -+ AS_IF([$PKG_CONFIG icu-uc --atleast-version=74],[ -+ AC_MSG_RESULT([yes]) -+ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) -+ ],[ -+ AC_MSG_RESULT([no]) -+ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) -+ ]) -+ - PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" - case $host_alias in - *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L" diff --git a/lang/php/8.1/patches/patch-ext_mysqlnd_config9_m4 b/lang/php/8.1/patches/patch-ext_mysqlnd_config9_m4 deleted file mode 100644 index 16f4dae8f39..00000000000 --- a/lang/php/8.1/patches/patch-ext_mysqlnd_config9_m4 +++ /dev/null @@ -1,11 +0,0 @@ -Index: ext/mysqlnd/config9.m4 ---- ext/mysqlnd/config9.m4.orig -+++ ext/mysqlnd/config9.m4 -@@ -14,6 +14,7 @@ PHP_ARG_ENABLE([mysqlnd_compression_support], - [no]) - - dnl If some extension uses mysqlnd it will get compiled in PHP core -+PHP_MYSQLND_ENABLED="yes" - if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then - mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c" - mysqlnd_base_sources="mysqlnd_connection.c mysqlnd_alloc.c mysqlnd_charset.c mysqlnd_wireprotocol.c \ diff --git a/lang/php/8.1/patches/patch-ext_openssl_openssl_c b/lang/php/8.1/patches/patch-ext_openssl_openssl_c deleted file mode 100644 index 0a3a8b3ee2b..00000000000 --- a/lang/php/8.1/patches/patch-ext_openssl_openssl_c +++ /dev/null @@ -1,16 +0,0 @@ -This check doesn't make sense for EC keys. (Also it ignores the default -key size compiled into libcrypto, only looks at default_bits in openssl.cnf -and any settings in the php file, which results in bogus failures). - -Index: ext/openssl/openssl.c ---- ext/openssl/openssl.c.orig -+++ ext/openssl/openssl.c -@@ -3781,7 +3781,7 @@ static int php_openssl_get_evp_pkey_type(int key_type) - /* {{{ php_openssl_generate_private_key */ - static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req) - { -- if (req->priv_key_bits < MIN_KEY_LENGTH) { -+ if (req->priv_key_type != OPENSSL_KEYTYPE_EC && req->priv_key_bits < MIN_KEY_LENGTH) { - php_error_docref(NULL, E_WARNING, "Private key length must be at least %d bits, configured to %d", - MIN_KEY_LENGTH, req->priv_key_bits); - return NULL; diff --git a/lang/php/8.1/patches/patch-ext_standard_crc32_c b/lang/php/8.1/patches/patch-ext_standard_crc32_c deleted file mode 100644 index d93d3c17f61..00000000000 --- a/lang/php/8.1/patches/patch-ext_standard_crc32_c +++ /dev/null @@ -1,14 +0,0 @@ -Enable runtime CPU detection on aarch64. - -Index: ext/standard/crc32.c ---- ext/standard/crc32.c.orig -+++ ext/standard/crc32.c -@@ -26,7 +26,7 @@ - # include - # elif defined(__APPLE__) - # include --# elif defined(__FreeBSD__) -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) - # include - - static unsigned long getauxval(unsigned long key) { diff --git a/lang/php/8.1/patches/patch-main_php_h b/lang/php/8.1/patches/patch-main_php_h deleted file mode 100644 index fd77913c123..00000000000 --- a/lang/php/8.1/patches/patch-main_php_h +++ /dev/null @@ -1,13 +0,0 @@ -Index: main/php.h ---- main/php.h.orig -+++ main/php.h -@@ -189,7 +189,9 @@ END_EXTERN_C() - # ifdef PHP_WIN32 - typedef int socklen_t; - # else -+# if !defined(__OpenBSD__) - typedef unsigned int socklen_t; -+# endif - # endif - #endif - diff --git a/lang/php/8.1/patches/patch-main_php_ini_c b/lang/php/8.1/patches/patch-main_php_ini_c deleted file mode 100644 index e3f37a770f2..00000000000 --- a/lang/php/8.1/patches/patch-main_php_ini_c +++ /dev/null @@ -1,12 +0,0 @@ -Index: main/php_ini.c ---- main/php_ini.c.orig -+++ main/php_ini.c -@@ -593,7 +593,7 @@ int php_init_config(void) - - /* If still no ini file found, search for php.ini file in search path */ - if (!fp) { -- fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path); -+ fp = php_fopen_with_path("php-${PV}.ini", "r", php_ini_search_path, &opened_path); - if (fp) { - filename = ZSTR_VAL(opened_path); - } diff --git a/lang/php/8.1/patches/patch-php_ini-development b/lang/php/8.1/patches/patch-php_ini-development deleted file mode 100644 index bd396d1d575..00000000000 --- a/lang/php/8.1/patches/patch-php_ini-development +++ /dev/null @@ -1,42 +0,0 @@ -Index: php.ini-development ---- php.ini-development.orig -+++ php.ini-development -@@ -740,11 +740,8 @@ default_charset = "UTF-8" - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:OPENBSD_INCLUDE_PATH" - ; --; Windows: "\path1;\path2" --;include_path = ".;c:\php\includes" --; - ; PHP's default setting for include_path is ".;/path/to/php/pear" - ; https://php.net/include-path - -@@ -766,6 +763,7 @@ user_dir = - ;extension_dir = "./" - ; On windows: - ;extension_dir = "ext" -+extension_dir = "MODULES_DIR" - - ; Directory where the temporary files should be placed. - ; Defaults to the system default (see sys_get_temp_dir) -@@ -861,7 +859,7 @@ max_file_uploads = 20 - - ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. - ; https://php.net/allow-url-fopen --allow_url_fopen = On -+allow_url_fopen = Off - - ; Whether to allow include/require to open URLs (like https:// or ftp://) as files. - ; https://php.net/allow-url-include -@@ -973,7 +971,7 @@ cli_server.color = On - [Date] - ; Defines the default timezone used by the date functions - ; https://php.net/date.timezone --;date.timezone = -+date.timezone = UTC - - ; https://php.net/date.default-latitude - ;date.default_latitude = 31.7667 diff --git a/lang/php/8.1/patches/patch-php_ini-production b/lang/php/8.1/patches/patch-php_ini-production deleted file mode 100644 index 888c5a8b380..00000000000 --- a/lang/php/8.1/patches/patch-php_ini-production +++ /dev/null @@ -1,51 +0,0 @@ -Index: php.ini-production ---- php.ini-production.orig -+++ php.ini-production -@@ -397,7 +397,7 @@ zend.exception_string_param_max_len = 0 - ; threat in any way, but it makes it possible to determine whether you use PHP - ; on your server or not. - ; https://php.net/expose-php --expose_php = On -+expose_php = Off - - ;;;;;;;;;;;;;;;;;;; - ; Resource Limits ; -@@ -742,11 +742,8 @@ default_charset = "UTF-8" - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:OPENBSD_INCLUDE_PATH" - ; --; Windows: "\path1;\path2" --;include_path = ".;c:\php\includes" --; - ; PHP's default setting for include_path is ".;/path/to/php/pear" - ; https://php.net/include-path - -@@ -768,6 +765,7 @@ user_dir = - ;extension_dir = "./" - ; On windows: - ;extension_dir = "ext" -+extension_dir = "MODULES_DIR" - - ; Directory where the temporary files should be placed. - ; Defaults to the system default (see sys_get_temp_dir) -@@ -863,7 +861,7 @@ max_file_uploads = 20 - - ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. - ; https://php.net/allow-url-fopen --allow_url_fopen = On -+allow_url_fopen = Off - - ; Whether to allow include/require to open URLs (like https:// or ftp://) as files. - ; https://php.net/allow-url-include -@@ -975,7 +973,7 @@ cli_server.color = On - [Date] - ; Defines the default timezone used by the date functions - ; https://php.net/date.timezone --;date.timezone = -+date.timezone = UTC - - ; https://php.net/date.default-latitude - ;date.default_latitude = 31.7667 diff --git a/lang/php/8.1/patches/patch-sapi_cgi_cgi_main_c b/lang/php/8.1/patches/patch-sapi_cgi_cgi_main_c deleted file mode 100644 index 55f4caa1332..00000000000 --- a/lang/php/8.1/patches/patch-sapi_cgi_cgi_main_c +++ /dev/null @@ -1,25 +0,0 @@ -Index: sapi/cgi/cgi_main.c ---- sapi/cgi/cgi_main.c.orig -+++ sapi/cgi/cgi_main.c -@@ -1728,6 +1728,7 @@ int main(int argc, char *argv[]) - char *orig_optarg = php_optarg; - char *script_file = NULL; - size_t ini_entries_len = 0; -+ char *ini; - /* end of temporary locals */ - - int max_requests = 500; -@@ -1776,7 +1777,12 @@ int main(int argc, char *argv[]) - - sapi_startup(&cgi_sapi_module); - fastcgi = fcgi_is_fastcgi(); -- cgi_sapi_module.php_ini_path_override = NULL; -+ -+ if ((ini = getenv("PHP_INI_PATH"))) { -+ cgi_sapi_module.php_ini_path_override = ini; -+ } else { -+ cgi_sapi_module.php_ini_path_override = NULL; -+ } - - #ifdef PHP_WIN32 - _fmode = _O_BINARY; /* sets default for file streams to binary */ diff --git a/lang/php/8.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h b/lang/php/8.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h deleted file mode 100644 index e74714521d0..00000000000 --- a/lang/php/8.1/patches/patch-sapi_fpm_fpm_fpm_atomic_h +++ /dev/null @@ -1,70 +0,0 @@ -Add support for mips - -Index: sapi/fpm/fpm/fpm_atomic.h ---- sapi/fpm/fpm/fpm_atomic.h.orig -+++ sapi/fpm/fpm/fpm_atomic.h -@@ -131,6 +131,64 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l - #error Sparc v8 and predecessors are not and will not be supported (see bug report 53310) - #endif /* #if (__sparcv9 || __sparcv9__) */ - -+#elif ( __mips__ || __mips64__ ) -+ -+#if (__LP64__ || _LP64) -+typedef uint64_t atomic_uint_t; -+typedef volatile atomic_uint_t atomic_t; -+ -+static inline atomic_uint_t atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */ -+{ -+ atomic_uint_t v; -+ -+ __asm__ __volatile__ ( -+ "\t.set\tnoreorder\n" -+ "\tlld\t%0, 0(%1)\n" -+ "\tbne\t%0, %2, 1f\n" -+ "\tnop\n" -+ "\tscd\t%3, 0(%1)\n" -+ "1:\n" -+ "\t.set\treorder\n" : -+ "=r" (v) : "r" (lock), "r" (old), "r" (new) : "memory"); -+ -+ return v; -+} -+/* }}} */ -+ -+static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */ -+{ -+ return (atomic_cas_64(lock, old, set)==old); -+} -+/* }}} */ -+#else -+typedef uint32_t atomic_uint_t; -+typedef volatile atomic_uint_t atomic_t; -+ -+static inline atomic_uint_t atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */ -+{ -+ atomic_uint_t v; -+ -+ __asm__ __volatile__ ( -+ "\t.set\tnoreorder\n" -+ "\tll\t%0, 0(%1)\n" -+ "\tbne\t%0, %2, 1f\n" -+ "\tnop\n" -+ "\tsc\t%3, 0(%1)\n" -+ "1:\n" -+ "\t.set\treorder\n" : -+ "=r" (v) : "r" (lock), "r" (old), "r" (new) : "memory"); -+ -+ return v; -+} -+/* }}} */ -+ -+static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */ -+{ -+ return (atomic_cas_32(lock, old, set)==old); -+} -+/* }}} */ -+#endif -+ - #else - - #error Unsupported processor. Please open a bug report (bugs.php.net). diff --git a/lang/php/8.1/patches/patch-sapi_fpm_www_conf_in b/lang/php/8.1/patches/patch-sapi_fpm_www_conf_in deleted file mode 100644 index ea02ef4b7f1..00000000000 --- a/lang/php/8.1/patches/patch-sapi_fpm_www_conf_in +++ /dev/null @@ -1,35 +0,0 @@ -Index: sapi/fpm/www.conf.in ---- sapi/fpm/www.conf.in.orig -+++ sapi/fpm/www.conf.in -@@ -38,7 +38,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 -+; If using a TCP port, never expose this to a public network. -+listen = /var/www/run/php-fpm.sock - - ; Set listen(2) backlog. - ; Default Value: 511 (-1 on FreeBSD and OpenBSD) -@@ -50,9 +51,9 @@ listen = 127.0.0.1:9000 - ; and group can be specified either by name or by their numeric IDs. - ; Default Values: Owner is set to the master process running user. If the group - ; is not set, the owner's group is used. Mode is set to 0660. --;listen.owner = @php_fpm_user@ --;listen.group = @php_fpm_group@ --;listen.mode = 0660 -+listen.owner = www -+listen.group = www -+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. -@@ -396,7 +397,7 @@ pm.max_spare_servers = 3 - ; possible. However, all PHP paths will be relative to the chroot - ; (error_log, sessions.save_path, ...). - ; Default Value: not set --;chroot = -+chroot = /var/www - - ; Chdir to this directory at the start. - ; Note: relative path can be used. diff --git a/lang/php/8.1/patches/patch-scripts_Makefile_frag b/lang/php/8.1/patches/patch-scripts_Makefile_frag deleted file mode 100644 index d7f37c71863..00000000000 --- a/lang/php/8.1/patches/patch-scripts_Makefile_frag +++ /dev/null @@ -1,14 +0,0 @@ -Index: scripts/Makefile.frag ---- scripts/Makefile.frag.orig -+++ scripts/Makefile.frag -@@ -2,8 +2,8 @@ - # Build environment install - # - --phpincludedir = $(includedir)/php --phpbuilddir = $(libdir)/build -+phpincludedir = $(peardir)/include -+phpbuilddir = $(peardir)/build - - BUILD_FILES = \ - scripts/phpize.m4 \ diff --git a/lang/php/8.1/patches/patch-scripts_php-config_in b/lang/php/8.1/patches/patch-scripts_php-config_in deleted file mode 100644 index 1bae657a09b..00000000000 --- a/lang/php/8.1/patches/patch-scripts_php-config_in +++ /dev/null @@ -1,31 +0,0 @@ -Index: scripts/php-config.in ---- scripts/php-config.in.orig -+++ scripts/php-config.in -@@ -1,12 +1,12 @@ - #! /bin/sh - - SED="@SED@" --prefix="@prefix@" -+prefix='/var/www/pear' - datarootdir="@datarootdir@" - exec_prefix="@exec_prefix@" - version="@PHP_VERSION@" - vernum="@PHP_VERSION_ID@" --include_dir="@includedir@/php" -+include_dir="@PEAR_INSTALLDIR@/include" - 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@" -@@ -26,10 +26,11 @@ ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" - for sapi in $php_sapis; do - case $sapi in - cli) -- php_cli_binary="@bindir@/${program_prefix}php${program_suffix}${exe_extension}" -+ php_cli_binary="/usr/local/bin/php${program_suffix}" - ;; - cgi) - php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}" -+ php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}" - ;; - esac - done diff --git a/lang/php/8.1/patches/patch-scripts_phpize_in b/lang/php/8.1/patches/patch-scripts_phpize_in deleted file mode 100644 index 0a1273c61bd..00000000000 --- a/lang/php/8.1/patches/patch-scripts_phpize_in +++ /dev/null @@ -1,18 +0,0 @@ -Index: scripts/phpize.in ---- scripts/phpize.in.orig -+++ scripts/phpize.in -@@ -1,11 +1,11 @@ - #!/bin/sh - - # Variable declaration --prefix='@prefix@' -+prefix=@PEAR_INSTALLDIR@ - datarootdir='@datarootdir@' - exec_prefix="`eval echo @exec_prefix@`" --phpdir="`eval echo @libdir@`/build" --includedir="`eval echo @includedir@`/php" -+phpdir="$prefix/build" -+includedir="$prefix/include" - builddir="`pwd`" - SED="@SED@" - diff --git a/lang/php/8.1/pkg/PLIST-apache b/lang/php/8.1/pkg/PLIST-apache deleted file mode 100644 index c36fd219fd7..00000000000 --- a/lang/php/8.1/pkg/PLIST-apache +++ /dev/null @@ -1,15 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-apache-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-apache -@pkgpath lang/php/7.0,-apache -@pkgpath lang/php/7.1,-apache -@pkgpath lang/php/7.2,-apache -@pkgpath lang/php/7.3,-apache -@pkgpath lang/php/7.4,-apache -@pkgpath lang/php/8.0,-apache -${APACHE_DIR}/ -@so ${APACHE_DIR}/libphp.so -@sample ${MODPHP_CONFIG_PATH}/modules.sample/ -share/examples/php-${PV}/modphp.conf -@sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf diff --git a/lang/php/8.1/pkg/PLIST-bz2 b/lang/php/8.1/pkg/PLIST-bz2 deleted file mode 100644 index 42299708731..00000000000 --- a/lang/php/8.1/pkg/PLIST-bz2 +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-bz2-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-bz2 -@pkgpath lang/php/7.0,-bz2 -@pkgpath lang/php/7.1,-bz2 -@pkgpath lang/php/7.2,-bz2 -@pkgpath lang/php/7.3,-bz2 -@pkgpath lang/php/7.4,-bz2 -@pkgpath lang/php/8.0,-bz2 -@so lib/php-${PV}/modules/bz2.so -share/examples/php-${PV}/bz2.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini diff --git a/lang/php/8.1/pkg/PLIST-cgi b/lang/php/8.1/pkg/PLIST-cgi deleted file mode 100644 index 1593dc934b0..00000000000 --- a/lang/php/8.1/pkg/PLIST-cgi +++ /dev/null @@ -1,12 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-cgi-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-cgi -@pkgpath lang/php/7.0,-cgi -@pkgpath lang/php/7.1,-cgi -@pkgpath lang/php/7.2,-cgi -@pkgpath lang/php/7.3,-cgi -@pkgpath lang/php/7.4,-cgi -@pkgpath lang/php/8.0,-cgi -@bin bin/php-cgi-${PV} -@man man/man1/php-cgi-${PV}.1 diff --git a/lang/php/8.1/pkg/PLIST-curl b/lang/php/8.1/pkg/PLIST-curl deleted file mode 100644 index 9d53c54ad3e..00000000000 --- a/lang/php/8.1/pkg/PLIST-curl +++ /dev/null @@ -1,16 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-curl-${PHP_PKGSPEC} -@conflict php->8.1,<8.1.3p0 -@pkgpath lang/php/5.6,-curl -@pkgpath lang/php/7.0,-curl -@pkgpath lang/php/7.1,-curl -@pkgpath lang/php/7.2,-curl -@pkgpath lang/php/7.3,-curl -@pkgpath lang/php/7.4,-curl -@pkgpath lang/php/8.0,-curl -@so lib/php-${PV}/modules/curl.so -share/examples/php-${PV}/curl.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini -share/php-${PV}/include/ext/curl/ -share/php-${PV}/include/ext/curl/php_curl.h diff --git a/lang/php/8.1/pkg/PLIST-dba b/lang/php/8.1/pkg/PLIST-dba deleted file mode 100644 index af8425a2f0d..00000000000 --- a/lang/php/8.1/pkg/PLIST-dba +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-dba-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-dba -@pkgpath lang/php/7.0,-dba -@pkgpath lang/php/7.1,-dba -@pkgpath lang/php/7.2,-dba -@pkgpath lang/php/7.3,-dba -@pkgpath lang/php/7.4,-dba -@pkgpath lang/php/8.0,-dba -@so lib/php-${PV}/modules/dba.so -share/examples/php-${PV}/dba.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini diff --git a/lang/php/8.1/pkg/PLIST-dbg b/lang/php/8.1/pkg/PLIST-dbg deleted file mode 100644 index 042dc6d7dfb..00000000000 --- a/lang/php/8.1/pkg/PLIST-dbg +++ /dev/null @@ -1,12 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-dbg-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-dbg -@pkgpath lang/php/7.0,-dbg -@pkgpath lang/php/7.1,-dbg -@pkgpath lang/php/7.2,-dbg -@pkgpath lang/php/7.3,-dbg -@pkgpath lang/php/7.4,-dbg -@pkgpath lang/php/8.0,-dbg -@bin bin/phpdbg-${PV} -@man man/man1/phpdbg-${PV}.1 diff --git a/lang/php/8.1/pkg/PLIST-embed b/lang/php/8.1/pkg/PLIST-embed deleted file mode 100644 index 1a4f050b729..00000000000 --- a/lang/php/8.1/pkg/PLIST-embed +++ /dev/null @@ -1,8 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-embed-${PHP_PKGSPEC} -@pkgpath lang/php/7.4,-embed -@pkgpath lang/php/8.0,-embed -@so lib/php-${PV}/libphp.so -share/php-${PV}/include/sapi/embed/ -share/php-${PV}/include/sapi/embed/php_embed.h diff --git a/lang/php/8.1/pkg/PLIST-enchant b/lang/php/8.1/pkg/PLIST-enchant deleted file mode 100644 index 752db90f6a4..00000000000 --- a/lang/php/8.1/pkg/PLIST-enchant +++ /dev/null @@ -1,10 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-enchant-${PHP_PKGSPEC} -@pkgpath lang/php/7.2,-enchant -@pkgpath lang/php/7.3,-enchant -@pkgpath lang/php/7.4,-enchant -@pkgpath lang/php/8.0,-enchant -@so lib/php-${PV}/modules/enchant.so -share/examples/php-${PV}/enchant.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini diff --git a/lang/php/8.1/pkg/PLIST-gd b/lang/php/8.1/pkg/PLIST-gd deleted file mode 100644 index 8ee61804e8e..00000000000 --- a/lang/php/8.1/pkg/PLIST-gd +++ /dev/null @@ -1,18 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-gd-${PHP_PKGSPEC} -@conflict php->8.1,<8.1.3p0 -@pkgpath lang/php/5.6,-gd -@pkgpath lang/php/7.0,-gd -@pkgpath lang/php/7.1,-gd -@pkgpath lang/php/7.2,-gd -@pkgpath lang/php/7.3,-gd -@pkgpath lang/php/7.4,-gd -@pkgpath lang/php/8.0,-gd -@so lib/php-${PV}/modules/gd.so -share/examples/php-${PV}/gd.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini -share/php-${PV}/include/ext/gd/ -share/php-${PV}/include/ext/gd/gd_arginfo.h -share/php-${PV}/include/ext/gd/gd_compat.h -share/php-${PV}/include/ext/gd/php_gd.h diff --git a/lang/php/8.1/pkg/PLIST-gmp b/lang/php/8.1/pkg/PLIST-gmp deleted file mode 100644 index 699a476672a..00000000000 --- a/lang/php/8.1/pkg/PLIST-gmp +++ /dev/null @@ -1,15 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-gmp-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-gmp -@pkgpath lang/php/7.0,-gmp -@pkgpath lang/php/7.1,-gmp -@pkgpath lang/php/7.2,-gmp -@pkgpath lang/php/7.3,-gmp -@pkgpath lang/php/7.4,-gmp -@pkgpath lang/php/8.0,-gmp -@so lib/php-${PV}/modules/gmp.so -share/examples/php-${PV}/gmp.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini -share/php-${PV}/include/ext/gmp/ -share/php-${PV}/include/ext/gmp/php_gmp_int.h diff --git a/lang/php/8.1/pkg/PLIST-imap b/lang/php/8.1/pkg/PLIST-imap deleted file mode 100644 index ec385049075..00000000000 --- a/lang/php/8.1/pkg/PLIST-imap +++ /dev/null @@ -1,15 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-imap-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-imap -@pkgpath lang/php/7.0,-imap -@pkgpath lang/php/7.1,-imap -@pkgpath lang/php/7.2,-imap -@pkgpath lang/php/7.3,-imap -@pkgpath lang/php/7.4,-imap -@pkgpath lang/php/8.0,-imap -@so lib/php-${PV}/modules/imap.so -share/examples/php-${PV}/imap.ini -@comment etc/master.passwd -@comment etc/spwd.db -@sample ${SYSCONFDIR}/php-${PV}.sample/imap.ini diff --git a/lang/php/8.1/pkg/PLIST-intl b/lang/php/8.1/pkg/PLIST-intl deleted file mode 100644 index a48bdc66fb0..00000000000 --- a/lang/php/8.1/pkg/PLIST-intl +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-intl-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-intl -@pkgpath lang/php/7.0,-intl -@pkgpath lang/php/7.1,-intl -@pkgpath lang/php/7.2,-intl -@pkgpath lang/php/7.3,-intl -@pkgpath lang/php/7.4,-intl -@pkgpath lang/php/8.0,-intl -@so lib/php-${PV}/modules/intl.so -share/examples/php-${PV}/intl.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini diff --git a/lang/php/8.1/pkg/PLIST-ldap b/lang/php/8.1/pkg/PLIST-ldap deleted file mode 100644 index 382b1060d46..00000000000 --- a/lang/php/8.1/pkg/PLIST-ldap +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-ldap-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-ldap -@pkgpath lang/php/7.0,-ldap -@pkgpath lang/php/7.1,-ldap -@pkgpath lang/php/7.2,-ldap -@pkgpath lang/php/7.3,-ldap -@pkgpath lang/php/7.4,-ldap -@pkgpath lang/php/8.0,-ldap -@so lib/php-${PV}/modules/ldap.so -share/examples/php-${PV}/ldap.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini diff --git a/lang/php/8.1/pkg/PLIST-main b/lang/php/8.1/pkg/PLIST-main deleted file mode 100644 index a60759b7de2..00000000000 --- a/lang/php/8.1/pkg/PLIST-main +++ /dev/null @@ -1,393 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-${PHP_PKGSPEC} -@pkgpath lang/php/7.2,-main -@pkgpath lang/php/7.3,-main -@pkgpath lang/php/7.4,-main -@pkgpath lang/php/8.0,-main -@extraunexec rm -f ${SYSCONFDIR}/php-${PV}.sample/* -@extraunexec rm -f ${SYSCONFDIR}/php-fpm.d/* -@mode 1700 -@owner www -@group www -@sample ${CHROOT_DIR}/tmp/ -@mode -@owner -@group -@sample ${SYSCONFDIR}/php-fpm.d/ -@rcscript ${RCDIR}/php${SV}_fpm -bin/phar-${PV} -bin/phar-${PV}.phar -@bin bin/php-${PV} -bin/php-config-${PV} -bin/phpize-${PV} -@comment lib/apache2/ -lib/php-${PV}/ -lib/php-${PV}/modules/ -@so lib/php-${PV}/modules/opcache.so -@man man/man1/phar-${PV}.1 -@man man/man1/phar-${PV}.phar.1 -@man man/man1/php-${PV}.1 -@man man/man1/php-config-${PV}.1 -@man man/man1/phpize-${PV}.1 -@man man/man8/php-fpm-${PV}.8 -@bin sbin/php-fpm-${PV} -share/doc/pkg-readmes/${PKGSTEM} -share/examples/php-${PV}/ -@sample ${SYSCONFDIR}/php-${PV}.sample/ -share/examples/php-${PV}/opcache.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini -share/examples/php-${PV}/php-fpm.conf -@sample ${SYSCONFDIR}/php-fpm.conf -share/examples/php-${PV}/php.ini-development -share/examples/php-${PV}/php.ini-production -@sample ${SYSCONFDIR}/php-${PV}.ini -share/php-${PV}/ -share/php-${PV}/build/ -share/php-${PV}/build/Makefile.global -share/php-${PV}/build/ax_check_compile_flag.m4 -share/php-${PV}/build/ax_gcc_func_attribute.m4 -share/php-${PV}/build/config.guess -share/php-${PV}/build/config.sub -share/php-${PV}/build/gen_stub.php -share/php-${PV}/build/libtool.m4 -share/php-${PV}/build/ltmain.sh -share/php-${PV}/build/php.m4 -share/php-${PV}/build/php_cxx_compile_stdcxx.m4 -share/php-${PV}/build/phpize.m4 -share/php-${PV}/build/pkg.m4 -share/php-${PV}/build/run-tests.php -share/php-${PV}/build/shtool -share/php-${PV}/fpm/ -share/php-${PV}/fpm/status.html -share/php-${PV}/include/ -share/php-${PV}/include/TSRM/ -share/php-${PV}/include/TSRM/TSRM.h -share/php-${PV}/include/TSRM/tsrm_win32.h -share/php-${PV}/include/Zend/ -share/php-${PV}/include/Zend/Optimizer/ -share/php-${PV}/include/Zend/Optimizer/zend_call_graph.h -share/php-${PV}/include/Zend/Optimizer/zend_cfg.h -share/php-${PV}/include/Zend/Optimizer/zend_dfg.h -share/php-${PV}/include/Zend/Optimizer/zend_dump.h -share/php-${PV}/include/Zend/Optimizer/zend_func_info.h -share/php-${PV}/include/Zend/Optimizer/zend_inference.h -share/php-${PV}/include/Zend/Optimizer/zend_optimizer.h -share/php-${PV}/include/Zend/Optimizer/zend_ssa.h -share/php-${PV}/include/Zend/zend.h -share/php-${PV}/include/Zend/zend_API.h -share/php-${PV}/include/Zend/zend_alloc.h -share/php-${PV}/include/Zend/zend_alloc_sizes.h -share/php-${PV}/include/Zend/zend_arena.h -share/php-${PV}/include/Zend/zend_ast.h -share/php-${PV}/include/Zend/zend_attributes.h -share/php-${PV}/include/Zend/zend_attributes_arginfo.h -share/php-${PV}/include/Zend/zend_bitset.h -share/php-${PV}/include/Zend/zend_build.h -share/php-${PV}/include/Zend/zend_builtin_functions.h -share/php-${PV}/include/Zend/zend_builtin_functions_arginfo.h -share/php-${PV}/include/Zend/zend_closures.h -share/php-${PV}/include/Zend/zend_closures_arginfo.h -share/php-${PV}/include/Zend/zend_compile.h -share/php-${PV}/include/Zend/zend_config.h -share/php-${PV}/include/Zend/zend_config.w32.h -share/php-${PV}/include/Zend/zend_constants.h -share/php-${PV}/include/Zend/zend_cpuinfo.h -share/php-${PV}/include/Zend/zend_dtrace.h -share/php-${PV}/include/Zend/zend_enum.h -share/php-${PV}/include/Zend/zend_enum_arginfo.h -share/php-${PV}/include/Zend/zend_errors.h -share/php-${PV}/include/Zend/zend_exceptions.h -share/php-${PV}/include/Zend/zend_exceptions_arginfo.h -share/php-${PV}/include/Zend/zend_execute.h -share/php-${PV}/include/Zend/zend_extensions.h -share/php-${PV}/include/Zend/zend_fibers.h -share/php-${PV}/include/Zend/zend_fibers_arginfo.h -share/php-${PV}/include/Zend/zend_float.h -share/php-${PV}/include/Zend/zend_gc.h -share/php-${PV}/include/Zend/zend_gdb.h -share/php-${PV}/include/Zend/zend_generators.h -share/php-${PV}/include/Zend/zend_generators_arginfo.h -share/php-${PV}/include/Zend/zend_globals.h -share/php-${PV}/include/Zend/zend_globals_macros.h -share/php-${PV}/include/Zend/zend_hash.h -share/php-${PV}/include/Zend/zend_highlight.h -share/php-${PV}/include/Zend/zend_inheritance.h -share/php-${PV}/include/Zend/zend_ini.h -share/php-${PV}/include/Zend/zend_ini_parser.h -share/php-${PV}/include/Zend/zend_ini_scanner.h -share/php-${PV}/include/Zend/zend_ini_scanner_defs.h -share/php-${PV}/include/Zend/zend_interfaces.h -share/php-${PV}/include/Zend/zend_interfaces_arginfo.h -share/php-${PV}/include/Zend/zend_istdiostream.h -share/php-${PV}/include/Zend/zend_iterators.h -share/php-${PV}/include/Zend/zend_language_parser.h -share/php-${PV}/include/Zend/zend_language_scanner.h -share/php-${PV}/include/Zend/zend_language_scanner_defs.h -share/php-${PV}/include/Zend/zend_list.h -share/php-${PV}/include/Zend/zend_llist.h -share/php-${PV}/include/Zend/zend_long.h -share/php-${PV}/include/Zend/zend_map_ptr.h -share/php-${PV}/include/Zend/zend_max_execution_timer.h -share/php-${PV}/include/Zend/zend_modules.h -share/php-${PV}/include/Zend/zend_multibyte.h -share/php-${PV}/include/Zend/zend_multiply.h -share/php-${PV}/include/Zend/zend_object_handlers.h -share/php-${PV}/include/Zend/zend_objects.h -share/php-${PV}/include/Zend/zend_objects_API.h -share/php-${PV}/include/Zend/zend_observer.h -share/php-${PV}/include/Zend/zend_operators.h -share/php-${PV}/include/Zend/zend_portability.h -share/php-${PV}/include/Zend/zend_ptr_stack.h -share/php-${PV}/include/Zend/zend_range_check.h -share/php-${PV}/include/Zend/zend_signal.h -share/php-${PV}/include/Zend/zend_smart_str.h -share/php-${PV}/include/Zend/zend_smart_str_public.h -share/php-${PV}/include/Zend/zend_smart_string.h -share/php-${PV}/include/Zend/zend_smart_string_public.h -share/php-${PV}/include/Zend/zend_sort.h -share/php-${PV}/include/Zend/zend_stack.h -share/php-${PV}/include/Zend/zend_stream.h -share/php-${PV}/include/Zend/zend_string.h -share/php-${PV}/include/Zend/zend_strtod.h -share/php-${PV}/include/Zend/zend_strtod_int.h -share/php-${PV}/include/Zend/zend_system_id.h -share/php-${PV}/include/Zend/zend_type_info.h -share/php-${PV}/include/Zend/zend_types.h -share/php-${PV}/include/Zend/zend_variables.h -share/php-${PV}/include/Zend/zend_virtual_cwd.h -share/php-${PV}/include/Zend/zend_vm.h -share/php-${PV}/include/Zend/zend_vm_def.h -share/php-${PV}/include/Zend/zend_vm_execute.h -share/php-${PV}/include/Zend/zend_vm_handlers.h -share/php-${PV}/include/Zend/zend_vm_opcodes.h -share/php-${PV}/include/Zend/zend_vm_trace_handlers.h -share/php-${PV}/include/Zend/zend_vm_trace_lines.h -share/php-${PV}/include/Zend/zend_vm_trace_map.h -share/php-${PV}/include/Zend/zend_weakrefs.h -share/php-${PV}/include/Zend/zend_weakrefs_arginfo.h -share/php-${PV}/include/ext/ -share/php-${PV}/include/ext/date/ -share/php-${PV}/include/ext/date/lib/ -share/php-${PV}/include/ext/date/lib/timelib.h -share/php-${PV}/include/ext/date/lib/timelib_config.h -share/php-${PV}/include/ext/date/php_date.h -share/php-${PV}/include/ext/dom/ -share/php-${PV}/include/ext/dom/xml_common.h -share/php-${PV}/include/ext/filter/ -share/php-${PV}/include/ext/filter/php_filter.h -share/php-${PV}/include/ext/hash/ -share/php-${PV}/include/ext/hash/php_hash.h -share/php-${PV}/include/ext/hash/php_hash_adler32.h -share/php-${PV}/include/ext/hash/php_hash_crc32.h -share/php-${PV}/include/ext/hash/php_hash_fnv.h -share/php-${PV}/include/ext/hash/php_hash_gost.h -share/php-${PV}/include/ext/hash/php_hash_haval.h -share/php-${PV}/include/ext/hash/php_hash_joaat.h -share/php-${PV}/include/ext/hash/php_hash_md.h -share/php-${PV}/include/ext/hash/php_hash_murmur.h -share/php-${PV}/include/ext/hash/php_hash_ripemd.h -share/php-${PV}/include/ext/hash/php_hash_sha.h -share/php-${PV}/include/ext/hash/php_hash_sha3.h -share/php-${PV}/include/ext/hash/php_hash_snefru.h -share/php-${PV}/include/ext/hash/php_hash_tiger.h -share/php-${PV}/include/ext/hash/php_hash_whirlpool.h -share/php-${PV}/include/ext/hash/php_hash_xxhash.h -share/php-${PV}/include/ext/iconv/ -share/php-${PV}/include/ext/iconv/iconv_arginfo.h -share/php-${PV}/include/ext/iconv/php_iconv.h -share/php-${PV}/include/ext/json/ -share/php-${PV}/include/ext/json/php_json.h -share/php-${PV}/include/ext/json/php_json_parser.h -share/php-${PV}/include/ext/json/php_json_scanner.h -share/php-${PV}/include/ext/libxml/ -share/php-${PV}/include/ext/libxml/php_libxml.h -share/php-${PV}/include/ext/mbstring/ -share/php-${PV}/include/ext/mbstring/libmbfl/ -share/php-${PV}/include/ext/mbstring/libmbfl/config.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/ -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/eaw_table.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h -share/php-${PV}/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h -share/php-${PV}/include/ext/mbstring/mbstring.h -share/php-${PV}/include/ext/mbstring/php_mbregex.h -share/php-${PV}/include/ext/mbstring/php_onig_compat.h -share/php-${PV}/include/ext/mysqlnd/ -share/php-${PV}/include/ext/mysqlnd/config-win.h -share/php-${PV}/include/ext/mysqlnd/mysql_float_to_double.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_alloc.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_auth.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_block_alloc.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_charset.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_commands.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_connection.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_debug.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_enum_n_def.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_ext_plugin.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_libmysql_compat.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_plugin.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_portability.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_priv.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_protocol_frame_codec.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_ps.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_read_buffer.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_result.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_result_meta.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_reverse_api.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_statistics.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_structs.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_vio.h -share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h -share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h -share/php-${PV}/include/ext/pcre/ -share/php-${PV}/include/ext/pcre/php_pcre.h -share/php-${PV}/include/ext/pdo/ -share/php-${PV}/include/ext/pdo/php_pdo.h -share/php-${PV}/include/ext/pdo/php_pdo_driver.h -share/php-${PV}/include/ext/pdo/php_pdo_error.h -share/php-${PV}/include/ext/phar/ -share/php-${PV}/include/ext/phar/php_phar.h -share/php-${PV}/include/ext/session/ -share/php-${PV}/include/ext/session/mod_files.h -share/php-${PV}/include/ext/session/mod_user.h -share/php-${PV}/include/ext/session/php_session.h -share/php-${PV}/include/ext/simplexml/ -share/php-${PV}/include/ext/simplexml/php_simplexml.h -share/php-${PV}/include/ext/simplexml/php_simplexml_exports.h -share/php-${PV}/include/ext/sockets/ -share/php-${PV}/include/ext/sockets/php_sockets.h -share/php-${PV}/include/ext/spl/ -share/php-${PV}/include/ext/spl/php_spl.h -share/php-${PV}/include/ext/spl/spl_array.h -share/php-${PV}/include/ext/spl/spl_directory.h -share/php-${PV}/include/ext/spl/spl_dllist.h -share/php-${PV}/include/ext/spl/spl_engine.h -share/php-${PV}/include/ext/spl/spl_exceptions.h -share/php-${PV}/include/ext/spl/spl_fixedarray.h -share/php-${PV}/include/ext/spl/spl_functions.h -share/php-${PV}/include/ext/spl/spl_heap.h -share/php-${PV}/include/ext/spl/spl_iterators.h -share/php-${PV}/include/ext/spl/spl_observer.h -share/php-${PV}/include/ext/standard/ -share/php-${PV}/include/ext/standard/base64.h -share/php-${PV}/include/ext/standard/basic_functions.h -share/php-${PV}/include/ext/standard/basic_functions_arginfo.h -share/php-${PV}/include/ext/standard/crc32.h -share/php-${PV}/include/ext/standard/crc32_x86.h -share/php-${PV}/include/ext/standard/credits.h -share/php-${PV}/include/ext/standard/credits_ext.h -share/php-${PV}/include/ext/standard/credits_sapi.h -share/php-${PV}/include/ext/standard/crypt_blowfish.h -share/php-${PV}/include/ext/standard/crypt_freesec.h -share/php-${PV}/include/ext/standard/css.h -share/php-${PV}/include/ext/standard/datetime.h -share/php-${PV}/include/ext/standard/dir_arginfo.h -share/php-${PV}/include/ext/standard/dl.h -share/php-${PV}/include/ext/standard/dl_arginfo.h -share/php-${PV}/include/ext/standard/exec.h -share/php-${PV}/include/ext/standard/file.h -share/php-${PV}/include/ext/standard/flock_compat.h -share/php-${PV}/include/ext/standard/fsock.h -share/php-${PV}/include/ext/standard/head.h -share/php-${PV}/include/ext/standard/hrtime.h -share/php-${PV}/include/ext/standard/html.h -share/php-${PV}/include/ext/standard/html_tables.h -share/php-${PV}/include/ext/standard/info.h -share/php-${PV}/include/ext/standard/md5.h -share/php-${PV}/include/ext/standard/pack.h -share/php-${PV}/include/ext/standard/pageinfo.h -share/php-${PV}/include/ext/standard/php_array.h -share/php-${PV}/include/ext/standard/php_assert.h -share/php-${PV}/include/ext/standard/php_browscap.h -share/php-${PV}/include/ext/standard/php_crypt.h -share/php-${PV}/include/ext/standard/php_crypt_r.h -share/php-${PV}/include/ext/standard/php_dir.h -share/php-${PV}/include/ext/standard/php_dns.h -share/php-${PV}/include/ext/standard/php_ext_syslog.h -share/php-${PV}/include/ext/standard/php_filestat.h -share/php-${PV}/include/ext/standard/php_fopen_wrappers.h -share/php-${PV}/include/ext/standard/php_http.h -share/php-${PV}/include/ext/standard/php_image.h -share/php-${PV}/include/ext/standard/php_incomplete_class.h -share/php-${PV}/include/ext/standard/php_lcg.h -share/php-${PV}/include/ext/standard/php_mail.h -share/php-${PV}/include/ext/standard/php_math.h -share/php-${PV}/include/ext/standard/php_mt_rand.h -share/php-${PV}/include/ext/standard/php_net.h -share/php-${PV}/include/ext/standard/php_password.h -share/php-${PV}/include/ext/standard/php_rand.h -share/php-${PV}/include/ext/standard/php_random.h -share/php-${PV}/include/ext/standard/php_smart_string.h -share/php-${PV}/include/ext/standard/php_smart_string_public.h -share/php-${PV}/include/ext/standard/php_standard.h -share/php-${PV}/include/ext/standard/php_string.h -share/php-${PV}/include/ext/standard/php_uuencode.h -share/php-${PV}/include/ext/standard/php_var.h -share/php-${PV}/include/ext/standard/php_versioning.h -share/php-${PV}/include/ext/standard/proc_open.h -share/php-${PV}/include/ext/standard/quot_print.h -share/php-${PV}/include/ext/standard/scanf.h -share/php-${PV}/include/ext/standard/sha1.h -share/php-${PV}/include/ext/standard/streamsfuncs.h -share/php-${PV}/include/ext/standard/url.h -share/php-${PV}/include/ext/standard/url_scanner_ex.h -share/php-${PV}/include/ext/standard/user_filters_arginfo.h -share/php-${PV}/include/ext/standard/winver.h -share/php-${PV}/include/ext/xml/ -share/php-${PV}/include/ext/xml/expat_compat.h -share/php-${PV}/include/ext/xml/php_xml.h -share/php-${PV}/include/ext/xml/xml_arginfo.h -share/php-${PV}/include/include/ -share/php-${PV}/include/main/ -share/php-${PV}/include/main/SAPI.h -share/php-${PV}/include/main/build-defs.h -share/php-${PV}/include/main/fastcgi.h -share/php-${PV}/include/main/fopen_wrappers.h -share/php-${PV}/include/main/http_status_codes.h -share/php-${PV}/include/main/php.h -share/php-${PV}/include/main/php_compat.h -share/php-${PV}/include/main/php_config.h -share/php-${PV}/include/main/php_content_types.h -share/php-${PV}/include/main/php_getopt.h -share/php-${PV}/include/main/php_globals.h -share/php-${PV}/include/main/php_ini.h -share/php-${PV}/include/main/php_main.h -share/php-${PV}/include/main/php_memory_streams.h -share/php-${PV}/include/main/php_network.h -share/php-${PV}/include/main/php_open_temporary_file.h -share/php-${PV}/include/main/php_output.h -share/php-${PV}/include/main/php_reentrancy.h -share/php-${PV}/include/main/php_scandir.h -share/php-${PV}/include/main/php_stdint.h -share/php-${PV}/include/main/php_streams.h -share/php-${PV}/include/main/php_syslog.h -share/php-${PV}/include/main/php_ticks.h -share/php-${PV}/include/main/php_variables.h -share/php-${PV}/include/main/php_version.h -share/php-${PV}/include/main/rfc1867.h -share/php-${PV}/include/main/snprintf.h -share/php-${PV}/include/main/spprintf.h -share/php-${PV}/include/main/streams/ -share/php-${PV}/include/main/streams/php_stream_context.h -share/php-${PV}/include/main/streams/php_stream_filter_api.h -share/php-${PV}/include/main/streams/php_stream_glob_wrapper.h -share/php-${PV}/include/main/streams/php_stream_mmap.h -share/php-${PV}/include/main/streams/php_stream_plain_wrapper.h -share/php-${PV}/include/main/streams/php_stream_transport.h -share/php-${PV}/include/main/streams/php_stream_userspace.h -share/php-${PV}/include/main/streams/php_streams_int.h -share/php-${PV}/include/sapi/ -share/php-${PV}/include/sapi/cli/ -share/php-${PV}/include/sapi/cli/cli.h -@sample ${SYSCONFDIR}/php-${PV}/ diff --git a/lang/php/8.1/pkg/PLIST-mysqli b/lang/php/8.1/pkg/PLIST-mysqli deleted file mode 100644 index 086c076ec2c..00000000000 --- a/lang/php/8.1/pkg/PLIST-mysqli +++ /dev/null @@ -1,16 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-mysqli-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-mysqli -@pkgpath lang/php/7.0,-mysqli -@pkgpath lang/php/7.1,-mysqli -@pkgpath lang/php/7.2,-mysqli -@pkgpath lang/php/7.3,-mysqli -@pkgpath lang/php/7.4,-mysqli -@pkgpath lang/php/8.0,-mysqli -@so lib/php-${PV}/modules/mysqli.so -share/examples/php-${PV}/mysqli.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini -share/php-${PV}/include/ext/mysqli/ -share/php-${PV}/include/ext/mysqli/mysqli_mysqlnd.h -share/php-${PV}/include/ext/mysqli/php_mysqli_structs.h diff --git a/lang/php/8.1/pkg/PLIST-odbc b/lang/php/8.1/pkg/PLIST-odbc deleted file mode 100644 index 9e2c8e87cea..00000000000 --- a/lang/php/8.1/pkg/PLIST-odbc +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-odbc-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-odbc -@pkgpath lang/php/7.0,-odbc -@pkgpath lang/php/7.1,-odbc -@pkgpath lang/php/7.2,-odbc -@pkgpath lang/php/7.3,-odbc -@pkgpath lang/php/7.4,-odbc -@pkgpath lang/php/8.0,-odbc -@so lib/php-${PV}/modules/odbc.so -share/examples/php-${PV}/odbc.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini diff --git a/lang/php/8.1/pkg/PLIST-pcntl b/lang/php/8.1/pkg/PLIST-pcntl deleted file mode 100644 index 47df75f8565..00000000000 --- a/lang/php/8.1/pkg/PLIST-pcntl +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pcntl-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pcntl -@pkgpath lang/php/7.0,-pcntl -@pkgpath lang/php/7.1,-pcntl -@pkgpath lang/php/7.2,-pcntl -@pkgpath lang/php/7.3,-pcntl -@pkgpath lang/php/7.4,-pcntl -@pkgpath lang/php/8.0,-pcntl -@so lib/php-${PV}/modules/pcntl.so -share/examples/php-${PV}/pcntl.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pcntl.ini diff --git a/lang/php/8.1/pkg/PLIST-pdo_dblib b/lang/php/8.1/pkg/PLIST-pdo_dblib deleted file mode 100644 index 766cfaeef8c..00000000000 --- a/lang/php/8.1/pkg/PLIST-pdo_dblib +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pdo_dblib-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pdo_dblib -@pkgpath lang/php/7.0,-pdo_dblib -@pkgpath lang/php/7.1,-pdo_dblib -@pkgpath lang/php/7.2,-pdo_dblib -@pkgpath lang/php/7.3,-pdo_dblib -@pkgpath lang/php/7.4,-pdo_dblib -@pkgpath lang/php/8.0,-pdo_dblib -@so lib/php-${PV}/modules/pdo_dblib.so -share/examples/php-${PV}/pdo_dblib.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_dblib.ini diff --git a/lang/php/8.1/pkg/PLIST-pdo_mysql b/lang/php/8.1/pkg/PLIST-pdo_mysql deleted file mode 100644 index 3ad0eaf060a..00000000000 --- a/lang/php/8.1/pkg/PLIST-pdo_mysql +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pdo_mysql-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pdo_mysql -@pkgpath lang/php/7.0,-pdo_mysql -@pkgpath lang/php/7.1,-pdo_mysql -@pkgpath lang/php/7.2,-pdo_mysql -@pkgpath lang/php/7.3,-pdo_mysql -@pkgpath lang/php/7.4,-pdo_mysql -@pkgpath lang/php/8.0,-pdo_mysql -@so lib/php-${PV}/modules/pdo_mysql.so -share/examples/php-${PV}/pdo_mysql.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_mysql.ini diff --git a/lang/php/8.1/pkg/PLIST-pdo_odbc b/lang/php/8.1/pkg/PLIST-pdo_odbc deleted file mode 100644 index 7a8ef9dbf3a..00000000000 --- a/lang/php/8.1/pkg/PLIST-pdo_odbc +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pdo_odbc-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pdo_odbc -@pkgpath lang/php/7.0,-pdo_odbc -@pkgpath lang/php/7.1,-pdo_odbc -@pkgpath lang/php/7.2,-pdo_odbc -@pkgpath lang/php/7.3,-pdo_odbc -@pkgpath lang/php/7.4,-pdo_odbc -@pkgpath lang/php/8.0,-pdo_odbc -@so lib/php-${PV}/modules/pdo_odbc.so -share/examples/php-${PV}/pdo_odbc.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_odbc.ini diff --git a/lang/php/8.1/pkg/PLIST-pdo_pgsql b/lang/php/8.1/pkg/PLIST-pdo_pgsql deleted file mode 100644 index 486cba5d365..00000000000 --- a/lang/php/8.1/pkg/PLIST-pdo_pgsql +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pdo_pgsql-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pdo_pgsql -@pkgpath lang/php/7.0,-pdo_pgsql -@pkgpath lang/php/7.1,-pdo_pgsql -@pkgpath lang/php/7.2,-pdo_pgsql -@pkgpath lang/php/7.3,-pdo_pgsql -@pkgpath lang/php/7.4,-pdo_pgsql -@pkgpath lang/php/8.0,-pdo_pgsql -@so lib/php-${PV}/modules/pdo_pgsql.so -share/examples/php-${PV}/pdo_pgsql.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_pgsql.ini diff --git a/lang/php/8.1/pkg/PLIST-pdo_sqlite b/lang/php/8.1/pkg/PLIST-pdo_sqlite deleted file mode 100644 index cfb086328f5..00000000000 --- a/lang/php/8.1/pkg/PLIST-pdo_sqlite +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pdo_sqlite-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pdo_sqlite -@pkgpath lang/php/7.0,-pdo_sqlite -@pkgpath lang/php/7.1,-pdo_sqlite -@pkgpath lang/php/7.2,-pdo_sqlite -@pkgpath lang/php/7.3,-pdo_sqlite -@pkgpath lang/php/7.4,-pdo_sqlite -@pkgpath lang/php/8.0,-pdo_sqlite -@so lib/php-${PV}/modules/pdo_sqlite.so -share/examples/php-${PV}/pdo_sqlite.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini diff --git a/lang/php/8.1/pkg/PLIST-pgsql b/lang/php/8.1/pkg/PLIST-pgsql deleted file mode 100644 index 5e5b1ab346d..00000000000 --- a/lang/php/8.1/pkg/PLIST-pgsql +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pgsql-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pgsql -@pkgpath lang/php/7.0,-pgsql -@pkgpath lang/php/7.1,-pgsql -@pkgpath lang/php/7.2,-pgsql -@pkgpath lang/php/7.3,-pgsql -@pkgpath lang/php/7.4,-pgsql -@pkgpath lang/php/8.0,-pgsql -@so lib/php-${PV}/modules/pgsql.so -share/examples/php-${PV}/pgsql.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini diff --git a/lang/php/8.1/pkg/PLIST-pspell b/lang/php/8.1/pkg/PLIST-pspell deleted file mode 100644 index 57635a15b30..00000000000 --- a/lang/php/8.1/pkg/PLIST-pspell +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-pspell-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-pspell -@pkgpath lang/php/7.0,-pspell -@pkgpath lang/php/7.1,-pspell -@pkgpath lang/php/7.2,-pspell -@pkgpath lang/php/7.3,-pspell -@pkgpath lang/php/7.4,-pspell -@pkgpath lang/php/8.0,-pspell -@so lib/php-${PV}/modules/pspell.so -share/examples/php-${PV}/pspell.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini diff --git a/lang/php/8.1/pkg/PLIST-shmop b/lang/php/8.1/pkg/PLIST-shmop deleted file mode 100644 index b27c70bdda6..00000000000 --- a/lang/php/8.1/pkg/PLIST-shmop +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-shmop-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-shmop -@pkgpath lang/php/7.0,-shmop -@pkgpath lang/php/7.1,-shmop -@pkgpath lang/php/7.2,-shmop -@pkgpath lang/php/7.3,-shmop -@pkgpath lang/php/7.4,-shmop -@pkgpath lang/php/8.0,-shmop -@so lib/php-${PV}/modules/shmop.so -share/examples/php-${PV}/shmop.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini diff --git a/lang/php/8.1/pkg/PLIST-snmp b/lang/php/8.1/pkg/PLIST-snmp deleted file mode 100644 index 90e4f3fbbb6..00000000000 --- a/lang/php/8.1/pkg/PLIST-snmp +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-snmp-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-snmp -@pkgpath lang/php/7.0,-snmp -@pkgpath lang/php/7.1,-snmp -@pkgpath lang/php/7.2,-snmp -@pkgpath lang/php/7.3,-snmp -@pkgpath lang/php/7.4,-snmp -@pkgpath lang/php/8.0,-snmp -@so lib/php-${PV}/modules/snmp.so -share/examples/php-${PV}/snmp.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini diff --git a/lang/php/8.1/pkg/PLIST-soap b/lang/php/8.1/pkg/PLIST-soap deleted file mode 100644 index 1d45cce78b4..00000000000 --- a/lang/php/8.1/pkg/PLIST-soap +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-soap-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-soap -@pkgpath lang/php/7.0,-soap -@pkgpath lang/php/7.1,-soap -@pkgpath lang/php/7.2,-soap -@pkgpath lang/php/7.3,-soap -@pkgpath lang/php/7.4,-soap -@pkgpath lang/php/8.0,-soap -@so lib/php-${PV}/modules/soap.so -share/examples/php-${PV}/soap.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini diff --git a/lang/php/8.1/pkg/PLIST-sqlite3 b/lang/php/8.1/pkg/PLIST-sqlite3 deleted file mode 100644 index b75712e6451..00000000000 --- a/lang/php/8.1/pkg/PLIST-sqlite3 +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-sqlite3-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-sqlite3 -@pkgpath lang/php/7.0,-sqlite3 -@pkgpath lang/php/7.1,-sqlite3 -@pkgpath lang/php/7.2,-sqlite3 -@pkgpath lang/php/7.3,-sqlite3 -@pkgpath lang/php/7.4,-sqlite3 -@pkgpath lang/php/8.0,-sqlite3 -@so lib/php-${PV}/modules/sqlite3.so -share/examples/php-${PV}/sqlite3.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini diff --git a/lang/php/8.1/pkg/PLIST-tidy b/lang/php/8.1/pkg/PLIST-tidy deleted file mode 100644 index 498010bf162..00000000000 --- a/lang/php/8.1/pkg/PLIST-tidy +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-tidy-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-tidy -@pkgpath lang/php/7.0,-tidy -@pkgpath lang/php/7.1,-tidy -@pkgpath lang/php/7.2,-tidy -@pkgpath lang/php/7.3,-tidy -@pkgpath lang/php/7.4,-tidy -@pkgpath lang/php/8.0,-tidy -@so lib/php-${PV}/modules/tidy.so -share/examples/php-${PV}/tidy.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini diff --git a/lang/php/8.1/pkg/PLIST-xsl b/lang/php/8.1/pkg/PLIST-xsl deleted file mode 100644 index 6d3d9ace9de..00000000000 --- a/lang/php/8.1/pkg/PLIST-xsl +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-xsl-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-xsl -@pkgpath lang/php/7.0,-xsl -@pkgpath lang/php/7.1,-xsl -@pkgpath lang/php/7.2,-xsl -@pkgpath lang/php/7.3,-xsl -@pkgpath lang/php/7.4,-xsl -@pkgpath lang/php/8.0,-xsl -@so lib/php-${PV}/modules/xsl.so -share/examples/php-${PV}/xsl.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini diff --git a/lang/php/8.1/pkg/PLIST-zip b/lang/php/8.1/pkg/PLIST-zip deleted file mode 100644 index 6580937bef3..00000000000 --- a/lang/php/8.1/pkg/PLIST-zip +++ /dev/null @@ -1,13 +0,0 @@ -@option no-default-conflict -@option is-branch -@conflict php-zip-${PHP_PKGSPEC} -@pkgpath lang/php/5.6,-zip -@pkgpath lang/php/7.0,-zip -@pkgpath lang/php/7.1,-zip -@pkgpath lang/php/7.2,-zip -@pkgpath lang/php/7.3,-zip -@pkgpath lang/php/7.4,-zip -@pkgpath lang/php/8.0,-zip -@so lib/php-${PV}/modules/zip.so -share/examples/php-${PV}/zip.ini -@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini diff --git a/lang/php/8.1/pkg/php81_fpm.rc b/lang/php/8.1/pkg/php81_fpm.rc deleted file mode 100755 index 23a86ad5708..00000000000 --- a/lang/php/8.1/pkg/php81_fpm.rc +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/ksh - -daemon="${TRUEPREFIX}/sbin/php-fpm-${PV}" - -. /etc/rc.d/rc.subr - -pexp="php-fpm-${PV}: master process .*" -rc_reload=NO - -rc_cmd $1 diff --git a/lang/php/8.2/Makefile b/lang/php/8.2/Makefile index 5dcb63e995c..ec65bed82c3 100644 --- a/lang/php/8.2/Makefile +++ b/lang/php/8.2/Makefile @@ -1,6 +1,9 @@ PHP_VERSION= 8.2.26 PHP_PKGSPEC= >=8.2,<8.3 +# keep above 7.6-stable; @pkgpath markers +REVISION= 0 + DEFAULT_PHP= Yes PHP_EXTENSIONS+= -imap -pspell diff --git a/lang/php/8.2/pkg/PLIST-apache b/lang/php/8.2/pkg/PLIST-apache index 03ca01f0032..72ad2abbac1 100644 --- a/lang/php/8.2/pkg/PLIST-apache +++ b/lang/php/8.2/pkg/PLIST-apache @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-apache-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-apache +@pkgpath lang/php/7.0,-apache +@pkgpath lang/php/7.1,-apache +@pkgpath lang/php/7.2,-apache +@pkgpath lang/php/7.3,-apache +@pkgpath lang/php/7.4,-apache +@pkgpath lang/php/8.0,-apache +@pkgpath lang/php/8.1,-apache ${APACHE_DIR}/ @so ${APACHE_DIR}/libphp.so @sample ${MODPHP_CONFIG_PATH}/modules.sample/ diff --git a/lang/php/8.2/pkg/PLIST-bz2 b/lang/php/8.2/pkg/PLIST-bz2 index 6673f15d0aa..997ce3a4529 100644 --- a/lang/php/8.2/pkg/PLIST-bz2 +++ b/lang/php/8.2/pkg/PLIST-bz2 @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-bz2-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-bz2 +@pkgpath lang/php/7.0,-bz2 +@pkgpath lang/php/7.1,-bz2 +@pkgpath lang/php/7.2,-bz2 +@pkgpath lang/php/7.3,-bz2 +@pkgpath lang/php/7.4,-bz2 +@pkgpath lang/php/8.0,-bz2 +@pkgpath lang/php/8.1,-bz2 @so lib/php-${PV}/modules/bz2.so share/examples/php-${PV}/bz2.ini @sample ${SYSCONFDIR}/php-${PV}.sample/bz2.ini diff --git a/lang/php/8.2/pkg/PLIST-cgi b/lang/php/8.2/pkg/PLIST-cgi index eb94a72fcd6..e40be2c5c58 100644 --- a/lang/php/8.2/pkg/PLIST-cgi +++ b/lang/php/8.2/pkg/PLIST-cgi @@ -1,5 +1,13 @@ @option no-default-conflict @option is-branch @conflict php-cgi-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-cgi +@pkgpath lang/php/7.0,-cgi +@pkgpath lang/php/7.1,-cgi +@pkgpath lang/php/7.2,-cgi +@pkgpath lang/php/7.3,-cgi +@pkgpath lang/php/7.4,-cgi +@pkgpath lang/php/8.0,-cgi +@pkgpath lang/php/8.1,-cgi @bin bin/php-cgi-${PV} @man man/man1/php-cgi-${PV}.1 diff --git a/lang/php/8.2/pkg/PLIST-curl b/lang/php/8.2/pkg/PLIST-curl index 88a887f72cf..a6a710fe3ea 100644 --- a/lang/php/8.2/pkg/PLIST-curl +++ b/lang/php/8.2/pkg/PLIST-curl @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-curl-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-curl +@pkgpath lang/php/7.0,-curl +@pkgpath lang/php/7.1,-curl +@pkgpath lang/php/7.2,-curl +@pkgpath lang/php/7.3,-curl +@pkgpath lang/php/7.4,-curl +@pkgpath lang/php/8.0,-curl +@pkgpath lang/php/8.1,-curl @so lib/php-${PV}/modules/curl.so share/examples/php-${PV}/curl.ini @sample ${SYSCONFDIR}/php-${PV}.sample/curl.ini diff --git a/lang/php/8.2/pkg/PLIST-dba b/lang/php/8.2/pkg/PLIST-dba index f97263394c5..770b0333e71 100644 --- a/lang/php/8.2/pkg/PLIST-dba +++ b/lang/php/8.2/pkg/PLIST-dba @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-dba-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-dba +@pkgpath lang/php/7.0,-dba +@pkgpath lang/php/7.1,-dba +@pkgpath lang/php/7.2,-dba +@pkgpath lang/php/7.3,-dba +@pkgpath lang/php/7.4,-dba +@pkgpath lang/php/8.0,-dba +@pkgpath lang/php/8.1,-dba @so lib/php-${PV}/modules/dba.so share/examples/php-${PV}/dba.ini @sample ${SYSCONFDIR}/php-${PV}.sample/dba.ini diff --git a/lang/php/8.2/pkg/PLIST-dbg b/lang/php/8.2/pkg/PLIST-dbg index edb968fd80b..819788b6a44 100644 --- a/lang/php/8.2/pkg/PLIST-dbg +++ b/lang/php/8.2/pkg/PLIST-dbg @@ -1,5 +1,13 @@ @option no-default-conflict @option is-branch @conflict php-dbg-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-dbg +@pkgpath lang/php/7.0,-dbg +@pkgpath lang/php/7.1,-dbg +@pkgpath lang/php/7.2,-dbg +@pkgpath lang/php/7.3,-dbg +@pkgpath lang/php/7.4,-dbg +@pkgpath lang/php/8.0,-dbg +@pkgpath lang/php/8.1,-dbg @bin bin/phpdbg-${PV} @man man/man1/phpdbg-${PV}.1 diff --git a/lang/php/8.2/pkg/PLIST-embed b/lang/php/8.2/pkg/PLIST-embed index 5cce5498cb4..ea20dc803cd 100644 --- a/lang/php/8.2/pkg/PLIST-embed +++ b/lang/php/8.2/pkg/PLIST-embed @@ -1,6 +1,9 @@ @option no-default-conflict @option is-branch @conflict php-embed-${PHP_PKGSPEC} +@pkgpath lang/php/7.4,-embed +@pkgpath lang/php/8.0,-embed +@pkgpath lang/php/8.1,-embed @so lib/php-${PV}/libphp.so share/php-${PV}/include/sapi/embed/ share/php-${PV}/include/sapi/embed/php_embed.h diff --git a/lang/php/8.2/pkg/PLIST-enchant b/lang/php/8.2/pkg/PLIST-enchant index 1896dc3e0b8..ed6f39a87a8 100644 --- a/lang/php/8.2/pkg/PLIST-enchant +++ b/lang/php/8.2/pkg/PLIST-enchant @@ -1,6 +1,11 @@ @option no-default-conflict @option is-branch @conflict php-enchant-${PHP_PKGSPEC} +@pkgpath lang/php/7.2,-enchant +@pkgpath lang/php/7.3,-enchant +@pkgpath lang/php/7.4,-enchant +@pkgpath lang/php/8.0,-enchant +@pkgpath lang/php/8.1,-enchant @so lib/php-${PV}/modules/enchant.so share/examples/php-${PV}/enchant.ini @sample ${SYSCONFDIR}/php-${PV}.sample/enchant.ini diff --git a/lang/php/8.2/pkg/PLIST-gd b/lang/php/8.2/pkg/PLIST-gd index c7b6fc2f304..e78c7a67be3 100644 --- a/lang/php/8.2/pkg/PLIST-gd +++ b/lang/php/8.2/pkg/PLIST-gd @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-gd-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-gd +@pkgpath lang/php/7.0,-gd +@pkgpath lang/php/7.1,-gd +@pkgpath lang/php/7.2,-gd +@pkgpath lang/php/7.3,-gd +@pkgpath lang/php/7.4,-gd +@pkgpath lang/php/8.0,-gd +@pkgpath lang/php/8.1,-gd @so lib/php-${PV}/modules/gd.so share/examples/php-${PV}/gd.ini @sample ${SYSCONFDIR}/php-${PV}.sample/gd.ini diff --git a/lang/php/8.2/pkg/PLIST-gmp b/lang/php/8.2/pkg/PLIST-gmp index ec17e4194b3..b5cb77ec07e 100644 --- a/lang/php/8.2/pkg/PLIST-gmp +++ b/lang/php/8.2/pkg/PLIST-gmp @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-gmp-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-gmp +@pkgpath lang/php/7.0,-gmp +@pkgpath lang/php/7.1,-gmp +@pkgpath lang/php/7.2,-gmp +@pkgpath lang/php/7.3,-gmp +@pkgpath lang/php/7.4,-gmp +@pkgpath lang/php/8.0,-gmp +@pkgpath lang/php/8.1,-gmp @so lib/php-${PV}/modules/gmp.so share/examples/php-${PV}/gmp.ini @sample ${SYSCONFDIR}/php-${PV}.sample/gmp.ini diff --git a/lang/php/8.2/pkg/PLIST-imap b/lang/php/8.2/pkg/PLIST-imap index 1b0afa21fa1..e255fbfda29 100644 --- a/lang/php/8.2/pkg/PLIST-imap +++ b/lang/php/8.2/pkg/PLIST-imap @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-imap-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-imap +@pkgpath lang/php/7.0,-imap +@pkgpath lang/php/7.1,-imap +@pkgpath lang/php/7.2,-imap +@pkgpath lang/php/7.3,-imap +@pkgpath lang/php/7.4,-imap +@pkgpath lang/php/8.0,-imap +@pkgpath lang/php/8.1,-imap @so lib/php-${PV}/modules/imap.so share/examples/php-${PV}/imap.ini @comment etc/master.passwd diff --git a/lang/php/8.2/pkg/PLIST-intl b/lang/php/8.2/pkg/PLIST-intl index 3cb5d04e5a6..908c1b14267 100644 --- a/lang/php/8.2/pkg/PLIST-intl +++ b/lang/php/8.2/pkg/PLIST-intl @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-intl-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-intl +@pkgpath lang/php/7.0,-intl +@pkgpath lang/php/7.1,-intl +@pkgpath lang/php/7.2,-intl +@pkgpath lang/php/7.3,-intl +@pkgpath lang/php/7.4,-intl +@pkgpath lang/php/8.0,-intl +@pkgpath lang/php/8.1,-intl @so lib/php-${PV}/modules/intl.so share/examples/php-${PV}/intl.ini @sample ${SYSCONFDIR}/php-${PV}.sample/intl.ini diff --git a/lang/php/8.2/pkg/PLIST-ldap b/lang/php/8.2/pkg/PLIST-ldap index e4236b803e8..c6f11bf0ec3 100644 --- a/lang/php/8.2/pkg/PLIST-ldap +++ b/lang/php/8.2/pkg/PLIST-ldap @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-ldap-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-ldap +@pkgpath lang/php/7.0,-ldap +@pkgpath lang/php/7.1,-ldap +@pkgpath lang/php/7.2,-ldap +@pkgpath lang/php/7.3,-ldap +@pkgpath lang/php/7.4,-ldap +@pkgpath lang/php/8.0,-ldap +@pkgpath lang/php/8.1,-ldap @so lib/php-${PV}/modules/ldap.so share/examples/php-${PV}/ldap.ini @sample ${SYSCONFDIR}/php-${PV}.sample/ldap.ini diff --git a/lang/php/8.2/pkg/PLIST-main b/lang/php/8.2/pkg/PLIST-main index 52463eb7937..8cb4cb9a800 100644 --- a/lang/php/8.2/pkg/PLIST-main +++ b/lang/php/8.2/pkg/PLIST-main @@ -4,6 +4,11 @@ @conflict php->=7.4,<7.4.28p1 @conflict php->=8.0,<8.0.28p1 @conflict php->=8.1,<8.1.28p0 +@pkgpath lang/php/7.2,-main +@pkgpath lang/php/7.3,-main +@pkgpath lang/php/7.4,-main +@pkgpath lang/php/8.0,-main +@pkgpath lang/php/8.1,-main @extraunexec rm -f ${SYSCONFDIR}/php-${PV}.sample/* @extraunexec rm -f ${SYSCONFDIR}/php-fpm.d/* @mode 1700 diff --git a/lang/php/8.2/pkg/PLIST-mysqli b/lang/php/8.2/pkg/PLIST-mysqli index ec42dc54df4..cdf5a810d85 100644 --- a/lang/php/8.2/pkg/PLIST-mysqli +++ b/lang/php/8.2/pkg/PLIST-mysqli @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-mysqli-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-mysqli +@pkgpath lang/php/7.0,-mysqli +@pkgpath lang/php/7.1,-mysqli +@pkgpath lang/php/7.2,-mysqli +@pkgpath lang/php/7.3,-mysqli +@pkgpath lang/php/7.4,-mysqli +@pkgpath lang/php/8.0,-mysqli +@pkgpath lang/php/8.1,-mysqli @so lib/php-${PV}/modules/mysqli.so share/examples/php-${PV}/mysqli.ini @sample ${SYSCONFDIR}/php-${PV}.sample/mysqli.ini diff --git a/lang/php/8.2/pkg/PLIST-odbc b/lang/php/8.2/pkg/PLIST-odbc index c77063abe00..08fa9f4d747 100644 --- a/lang/php/8.2/pkg/PLIST-odbc +++ b/lang/php/8.2/pkg/PLIST-odbc @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-odbc-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-odbc +@pkgpath lang/php/7.0,-odbc +@pkgpath lang/php/7.1,-odbc +@pkgpath lang/php/7.2,-odbc +@pkgpath lang/php/7.3,-odbc +@pkgpath lang/php/7.4,-odbc +@pkgpath lang/php/8.0,-odbc +@pkgpath lang/php/8.1,-odbc @so lib/php-${PV}/modules/odbc.so share/examples/php-${PV}/odbc.ini @sample ${SYSCONFDIR}/php-${PV}.sample/odbc.ini diff --git a/lang/php/8.2/pkg/PLIST-pcntl b/lang/php/8.2/pkg/PLIST-pcntl index ccc90dd99d7..6b35118ad6f 100644 --- a/lang/php/8.2/pkg/PLIST-pcntl +++ b/lang/php/8.2/pkg/PLIST-pcntl @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pcntl-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pcntl +@pkgpath lang/php/7.0,-pcntl +@pkgpath lang/php/7.1,-pcntl +@pkgpath lang/php/7.2,-pcntl +@pkgpath lang/php/7.3,-pcntl +@pkgpath lang/php/7.4,-pcntl +@pkgpath lang/php/8.0,-pcntl +@pkgpath lang/php/8.1,-pcntl @so lib/php-${PV}/modules/pcntl.so share/examples/php-${PV}/pcntl.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pcntl.ini diff --git a/lang/php/8.2/pkg/PLIST-pdo_dblib b/lang/php/8.2/pkg/PLIST-pdo_dblib index 1fdc1e08e66..b82e972172a 100644 --- a/lang/php/8.2/pkg/PLIST-pdo_dblib +++ b/lang/php/8.2/pkg/PLIST-pdo_dblib @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pdo_dblib-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pdo_dblib +@pkgpath lang/php/7.0,-pdo_dblib +@pkgpath lang/php/7.1,-pdo_dblib +@pkgpath lang/php/7.2,-pdo_dblib +@pkgpath lang/php/7.3,-pdo_dblib +@pkgpath lang/php/7.4,-pdo_dblib +@pkgpath lang/php/8.0,-pdo_dblib +@pkgpath lang/php/8.1,-pdo_dblib @so lib/php-${PV}/modules/pdo_dblib.so share/examples/php-${PV}/pdo_dblib.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pdo_dblib.ini diff --git a/lang/php/8.2/pkg/PLIST-pdo_mysql b/lang/php/8.2/pkg/PLIST-pdo_mysql index 661fb7127dd..74f14bfb8f7 100644 --- a/lang/php/8.2/pkg/PLIST-pdo_mysql +++ b/lang/php/8.2/pkg/PLIST-pdo_mysql @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pdo_mysql-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pdo_mysql +@pkgpath lang/php/7.0,-pdo_mysql +@pkgpath lang/php/7.1,-pdo_mysql +@pkgpath lang/php/7.2,-pdo_mysql +@pkgpath lang/php/7.3,-pdo_mysql +@pkgpath lang/php/7.4,-pdo_mysql +@pkgpath lang/php/8.0,-pdo_mysql +@pkgpath lang/php/8.1,-pdo_mysql @so lib/php-${PV}/modules/pdo_mysql.so share/examples/php-${PV}/pdo_mysql.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pdo_mysql.ini diff --git a/lang/php/8.2/pkg/PLIST-pdo_odbc b/lang/php/8.2/pkg/PLIST-pdo_odbc index 9fcc359892b..d24cdffcc85 100644 --- a/lang/php/8.2/pkg/PLIST-pdo_odbc +++ b/lang/php/8.2/pkg/PLIST-pdo_odbc @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pdo_odbc-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pdo_odbc +@pkgpath lang/php/7.0,-pdo_odbc +@pkgpath lang/php/7.1,-pdo_odbc +@pkgpath lang/php/7.2,-pdo_odbc +@pkgpath lang/php/7.3,-pdo_odbc +@pkgpath lang/php/7.4,-pdo_odbc +@pkgpath lang/php/8.0,-pdo_odbc +@pkgpath lang/php/8.1,-pdo_odbc @so lib/php-${PV}/modules/pdo_odbc.so share/examples/php-${PV}/pdo_odbc.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pdo_odbc.ini diff --git a/lang/php/8.2/pkg/PLIST-pdo_pgsql b/lang/php/8.2/pkg/PLIST-pdo_pgsql index 838a4375fa9..98e03abdc67 100644 --- a/lang/php/8.2/pkg/PLIST-pdo_pgsql +++ b/lang/php/8.2/pkg/PLIST-pdo_pgsql @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pdo_pgsql-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pdo_pgsql +@pkgpath lang/php/7.0,-pdo_pgsql +@pkgpath lang/php/7.1,-pdo_pgsql +@pkgpath lang/php/7.2,-pdo_pgsql +@pkgpath lang/php/7.3,-pdo_pgsql +@pkgpath lang/php/7.4,-pdo_pgsql +@pkgpath lang/php/8.0,-pdo_pgsql +@pkgpath lang/php/8.1,-pdo_pgsql @so lib/php-${PV}/modules/pdo_pgsql.so share/examples/php-${PV}/pdo_pgsql.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pdo_pgsql.ini diff --git a/lang/php/8.2/pkg/PLIST-pdo_sqlite b/lang/php/8.2/pkg/PLIST-pdo_sqlite index 9014e5afbc9..0b4fac303f4 100644 --- a/lang/php/8.2/pkg/PLIST-pdo_sqlite +++ b/lang/php/8.2/pkg/PLIST-pdo_sqlite @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pdo_sqlite-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pdo_sqlite +@pkgpath lang/php/7.0,-pdo_sqlite +@pkgpath lang/php/7.1,-pdo_sqlite +@pkgpath lang/php/7.2,-pdo_sqlite +@pkgpath lang/php/7.3,-pdo_sqlite +@pkgpath lang/php/7.4,-pdo_sqlite +@pkgpath lang/php/8.0,-pdo_sqlite +@pkgpath lang/php/8.1,-pdo_sqlite @so lib/php-${PV}/modules/pdo_sqlite.so share/examples/php-${PV}/pdo_sqlite.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pdo_sqlite.ini diff --git a/lang/php/8.2/pkg/PLIST-pgsql b/lang/php/8.2/pkg/PLIST-pgsql index 320502e79ca..7a33539d68c 100644 --- a/lang/php/8.2/pkg/PLIST-pgsql +++ b/lang/php/8.2/pkg/PLIST-pgsql @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pgsql-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pgsql +@pkgpath lang/php/7.0,-pgsql +@pkgpath lang/php/7.1,-pgsql +@pkgpath lang/php/7.2,-pgsql +@pkgpath lang/php/7.3,-pgsql +@pkgpath lang/php/7.4,-pgsql +@pkgpath lang/php/8.0,-pgsql +@pkgpath lang/php/8.1,-pgsql @so lib/php-${PV}/modules/pgsql.so share/examples/php-${PV}/pgsql.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pgsql.ini diff --git a/lang/php/8.2/pkg/PLIST-pspell b/lang/php/8.2/pkg/PLIST-pspell index 9aed920c631..91d86c1aaad 100644 --- a/lang/php/8.2/pkg/PLIST-pspell +++ b/lang/php/8.2/pkg/PLIST-pspell @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-pspell-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-pspell +@pkgpath lang/php/7.0,-pspell +@pkgpath lang/php/7.1,-pspell +@pkgpath lang/php/7.2,-pspell +@pkgpath lang/php/7.3,-pspell +@pkgpath lang/php/7.4,-pspell +@pkgpath lang/php/8.0,-pspell +@pkgpath lang/php/8.1,-pspell @so lib/php-${PV}/modules/pspell.so share/examples/php-${PV}/pspell.ini @sample ${SYSCONFDIR}/php-${PV}.sample/pspell.ini diff --git a/lang/php/8.2/pkg/PLIST-shmop b/lang/php/8.2/pkg/PLIST-shmop index 8404738c2a9..3e68b95ef7b 100644 --- a/lang/php/8.2/pkg/PLIST-shmop +++ b/lang/php/8.2/pkg/PLIST-shmop @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-shmop-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-shmop +@pkgpath lang/php/7.0,-shmop +@pkgpath lang/php/7.1,-shmop +@pkgpath lang/php/7.2,-shmop +@pkgpath lang/php/7.3,-shmop +@pkgpath lang/php/7.4,-shmop +@pkgpath lang/php/8.0,-shmop +@pkgpath lang/php/8.1,-shmop @so lib/php-${PV}/modules/shmop.so share/examples/php-${PV}/shmop.ini @sample ${SYSCONFDIR}/php-${PV}.sample/shmop.ini diff --git a/lang/php/8.2/pkg/PLIST-snmp b/lang/php/8.2/pkg/PLIST-snmp index 2ee3d51ff6b..eed31f3103d 100644 --- a/lang/php/8.2/pkg/PLIST-snmp +++ b/lang/php/8.2/pkg/PLIST-snmp @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-snmp-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-snmp +@pkgpath lang/php/7.0,-snmp +@pkgpath lang/php/7.1,-snmp +@pkgpath lang/php/7.2,-snmp +@pkgpath lang/php/7.3,-snmp +@pkgpath lang/php/7.4,-snmp +@pkgpath lang/php/8.0,-snmp +@pkgpath lang/php/8.1,-snmp @so lib/php-${PV}/modules/snmp.so share/examples/php-${PV}/snmp.ini @sample ${SYSCONFDIR}/php-${PV}.sample/snmp.ini diff --git a/lang/php/8.2/pkg/PLIST-soap b/lang/php/8.2/pkg/PLIST-soap index 32261959234..99e36fdf2dc 100644 --- a/lang/php/8.2/pkg/PLIST-soap +++ b/lang/php/8.2/pkg/PLIST-soap @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-soap-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-soap +@pkgpath lang/php/7.0,-soap +@pkgpath lang/php/7.1,-soap +@pkgpath lang/php/7.2,-soap +@pkgpath lang/php/7.3,-soap +@pkgpath lang/php/7.4,-soap +@pkgpath lang/php/8.0,-soap +@pkgpath lang/php/8.1,-soap @so lib/php-${PV}/modules/soap.so share/examples/php-${PV}/soap.ini @sample ${SYSCONFDIR}/php-${PV}.sample/soap.ini diff --git a/lang/php/8.2/pkg/PLIST-sqlite3 b/lang/php/8.2/pkg/PLIST-sqlite3 index c4f5e0ac4b8..2f2f4088ae1 100644 --- a/lang/php/8.2/pkg/PLIST-sqlite3 +++ b/lang/php/8.2/pkg/PLIST-sqlite3 @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-sqlite3-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-sqlite3 +@pkgpath lang/php/7.0,-sqlite3 +@pkgpath lang/php/7.1,-sqlite3 +@pkgpath lang/php/7.2,-sqlite3 +@pkgpath lang/php/7.3,-sqlite3 +@pkgpath lang/php/7.4,-sqlite3 +@pkgpath lang/php/8.0,-sqlite3 +@pkgpath lang/php/8.1,-sqlite3 @so lib/php-${PV}/modules/sqlite3.so share/examples/php-${PV}/sqlite3.ini @sample ${SYSCONFDIR}/php-${PV}.sample/sqlite3.ini diff --git a/lang/php/8.2/pkg/PLIST-tidy b/lang/php/8.2/pkg/PLIST-tidy index 3eb1db8f0e2..58a3b96474c 100644 --- a/lang/php/8.2/pkg/PLIST-tidy +++ b/lang/php/8.2/pkg/PLIST-tidy @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-tidy-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-tidy +@pkgpath lang/php/7.0,-tidy +@pkgpath lang/php/7.1,-tidy +@pkgpath lang/php/7.2,-tidy +@pkgpath lang/php/7.3,-tidy +@pkgpath lang/php/7.4,-tidy +@pkgpath lang/php/8.0,-tidy +@pkgpath lang/php/8.1,-tidy @so lib/php-${PV}/modules/tidy.so share/examples/php-${PV}/tidy.ini @sample ${SYSCONFDIR}/php-${PV}.sample/tidy.ini diff --git a/lang/php/8.2/pkg/PLIST-xsl b/lang/php/8.2/pkg/PLIST-xsl index 9e0ae99116b..ac29ff29e42 100644 --- a/lang/php/8.2/pkg/PLIST-xsl +++ b/lang/php/8.2/pkg/PLIST-xsl @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-xsl-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-xsl +@pkgpath lang/php/7.0,-xsl +@pkgpath lang/php/7.1,-xsl +@pkgpath lang/php/7.2,-xsl +@pkgpath lang/php/7.3,-xsl +@pkgpath lang/php/7.4,-xsl +@pkgpath lang/php/8.0,-xsl +@pkgpath lang/php/8.1,-xsl @so lib/php-${PV}/modules/xsl.so share/examples/php-${PV}/xsl.ini @sample ${SYSCONFDIR}/php-${PV}.sample/xsl.ini diff --git a/lang/php/8.2/pkg/PLIST-zip b/lang/php/8.2/pkg/PLIST-zip index 8fc8bdb6665..b1f4a1de0c3 100644 --- a/lang/php/8.2/pkg/PLIST-zip +++ b/lang/php/8.2/pkg/PLIST-zip @@ -1,6 +1,14 @@ @option no-default-conflict @option is-branch @conflict php-zip-${PHP_PKGSPEC} +@pkgpath lang/php/5.6,-zip +@pkgpath lang/php/7.0,-zip +@pkgpath lang/php/7.1,-zip +@pkgpath lang/php/7.2,-zip +@pkgpath lang/php/7.3,-zip +@pkgpath lang/php/7.4,-zip +@pkgpath lang/php/8.0,-zip +@pkgpath lang/php/8.1,-zip @so lib/php-${PV}/modules/zip.so share/examples/php-${PV}/zip.ini @sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini diff --git a/lang/php/Makefile b/lang/php/Makefile index e8ebdece1c0..dbeeb773b71 100644 --- a/lang/php/Makefile +++ b/lang/php/Makefile @@ -1,6 +1,4 @@ SUBDIR = -SUBDIR += 8.1 -SUBDIR += 8.1,embed SUBDIR += 8.2 SUBDIR += 8.2,embed SUBDIR += 8.3 diff --git a/lang/php/pecl/pecl.port.mk b/lang/php/pecl/pecl.port.mk index fac912b408d..daa7b9b5dcd 100644 --- a/lang/php/pecl/pecl.port.mk +++ b/lang/php/pecl/pecl.port.mk @@ -1,8 +1,9 @@ # PHP PECL module MODULES += lang/php +DIST_SUBDIR ?= pecl -FLAVORS ?= php81 php82 php83 php84 +FLAVORS ?= php82 php83 php84 FLAVOR ?= php82 DIST_SUBDIR ?= pecl diff --git a/lang/php/php.port.mk b/lang/php/php.port.mk index 19486f1826e..42d226a622d 100644 --- a/lang/php/php.port.mk +++ b/lang/php/php.port.mk @@ -2,10 +2,7 @@ CATEGORIES+= lang/php MODPHP_VERSION?= 8.2 -.if ${MODPHP_VERSION} == 8.1 -MODPHP_FLAVOR = ,php81 -MODPHP_VSPEC = >=8.1,<8.2 -.elif ${MODPHP_VERSION} == 8.2 +.if ${MODPHP_VERSION} == 8.2 MODPHP_FLAVOR = ,php82 MODPHP_VSPEC = >=8.2,<8.3 .elif ${MODPHP_VERSION} == 8.3 diff --git a/mail/Makefile b/mail/Makefile index 2ee37675d5d..e0ede6e7ef8 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -180,7 +180,6 @@ SUBDIR += p5-Mail-Webmail-Gmail SUBDIR += p5-OpenSMTPd-Filter SUBDIR += p5-SMTP-Server - SUBDIR += pecl-mailparse,php81 SUBDIR += pecl-mailparse,php82 SUBDIR += pecl-mailparse,php83 SUBDIR += pecl-mailparse,php84 diff --git a/mail/pecl-mailparse/Makefile b/mail/pecl-mailparse/Makefile index 8c1df61d2c3..8ffacfbeef7 100644 --- a/mail/pecl-mailparse/Makefile +++ b/mail/pecl-mailparse/Makefile @@ -1,6 +1,7 @@ COMMENT= PHP extension for parsing and working with plain/MIME email DISTNAME= mailparse-3.1.8 +REVISION= 0 CATEGORIES= mail MAINTAINER= Stuart Henderson diff --git a/mail/pecl-mailparse/pkg/PLIST b/mail/pecl-mailparse/pkg/PLIST index f07ff2e19a2..dfb3337ad98 100644 --- a/mail/pecl-mailparse/pkg/PLIST +++ b/mail/pecl-mailparse/pkg/PLIST @@ -6,6 +6,7 @@ ${MODPECL_DEFAULTV}@pkgpath mail/pecl-mailparse,php72 ${MODPECL_DEFAULTV}@pkgpath mail/pecl-mailparse,php73 ${MODPECL_DEFAULTV}@pkgpath mail/pecl-mailparse,php74 ${MODPECL_DEFAULTV}@pkgpath mail/pecl-mailparse,php80 +${MODPECL_DEFAULTV}@pkgpath mail/pecl-mailparse,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini diff --git a/security/Makefile b/security/Makefile index 2b43e535347..20ebf7b8c7e 100644 --- a/security/Makefile +++ b/security/Makefile @@ -244,7 +244,6 @@ SUBDIR += pdf-parser SUBDIR += pdfcrack SUBDIR += pdfid - SUBDIR += pecl-mcrypt,php81 SUBDIR += pecl-mcrypt,php82 SUBDIR += pecl-mcrypt,php83 #SUBDIR += pecl-mcrypt,php84 diff --git a/security/pecl-mcrypt/Makefile b/security/pecl-mcrypt/Makefile index 6b45e7075cd..9ed9d5661c8 100644 --- a/security/pecl-mcrypt/Makefile +++ b/security/pecl-mcrypt/Makefile @@ -1,9 +1,9 @@ COMMENT= PHP bindings for the libmcrypt library DISTNAME= mcrypt-1.0.7 -REVISION= 1 +REVISION= 2 -FLAVORS= php81 php82 php83 +FLAVORS= php82 php83 CATEGORIES= security diff --git a/security/pecl-mcrypt/pkg/PLIST b/security/pecl-mcrypt/pkg/PLIST index 777379b17b1..621cead38b8 100644 --- a/security/pecl-mcrypt/pkg/PLIST +++ b/security/pecl-mcrypt/pkg/PLIST @@ -2,6 +2,7 @@ ${MODPECL_DEFAULTV}@pkgpath security/pecl-mcrypt,php72 ${MODPECL_DEFAULTV}@pkgpath security/pecl-mcrypt,php73 ${MODPECL_DEFAULTV}@pkgpath security/pecl-mcrypt,php74 ${MODPECL_DEFAULTV}@pkgpath security/pecl-mcrypt,php80 +${MODPECL_DEFAULTV}@pkgpath security/pecl-mcrypt,php81 @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini diff --git a/textproc/Makefile b/textproc/Makefile index dc3dbec1e4f..d086809b7c4 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -381,7 +381,6 @@ SUBDIR += pdfgrep SUBDIR += pdfpc SUBDIR += pdftk - SUBDIR += pecl-yaml,php81 SUBDIR += pecl-yaml,php82 SUBDIR += pecl-yaml,php83 SUBDIR += pecl-yaml,php84 diff --git a/textproc/pecl-yaml/Makefile b/textproc/pecl-yaml/Makefile index 11f9cf53036..25e8ff5706d 100644 --- a/textproc/pecl-yaml/Makefile +++ b/textproc/pecl-yaml/Makefile @@ -1,6 +1,7 @@ COMMENT= YAML-1.1 parser and emitter for PHP DISTNAME= yaml-2.2.4 +REVISION= 0 CATEGORIES= textproc diff --git a/textproc/pecl-yaml/pkg/PLIST b/textproc/pecl-yaml/pkg/PLIST index 2413c9f966d..515952adbac 100644 --- a/textproc/pecl-yaml/pkg/PLIST +++ b/textproc/pecl-yaml/pkg/PLIST @@ -2,6 +2,7 @@ ${MODPECL_DEFAULTV}@pkgpath textproc/pecl-yaml,php72 ${MODPECL_DEFAULTV}@pkgpath textproc/pecl-yaml,php73 ${MODPECL_DEFAULTV}@pkgpath textproc/pecl-yaml,php74 ${MODPECL_DEFAULTV}@pkgpath textproc/pecl-yaml,php80 +${MODPECL_DEFAULTV}@pkgpath textproc/pecl-yaml,php81 @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini diff --git a/www/Makefile b/www/Makefile index 1bee8a08d9a..888b3034240 100644 --- a/www/Makefile +++ b/www/Makefile @@ -388,19 +388,15 @@ SUBDIR += p5-libwww SUBDIR += p5-pQuery SUBDIR += pear - SUBDIR += pecl-memcached,php81 SUBDIR += pecl-memcached,php82 SUBDIR += pecl-memcached,php83 SUBDIR += pecl-memcached,php84 - SUBDIR += pecl-pledge,php81 SUBDIR += pecl-pledge,php82 SUBDIR += pecl-pledge,php83 SUBDIR += pecl-pledge,php84 - SUBDIR += pecl-raphf,php81 SUBDIR += pecl-raphf,php82 SUBDIR += pecl-raphf,php83 SUBDIR += pecl-raphf,php84 - SUBDIR += pecl-ssh2,php81 SUBDIR += pecl-ssh2,php82 SUBDIR += pecl-ssh2,php83 SUBDIR += pecl-ssh2,php84 diff --git a/www/pecl-memcached/Makefile b/www/pecl-memcached/Makefile index 34d2eed0f7f..46b826994d1 100644 --- a/www/pecl-memcached/Makefile +++ b/www/pecl-memcached/Makefile @@ -1,6 +1,7 @@ COMMENT= PHP interface to memcached via libmemcached DISTNAME= memcached-3.3.0 +REVISION= 0 # PHP PERMIT_PACKAGE= Yes diff --git a/www/pecl-memcached/pkg/PLIST b/www/pecl-memcached/pkg/PLIST index 408d37a7b11..771f69ba74b 100644 --- a/www/pecl-memcached/pkg/PLIST +++ b/www/pecl-memcached/pkg/PLIST @@ -6,6 +6,7 @@ ${MODPECL_DEFAULTV}@pkgpath www/pecl-memcached,php72 ${MODPECL_DEFAULTV}@pkgpath www/pecl-memcached,php73 ${MODPECL_DEFAULTV}@pkgpath www/pecl-memcached,php74 ${MODPECL_DEFAULTV}@pkgpath www/pecl-memcached,php80 +${MODPECL_DEFAULTV}@pkgpath www/pecl-memcached,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini diff --git a/www/pecl-pledge/Makefile b/www/pecl-pledge/Makefile index dad51055fc7..041bb3ab8bc 100644 --- a/www/pecl-pledge/Makefile +++ b/www/pecl-pledge/Makefile @@ -1,7 +1,7 @@ COMMENT= PHP wrapper for pledge(2) and unveil(2) DISTNAME= pledge-2.1.2 -REVISION= 1 +REVISION= 2 CATEGORIES= www diff --git a/www/pecl-pledge/pkg/PLIST b/www/pecl-pledge/pkg/PLIST index 6906393ea45..6eb33965a21 100644 --- a/www/pecl-pledge/pkg/PLIST +++ b/www/pecl-pledge/pkg/PLIST @@ -2,6 +2,7 @@ ${MODPECL_DEFAULTV}@pkgpath www/pecl-pledge,php72 ${MODPECL_DEFAULTV}@pkgpath www/pecl-pledge,php73 ${MODPECL_DEFAULTV}@pkgpath www/pecl-pledge,php74 ${MODPECL_DEFAULTV}@pkgpath www/pecl-pledge,php80 +${MODPECL_DEFAULTV}@pkgpath www/pecl-pledge,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/doc/pkg-readmes/${PKGSTEM} diff --git a/www/pecl-raphf/Makefile b/www/pecl-raphf/Makefile index 0c626c680ee..3d69e13a651 100644 --- a/www/pecl-raphf/Makefile +++ b/www/pecl-raphf/Makefile @@ -1,7 +1,7 @@ COMMENT= persistent handle and resource factory API DISTNAME= raphf-2.0.0 -REVISION= 8 +REVISION= 9 # PHP PERMIT_PACKAGE= Yes diff --git a/www/pecl-raphf/pkg/PLIST b/www/pecl-raphf/pkg/PLIST index 4e2da6c2d64..9befd539b4b 100644 --- a/www/pecl-raphf/pkg/PLIST +++ b/www/pecl-raphf/pkg/PLIST @@ -6,6 +6,7 @@ ${MODPECL_DEFAULTV}@pkgpath www/pecl-raphf,php72 ${MODPECL_DEFAULTV}@pkgpath www/pecl-raphf,php73 ${MODPECL_DEFAULTV}@pkgpath www/pecl-raphf,php74 ${MODPECL_DEFAULTV}@pkgpath www/pecl-raphf,php80 +${MODPECL_DEFAULTV}@pkgpath www/pecl-raphf,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini diff --git a/www/pecl-ssh2/Makefile b/www/pecl-ssh2/Makefile index 32acd1ff659..e96c84ea987 100644 --- a/www/pecl-ssh2/Makefile +++ b/www/pecl-ssh2/Makefile @@ -1,7 +1,7 @@ COMMENT= PHP bindings for the libssh2 library DISTNAME= ssh2-1.4 -REVISION= 1 +REVISION= 2 # PHP PERMIT_PACKAGE= Yes diff --git a/www/pecl-ssh2/pkg/PLIST b/www/pecl-ssh2/pkg/PLIST index d5d5d3686de..863e29e50a0 100644 --- a/www/pecl-ssh2/pkg/PLIST +++ b/www/pecl-ssh2/pkg/PLIST @@ -6,6 +6,7 @@ ${MODPECL_DEFAULTV}@pkgpath www/pecl-ssh2,php72 ${MODPECL_DEFAULTV}@pkgpath www/pecl-ssh2,php73 ${MODPECL_DEFAULTV}@pkgpath www/pecl-ssh2,php74 ${MODPECL_DEFAULTV}@pkgpath www/pecl-ssh2,php80 +${MODPECL_DEFAULTV}@pkgpath www/pecl-ssh2,php81 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini @so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini diff --git a/www/unit/Makefile b/www/unit/Makefile index d5603925391..3cef24428de 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -1,7 +1,6 @@ SUBDIR = SUBDIR += unit SUBDIR += unit-perl -SUBDIR += unit-php,php81 SUBDIR += unit-php,php82 SUBDIR += unit-php,php83 SUBDIR += unit-php,php84 diff --git a/www/unit/unit-php/Makefile b/www/unit/unit-php/Makefile index 7a6a6d816cb..c7a3598eb43 100644 --- a/www/unit/unit-php/Makefile +++ b/www/unit/unit-php/Makefile @@ -7,7 +7,7 @@ UNIT_SHORTNAME= ${FLAVOR} MODULES= lang/php -FLAVORS= php81 php82 php83 php84 +FLAVORS= php82 php83 php84 FLAVOR?= php82 MODPHP_VERSION= ${FLAVOR:C/php([0-9])([0-9])/\1.\2/} MODPHP_BUILDDEP= Yes