CVS commit: [pkgsrc-2024Q1] pkgsrc/lang

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jun 24 18:13:14 UTC 2024

Modified Files:
        pkgsrc/lang/php81 [pkgsrc-2024Q1]: Makefile
        pkgsrc/lang/php82 [pkgsrc-2024Q1]: Makefile
        pkgsrc/lang/php83 [pkgsrc-2024Q1]: Makefile

Log Message:
Pullup ticket #6868 - requested by taca
lang/php81, lang/php82, lang/php83: bugfix

Revisions pulled up:
- lang/php81/Makefile                                           1.24
- lang/php82/Makefile                                           1.11
- lang/php83/Makefile                                           1.5

---
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Tue Jun 11 13:14:01 UTC 2024

   Modified Files:
        pkgsrc/lang/php81: Makefile
        pkgsrc/lang/php82: Makefile
        pkgsrc/lang/php83: Makefile

   Log Message:
   php8*: Run autoconf under CONFIGURE_ENV.

   Without this, depending on the user's LANG, the configure stage can break due
   to the --disable-pdo option being parsed after the checks for individual PDO
   modules, which then fail.  Something in the maze of m4 includes is dependent on
   the locale for correct ordering when generating configure.


To generate a diff of this commit:
cvs rdiff -u -r1.20.4.1 -r1.20.4.2 pkgsrc/lang/php81/Makefile
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 pkgsrc/lang/php82/Makefile
cvs rdiff -u -r1.1.4.1 -r1.1.4.2 pkgsrc/lang/php83/Makefile

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

Modified files:

Index: pkgsrc/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.20.4.1 pkgsrc/lang/php81/Makefile:1.20.4.2
--- pkgsrc/lang/php81/Makefile:1.20.4.1 Mon Jun 24 18:04:51 2024
+++ pkgsrc/lang/php81/Makefile  Mon Jun 24 18:13:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20.4.1 2024/06/24 18:04:51 bsiegert Exp $
+# $NetBSD: Makefile,v 1.20.4.2 2024/06/24 18:13:13 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -56,7 +56,7 @@ CFLAGS+=      -DSQLITE_ENABLE_LOCKING_STYLE=0
 .endif
 
 pre-configure:
-       cd ${WRKSRC} && autoconf -f
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
 
 post-install:
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \

Index: pkgsrc/lang/php82/Makefile
diff -u pkgsrc/lang/php82/Makefile:1.7.4.1 pkgsrc/lang/php82/Makefile:1.7.4.2
--- pkgsrc/lang/php82/Makefile:1.7.4.1  Mon Jun 24 18:12:30 2024
+++ pkgsrc/lang/php82/Makefile  Mon Jun 24 18:13:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.4.1 2024/06/24 18:12:30 bsiegert Exp $
+# $NetBSD: Makefile,v 1.7.4.2 2024/06/24 18:13:13 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -66,7 +66,7 @@ CFLAGS+=      -DSQLITE_ENABLE_LOCKING_STYLE=0
 .endif
 
 pre-configure:
-       cd ${WRKSRC} && autoconf -f
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
 
 post-install:
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \

Index: pkgsrc/lang/php83/Makefile
diff -u pkgsrc/lang/php83/Makefile:1.1.4.1 pkgsrc/lang/php83/Makefile:1.1.4.2
--- pkgsrc/lang/php83/Makefile:1.1.4.1  Thu Jun 13 14:34:05 2024
+++ pkgsrc/lang/php83/Makefile  Mon Jun 24 18:13:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.4.1 2024/06/13 14:34:05 bsiegert Exp $
+# $NetBSD: Makefile,v 1.1.4.2 2024/06/24 18:13:13 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -66,7 +66,7 @@ CFLAGS+=      -DSQLITE_ENABLE_LOCKING_STYLE=0
 .endif
 
 pre-configure:
-       cd ${WRKSRC} && autoconf -f
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
 
 post-install:
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \