CVS commit: pkgsrc

["Takahiro Kambe" <taca%netbsd.org@localhost>]

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.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/php81/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php81/Makefile.php
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/php82/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php82/Makefile.php
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php83/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php83/Makefile.php
cvs rdiff -u -r1.56 -r1.57 pkgsrc/www/ap-php/Makefile
cvs rdiff -u -r1.40 -r1.41 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/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.22 pkgsrc/lang/php81/Makefile:1.23
--- pkgsrc/lang/php81/Makefile:1.22     Fri Jun  7 13:54:25 2024
+++ pkgsrc/lang/php81/Makefile  Fri Jun  7 23:11:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/06/07 13:54:25 taca Exp $
+# $NetBSD: Makefile,v 1.23 2024/06/07 23:11:40 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -42,16 +42,6 @@ PHP_PKGCONFIG_PATH=  ${PKGCONFIG_PATHS:ts
 
 REPLACE_PHP=           ext/phar/phar/phar.php run-tests.php
 
-SUBST_CLASSES+=                path
-SUBST_MESSAGE.path=    Fixing common paths.
-SUBST_STAGE.path=      pre-configure
-SUBST_FILES.path=      build/php.m4
-SUBST_FILES.path+=     php.ini-development php.ini-production
-SUBST_FILES.path+=     sapi/cgi/Makefile.frag
-SUBST_VARS.path=       CGIDIR
-SUBST_VARS.path+=      PREFIX
-SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
-
 INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
 # Make sure modules can link correctly

Index: pkgsrc/lang/php81/Makefile.php
diff -u pkgsrc/lang/php81/Makefile.php:1.1 pkgsrc/lang/php81/Makefile.php:1.2
--- pkgsrc/lang/php81/Makefile.php:1.1  Sat Nov 27 07:24:43 2021
+++ pkgsrc/lang/php81/Makefile.php      Fri Jun  7 23:11:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2021/11/27 07:24:43 taca Exp $
+# $NetBSD: Makefile.php,v 1.2 2024/06/07 23:11:40 taca Exp $
 # used by lang/php81/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -47,6 +47,16 @@ CONFIGURE_ARGS+=     --enable-xml
 
 CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
+SUBST_CLASSES+=                path
+SUBST_MESSAGE.path=    Fixing common paths.
+SUBST_STAGE.path=      pre-configure
+SUBST_FILES.path=      build/php.m4
+SUBST_FILES.path+=     php.ini-development php.ini-production
+SUBST_FILES.path+=     sapi/cgi/Makefile.frag
+SUBST_VARS.path=       CGIDIR
+SUBST_VARS.path+=      PREFIX
+SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
+
 .include "../../textproc/libxml2/buildlink3.mk"
 
 #CONFIGURE_ARGS+=      --with-pcre-regex=${BUILDLINK_PREFIX.pcre2}

Index: pkgsrc/lang/php82/Makefile
diff -u pkgsrc/lang/php82/Makefile:1.9 pkgsrc/lang/php82/Makefile:1.10
--- pkgsrc/lang/php82/Makefile:1.9      Fri Jun  7 13:58:44 2024
+++ pkgsrc/lang/php82/Makefile  Fri Jun  7 23:11:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/06/07 13:58:44 taca Exp $
+# $NetBSD: Makefile,v 1.10 2024/06/07 23:11:41 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -42,16 +42,6 @@ PHP_PKGCONFIG_PATH=  ${PKGCONFIG_PATHS:ts
 
 REPLACE_PHP=           ext/phar/phar/phar.php run-tests.php
 
-SUBST_CLASSES+=                path
-SUBST_MESSAGE.path=    Fixing common paths.
-SUBST_STAGE.path=      pre-configure
-SUBST_FILES.path=      build/php.m4
-SUBST_FILES.path+=     php.ini-development php.ini-production
-SUBST_FILES.path+=     sapi/cgi/Makefile.frag
-SUBST_VARS.path=       CGIDIR
-SUBST_VARS.path+=      PREFIX
-SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
-
 INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
 # Make sure modules can link correctly

Index: pkgsrc/lang/php82/Makefile.php
diff -u pkgsrc/lang/php82/Makefile.php:1.1 pkgsrc/lang/php82/Makefile.php:1.2
--- pkgsrc/lang/php82/Makefile.php:1.1  Sun Dec 11 14:12:29 2022
+++ pkgsrc/lang/php82/Makefile.php      Fri Jun  7 23:11:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2022/12/11 14:12:29 taca Exp $
+# $NetBSD: Makefile.php,v 1.2 2024/06/07 23:11:41 taca Exp $
 # used by lang/php82/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -47,6 +47,16 @@ CONFIGURE_ARGS+=     --enable-xml
 
 CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
