pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/pear



Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:24:29 UTC 2025

Modified Files:
        pkgsrc/lang/pear: MESSAGE Makefile PLIST distinfo
        pkgsrc/lang/pear/files: go-pear.php
Added Files:
        pkgsrc/lang/pear: ALTERNATIVES
        pkgsrc/lang/pear/patches: patch-PEAR_Config.php

Log Message:
lang/pear: multiple PHP support

Also bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/pear/ALTERNATIVES
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/pear/MESSAGE
cvs rdiff -u -r1.64 -r1.65 pkgsrc/lang/pear/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/pear/PLIST
cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/pear/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/pear/files/go-pear.php
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/pear/patches/patch-PEAR_Config.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/pear/MESSAGE
diff -u pkgsrc/lang/pear/MESSAGE:1.4 pkgsrc/lang/pear/MESSAGE:1.5
--- pkgsrc/lang/pear/MESSAGE:1.4        Sat Mar 16 02:06:20 2013
+++ pkgsrc/lang/pear/MESSAGE    Sat Feb  8 03:24:29 2025
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2013/03/16 02:06:20 taca Exp $
+$NetBSD: MESSAGE,v 1.5 2025/02/08 03:24:29 taca Exp $
 
 In order to use PEAR packages you may want to alter the default
 include_path of PHP to include the PEAR installation directory where the
@@ -10,7 +10,7 @@ directive in your php.ini file:
 
 Change the "include_path" directive to read as follows:
 
-       include_path = ".:${PREFIX}/lib/php"
+       include_path = ".:${PREFIX}/${PHP_LIBDIR}"
 
 It should be done automatically.
 ===========================================================================

Index: pkgsrc/lang/pear/Makefile
diff -u pkgsrc/lang/pear/Makefile:1.64 pkgsrc/lang/pear/Makefile:1.65
--- pkgsrc/lang/pear/Makefile:1.64      Wed Dec 11 16:19:12 2024
+++ pkgsrc/lang/pear/Makefile   Sat Feb  8 03:24:29 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2024/12/11 16:19:12 taca Exp $
+# $NetBSD: Makefile,v 1.65 2025/02/08 03:24:29 taca Exp $
 #
 
 DISTNAME=      PEAR-1.10.16
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
 CATEGORIES=    lang
 MASTER_SITES=  http://download.pear.php.net/package/
@@ -14,14 +15,14 @@ LICENSE=    2-clause-bsd
 
 USE_LANGUAGES= # none
 EXTRACT_ONLY=  # none
-USE_TOOLS+=    gzcat
+USE_TOOLS+=    gzcat tar
 
 .include "../../lang/php/phpversion.mk"
 
 CONFLICTS+=    php<5.2.1nb2
 
 PKG_SYSCONFVAR=        php
-CONF_FILES=    ${PREFIX}/share/examples/pear/pear.conf \
+CONF_FILES=    ${PREFIX}/${PHP_EGDIR}/pear.conf \
                ${PKG_SYSCONFDIR}/pear.conf
 
 BUNDLE=                ${WRKSRC}/install/go-pear-bundle
@@ -53,14 +54,12 @@ DISTFILES+=         ${XMLUTIL_SRCS}
 
 SUBST_CLASSES+=                config
 SUBST_STAGE.config=    pre-configure
-SUBST_FILES.config=    install/go-pear.php
-SUBST_VARS.config=     WRKSRC
-SUBST_VARS.config+=    PREFIX
+SUBST_FILES.config=    install/go-pear.php PEAR/Config.php
+SUBST_VARS.config+=    PREFIX PHP_VER PHP_LIBDIR WRKSRC
 SUBST_MESSAGE.config=  Fixing configuration files.
 
-REPLACE_SH+=           scripts/pear.sh
-
-INSTALLATION_DIRS+=    share/examples/pear
+PEAR_COMMANDS=         pear peardev pecl
+INSTALLATION_DIRS+=    ${PHP_EGDIR}
 
 pre-patch:
        ${RM} ${WRKSRC}/INSTALL
@@ -76,11 +75,18 @@ do-build:
 .endfor
        ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE}
        ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE}
+       cd ${WRKDIR} && tar -u -f ${BUNDLE}/${DISTNAME}.tar \
+               ${DISTNAME}/PEAR/Config.php
 
 do-install:
