CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Mon, 7 Apr 2025 17:33:37 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Apr  7 17:33:37 UTC 2025

Modified Files:
        pkgsrc/lang/php74: distinfo
        pkgsrc/lang/php74/patches: patch-configure.ac
        pkgsrc/lang/php81: distinfo
        pkgsrc/lang/php81/patches: patch-configure.ac
        pkgsrc/lang/php82: distinfo
        pkgsrc/lang/php82/patches: patch-configure.ac
        pkgsrc/lang/php83: distinfo
        pkgsrc/lang/php83/patches: patch-configure.ac
        pkgsrc/lang/php84: distinfo
        pkgsrc/lang/php84/patches: patch-configure.ac

Log Message:
Correct pear path in configure.ac for consistency.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/php74/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php74/patches/patch-configure.ac
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/php81/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php81/patches/patch-configure.ac
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/php82/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php82/patches/patch-configure.ac
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/php83/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php83/patches/patch-configure.ac
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php84/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php84/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/lang/php74/distinfo
diff -u pkgsrc/lang/php74/distinfo:1.42 pkgsrc/lang/php74/distinfo:1.43
--- pkgsrc/lang/php74/distinfo:1.42     Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/distinfo  Mon Apr  7 17:33:36 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.42 2025/02/08 02:58:55 taca Exp $
+$NetBSD: distinfo,v 1.43 2025/04/07 17:33:36 taca Exp $
 
 BLAKE2s (php-7.4.33.tar.xz) = 11ec78e0a566d33168e9867e60796f25b8edc4efa03868929251a6297021e79d
 SHA512 (php-7.4.33.tar.xz) = 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 Size (php-7.4.33.tar.xz) = 10420144 bytes
 SHA1 (patch-build_Makefile.global) = 9776c936b982042d6a06c7a3e43c547fefb13c39
 SHA1 (patch-build_php.m4) = b134d33cd47dae37be011bb8dd0c0f2a6efe2a78
-SHA1 (patch-configure.ac) = 6c6158fdaddcf5b27c3967ff8e8a65b8d2fc4efd
+SHA1 (patch-configure.ac) = 42cb03a3cb3a872f9acbcab30ea0813686a7af9a
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = b0ded220ffa42b77228d66696f00212caf37b4aa
 SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530

Index: pkgsrc/lang/php74/patches/patch-configure.ac
diff -u pkgsrc/lang/php74/patches/patch-configure.ac:1.3 pkgsrc/lang/php74/patches/patch-configure.ac:1.4
--- pkgsrc/lang/php74/patches/patch-configure.ac:1.3    Sat Feb  8 02:58:55 2025
+++ pkgsrc/lang/php74/patches/patch-configure.ac        Mon Apr  7 17:33:36 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.3 2025/02/08 02:58:55 taca Exp $
+$NetBSD: patch-configure.ac,v 1.4 2025/04/07 17:33:36 taca Exp $
 
 * Adjust PHP directories.
 * Adjust PHP library name.
@@ -44,6 +44,15 @@ $NetBSD: patch-configure.ac,v 1.3 2025/0
  
  PHP_CONFIGURE_PART(Configuring SAPI modules)
  
+@@ -1157,7 +1156,7 @@ if test "$PHP_PEAR" != "no"; then
+   if test "$PHP_PEAR" = "yes"; then
+     case $PHP_LAYOUT in
+       GNU) PEAR_INSTALLDIR=$datadir/pear;;
+-      *)   PEAR_INSTALLDIR=$libdir/php;;
++      *)   PEAR_INSTALLDIR=$libdir/php/${PHP_API_VERS};;
+     esac
+   fi
+ 
 @@ -1212,12 +1211,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in

Index: pkgsrc/lang/php81/distinfo
diff -u pkgsrc/lang/php81/distinfo:1.37 pkgsrc/lang/php81/distinfo:1.38
--- pkgsrc/lang/php81/distinfo:1.37     Fri Mar 14 15:25:31 2025
+++ pkgsrc/lang/php81/distinfo  Mon Apr  7 17:33:36 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.37 2025/03/14 15:25:31 taca Exp $
+$NetBSD: distinfo,v 1.38 2025/04/07 17:33:36 taca Exp $
 
 BLAKE2s (php-8.1.32.tar.xz) = b0555666ee77e5fc629cde2879d0336b1d39324032be82d68ab259cd8150444a
 SHA512 (php-8.1.32.tar.xz) = d8084415ead65d685c68c4264e793abb1322b01e120c2ac09c2e33889a13513fb42401621fcb702e36bc1a3239b317a4c10e20c676bb19eb05749a6d6e646318
 Size (php-8.1.32.tar.xz) = 11893516 bytes
 SHA1 (patch-build_Makefile.global) = a5540dc209ea9b2b696ded4c1a3967eec9727800
 SHA1 (patch-build_php.m4) = 0d1bb2ded23a86b339a453655b7381de129e9274
