CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Wed, 11 Jun 2025 14:58:28 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Jun 11 14:58:27 UTC 2025

Modified Files:
        pkgsrc/lang/php74: Makefile distinfo
        pkgsrc/lang/php74/patches: patch-php.ini-development
            patch-php.ini-production
        pkgsrc/lang/php81: Makefile distinfo
        pkgsrc/lang/php81/patches: patch-php.ini-development
            patch-php.ini-production
        pkgsrc/lang/php82: Makefile distinfo
        pkgsrc/lang/php82/patches: patch-php.ini-development
            patch-php.ini-production
        pkgsrc/lang/php83: Makefile distinfo
        pkgsrc/lang/php83/patches: patch-php.ini-development
            patch-php.ini-production
        pkgsrc/lang/php84: Makefile distinfo
        pkgsrc/lang/php84/patches: patch-php.ini-development
            patch-php.ini-production

Log Message:
lang/php{74,81,82,83,84}: correct include_path

Correct default include_path in configuration files.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/php74/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php74/patches/patch-php.ini-development \
    pkgsrc/lang/php74/patches/patch-php.ini-production
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/php81/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/php81/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php81/patches/patch-php.ini-development \
    pkgsrc/lang/php81/patches/patch-php.ini-production
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/php82/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/php82/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php82/patches/patch-php.ini-development \
    pkgsrc/lang/php82/patches/patch-php.ini-production
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/php83/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/php83/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php83/patches/patch-php.ini-development \
    pkgsrc/lang/php83/patches/patch-php.ini-production
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php84/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/php84/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php84/patches/patch-php.ini-development \
    pkgsrc/lang/php84/patches/patch-php.ini-production

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

Modified files:

Index: pkgsrc/lang/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.30 pkgsrc/lang/php74/Makefile:1.31
--- pkgsrc/lang/php74/Makefile:1.30     Sat May 17 05:37:25 2025
+++ pkgsrc/lang/php74/Makefile  Wed Jun 11 14:58:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2025/05/17 05:37:25 taca Exp $
+# $NetBSD: Makefile,v 1.31 2025/06/11 14:58:26 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 7.4

Index: pkgsrc/lang/php74/distinfo
diff -u pkgsrc/lang/php74/distinfo:1.44 pkgsrc/lang/php74/distinfo:1.45
--- pkgsrc/lang/php74/distinfo:1.44     Tue Apr 22 10:17:08 2025
+++ pkgsrc/lang/php74/distinfo  Wed Jun 11 14:58:26 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2025/04/22 10:17:08 wiz Exp $
+$NetBSD: distinfo,v 1.45 2025/06/11 14:58:26 taca Exp $
 
 BLAKE2s (php-7.4.33.tar.xz) = 11ec78e0a566d33168e9867e60796f25b8edc4efa03868929251a6297021e79d
 SHA512 (php-7.4.33.tar.xz) = 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
@@ -18,8 +18,8 @@ SHA1 (patch-ext_openssl_openssl.c) = bbd
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
-SHA1 (patch-php.ini-development) = 6dfedc2283b7efa9d47838a1bc57716f87557b22
-SHA1 (patch-php.ini-production) = 56dd18dc2e921765c25de26b6474d740bbf5f87c
+SHA1 (patch-php.ini-development) = 719cc709ea383691ef656f38e1ab5f30a11ef509
+SHA1 (patch-php.ini-production) = 334fcba211c0b5d864c93b6f79c997e07e1ed70d
 SHA1 (patch-sapi_apache2handler_config.m4) = 398b774f93044cac9f6cf15599c8b9eef1c97cf8
 SHA1 (patch-sapi_cgi_Makefile.frag) = e997903c360a4634285f9301bc58dd93152e5beb
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3

Index: pkgsrc/lang/php74/patches/patch-php.ini-development
diff -u pkgsrc/lang/php74/patches/patch-php.ini-development:1.2 pkgsrc/lang/php74/patches/patch-php.ini-development:1.3
--- pkgsrc/lang/php74/patches/patch-php.ini-development:1.2     Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-php.ini-development Wed Jun 11 14:58:26 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-php.ini-development,v 1.2 2025/02/08 02:58:55 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.3 2025/06/11 14:58:26 taca Exp $
 
 Set proper default configuration values.
 
