CVS commit: pkgsrc/lang/php

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar 27 12:40:56 UTC 2025

Modified Files:
        pkgsrc/lang/php: common.mk phpversion.mk

Log Message:
lang/php: Narrow scope of PKG_SYSCONFSUBDIR

Move the setting of PKG_SYSCONFSUBDIR from phpversion.mk to common.mk,
so that it will continue to apply to:

  - phpNN packages
  - php-foo packages that are PHP extensions

and that it will not apply to

  - packages that simply use php, e.g. php-nextcloud

This should resolve a regression in security/zoneminder where
PKG_SYSCONFDIR ended up set to the php location (but already fixed
separately).  Likely resolves an unknown number of similar
regressions.

Tested lightly that it adjusts settings as intended.
Reviewed by sborrill@.  No other comments/objections received.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/php/common.mk
cvs rdiff -u -r1.459 -r1.460 pkgsrc/lang/php/phpversion.mk

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

Modified files:

Index: pkgsrc/lang/php/common.mk
diff -u pkgsrc/lang/php/common.mk:1.13 pkgsrc/lang/php/common.mk:1.14
--- pkgsrc/lang/php/common.mk:1.13      Sat Feb  8 02:56:24 2025
+++ pkgsrc/lang/php/common.mk   Thu Mar 27 12:40:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: common.mk,v 1.13 2025/02/08 02:56:24 taca Exp $
+# $NetBSD: common.mk,v 1.14 2025/03/27 12:40:55 gdt Exp $
 # used by lang/php56/Makefile.common
 # used by lang/php74/Makefile.common
 # used by lang/php81/Makefile.common
@@ -18,4 +18,7 @@ EXTRACT_SUFX?=                .tar.xz
 HOMEPAGE?=             https://www.php.net/
 
 .include "../../lang/php/phpversion.mk"
+
+PKG_SYSCONFSUBDIR?=    php/${PHP_API_VERS}
+
 .endif # PHPCOMMON_MK

Index: pkgsrc/lang/php/phpversion.mk
diff -u pkgsrc/lang/php/phpversion.mk:1.459 pkgsrc/lang/php/phpversion.mk:1.460
--- pkgsrc/lang/php/phpversion.mk:1.459 Fri Mar 14 15:27:16 2025
+++ pkgsrc/lang/php/phpversion.mk       Thu Mar 27 12:40:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.459 2025/03/14 15:27:16 taca Exp $
+# $NetBSD: phpversion.mk,v 1.460 2025/03/27 12:40:55 gdt Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -218,8 +218,6 @@ PHP_SHAREDIR=               share/php/${PHP_API_VERS}
 
 PHP_EXTENSION_DIR=     ${PHP_LIBDIR}/${MACHINE_GNU_ARCH}
 
-PKG_SYSCONFSUBDIR?=    php/${PHP_API_VERS}
-
 MAKE_ENV+=             PHP_VERSION_REQD="${PHP_VER}" \
                        PHP_VER="${PHP_VER}" PHP_API_VERS="${PHP_API_VERS}" \
                        PHP_INCDIR="${PHP_INCDIR}" \