-SHA1 (patch-configure.ac) = 18bb37f904beac1ff1cba8c186cd8f589bd66af3
+SHA1 (patch-configure.ac) = efa879e8304838d3c8cf3851310ce3d9e54c1a1e
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_enchant_enchant.c) = 7924acc5fdadea89b3a385cf744ef982795bf89d
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd

Index: pkgsrc/lang/php81/patches/patch-configure.ac
diff -u pkgsrc/lang/php81/patches/patch-configure.ac:1.1 pkgsrc/lang/php81/patches/patch-configure.ac:1.2
--- pkgsrc/lang/php81/patches/patch-configure.ac:1.1    Sat Feb  8 02:59:30 2025
+++ pkgsrc/lang/php81/patches/patch-configure.ac        Mon Apr  7 17:33:36 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.1 2025/02/08 02:59:30 taca Exp $
+$NetBSD: patch-configure.ac,v 1.2 2025/04/07 17:33:36 taca Exp $
 
 * Adjust PHP directories.
 * Adjust PHP library name.
 * Do not create extra "include" sub directory.
 
---- configure.ac.orig  2024-09-26 17:35:59.000000000 +0000
+--- configure.ac.orig  2025-03-11 22:09:20.000000000 +0000
 +++ configure.ac
 @@ -285,9 +285,9 @@ dnl SAPI configuration.
  dnl ----------------------------------------------------------------------------
@@ -19,6 +19,15 @@ $NetBSD: patch-configure.ac,v 1.1 2025/0
  
  PHP_CONFIGURE_PART(Configuring SAPI modules)
  
+@@ -1187,7 +1187,7 @@ if test "$PHP_PEAR" != "no"; then
+   if test "$PHP_PEAR" = "yes"; then
+     case $PHP_LAYOUT in
+       GNU) PEAR_INSTALLDIR=$datadir/pear;;
+-      *)   PEAR_INSTALLDIR=$libdir/php;;
++      *)   PEAR_INSTALLDIR=$libdir/php/${PHP_API_VERS};;
+     esac
+   fi
+ 
 @@ -1312,12 +1312,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in

Index: pkgsrc/lang/php82/distinfo
diff -u pkgsrc/lang/php82/distinfo:1.31 pkgsrc/lang/php82/distinfo:1.32
--- pkgsrc/lang/php82/distinfo:1.31     Fri Mar 14 15:27:16 2025
+++ pkgsrc/lang/php82/distinfo  Mon Apr  7 17:33:36 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.31 2025/03/14 15:27:16 taca Exp $
+$NetBSD: distinfo,v 1.32 2025/04/07 17:33:36 taca Exp $
 
 BLAKE2s (php-8.2.28.tar.xz) = 8fb6d1b81c1a42a39dbe7cfc3bf6982bd54766c6cc1ac714273f55a001635064
 SHA512 (php-8.2.28.tar.xz) = af2a4f43da756a78f762dbd2b9e589e52864c7069fd55a6a2b900e32a08728a7d69b80577dc79b5d4a86993846a2232b809b75ae415344935610a3934b10c6ba
 Size (php-8.2.28.tar.xz) = 12147756 bytes
 SHA1 (patch-build_Makefile.global) = 87c533087a536649b5f51108ef4f4b72c8efc5b2
 SHA1 (patch-build_php.m4) = 465d2896c8c4d88c325414caf221e1f2aec27fc3
-SHA1 (patch-configure.ac) = d3bb35c423250d1124e2ada0974fc93448634abb
+SHA1 (patch-configure.ac) = 97d6378ca03682aca635af45df3e7d777fd1d787
 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640

Index: pkgsrc/lang/php82/patches/patch-configure.ac
diff -u pkgsrc/lang/php82/patches/patch-configure.ac:1.1 pkgsrc/lang/php82/patches/patch-configure.ac:1.2
--- pkgsrc/lang/php82/patches/patch-configure.ac:1.1    Sat Feb  8 02:59:45 2025
+++ pkgsrc/lang/php82/patches/patch-configure.ac        Mon Apr  7 17:33:36 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.1 2025/02/08 02:59:45 taca Exp $
+$NetBSD: patch-configure.ac,v 1.2 2025/04/07 17:33:36 taca Exp $
 
 * Adjust PHP directories.
 * Adjust PHP library name.
 * Do not create extra "include" sub directory.
 
---- configure.ac.orig  2024-12-17 11:39:23.000000000 +0000
+--- configure.ac.orig  2025-03-11 17:58:12.000000000 +0000
 +++ configure.ac
 @@ -294,9 +294,9 @@ dnl SAPI configuration.
  dnl ----------------------------------------------------------------------------