@@ -9,7 +9,7 @@ Set proper default configuration values.
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
Index: pkgsrc/lang/php74/patches/patch-php.ini-production
diff -u pkgsrc/lang/php74/patches/patch-php.ini-production:1.2 pkgsrc/lang/php74/patches/patch-php.ini-production:1.3
--- pkgsrc/lang/php74/patches/patch-php.ini-production:1.2      Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-php.ini-production  Wed Jun 11 14:58:26 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-php.ini-production,v 1.2 2025/02/08 02:58:55 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.3 2025/06/11 14:58:26 taca Exp $
 
 Set proper default configuration values.
 
@@ -9,7 +9,7 @@ Set proper default configuration values.
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"

Index: pkgsrc/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.32 pkgsrc/lang/php81/Makefile:1.33
--- pkgsrc/lang/php81/Makefile:1.32     Sat May 17 05:37:25 2025
+++ pkgsrc/lang/php81/Makefile  Wed Jun 11 14:58:26 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2025/05/17 05:37:25 taca Exp $
+# $NetBSD: Makefile,v 1.33 2025/06/11 14:58:26 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.1

Index: pkgsrc/lang/php81/distinfo
diff -u pkgsrc/lang/php81/distinfo:1.38 pkgsrc/lang/php81/distinfo:1.39
--- pkgsrc/lang/php81/distinfo:1.38     Mon Apr  7 17:33:36 2025
+++ pkgsrc/lang/php81/distinfo  Wed Jun 11 14:58:26 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2025/04/07 17:33:36 taca Exp $
+$NetBSD: distinfo,v 1.39 2025/06/11 14:58:26 taca Exp $
 
 BLAKE2s (php-8.1.32.tar.xz) = b0555666ee77e5fc629cde2879d0336b1d39324032be82d68ab259cd8150444a
 SHA512 (php-8.1.32.tar.xz) = d8084415ead65d685c68c4264e793abb1322b01e120c2ac09c2e33889a13513fb42401621fcb702e36bc1a3239b317a4c10e20c676bb19eb05749a6d6e646318
@@ -12,8 +12,8 @@ SHA1 (patch-ext_phar_Makefile.frag) = 53
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483
-SHA1 (patch-php.ini-development) = 09747cf58c7a29167bd01c48a373e0d75286fdba
-SHA1 (patch-php.ini-production) = f90ae8ea49a0f83964e45354d36df2d7b33f3e1b
+SHA1 (patch-php.ini-development) = c19d1f756707ead8b73e038ef82b15c24fed5800
+SHA1 (patch-php.ini-production) = 20240004d2c344a2d3c00730f3f1944551a7fd60
 SHA1 (patch-sapi_apache2handler_config.m4) = ecfb1ec8d58743e96ac9799f8e4be9d3ec2912eb
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cgi_config9.m4) = 1958863945bec4b3baa1018fb2b56167b9e90a4f

Index: pkgsrc/lang/php81/patches/patch-php.ini-development
diff -u pkgsrc/lang/php81/patches/patch-php.ini-development:1.2 pkgsrc/lang/php81/patches/patch-php.ini-development:1.3
--- pkgsrc/lang/php81/patches/patch-php.ini-development:1.2     Sat Feb  8 02:59:30 2025
+++ pkgsrc/lang/php81/patches/patch-php.ini-development Wed Jun 11 14:58:27 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-php.ini-development,v 1.2 2025/02/08 02:59:30 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.3 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-development.orig   2024-11-19 15:24:51.000000000 +0000
+--- php.ini-development.orig   2025-03-11 22:09:20.000000000 +0000
 +++ php.ini-development
 @@ -740,7 +740,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
Index: pkgsrc/lang/php81/patches/patch-php.ini-production
diff -u pkgsrc/lang/php81/patches/patch-php.ini-production:1.2 pkgsrc/lang/php81/patches/patch-php.ini-production:1.3
--- pkgsrc/lang/php81/patches/patch-php.ini-production:1.2      Sat Feb  8 02:59:30 2025
+++ pkgsrc/lang/php81/patches/patch-php.ini-production  Wed Jun 11 14:58:27 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-php.ini-production,v 1.2 2025/02/08 02:59:30 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.3 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-production.orig    2024-11-19 15:24:51.000000000 +0000
+--- php.ini-production.orig    2025-03-11 22:09:20.000000000 +0000
 +++ php.ini-production
 @@ -742,7 +742,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"

