CVS commit: pkgsrc/lang/php85

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Jan 10 09:10:48 UTC 2026

Modified Files:
        pkgsrc/lang/php85: Makefile Makefile.php

Log Message:
lang/php5: fix build problem of php85-fpm

Move PHP_PKGSRC_README from Makefile.php to Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php85/Makefile \
    pkgsrc/lang/php85/Makefile.php

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

Modified files:

Index: pkgsrc/lang/php85/Makefile
diff -u pkgsrc/lang/php85/Makefile:1.1 pkgsrc/lang/php85/Makefile:1.2
--- pkgsrc/lang/php85/Makefile:1.1      Thu Jan  8 13:38:00 2026
+++ pkgsrc/lang/php85/Makefile  Sat Jan 10 09:10:48 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/01/08 13:38:00 taca Exp $
+# $NetBSD: Makefile,v 1.2 2026/01/10 09:10:48 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -37,12 +37,15 @@ PKGCONFIG_PATHS+=   ${X11BASE}/lib/pkgconf
 .endif
 
 PHP_PKGCONFIG_PATH=    ${PKGCONFIG_PATHS:ts:}
+SUBST_FILES.path+=     ${WRKDIR}/${PHP_PKGSRC_README:T}
 
 REPLACE_PHP=           ext/phar/phar/phar.php run-tests.php
 
 INSTALLATION_DIRS+=    ${CGIDIR} ${PHP_EXTENSION_DIR} ${PHP_EGDIR} \
                        ${PHP_SHAREDIR}
 
+PHP_PKGSRC_README=     ../../lang/php/files/README.pkgsrc
+
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=    yes
Index: pkgsrc/lang/php85/Makefile.php
diff -u pkgsrc/lang/php85/Makefile.php:1.1 pkgsrc/lang/php85/Makefile.php:1.2
--- pkgsrc/lang/php85/Makefile.php:1.1  Thu Jan  8 13:38:00 2026
+++ pkgsrc/lang/php85/Makefile.php      Sat Jan 10 09:10:48 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2026/01/08 13:38:00 taca Exp $
+# $NetBSD: Makefile.php,v 1.2 2026/01/10 09:10:48 taca Exp $
 # used by lang/php85/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -24,8 +24,6 @@ PLIST_VARS+=          dtrace
 DISTINFO_FILE= ${.CURDIR}/../../lang/php85/distinfo
 PATCHDIR=      ${.CURDIR}/../../lang/php85/patches
 
-PHP_PKGSRC_README=     ../../lang/php/files/README.pkgsrc
-
 PLIST_SUBST+=  PHP_VER="${PHP_VER}"
 
 PRINT_PLIST_AWK+=      /${PHP_EXTENSION_DIR:S/\//\\\//g}/ \
@@ -87,7 +85,6 @@ SUBST_FILES.path+=    sapi/cgi/Makefile.fra
 SUBST_FILES.path+=     sapi/fpm/php-fpm.conf.in sapi/fpm/www.conf.in
 SUBST_FILES.path+=     sapi/fpm/fpm/fpm_conf.c
 SUBST_FILES.path+=     scripts/php-config.in scripts/phpize.in
-SUBST_FILES.path+=     ${WRKDIR}/${PHP_PKGSRC_README:T}
 SUBST_VARS.path=       PREFIX CGIDIR PHP_VER PHP_API_VERS
 SUBST_VARS.path+=      PHP_EGDIR PHP_INCDIR PHP_LIBDIR
 SUBST_VARS.path+=      TOOLS_PATH.pkg-config PHP_PKGCONFIG_PATH