-       ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local
+       ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/php${PHP_VER} ${WRKSRC}/install/go-pear.php local
        ${INSTALL_DATA} ${WRKSRC}/pear.conf \
-               ${DESTDIR}${PREFIX}/share/examples/pear/pear.conf
+               ${DESTDIR}${PREFIX}/${PHP_EGDIR}/pear.conf
+
+post-install:
+       cd ${DESTDIR}${PREFIX}/bin && for f in ${PEAR_COMMANDS}; do \
+               ${MV} -f $${f} $${f}${PHP_VER}; \
+       done
 
 .include "${PHPPKGSRCDIR}/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/pear/PLIST
diff -u pkgsrc/lang/pear/PLIST:1.12 pkgsrc/lang/pear/PLIST:1.13
--- pkgsrc/lang/pear/PLIST:1.12 Mon Jun  3 15:00:02 2024
+++ pkgsrc/lang/pear/PLIST      Sat Feb  8 03:24:29 2025
@@ -1,165 +1,166 @@
-@comment $NetBSD: PLIST,v 1.12 2024/06/03 15:00:02 taca Exp $
-bin/pear
-bin/peardev
-bin/pecl
-lib/php/.channels/.alias/pear.txt
-lib/php/.channels/.alias/pecl.txt
-lib/php/.channels/.alias/phpdocs.txt
-lib/php/.channels/__uri.reg
-lib/php/.channels/doc.php.net.reg
-lib/php/.channels/pear.php.net.reg
-lib/php/.channels/pecl.php.net.reg
-lib/php/.depdb
-lib/php/.depdblock
-lib/php/.filemap
-lib/php/.lock
-lib/php/.registry/archive_tar.reg
-lib/php/.registry/console_getopt.reg
-lib/php/.registry/pear.reg
-lib/php/.registry/structures_graph.reg
-lib/php/.registry/xml_util.reg
-lib/php/Archive/Tar.php
-lib/php/Console/Getopt.php
-lib/php/OS/Guess.php
-lib/php/PEAR.php
-lib/php/PEAR/Builder.php
-lib/php/PEAR/ChannelFile.php
-lib/php/PEAR/ChannelFile/Parser.php
-lib/php/PEAR/Command.php
-lib/php/PEAR/Command/Auth.php
-lib/php/PEAR/Command/Auth.xml
-lib/php/PEAR/Command/Build.php
-lib/php/PEAR/Command/Build.xml
-lib/php/PEAR/Command/Channels.php
-lib/php/PEAR/Command/Channels.xml
-lib/php/PEAR/Command/Common.php
-lib/php/PEAR/Command/Config.php
-lib/php/PEAR/Command/Config.xml
-lib/php/PEAR/Command/Install.php
-lib/php/PEAR/Command/Install.xml
-lib/php/PEAR/Command/Mirror.php
-lib/php/PEAR/Command/Mirror.xml
-lib/php/PEAR/Command/Package.php
-lib/php/PEAR/Command/Package.xml
-lib/php/PEAR/Command/Pickle.php
-lib/php/PEAR/Command/Pickle.xml
-lib/php/PEAR/Command/Registry.php
-lib/php/PEAR/Command/Registry.xml
-lib/php/PEAR/Command/Remote.php
-lib/php/PEAR/Command/Remote.xml
-lib/php/PEAR/Command/Test.php
-lib/php/PEAR/Command/Test.xml
-lib/php/PEAR/Common.php
-lib/php/PEAR/Config.php
-lib/php/PEAR/Dependency2.php
-lib/php/PEAR/DependencyDB.php
-lib/php/PEAR/Downloader.php
-lib/php/PEAR/Downloader/Package.php
-lib/php/PEAR/ErrorStack.php
-lib/php/PEAR/Exception.php
-lib/php/PEAR/Frontend.php
-lib/php/PEAR/Frontend/CLI.php
-lib/php/PEAR/Installer.php
-lib/php/PEAR/Installer/Role.php
-lib/php/PEAR/Installer/Role/Cfg.php
-lib/php/PEAR/Installer/Role/Cfg.xml
-lib/php/PEAR/Installer/Role/Common.php
-lib/php/PEAR/Installer/Role/Data.php
-lib/php/PEAR/Installer/Role/Data.xml
-lib/php/PEAR/Installer/Role/Doc.php
-lib/php/PEAR/Installer/Role/Doc.xml
-lib/php/PEAR/Installer/Role/Ext.php
-lib/php/PEAR/Installer/Role/Ext.xml
-lib/php/PEAR/Installer/Role/Man.php
-lib/php/PEAR/Installer/Role/Man.xml
-lib/php/PEAR/Installer/Role/Php.php
-lib/php/PEAR/Installer/Role/Php.xml
-lib/php/PEAR/Installer/Role/Script.php
-lib/php/PEAR/Installer/Role/Script.xml
-lib/php/PEAR/Installer/Role/Src.php
-lib/php/PEAR/Installer/Role/Src.xml
-lib/php/PEAR/Installer/Role/Test.php
-lib/php/PEAR/Installer/Role/Test.xml
-lib/php/PEAR/Installer/Role/Www.php
-lib/php/PEAR/Installer/Role/Www.xml
-lib/php/PEAR/PackageFile.php
-lib/php/PEAR/PackageFile/Generator/v1.php
-lib/php/PEAR/PackageFile/Generator/v2.php
-lib/php/PEAR/PackageFile/Parser/v1.php
-lib/php/PEAR/PackageFile/Parser/v2.php
-lib/php/PEAR/PackageFile/v1.php
-lib/php/PEAR/PackageFile/v2.php
-lib/php/PEAR/PackageFile/v2/Validator.php
-lib/php/PEAR/PackageFile/v2/rw.php
-lib/php/PEAR/Packager.php
-lib/php/PEAR/Proxy.php
-lib/php/PEAR/REST.php
-lib/php/PEAR/REST/10.php
-lib/php/PEAR/REST/11.php
-lib/php/PEAR/REST/13.php
-lib/php/PEAR/Registry.php
-lib/php/PEAR/RunTest.php
-lib/php/PEAR/Task/Common.php
-lib/php/PEAR/Task/Postinstallscript.php
-lib/php/PEAR/Task/Postinstallscript/rw.php
-lib/php/PEAR/Task/Replace.php
-lib/php/PEAR/Task/Replace/rw.php
-lib/php/PEAR/Task/Unixeol.php
-lib/php/PEAR/Task/Unixeol/rw.php
-lib/php/PEAR/Task/Windowseol.php
-lib/php/PEAR/Task/Windowseol/rw.php
-lib/php/PEAR/Validate.php
-lib/php/PEAR/Validator/PECL.php
-lib/php/PEAR/XMLParser.php
-lib/php/Structures/Graph.php
-lib/php/Structures/Graph/Manipulator/AcyclicTest.php
-lib/php/Structures/Graph/Manipulator/TopologicalSorter.php
-lib/php/Structures/Graph/Node.php
-lib/php/System.php
-lib/php/XML/Util.php
-lib/php/data/PEAR/package.dtd
-lib/php/data/PEAR/template.spec
-lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
-lib/php/doc/PEAR/INSTALL
-lib/php/doc/PEAR/LICENSE
-lib/php/doc/PEAR/README.rst
-lib/php/doc/Structures_Graph/LICENSE
-lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
-lib/php/doc/XML_Util/examples/example.php
-lib/php/doc/XML_Util/examples/example2.php
-lib/php/pearcmd.php
-lib/php/peclcmd.php
-lib/php/test/Console_Getopt/tests/001-getopt.phpt
-lib/php/test/Console_Getopt/tests/bug10557.phpt
-lib/php/test/Console_Getopt/tests/bug11068.phpt
-lib/php/test/Console_Getopt/tests/bug13140.phpt
-lib/php/test/Structures_Graph/tests/AcyclicTestTest.php
-lib/php/test/Structures_Graph/tests/BasicGraphTest.php
-lib/php/test/Structures_Graph/tests/TopologicalSorterTest.php
-lib/php/test/Structures_Graph/tests/helper.inc
-lib/php/test/XML_Util/tests/AbstractUnitTests.php
-lib/php/test/XML_Util/tests/ApiVersionTests.php
-lib/php/test/XML_Util/tests/AttributesToStringTests.php
-lib/php/test/XML_Util/tests/Bug18343Tests.php
-lib/php/test/XML_Util/tests/Bug21177Tests.php
-lib/php/test/XML_Util/tests/Bug21184Tests.php
-lib/php/test/XML_Util/tests/Bug4950Tests.php
-lib/php/test/XML_Util/tests/Bug5392Tests.php
-lib/php/test/XML_Util/tests/CollapseEmptyTagsTests.php
-lib/php/test/XML_Util/tests/CreateCDataSectionTests.php
-lib/php/test/XML_Util/tests/CreateCommentTests.php
-lib/php/test/XML_Util/tests/CreateEndElementTests.php
-lib/php/test/XML_Util/tests/CreateStartElementTests.php
-lib/php/test/XML_Util/tests/CreateTagFromArrayTests.php
-lib/php/test/XML_Util/tests/CreateTagTests.php
-lib/php/test/XML_Util/tests/GetDocTypeDeclarationTests.php
-lib/php/test/XML_Util/tests/GetXmlDeclarationTests.php
-lib/php/test/XML_Util/tests/IsValidNameTests.php
-lib/php/test/XML_Util/tests/RaiseErrorTests.php
-lib/php/test/XML_Util/tests/ReplaceEntitiesTests.php
-lib/php/test/XML_Util/tests/ReverseEntitiesTests.php
-lib/php/test/XML_Util/tests/SplitQualifiedNameTests.php
-share/examples/pear/pear.conf
-@pkgdir lib/php/.registry/.channel.pecl.php.net
-@pkgdir lib/php/.registry/.channel.doc.php.net
-@pkgdir lib/php/.registry/.channel.__uri
+@comment $NetBSD: PLIST,v 1.13 2025/02/08 03:24:29 taca Exp $
+bin/pear${PHP_VER}
+bin/peardev${PHP_VER}
+bin/pecl${PHP_VER}
+${PHP_LIBDIR}/.channels/.alias/pear.txt
+${PHP_LIBDIR}/.channels/.alias/pecl.txt
+${PHP_LIBDIR}/.channels/.alias/phpdocs.txt
+${PHP_LIBDIR}/.channels/__uri.reg
+${PHP_LIBDIR}/.channels/doc.php.net.reg
+${PHP_LIBDIR}/.channels/pear.php.net.reg
+${PHP_LIBDIR}/.channels/pecl.php.net.reg
+${PHP_LIBDIR}/.depdb
+${PHP_LIBDIR}/.depdblock
+${PHP_LIBDIR}/.filemap
+${PHP_LIBDIR}/.lock
+${PHP_LIBDIR}/.registry/archive_tar.reg
+${PHP_LIBDIR}/.registry/console_getopt.reg
+${PHP_LIBDIR}/.registry/pear.reg
+${PHP_LIBDIR}/.registry/structures_graph.reg
+${PHP_LIBDIR}/.registry/xml_util.reg
+${PHP_LIBDIR}/Archive/Tar.php
+${PHP_LIBDIR}/Console/Getopt.php
+${PHP_LIBDIR}/OS/Guess.php
+${PHP_LIBDIR}/PEAR.php
+${PHP_LIBDIR}/PEAR/Builder.php
+${PHP_LIBDIR}/PEAR/ChannelFile.php
+${PHP_LIBDIR}/PEAR/ChannelFile/Parser.php
+${PHP_LIBDIR}/PEAR/Command.php
+${PHP_LIBDIR}/PEAR/Command/Auth.php
+${PHP_LIBDIR}/PEAR/Command/Auth.xml
+${PHP_LIBDIR}/PEAR/Command/Build.php
+${PHP_LIBDIR}/PEAR/Command/Build.xml
+${PHP_LIBDIR}/PEAR/Command/Channels.php
+${PHP_LIBDIR}/PEAR/Command/Channels.xml
+${PHP_LIBDIR}/PEAR/Command/Common.php
+${PHP_LIBDIR}/PEAR/Command/Config.php
+${PHP_LIBDIR}/PEAR/Command/Config.xml
+${PHP_LIBDIR}/PEAR/Command/Install.php
+${PHP_LIBDIR}/PEAR/Command/Install.xml
+${PHP_LIBDIR}/PEAR/Command/Mirror.php
+${PHP_LIBDIR}/PEAR/Command/Mirror.xml
+${PHP_LIBDIR}/PEAR/Command/Package.php
+${PHP_LIBDIR}/PEAR/Command/Package.xml
+${PHP_LIBDIR}/PEAR/Command/Pickle.php
+${PHP_LIBDIR}/PEAR/Command/Pickle.xml
+${PHP_LIBDIR}/PEAR/Command/Registry.php
+${PHP_LIBDIR}/PEAR/Command/Registry.xml
+${PHP_LIBDIR}/PEAR/Command/Remote.php
+${PHP_LIBDIR}/PEAR/Command/Remote.xml
+${PHP_LIBDIR}/PEAR/Command/Test.php
+${PHP_LIBDIR}/PEAR/Command/Test.xml
+${PHP_LIBDIR}/PEAR/Common.php
+${PHP_LIBDIR}/PEAR/Config.php
+${PHP_LIBDIR}/PEAR/Dependency2.php
+${PHP_LIBDIR}/PEAR/DependencyDB.php
+${PHP_LIBDIR}/PEAR/Downloader.php
+${PHP_LIBDIR}/PEAR/Downloader/Package.php
+${PHP_LIBDIR}/PEAR/ErrorStack.php
+${PHP_LIBDIR}/PEAR/Exception.php
+${PHP_LIBDIR}/PEAR/Frontend.php
+${PHP_LIBDIR}/PEAR/Frontend/CLI.php
+${PHP_LIBDIR}/PEAR/Installer.php
+${PHP_LIBDIR}/PEAR/Installer/Role.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Cfg.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Cfg.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Common.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Data.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Data.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Doc.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Doc.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Ext.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Ext.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Man.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Man.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Php.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Php.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Script.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Script.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Src.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Src.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Test.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Test.xml
+${PHP_LIBDIR}/PEAR/Installer/Role/Www.php
+${PHP_LIBDIR}/PEAR/Installer/Role/Www.xml
+${PHP_LIBDIR}/PEAR/PackageFile.php
+${PHP_LIBDIR}/PEAR/PackageFile/Generator/v1.php
+${PHP_LIBDIR}/PEAR/PackageFile/Generator/v2.php
+${PHP_LIBDIR}/PEAR/PackageFile/Parser/v1.php
+${PHP_LIBDIR}/PEAR/PackageFile/Parser/v2.php
+${PHP_LIBDIR}/PEAR/PackageFile/v1.php
+${PHP_LIBDIR}/PEAR/PackageFile/v2.php
+${PHP_LIBDIR}/PEAR/PackageFile/v2/Validator.php
+${PHP_LIBDIR}/PEAR/PackageFile/v2/rw.php
+${PHP_LIBDIR}/PEAR/Packager.php
+${PHP_LIBDIR}/PEAR/Proxy.php
+${PHP_LIBDIR}/PEAR/REST.php
+${PHP_LIBDIR}/PEAR/REST/10.php
+${PHP_LIBDIR}/PEAR/REST/11.php
+${PHP_LIBDIR}/PEAR/REST/13.php
+${PHP_LIBDIR}/PEAR/Registry.php
+${PHP_LIBDIR}/PEAR/RunTest.php
+${PHP_LIBDIR}/PEAR/Task/Common.php
+${PHP_LIBDIR}/PEAR/Task/Postinstallscript.php
+${PHP_LIBDIR}/PEAR/Task/Postinstallscript/rw.php
+${PHP_LIBDIR}/PEAR/Task/Replace.php
+${PHP_LIBDIR}/PEAR/Task/Replace/rw.php
+${PHP_LIBDIR}/PEAR/Task/Unixeol.php
+${PHP_LIBDIR}/PEAR/Task/Unixeol/rw.php
+${PHP_LIBDIR}/PEAR/Task/Windowseol.php
+${PHP_LIBDIR}/PEAR/Task/Windowseol/rw.php
+${PHP_LIBDIR}/PEAR/Validate.php
+${PHP_LIBDIR}/PEAR/Validator/PECL.php
+${PHP_LIBDIR}/PEAR/XMLParser.php
+${PHP_LIBDIR}/Structures/Graph.php
+${PHP_LIBDIR}/Structures/Graph/Manipulator/AcyclicTest.php
+${PHP_LIBDIR}/Structures/Graph/Manipulator/TopologicalSorter.php
+${PHP_LIBDIR}/Structures/Graph/Node.php
+${PHP_LIBDIR}/System.php
+${PHP_LIBDIR}/XML/Util.php
+${PHP_LIBDIR}/data/PEAR/package.dtd
+${PHP_LIBDIR}/data/PEAR/template.spec
+${PHP_LIBDIR}/doc/Archive_Tar/docs/Archive_Tar.txt
+${PHP_LIBDIR}/doc/PEAR/INSTALL
+${PHP_LIBDIR}/doc/PEAR/LICENSE
+${PHP_LIBDIR}/doc/PEAR/README.rst
+${PHP_LIBDIR}/doc/Structures_Graph/LICENSE
+${PHP_LIBDIR}/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
+${PHP_LIBDIR}/doc/XML_Util/examples/example.php
+${PHP_LIBDIR}/doc/XML_Util/examples/example2.php
+${PHP_LIBDIR}/pearcmd.php
+${PHP_LIBDIR}/peclcmd.php
+${PHP_LIBDIR}/test/Console_Getopt/tests/001-getopt.phpt
+${PHP_LIBDIR}/test/Console_Getopt/tests/bug10557.phpt
+${PHP_LIBDIR}/test/Console_Getopt/tests/bug11068.phpt
+${PHP_LIBDIR}/test/Console_Getopt/tests/bug13140.phpt
+${PHP_LIBDIR}/test/Structures_Graph/tests/AcyclicTestTest.php
+${PHP_LIBDIR}/test/Structures_Graph/tests/BasicGraphTest.php
+${PHP_LIBDIR}/test/Structures_Graph/tests/TopologicalSorterTest.php
+${PHP_LIBDIR}/test/Structures_Graph/tests/helper.inc
+${PHP_LIBDIR}/test/XML_Util/tests/AbstractUnitTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/ApiVersionTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/AttributesToStringTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/Bug18343Tests.php
+${PHP_LIBDIR}/test/XML_Util/tests/Bug21177Tests.php
+${PHP_LIBDIR}/test/XML_Util/tests/Bug21184Tests.php
+${PHP_LIBDIR}/test/XML_Util/tests/Bug4950Tests.php
+${PHP_LIBDIR}/test/XML_Util/tests/Bug5392Tests.php
+${PHP_LIBDIR}/test/XML_Util/tests/CollapseEmptyTagsTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/CreateCDataSectionTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/CreateCommentTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/CreateEndElementTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/CreateStartElementTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/CreateTagFromArrayTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/CreateTagTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/GetDocTypeDeclarationTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/GetXmlDeclarationTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/IsValidNameTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/RaiseErrorTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/ReplaceEntitiesTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/ReverseEntitiesTests.php
+${PHP_LIBDIR}/test/XML_Util/tests/SplitQualifiedNameTests.php
+${PHP_EGDIR}/pear.conf
+@pkgdir ${PHP_LIBDIR}/.registry/.channel.pecl.php.net
+@pkgdir ${PHP_LIBDIR}/.registry/.channel.doc.php.net
+@pkgdir ${PHP_LIBDIR}/.registry/.channel.__uri
+@pkgdir ${PHP_LIBDIR}/pear