@@ -19,6 +19,15 @@ $NetBSD: patch-configure.ac,v 1.1 2025/0
  
  PHP_CONFIGURE_PART(Configuring SAPI modules)
  
+@@ -1239,7 +1239,7 @@ if test "$PHP_PEAR" != "no"; then
+   if test "$PHP_PEAR" = "yes"; then
+     case $PHP_LAYOUT in
+       GNU) PEAR_INSTALLDIR=$datadir/pear;;
+-      *)   PEAR_INSTALLDIR=$libdir/php;;
++      *)   PEAR_INSTALLDIR=$libdir/php/${PHP_API_VERS};;
+     esac
+   fi
+ 
 @@ -1364,12 +1364,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in
@@ -43,7 +52,7 @@ $NetBSD: patch-configure.ac,v 1.1 2025/0
      ;;
  esac
  
-@@ -1673,7 +1674,7 @@ PHP_SUBST(all_targets)
+@@ -1673,7 +1673,7 @@ PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  PHP_SUBST(install_binary_targets)
  

Index: pkgsrc/lang/php83/distinfo
diff -u pkgsrc/lang/php83/distinfo:1.20 pkgsrc/lang/php83/distinfo:1.21
--- pkgsrc/lang/php83/distinfo:1.20     Thu Mar 13 15:16:17 2025
+++ pkgsrc/lang/php83/distinfo  Mon Apr  7 17:33:36 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2025/03/13 15:16:17 taca Exp $
+$NetBSD: distinfo,v 1.21 2025/04/07 17:33:36 taca Exp $
 
 BLAKE2s (php-8.3.19.tar.xz) = c5119f2fa7692da110db99b803c46d67c004a29cc67a1b0b4ad3a7ae46c7b932
 SHA512 (php-8.3.19.tar.xz) = 2872639f6a6de1680540da5a2df43db7ceeb7e25690b6f66d73373779ee3f9b0c2fe74aeeb7181749c9738b64f8d41b8a6f496751778c1df10b7f9aab43f21f7
@@ -7,7 +7,7 @@ SHA1 (patch-TSRM_TSRM.c) = 278007810b74f
 SHA1 (patch-TSRM_TSRM.h) = 70ebc03a611124d76d6813f619ff18b3a8fbf1e8
 SHA1 (patch-build_Makefile.global) = 87c533087a536649b5f51108ef4f4b72c8efc5b2
 SHA1 (patch-build_php.m4) = 4a99c91785e7de3095cab08ed2fad6053b4a94e0
-SHA1 (patch-configure.ac) = d3bb35c423250d1124e2ada0974fc93448634abb
+SHA1 (patch-configure.ac) = 11600400f69e0db2b429f4d37d70477550b0cd6a
 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b
 SHA1 (patch-ext_opcache_jit_zend__jit__x86.dasc) = 4d0d368aa1fb8ec076b392b6b64d2cf5d742133a
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd

Index: pkgsrc/lang/php83/patches/patch-configure.ac
diff -u pkgsrc/lang/php83/patches/patch-configure.ac:1.1 pkgsrc/lang/php83/patches/patch-configure.ac:1.2
--- pkgsrc/lang/php83/patches/patch-configure.ac:1.1    Sat Feb  8 02:59:57 2025
+++ pkgsrc/lang/php83/patches/patch-configure.ac        Mon Apr  7 17:33:36 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure.ac,v 1.1 2025/02/08 02:59:57 taca Exp $
+$NetBSD: patch-configure.ac,v 1.2 2025/04/07 17:33:36 taca Exp $
 
 * Adjust PHP directories.
 * Adjust PHP library name.
 * Do not create extra "include" sub directory.
 
---- configure.ac.orig  2024-12-17 11:39:23.000000000 +0000
+--- configure.ac.orig  2025-03-12 13:10:27.000000000 +0000
 +++ configure.ac
-@@ -294,9 +294,9 @@ dnl SAPI configuration.
+@@ -296,9 +296,9 @@ dnl SAPI configuration.
  dnl ----------------------------------------------------------------------------
  
  dnl Paths to the targets are relative to the build directory.
@@ -19,7 +19,16 @@ $NetBSD: patch-configure.ac,v 1.1 2025/0
  
  PHP_CONFIGURE_PART(Configuring SAPI modules)
  
-@@ -1364,12 +1364,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1254,7 +1254,7 @@ if test "$PHP_PEAR" != "no"; then
+   if test "$PHP_PEAR" = "yes"; then
+     case $PHP_LAYOUT in
+       GNU) PEAR_INSTALLDIR=$datadir/pear;;
+-      *)   PEAR_INSTALLDIR=$libdir/php;;
++      *)   PEAR_INSTALLDIR=$libdir/php/${PHP_API_VERS};;
+     esac
+   fi
+ 
+@@ -1403,12 +1403,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in
    '${exec_prefix}/lib')