Index: pkgsrc/lang/php82/Makefile
diff -u pkgsrc/lang/php82/Makefile:1.19 pkgsrc/lang/php82/Makefile:1.20
--- pkgsrc/lang/php82/Makefile:1.19     Sat May 17 05:37:25 2025
+++ pkgsrc/lang/php82/Makefile  Wed Jun 11 14:58:27 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2025/05/17 05:37:25 taca Exp $
+# $NetBSD: Makefile,v 1.20 2025/06/11 14:58:27 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.2

Index: pkgsrc/lang/php82/distinfo
diff -u pkgsrc/lang/php82/distinfo:1.32 pkgsrc/lang/php82/distinfo:1.33
--- pkgsrc/lang/php82/distinfo:1.32     Mon Apr  7 17:33:36 2025
+++ pkgsrc/lang/php82/distinfo  Wed Jun 11 14:58:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2025/04/07 17:33:36 taca Exp $
+$NetBSD: distinfo,v 1.33 2025/06/11 14:58:27 taca Exp $
 
 BLAKE2s (php-8.2.28.tar.xz) = 8fb6d1b81c1a42a39dbe7cfc3bf6982bd54766c6cc1ac714273f55a001635064
 SHA512 (php-8.2.28.tar.xz) = af2a4f43da756a78f762dbd2b9e589e52864c7069fd55a6a2b900e32a08728a7d69b80577dc79b5d4a86993846a2232b809b75ae415344935610a3934b10c6ba
@@ -12,8 +12,8 @@ SHA1 (patch-ext_standard_php__fopen__wra
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483
-SHA1 (patch-php.ini-development) = 039c0b316ac1a65b66c9e36f6aff17e9c9cd2a90
-SHA1 (patch-php.ini-production) = cd127bcbd4c0f16e2136e84dfcf1c0c3d6107705
+SHA1 (patch-php.ini-development) = aa91d6637dcebddc1338bf34a024005b33318130
+SHA1 (patch-php.ini-production) = 79aa3311976c9f4db2d01de66aacc7bd89772510
 SHA1 (patch-sapi_apache2handler_config.m4) = c669235e4890a3a56c02760c451b40d97c651c34
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cgi_config9.m4) = 080a809291984540aa426d14eb9b9c34225828a4

Index: pkgsrc/lang/php82/patches/patch-php.ini-development
diff -u pkgsrc/lang/php82/patches/patch-php.ini-development:1.2 pkgsrc/lang/php82/patches/patch-php.ini-development:1.3
--- pkgsrc/lang/php82/patches/patch-php.ini-development:1.2     Sat Feb  8 02:59:45 2025
+++ pkgsrc/lang/php82/patches/patch-php.ini-development Wed Jun 11 14:58:27 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-php.ini-development,v 1.2 2025/02/08 02:59:45 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.3 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-development.orig   2024-12-17 11:39:23.000000000 +0000
+--- php.ini-development.orig   2025-03-11 17:58:12.000000000 +0000
 +++ php.ini-development
 @@ -740,7 +740,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
Index: pkgsrc/lang/php82/patches/patch-php.ini-production
diff -u pkgsrc/lang/php82/patches/patch-php.ini-production:1.2 pkgsrc/lang/php82/patches/patch-php.ini-production:1.3
--- pkgsrc/lang/php82/patches/patch-php.ini-production:1.2      Sat Feb  8 02:59:45 2025
+++ pkgsrc/lang/php82/patches/patch-php.ini-production  Wed Jun 11 14:58:27 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-php.ini-production,v 1.2 2025/02/08 02:59:45 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.3 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-production.orig    2024-12-17 11:39:23.000000000 +0000
+--- php.ini-production.orig    2025-03-11 17:58:12.000000000 +0000
 +++ php.ini-production
 @@ -742,7 +742,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"

Index: pkgsrc/lang/php83/Makefile
diff -u pkgsrc/lang/php83/Makefile:1.15 pkgsrc/lang/php83/Makefile:1.16
--- pkgsrc/lang/php83/Makefile:1.15     Mon May 19 15:00:56 2025
+++ pkgsrc/lang/php83/Makefile  Wed Jun 11 14:58:27 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2025/05/19 15:00:56 taca Exp $
+# $NetBSD: Makefile,v 1.16 2025/06/11 14:58:27 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
+PKGREVISION=           1
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.3

