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

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Jun 25 18:20:17 UTC 2024

Modified Files:
        pkgsrc/www/ap-php [pkgsrc-2024Q1]: Makefile
        pkgsrc/www/php-fpm [pkgsrc-2024Q1]: Makefile

Log Message:
Pullup ticket #6865 (second part) - requested by taca
www/ap-php: build fix
www/php-fpm: build fix

Revisions pulled up:
- www/ap-php/Makefile                                           1.57-1.58
- www/php-fpm/Makefile                                          1.41-1.42

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Jun  7 23:11:41 UTC 2024

   Modified Files:
        pkgsrc/lang/php81: Makefile Makefile.php
        pkgsrc/lang/php82: Makefile Makefile.php
        pkgsrc/lang/php83: Makefile Makefile.php
        pkgsrc/www/ap-php: Makefile
        pkgsrc/www/php-fpm: Makefile

   Log Message:
   Fix build problem of www/ap-php and www/php-fpm.

   Switch these packages to use autoconf, too.

---
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Sat Jun 15 08:01:18 UTC 2024

   Modified Files:
        pkgsrc/www/ap-php: Makefile

   Log Message:
   ap-php: 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.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sat Jun 15 08:26:25 UTC 2024

   Modified Files:
        pkgsrc/www/php-fpm: Makefile

   Log Message:
   www/php-fpm: Run autoconf under CONFIGURE_ENV.

   The same change as jperkin@ did.  (Thank you!)

   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.56 -r1.56.2.1 pkgsrc/www/ap-php/Makefile
cvs rdiff -u -r1.40 -r1.40.8.1 pkgsrc/www/php-fpm/Makefile

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

Modified files:

Index: pkgsrc/www/ap-php/Makefile
diff -u pkgsrc/www/ap-php/Makefile:1.56 pkgsrc/www/ap-php/Makefile:1.56.2.1
--- pkgsrc/www/ap-php/Makefile:1.56     Tue Jan  9 16:12:54 2024
+++ pkgsrc/www/ap-php/Makefile  Tue Jun 25 18:20:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2024/01/09 16:12:54 sborrill Exp $
+# $NetBSD: Makefile,v 1.56.2.1 2024/06/25 18:20:17 bsiegert Exp $
 
 PKGNAME=               ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_VERSION}
 PKGREVISION=           11
@@ -6,7 +6,7 @@ COMMENT=                Apache (${PKG_APACHE}) module 
 
 CONFLICTS=             ap-php-[0-9]*
 
-USE_TOOLS+=            lex pkg-config
+USE_TOOLS+=            autoconf lex pkg-config
 
 APACHE_MODULE=         YES
 
@@ -21,6 +21,9 @@ CONFIGURE_ENV+=               EXTRA_LDFLAGS=${EXPORT_
 
 INSTALLATION_DIRS=     lib/httpd
 
+pre-configure:
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
+
 do-install:
        if [ -f ${WRKSRC}/.libs/libphp${PKG_PHP_MAJOR_VERS}.so ]; then  \
                ${INSTALL_DATA} ${WRKSRC}/.libs/libphp${PKG_PHP_MAJOR_VERS}.so \

Index: pkgsrc/www/php-fpm/Makefile
diff -u pkgsrc/www/php-fpm/Makefile:1.40 pkgsrc/www/php-fpm/Makefile:1.40.8.1
--- pkgsrc/www/php-fpm/Makefile:1.40    Wed Apr 19 08:11:50 2023
+++ pkgsrc/www/php-fpm/Makefile Tue Jun 25 18:20:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/04/19 08:11:50 adam Exp $
+# $NetBSD: Makefile,v 1.40.8.1 2024/06/25 18:20:17 bsiegert Exp $
 
 PKGNAME=       ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION}
 PKGREVISION=   11
@@ -8,7 +8,7 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       FPM interface for ${PKG_PHP}
 LICENSE=       2-clause-bsd
 
-USE_TOOLS+=    pkg-config
+USE_TOOLS+=    autoconf pkg-config
 
 LIBTOOL_OVERRIDE=      # empty
 
@@ -51,6 +51,9 @@ RCD_SCRIPTS=          php_fpm
 MESSAGE_SUBST+=                CGIDIR=${CGIDIR}
 MESSAGE_SUBST+=                VARBASE=${VARBASE}
 
+pre-configure:
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm
        ${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/