@@ -34,7 +43,7 @@ $NetBSD: patch-configure.ac,v 1.1 2025/0
      ;;
  esac
  
-@@ -1419,7 +1419,7 @@ case $PHP_LAYOUT in
+@@ -1458,7 +1458,7 @@ case $PHP_LAYOUT in
      datarootdir=$prefix/share
      ;;
    *)
@@ -43,7 +52,7 @@ $NetBSD: patch-configure.ac,v 1.1 2025/0
      ;;
  esac
  
-@@ -1673,7 +1674,7 @@ PHP_SUBST(all_targets)
+@@ -1712,7 +1712,7 @@ PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  PHP_SUBST(install_binary_targets)
  

Index: pkgsrc/lang/php84/distinfo
diff -u pkgsrc/lang/php84/distinfo:1.2 pkgsrc/lang/php84/distinfo:1.3
--- pkgsrc/lang/php84/distinfo:1.2      Thu Mar 13 15:21:30 2025
+++ pkgsrc/lang/php84/distinfo  Mon Apr  7 17:33:37 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2025/03/13 15:21:30 taca Exp $
+$NetBSD: distinfo,v 1.3 2025/04/07 17:33:37 taca Exp $
 
 BLAKE2s (php-8.4.5.tar.xz) = c485bb09cdf91e15b8cc7042a0fea82908d6d3724be7cb37f0db857924017a8c
 SHA512 (php-8.4.5.tar.xz) = 02dc98ae1b8450eff1510bad40c790c1b0e79cb89cd63f40a43a0e538b7b19a70650105d01d6710bc4ecc1bc193f066c995f572f3b57f901f958db5a1f97c97c
 Size (php-8.4.5.tar.xz) = 13604056 bytes
 SHA1 (patch-build_Makefile.global) = 0d3e9c171782cc40576c377387d7c5e93add4d7f
 SHA1 (patch-build_php.m4) = bb72e38ab391ad587962940ba85e8d4de8633dca
-SHA1 (patch-configure.ac) = 436c780b755c9dc1c99f406a2d6253493eb78c3f
+SHA1 (patch-configure.ac) = 2bdd1d2b1def552032dba5fbeb6140922b72c880
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483

Index: pkgsrc/lang/php84/patches/patch-configure.ac
diff -u pkgsrc/lang/php84/patches/patch-configure.ac:1.1 pkgsrc/lang/php84/patches/patch-configure.ac:1.2
--- pkgsrc/lang/php84/patches/patch-configure.ac:1.1    Sat Feb 22 15:27:56 2025
+++ pkgsrc/lang/php84/patches/patch-configure.ac        Mon Apr  7 17:33:37 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure.ac,v 1.1 2025/02/22 15:27:56 taca Exp $
+$NetBSD: patch-configure.ac,v 1.2 2025/04/07 17:33:37 taca Exp $
 
 * libphp.so => libphp${PHP_VER}.so.
 * add ${PHP_VER} to lib/php.
 
---- configure.ac.orig  2025-01-15 01:03:17.000000000 +0000
+--- configure.ac.orig  2025-03-12 01:55:56.000000000 +0000
 +++ configure.ac
 @@ -259,7 +259,7 @@ dnl SAPI configuration.
  dnl ----------------------------------------------------------------------------
@@ -14,6 +14,15 @@ $NetBSD: patch-configure.ac,v 1.1 2025/0
  SAPI_LIBNAME_SHARED=$SAPI_LIBNAME.[]$SHLIB_DL_SUFFIX_NAME
  SAPI_LIBNAME_STATIC=$SAPI_LIBNAME.a
  SAPI_SHARED=libs/$SAPI_LIBNAME_SHARED
+@@ -1148,7 +1148,7 @@ AS_VAR_IF([PHP_PEAR], [no],, [
+   AS_VAR_IF([PHP_PEAR], [yes],
+     [AS_CASE([$PHP_LAYOUT],
+       [GNU], [PEAR_INSTALLDIR=$datadir/pear],
+-      [PEAR_INSTALLDIR=$libdir/php])],
++      [PEAR_INSTALLDIR=$libdir/php/${PHP_API_VERS}])],
+     [PEAR_INSTALLDIR=$PHP_PEAR])
+ 
+   PHP_SUBST([PEAR_INSTALLDIR])
 @@ -1306,10 +1306,10 @@ AS_VAR_IF([program_suffix], [NONE], [pro
  
  orig_libdir=$libdir

Prev by Date: CVS commit: pkgsrc/devel/wayland
Next by Date: CVS commit: pkgsrc/devel/py-ruamel-yaml
Previous by Thread: CVS commit: pkgsrc/devel/wayland
Next by Thread: CVS commit: pkgsrc/devel/py-ruamel-yaml
Indexes:

Home | Main Index | Thread Index | Old Index