Index: pkgsrc/lang/php83/distinfo
diff -u pkgsrc/lang/php83/distinfo:1.24 pkgsrc/lang/php83/distinfo:1.25
--- pkgsrc/lang/php83/distinfo:1.24     Sun Jun  8 16:27:30 2025
+++ pkgsrc/lang/php83/distinfo  Wed Jun 11 14:58:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2025/06/08 16:27:30 taca Exp $
+$NetBSD: distinfo,v 1.25 2025/06/11 14:58:27 taca Exp $
 
 BLAKE2s (php-8.3.22.tar.xz) = 90934219c8efa794845cd474bc518eb9e6c3d131f85505cf2a153c5693e9dbf1
 SHA512 (php-8.3.22.tar.xz) = 58a107531bb6a28c058fd45a6fd2cab049ebd1ca541729dea2e9c08bd1cbe25279fdb30a10da138efd2ccad424c4fe0b06b5a40c34aad249ceed1cfae3110b67
@@ -15,8 +15,8 @@ SHA1 (patch-ext_standard_php__fopen__wra
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483
-SHA1 (patch-php.ini-development) = 73ff10ef292404e2788897ce893a99758cf4962c
-SHA1 (patch-php.ini-production) = dbffa0ccc84b604f9efb58d9fee0b9dd0295801f
+SHA1 (patch-php.ini-development) = 0eaf4a5d7c99dfe9ef55e6da2902a314535253cc
+SHA1 (patch-php.ini-production) = 849441a8218626a2e1b107c1a7670d2943ad2682
 SHA1 (patch-sapi_apache2handler_config.m4) = 5de841440e35bda2bf82e7565c31d15fd3f263b2
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cgi_config9.m4) = ee690f742c99e519755eb6489180795f7bc6df40

Index: pkgsrc/lang/php83/patches/patch-php.ini-development
diff -u pkgsrc/lang/php83/patches/patch-php.ini-development:1.2 pkgsrc/lang/php83/patches/patch-php.ini-development:1.3
--- pkgsrc/lang/php83/patches/patch-php.ini-development:1.2     Sat Feb  8 02:59:57 2025
+++ pkgsrc/lang/php83/patches/patch-php.ini-development Wed Jun 11 14:58:27 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-php.ini-development,v 1.2 2025/02/08 02:59:57 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.3 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-development.orig   2024-12-17 18:18:02.000000000 +0000
+--- php.ini-development.orig   2025-06-03 17:17:57.000000000 +0000
 +++ php.ini-development
 @@ -750,7 +750,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
Index: pkgsrc/lang/php83/patches/patch-php.ini-production
diff -u pkgsrc/lang/php83/patches/patch-php.ini-production:1.2 pkgsrc/lang/php83/patches/patch-php.ini-production:1.3
--- pkgsrc/lang/php83/patches/patch-php.ini-production:1.2      Sat Feb  8 02:59:57 2025
+++ pkgsrc/lang/php83/patches/patch-php.ini-production  Wed Jun 11 14:58:27 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-php.ini-production,v 1.2 2025/02/08 02:59:57 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.3 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-production.orig    2024-12-17 18:18:02.000000000 +0000
+--- php.ini-production.orig    2025-06-03 17:17:57.000000000 +0000
 +++ php.ini-production
 @@ -752,7 +752,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"

Index: pkgsrc/lang/php84/Makefile
diff -u pkgsrc/lang/php84/Makefile:1.5 pkgsrc/lang/php84/Makefile:1.6
--- pkgsrc/lang/php84/Makefile:1.5      Mon May 19 15:04:50 2025
+++ pkgsrc/lang/php84/Makefile  Wed Jun 11 14:58:27 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2025/05/19 15:04:50 taca Exp $
+# $NetBSD: Makefile,v 1.6 2025/06/11 14:58:27 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
+PKGREVISION=           1
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.4