Index: pkgsrc/lang/pear/distinfo
diff -u pkgsrc/lang/pear/distinfo:1.50 pkgsrc/lang/pear/distinfo:1.51
--- pkgsrc/lang/pear/distinfo:1.50      Wed Dec 11 16:19:12 2024
+++ pkgsrc/lang/pear/distinfo   Sat Feb  8 03:24:29 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2024/12/11 16:19:12 taca Exp $
+$NetBSD: distinfo,v 1.51 2025/02/08 03:24:29 taca Exp $
 
 BLAKE2s (Archive_Tar-1.5.0.tgz) = 5002a313cbb8cbc4c614a70a05b71fa249e005a8ced26a4838a4870a92879a38
 SHA512 (Archive_Tar-1.5.0.tgz) = 2e586320ee53e05b94d0fd26185362ddd5f4bab5b8adcecc46388c6a10b98bbf187d5ce9156e2677320c319827273d537e33698c3cc27107b8d42f627c4f2880
@@ -15,3 +15,4 @@ Size (Structures_Graph-1.2.0.tgz) = 1250
 BLAKE2s (XML_Util-1.4.5.tgz) = c866e4cec481ea5ce876dfc4f5410fc389f5f2326e5fec638a51ac75eda02661
 SHA512 (XML_Util-1.4.5.tgz) = dd373c15ea8057e1a31953a10d75a4821bb9ad63d55ec5ccdbe17c114895ac9b9a57871d50f9f83bca7e3920b461417aa09063cb06051834996d4a8aebfa84c9
 Size (XML_Util-1.4.5.tgz) = 19191 bytes