+SUBST_CLASSES+=                path
+SUBST_MESSAGE.path=    Fixing common paths.
+SUBST_STAGE.path=      pre-configure
+SUBST_FILES.path=      build/php.m4
+SUBST_FILES.path+=     php.ini-development php.ini-production
+SUBST_FILES.path+=     sapi/cgi/Makefile.frag
+SUBST_VARS.path=       CGIDIR
+SUBST_VARS.path+=      PREFIX
+SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
+
 .include "../../textproc/libxml2/buildlink3.mk"
 
 #CONFIGURE_ARGS+=      --with-pcre-regex=${BUILDLINK_PREFIX.pcre2}

Index: pkgsrc/lang/php83/Makefile
diff -u pkgsrc/lang/php83/Makefile:1.3 pkgsrc/lang/php83/Makefile:1.4
--- pkgsrc/lang/php83/Makefile:1.3      Fri Jun  7 13:57:24 2024
+++ pkgsrc/lang/php83/Makefile  Fri Jun  7 23:11:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/06/07 13:57:24 taca Exp $
+# $NetBSD: Makefile,v 1.4 2024/06/07 23:11:41 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -42,16 +42,6 @@ PHP_PKGCONFIG_PATH=  ${PKGCONFIG_PATHS:ts
 
 REPLACE_PHP=           ext/phar/phar/phar.php run-tests.php
 
-SUBST_CLASSES+=                path
-SUBST_MESSAGE.path=    Fixing common paths.
-SUBST_STAGE.path=      pre-configure
-SUBST_FILES.path=      build/php.m4
-SUBST_FILES.path+=     php.ini-development php.ini-production
-SUBST_FILES.path+=     sapi/cgi/Makefile.frag
-SUBST_VARS.path=       CGIDIR
-SUBST_VARS.path+=      PREFIX
-SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
-
 INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
 # Make sure modules can link correctly

Index: pkgsrc/lang/php83/Makefile.php
diff -u pkgsrc/lang/php83/Makefile.php:1.1 pkgsrc/lang/php83/Makefile.php:1.2
--- pkgsrc/lang/php83/Makefile.php:1.1  Thu Nov 30 16:14:50 2023
+++ pkgsrc/lang/php83/Makefile.php      Fri Jun  7 23:11:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2023/11/30 16:14:50 taca Exp $
+# $NetBSD: Makefile.php,v 1.2 2024/06/07 23:11:41 taca Exp $
 # used by lang/php83/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -47,6 +47,16 @@ CONFIGURE_ARGS+=     --enable-xml
 
 CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
+SUBST_CLASSES+=                path
+SUBST_MESSAGE.path=    Fixing common paths.
+SUBST_STAGE.path=      pre-configure
+SUBST_FILES.path=      build/php.m4
+SUBST_FILES.path+=     php.ini-development php.ini-production
+SUBST_FILES.path+=     sapi/cgi/Makefile.frag
+SUBST_VARS.path=       CGIDIR
+SUBST_VARS.path+=      PREFIX
+SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH
+
 .include "../../textproc/libxml2/buildlink3.mk"
 
 #CONFIGURE_ARGS+=      --with-pcre-regex=${BUILDLINK_PREFIX.pcre2}

Index: pkgsrc/www/ap-php/Makefile
diff -u pkgsrc/www/ap-php/Makefile:1.56 pkgsrc/www/ap-php/Makefile:1.57
--- pkgsrc/www/ap-php/Makefile:1.56     Tue Jan  9 16:12:54 2024
+++ pkgsrc/www/ap-php/Makefile  Fri Jun  7 23:11:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2024/01/09 16:12:54 sborrill Exp $
+# $NetBSD: Makefile,v 1.57 2024/06/07 23:11:41 taca 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} && 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.41
--- pkgsrc/www/php-fpm/Makefile:1.40    Wed Apr 19 08:11:50 2023
+++ pkgsrc/www/php-fpm/Makefile Fri Jun  7 23:11:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/04/19 08:11:50 adam Exp $
+# $NetBSD: Makefile,v 1.41 2024/06/07 23:11:41 taca 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} && 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/