Index: pkgsrc/lang/php84/distinfo
diff -u pkgsrc/lang/php84/distinfo:1.7 pkgsrc/lang/php84/distinfo:1.8
--- pkgsrc/lang/php84/distinfo:1.7      Sun Jun  8 16:25:42 2025
+++ pkgsrc/lang/php84/distinfo  Wed Jun 11 14:58:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2025/06/08 16:25:42 taca Exp $
+$NetBSD: distinfo,v 1.8 2025/06/11 14:58:27 taca Exp $
 
 BLAKE2s (php-8.4.8.tar.xz) = 8365674fd7b8e54b9fa46b4dbf6e22a8424e3cb0ed77ce006b510bcd692d824d
 SHA512 (php-8.4.8.tar.xz) = 1a762f51c4679ffec5565458359bf41eaba6e94edb8af4e74ef30b7cf1c4d641cd36a1d91f6538c0e2be8e955326b60e5a5ecd0d85e66842fbc3c2c2ee999b73
@@ -9,8 +9,8 @@ SHA1 (patch-configure.ac) = 2bdd1d2b1def
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483
-SHA1 (patch-php.ini-development) = 73ff10ef292404e2788897ce893a99758cf4962c
-SHA1 (patch-php.ini-production) = dbffa0ccc84b604f9efb58d9fee0b9dd0295801f
+SHA1 (patch-php.ini-development) = 2974af3c5f923491d4d23f85a3dcf24d91ce7c86
+SHA1 (patch-php.ini-production) = 023ba88c06470e32b18d5502bc500dd7c2510702
 SHA1 (patch-sapi_apache2handler_config.m4) = 6b1834b9c212887fbcc1b6679858d5dd8eb4e19b
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cgi_config9.m4) = 473d5bd351138538bb6f2c394982df35b6543714

Index: pkgsrc/lang/php84/patches/patch-php.ini-development
diff -u pkgsrc/lang/php84/patches/patch-php.ini-development:1.1 pkgsrc/lang/php84/patches/patch-php.ini-development:1.2
--- pkgsrc/lang/php84/patches/patch-php.ini-development:1.1     Sat Feb 22 15:27:56 2025
+++ pkgsrc/lang/php84/patches/patch-php.ini-development Wed Jun 11 14:58:27 2025
@@ -1,19 +1,19 @@
-$NetBSD: patch-php.ini-development,v 1.1 2025/02/22 15:27:56 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.2 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-development.orig   2024-12-17 18:18:02.000000000 +0000
+--- php.ini-development.orig   2025-06-03 16:29:26.000000000 +0000
 +++ php.ini-development
-@@ -750,7 +750,7 @@ default_charset = "UTF-8"
+@@ -736,7 +736,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -771,7 +771,8 @@ doc_root =
+@@ -757,7 +757,8 @@ doc_root =
  ; https://php.net/user-dir
  user_dir =
  
@@ -23,7 +23,7 @@ Set proper default configuration values.
  ; https://php.net/extension-dir
  ;extension_dir = "./"
  ; On windows:
-@@ -856,7 +857,7 @@ file_uploads = On
+@@ -842,7 +843,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; https://php.net/upload-tmp-dir
Index: pkgsrc/lang/php84/patches/patch-php.ini-production
diff -u pkgsrc/lang/php84/patches/patch-php.ini-production:1.1 pkgsrc/lang/php84/patches/patch-php.ini-production:1.2
--- pkgsrc/lang/php84/patches/patch-php.ini-production:1.1      Sat Feb 22 15:27:56 2025
+++ pkgsrc/lang/php84/patches/patch-php.ini-production  Wed Jun 11 14:58:27 2025
@@ -1,19 +1,19 @@
-$NetBSD: patch-php.ini-production,v 1.1 2025/02/22 15:27:56 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.2 2025/06/11 14:58:27 taca Exp $
 
 Set proper default configuration values.
 
---- php.ini-production.orig    2024-12-17 18:18:02.000000000 +0000
+--- php.ini-production.orig    2025-06-03 16:29:26.000000000 +0000
 +++ php.ini-production
-@@ -752,7 +752,7 @@ default_charset = "UTF-8"
+@@ -738,7 +738,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:@PREFIX@/lib/php@PHP_VER@"
++include_path = ".:@PREFIX@/@PHP_LIBDIR@"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -773,7 +773,8 @@ doc_root =
+@@ -759,7 +759,8 @@ doc_root =
  ; https://php.net/user-dir
  user_dir =
  
@@ -23,7 +23,7 @@ Set proper default configuration values.
  ; https://php.net/extension-dir
  ;extension_dir = "./"
  ; On windows:
-@@ -858,7 +859,7 @@ file_uploads = On
+@@ -844,7 +845,7 @@ file_uploads = On
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
  ; https://php.net/upload-tmp-dir

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index