+SHA1 (patch-PEAR_Config.php) = e67fe5191cf13ebd582c70944ad723bbbf676183

Index: pkgsrc/lang/pear/files/go-pear.php
diff -u pkgsrc/lang/pear/files/go-pear.php:1.5 pkgsrc/lang/pear/files/go-pear.php:1.6
--- pkgsrc/lang/pear/files/go-pear.php:1.5      Sun Mar  7 13:14:08 2021
+++ pkgsrc/lang/pear/files/go-pear.php  Sat Feb  8 03:24:29 2025
@@ -35,7 +35,7 @@
  * @author     Tias Guns <tias%ulyssis.org@localhost>
  */
 
-/* $NetBSD: go-pear.php,v 1.5 2021/03/07 13:14:08 taca Exp $ */
+/* $NetBSD: go-pear.php,v 1.6 2025/02/08 03:24:29 taca Exp $ */
 
 $sapi_name = php_sapi_name();
 
@@ -1106,14 +1106,12 @@ function detect_install_dirs($_prefix = 
         }
     } else {
         if ($_prefix === null) {
-            #$prefix    = dirname(PHP_BINDIR);
             $prefix    = "@PREFIX@";
         } else {
             $prefix = $_prefix;
         }
         $bin_dir   = '$prefix/bin';
-        #$php_dir   = '$prefix/share/pear';
-        $php_dir   = '$prefix/lib/php';
+        $php_dir   = '$prefix/@PHP_LIBDIR@';
         $doc_dir   = '$php_dir/doc';
         $data_dir  = '$php_dir/data';
         $test_dir  = '$php_dir/test';

Added files:

Index: pkgsrc/lang/pear/ALTERNATIVES
diff -u /dev/null pkgsrc/lang/pear/ALTERNATIVES:1.1
--- /dev/null   Sat Feb  8 03:24:29 2025
+++ pkgsrc/lang/pear/ALTERNATIVES       Sat Feb  8 03:24:29 2025
@@ -0,0 +1,3 @@
+bin/pear @PREFIX@/bin/pear@PHP_VER@
+bin/peardev @PREFIX@/bin/peardev@PHP_VER@
+bin/pecl @PREFIX@/bin/pecl@PHP_VER@

Index: pkgsrc/lang/pear/patches/patch-PEAR_Config.php
diff -u /dev/null pkgsrc/lang/pear/patches/patch-PEAR_Config.php:1.1
--- /dev/null   Sat Feb  8 03:24:29 2025
+++ pkgsrc/lang/pear/patches/patch-PEAR_Config.php      Sat Feb  8 03:24:29 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-PEAR_Config.php,v 1.1 2025/02/08 03:24:29 taca Exp $
+
+* Add ${PHP_VER} suffix.
+
+--- PEAR/Config.php.orig       2024-03-09 19:35:30.000000000 +0000
++++ PEAR/Config.php
+@@ -196,7 +196,7 @@ if (getenv('PHP_PEAR_PHP_BIN')) {
+     define('PEAR_CONFIG_DEFAULT_PHP_BIN', getenv('PHP_PEAR_PHP_BIN'));
+ } else {
+     define('PEAR_CONFIG_DEFAULT_PHP_BIN', PEAR_CONFIG_DEFAULT_BIN_DIR.
+-           DIRECTORY_SEPARATOR.'php'.(OS_WINDOWS ? '.exe' : ''));
++           DIRECTORY_SEPARATOR.'php@PHP_VER@'.(OS_WINDOWS ? '.exe' : ''));
+ }
+ 
+ // Default for verbose



Home | Main Index | Thread Index | Old Index