CVS commit: pkgsrc/lang/pear

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Jan 21 05:10:02 UTC 2026

Modified Files:
        pkgsrc/lang/pear: Makefile PLIST

Log Message:
lang/pear: fix conflicting with base php

Rename README.pkgsrc to README-pear.pkgsrc at install.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/lang/pear/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/pear/PLIST

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.70 pkgsrc/lang/pear/Makefile:1.71
--- pkgsrc/lang/pear/Makefile:1.70      Fri Jan  2 09:09:36 2026
+++ pkgsrc/lang/pear/Makefile   Wed Jan 21 05:10:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2026/01/02 09:09:36 taca Exp $
+# $NetBSD: Makefile,v 1.71 2026/01/21 05:10:01 taca Exp $
 #
 # This is super confusing, but the PEAR tarball does not include an installer,
 # it is only available in a different installer package which bundles the PEAR
@@ -8,6 +8,7 @@
 
 DISTNAME=      pearweb_phars-1.10.25
 PKGNAME=       ${PHP_PKG_PREFIX}-pear-1.10.17
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://download.pear.php.net/package/
 EXTRACT_SUFX=  .tgz
@@ -29,7 +30,7 @@ CONF_FILES=   ${PREFIX}/${PHP_EGDIR}/pear.
 
 SUBST_CLASSES+=                config
 SUBST_STAGE.config=    pre-configure
-SUBST_FILES.config=    src/PEAR/Start.php ${WRKDIR}/README.pkgsrc
+SUBST_FILES.config=    src/PEAR/Start.php ${WRKDIR}/README-pear.pkgsrc
 SUBST_VARS.config+=    PHP_LIBDIR PKGMANDIR PREFIX WRKSRC PHP_VER
 SUBST_MESSAGE.config=  Fixing configuration files.
 
@@ -45,7 +46,7 @@ post-extract:
                '$$p = new Phar("go-pear.phar"); \
                 $$p->extractTo("src");'
        ${MV} ${WRKSRC}/go-pear.phar ${WRKSRC}/go-pear-orig.phar
-       ${CP} ${FILESDIR}/README.pkgsrc ${WRKDIR}
+       ${CP} ${FILESDIR}/README.pkgsrc ${WRKDIR}/README-pear.pkgsrc
 
 # This does not actually build anything, just packs our patched source files
 # back to an updated .phar.
@@ -62,7 +63,7 @@ do-install:
                ${PKGSRC_SETENV} ${INSTALL_ENV} ${PHPBIN} go-pear.phar
        ${INSTALL_DATA} ${WRKSRC}/pear.conf \
                ${DESTDIR}${PREFIX}/${PHP_EGDIR}/pear.conf
-       ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \
+       ${INSTALL_DATA} ${WRKDIR}/README-pear.pkgsrc \
                ${DESTDIR}${PREFIX}/${PHP_SHAREDIR}
 
 post-install:

Index: pkgsrc/lang/pear/PLIST
diff -u pkgsrc/lang/pear/PLIST:1.15 pkgsrc/lang/pear/PLIST:1.16
--- pkgsrc/lang/pear/PLIST:1.15 Fri Jan  2 09:09:36 2026
+++ pkgsrc/lang/pear/PLIST      Wed Jan 21 05:10:01 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2026/01/02 09:09:36 taca Exp $
+@comment $NetBSD: PLIST,v 1.16 2026/01/21 05:10:01 taca Exp $
 bin/pear${PHP_VER}
 bin/peardev${PHP_VER}
 bin/pecl${PHP_VER}
@@ -158,7 +158,7 @@ ${PHP_LIBDIR}/test/XML_Util/tests/Replac
 ${PHP_LIBDIR}/test/XML_Util/tests/ReverseEntitiesTests.php
 ${PHP_LIBDIR}/test/XML_Util/tests/SplitQualifiedNameTests.php
 ${PHP_EGDIR}/pear.conf
-${PHP_SHAREDIR}/README.pkgsrc
+${PHP_SHAREDIR}/README-pear.pkgsrc
 @pkgdir ${PHP_LIBDIR}/.registry/.channel.pecl.php.net
 @pkgdir ${PHP_LIBDIR}/.registry/.channel.doc.php.net
 @pkgdir ${PHP_LIBDIR}/.registry/.channel.__uri