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

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Apr  8 18:27:50 UTC 2025

Modified Files:
        pkgsrc/lang/pear [pkgsrc-2025Q1]: Makefile
        pkgsrc/lang/php [pkgsrc-2025Q1]: common.mk

Log Message:
Pullup ticket #6956 - requested by taca
lang/pear: configuration file location fix

Revisions pulled up:
- lang/pear/Makefile                                            1.66
- lang/php/common.mk                                            1.15

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Mon Apr  7 17:12:28 UTC 2025

   Modified Files:
        pkgsrc/lang/pear: Makefile

   Log Message:
   lang/pear: install pear.conf to proper path

   Due to change of PKG_SYSCONFSUBDIR handling, lang/pear has lost proper
   PKG_SYSCONFDIR definition and it cause pear command reading pear.conf.

   So, include lang/php/common.mk instead of lang/php/phpversion.mk.

   Bump PKGREVISION.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Mon Apr  7 17:13:59 UTC 2025

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

   Log Message:
   lang/php/common.mk: add "used by" line

   Now this file is used by lang/pear/Makefile, too.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.65.2.1 pkgsrc/lang/pear/Makefile
cvs rdiff -u -r1.14 -r1.14.2.1 pkgsrc/lang/php/common.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/pear/Makefile
diff -u pkgsrc/lang/pear/Makefile:1.65 pkgsrc/lang/pear/Makefile:1.65.2.1
--- pkgsrc/lang/pear/Makefile:1.65      Sat Feb  8 03:24:29 2025
+++ pkgsrc/lang/pear/Makefile   Tue Apr  8 18:27:49 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2025/02/08 03:24:29 taca Exp $
+# $NetBSD: Makefile,v 1.65.2.1 2025/04/08 18:27:49 bsiegert Exp $
 #
 
 DISTNAME=      PEAR-1.10.16
-PKGREVISION=   1
+PKGREVISION=   2
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
 CATEGORIES=    lang
 MASTER_SITES=  http://download.pear.php.net/package/
@@ -17,7 +17,7 @@ USE_LANGUAGES=        # none
 EXTRACT_ONLY=  # none
 USE_TOOLS+=    gzcat tar
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/common.mk"
 
 CONFLICTS+=    php<5.2.1nb2
 

Index: pkgsrc/lang/php/common.mk
diff -u pkgsrc/lang/php/common.mk:1.14 pkgsrc/lang/php/common.mk:1.14.2.1
--- pkgsrc/lang/php/common.mk:1.14      Thu Mar 27 12:40:55 2025
+++ pkgsrc/lang/php/common.mk   Tue Apr  8 18:27:50 2025
@@ -1,4 +1,5 @@
-# $NetBSD: common.mk,v 1.14 2025/03/27 12:40:55 gdt Exp $
+# $NetBSD: common.mk,v 1.14.2.1 2025/04/08 18:27:50 bsiegert Exp $
+# used by lang/pear/Makefile
 # used by lang/php56/Makefile.common
 # used by lang/php74/Makefile.common
 # used by lang/php81/Makefile.common