diff --git a/devel/pear/Makefile b/devel/pear/Makefile
index 4ec6f3d7dcfd..08372c38380a 100644
--- a/devel/pear/Makefile
+++ b/devel/pear/Makefile
@@ -1,46 +1,75 @@
 PORTNAME=	pear
-PORTVERSION=	1.10.13
+PORTVERSION=	1.10.16
 CATEGORIES=	devel
-MASTER_SITES=	http://build.dimapanov.com/~fluffy/distfiles/ \
-		LOCAL/fluffy \
-		LOCAL/joneum
+MASTER_SITES=	https://pear.php.net/:go \
+		https://download.pear.php.net/package/
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
+DISTNAME=	PEAR-${DISTVERSION}
+DISTFILES=	go-pear:go ${DISTNAME}${EXTRACT_SUFX} \
+		${SGRAPH_DISTNAME} ${TAR_DISTNAME} \
+		${XMLU_DISTNAME} ${GETOPT_DISTNAME}
+DIST_SUBDIR=	PEAR
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		${GETOPT_DISTNAME} \
+		${TAR_DISTNAME} \
+		${SGRAPH_DISTNAME} \
+		${XMLU_DISTNAME}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	PEAR framework for PHP
 WWW=		https://pear.php.net/
 
 LICENSE=	PHP301
 
-USES=		cpe php:build,cli,flavors tar:xz
+USES=		cpe php:build,cli,flavors tar:tgz
 CPE_VENDOR=	php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_PHP=	xml:build zlib:build
 
+TAR_DISTNAME=		Archive_Tar-1.6.0${EXTRACT_SUFX}
+GETOPT_DISTNAME=	Console_Getopt-1.4.3${EXTRACT_SUFX}
+SGRAPH_DISTNAME=	Structures_Graph-1.2.0${EXTRACT_SUFX}
+XMLU_DISTNAME=		XML_Util-1.4.5${EXTRACT_SUFX}
+
 PEARDIR=	${PREFIX}/share/pear
 
 OPTIONS_DEFINE=	DOCS
 
+post-extract:
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/go-pear ${WRKSRC}/
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
-		-e "s|%%BUNDLEDIR%%|${WRKSRC}/go-pear-bundle|" \
+		-e "s|%%BUNDLEDIR%%|${WRKSRC}|" \
 		-e "s|%%TMPDIR%%|/tmp/pear|" \
 		${WRKSRC}/go-pear
-	@cd ${WRKSRC}/go-pear-bundle && ${MKDIR} tmp && ${TAR} -C tmp -xzf PEAR-${PORTVERSION}.tgz
+	@${MKDIR} ${WRKSRC}/go-pear-bundle
+	@${CP} ${WRKSRC}/PEAR.php ${WRKSRC}/go-pear-bundle/PEAR.php
+	@${CP} ${WRKDIR}/${TAR_DISTNAME:S/${EXTRACT_SUFX}//}/Archive/Tar.php ${WRKSRC}/go-pear-bundle/
+	@${CP} ${WRKDIR}/${GETOPT_DISTNAME:S/${EXTRACT_SUFX}//}/Console/Getopt.php ${WRKSRC}/go-pear-bundle/
+	@${CP} -r ${WRKDIR}/${TAR_DISTNAME:S/${EXTRACT_SUFX}//}/Archive ${WRKSRC}/
+	@${CP} -r ${WRKDIR}/${GETOPT_DISTNAME:S/${EXTRACT_SUFX}//}/Console ${WRKSRC}/
+	@${CP} -r ${WRKDIR}/${SGRAPH_DISTNAME:S/${EXTRACT_SUFX}//}/Structures ${WRKSRC}/
+	@${CP} -r ${WRKDIR}/${XMLU_DISTNAME:S/${EXTRACT_SUFX}//}/XML ${WRKSRC}/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${TAR_DISTNAME} ${WRKSRC}/go-pear-bundle/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${GETOPT_DISTNAME} ${WRKSRC}/go-pear-bundle/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC}/go-pear-bundle/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SGRAPH_DISTNAME} ${WRKSRC}/go-pear-bundle/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${XMLU_DISTNAME} ${WRKSRC}/go-pear-bundle/
+	@cd ${WRKSRC}/go-pear-bundle && ${MKDIR} tmp && ${TAR} -C tmp -xzf PEAR-${PORTVERSION}${EXTRACT_SUFX}
 	@cd ${WRKSRC}/go-pear-bundle/tmp/PEAR-${PORTVERSION} && ${PATCH} -s -p0 < ${FILESDIR}/extra-patch-PEAR-Config.php
 	@${RM} ${WRKSRC}/go-pear-bundle/tmp/PEAR-${PORTVERSION}/PEAR/Config.php.orig
-	@${MD5} -q ${WRKSRC}/go-pear-bundle/tmp/PEAR-${PORTVERSION}/PEAR/Config.php > ${WRKSRC}/Config.php.md5
-	@cd ${WRKSRC}/go-pear-bundle/tmp && ${TAR} -czf ../PEAR-${PORTVERSION}.tgz PEAR-${PORTVERSION} package.xml
+	@cd ${WRKSRC}/go-pear-bundle/tmp && ${TAR} -czf ../PEAR-${PORTVERSION}${EXTRACT_SUFX} PEAR-${PORTVERSION} package.xml
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${LOCALBASE}/bin/php -q ./go-pear
 # pear violates stage when staging as root, hide this
 .if defined(PACKAGE_BUILDING)
 	@${RM} -r ${PEARDIR}
 .endif
 # Clean up orphans re-generated by pkg-install
 	@${RM} -r ${STAGEDIR}${PEARDIR}/.depdb ${STAGEDIR}${PEARDIR}/.depdblock ${STAGEDIR}${PEARDIR}/.filemap ${STAGEDIR}${PEARDIR}/.lock
 
 .include <bsd.port.mk>
diff --git a/devel/pear/distinfo b/devel/pear/distinfo
index a913c464be17..200827ec988d 100644
--- a/devel/pear/distinfo
+++ b/devel/pear/distinfo
@@ -1,3 +1,13 @@
-TIMESTAMP = 1663752211
-SHA256 (pear-1.10.13.tar.xz) = 32932cb1fcd5dbc70fc1f1158b35fb637f5f47552ee2ec24135ac20fd59c6524
-SIZE (pear-1.10.13.tar.xz) = 419999
+TIMESTAMP = 1761576370
+SHA256 (PEAR/go-pear) = 8b5b760571cf36806507a4e6a5f09b26f4b78ebb606d2a3bfc51447871282739
+SIZE (PEAR/go-pear) = 88959
+SHA256 (PEAR/PEAR-1.10.16.tgz) = 65268187f21186876af5078aff3ec7d8a8f854ea2e808fca149463eea4da2e91
+SIZE (PEAR/PEAR-1.10.16.tgz) = 293781
+SHA256 (PEAR/Structures_Graph-1.2.0.tgz) = d8d8996c5d3c68119c00b0724fe20f46ae0aa7795aa71d94e6b0622315e6a9e9
+SIZE (PEAR/Structures_Graph-1.2.0.tgz) = 12507
+SHA256 (PEAR/Archive_Tar-1.6.0.tgz) = f856095f64bb3ffa44f870202ffca8f4e6eceef3cb74674f12be3362faafa7d3
+SIZE (PEAR/Archive_Tar-1.6.0.tgz) = 22303
+SHA256 (PEAR/XML_Util-1.4.5.tgz) = e0f8736cb47ce9dd32814de45425ff03ad55a72ba8bb757e42c456f861feedf6
+SIZE (PEAR/XML_Util-1.4.5.tgz) = 19191
+SHA256 (PEAR/Console_Getopt-1.4.3.tgz) = 54bdfb7c2c958cbd7e1e8f1b964b95c3bfbf3b2779052523011b4ee49d7dfacd
+SIZE (PEAR/Console_Getopt-1.4.3.tgz) = 5789
diff --git a/devel/pear/pkg-plist b/devel/pear/pkg-plist
index 484ebd74e70f..bba57885294b 100644
--- a/devel/pear/pkg-plist
+++ b/devel/pear/pkg-plist
@@ -1,140 +1,139 @@
 bin/pear
 bin/peardev
 bin/pecl
 @sample etc/pear.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/Archive_Tar/docs/Archive_Tar.txt
 %%PORTDOCS%%%%DOCSDIR%%/PEAR/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/PEAR/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/PEAR/README.rst
 %%PORTDOCS%%%%DOCSDIR%%/Structures_Graph/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
 %%DATADIR%%/.channels/.alias/pear.txt
 %%DATADIR%%/.channels/.alias/pecl.txt
 %%DATADIR%%/.channels/.alias/phpdocs.txt
 %%DATADIR%%/.channels/__uri.reg
 %%DATADIR%%/.channels/doc.php.net.reg
 %%DATADIR%%/.channels/pear.php.net.reg
 %%DATADIR%%/.channels/pecl.php.net.reg
 @touch share/pear/.depdb share/pear/.depdblock share/pear/.filemap share/pear/.lock
 %%DATADIR%%/.registry/archive_tar.reg
 %%DATADIR%%/.registry/console_getopt.reg
 %%DATADIR%%/.registry/pear.reg
 %%DATADIR%%/.registry/structures_graph.reg
 %%DATADIR%%/Archive/Tar.php
 %%DATADIR%%/Console/Getopt.php
 %%DATADIR%%/OS/Guess.php
 %%DATADIR%%/PEAR.php
 %%DATADIR%%/PEAR/Builder.php
 %%DATADIR%%/PEAR/ChannelFile.php
 %%DATADIR%%/PEAR/ChannelFile/Parser.php
 %%DATADIR%%/PEAR/Command.php
 %%DATADIR%%/PEAR/Command/Auth.php
 %%DATADIR%%/PEAR/Command/Auth.xml
 %%DATADIR%%/PEAR/Command/Build.php
 %%DATADIR%%/PEAR/Command/Build.xml
 %%DATADIR%%/PEAR/Command/Channels.php
 %%DATADIR%%/PEAR/Command/Channels.xml
 %%DATADIR%%/PEAR/Command/Common.php
 %%DATADIR%%/PEAR/Command/Config.php
 %%DATADIR%%/PEAR/Command/Config.xml
 %%DATADIR%%/PEAR/Command/Install.php
 %%DATADIR%%/PEAR/Command/Install.xml
 %%DATADIR%%/PEAR/Command/Mirror.php
 %%DATADIR%%/PEAR/Command/Mirror.xml
 %%DATADIR%%/PEAR/Command/Package.php
 %%DATADIR%%/PEAR/Command/Package.xml
 %%DATADIR%%/PEAR/Command/Pickle.php
 %%DATADIR%%/PEAR/Command/Pickle.xml
 %%DATADIR%%/PEAR/Command/Registry.php
 %%DATADIR%%/PEAR/Command/Registry.xml
 %%DATADIR%%/PEAR/Command/Remote.php
 %%DATADIR%%/PEAR/Command/Remote.xml
 %%DATADIR%%/PEAR/Command/Test.php
 %%DATADIR%%/PEAR/Command/Test.xml
 %%DATADIR%%/PEAR/Common.php
 %%DATADIR%%/PEAR/Config.php
 %%DATADIR%%/PEAR/Dependency2.php
 %%DATADIR%%/PEAR/DependencyDB.php
 %%DATADIR%%/PEAR/Downloader.php
 %%DATADIR%%/PEAR/Downloader/Package.php
 %%DATADIR%%/PEAR/ErrorStack.php
 %%DATADIR%%/PEAR/Exception.php
 %%DATADIR%%/PEAR/Frontend.php
 %%DATADIR%%/PEAR/Frontend/CLI.php
 %%DATADIR%%/PEAR/Installer.php
 %%DATADIR%%/PEAR/Installer/Role.php
 %%DATADIR%%/PEAR/Installer/Role/Cfg.php
 %%DATADIR%%/PEAR/Installer/Role/Cfg.xml
 %%DATADIR%%/PEAR/Installer/Role/Common.php
 %%DATADIR%%/PEAR/Installer/Role/Data.php
 %%DATADIR%%/PEAR/Installer/Role/Data.xml
 %%DATADIR%%/PEAR/Installer/Role/Doc.php
 %%DATADIR%%/PEAR/Installer/Role/Doc.xml
 %%DATADIR%%/PEAR/Installer/Role/Ext.php
 %%DATADIR%%/PEAR/Installer/Role/Ext.xml
 %%DATADIR%%/PEAR/Installer/Role/Man.php
 %%DATADIR%%/PEAR/Installer/Role/Man.xml
 %%DATADIR%%/PEAR/Installer/Role/Php.php
 %%DATADIR%%/PEAR/Installer/Role/Php.xml
 %%DATADIR%%/PEAR/Installer/Role/Script.php
 %%DATADIR%%/PEAR/Installer/Role/Script.xml
 %%DATADIR%%/PEAR/Installer/Role/Src.php
 %%DATADIR%%/PEAR/Installer/Role/Src.xml
 %%DATADIR%%/PEAR/Installer/Role/Test.php
 %%DATADIR%%/PEAR/Installer/Role/Test.xml
 %%DATADIR%%/PEAR/Installer/Role/Www.php
 %%DATADIR%%/PEAR/Installer/Role/Www.xml
 %%DATADIR%%/PEAR/PackageFile.php
 %%DATADIR%%/PEAR/PackageFile/Generator/v1.php
 %%DATADIR%%/PEAR/PackageFile/Generator/v2.php
 %%DATADIR%%/PEAR/PackageFile/Parser/v1.php
 %%DATADIR%%/PEAR/PackageFile/Parser/v2.php
 %%DATADIR%%/PEAR/PackageFile/v1.php
 %%DATADIR%%/PEAR/PackageFile/v2.php
 %%DATADIR%%/PEAR/PackageFile/v2/Validator.php
 %%DATADIR%%/PEAR/PackageFile/v2/rw.php
 %%DATADIR%%/PEAR/Packager.php
 %%DATADIR%%/PEAR/Proxy.php
 %%DATADIR%%/PEAR/REST.php
 %%DATADIR%%/PEAR/REST/10.php
 %%DATADIR%%/PEAR/REST/11.php
 %%DATADIR%%/PEAR/REST/13.php
 %%DATADIR%%/PEAR/Registry.php
 %%DATADIR%%/PEAR/RunTest.php
 %%DATADIR%%/PEAR/Task/Common.php
 %%DATADIR%%/PEAR/Task/Postinstallscript.php
 %%DATADIR%%/PEAR/Task/Postinstallscript/rw.php
 %%DATADIR%%/PEAR/Task/Replace.php
 %%DATADIR%%/PEAR/Task/Replace/rw.php
 %%DATADIR%%/PEAR/Task/Unixeol.php
 %%DATADIR%%/PEAR/Task/Unixeol/rw.php
 %%DATADIR%%/PEAR/Task/Windowseol.php
 %%DATADIR%%/PEAR/Task/Windowseol/rw.php
 %%DATADIR%%/PEAR/Validate.php
 %%DATADIR%%/PEAR/Validator/PECL.php
 %%DATADIR%%/PEAR/XMLParser.php
 %%DATADIR%%/Structures/Graph.php
 %%DATADIR%%/Structures/Graph/Manipulator/AcyclicTest.php
 %%DATADIR%%/Structures/Graph/Manipulator/TopologicalSorter.php
 %%DATADIR%%/Structures/Graph/Node.php
 %%DATADIR%%/System.php
 %%DATADIR%%/data/PEAR/package.dtd
 %%DATADIR%%/data/PEAR/template.spec
 %%DATADIR%%/pearcmd.php
 %%DATADIR%%/peclcmd.php
 %%DATADIR%%/tests/Console_Getopt/tests/001-getopt.phpt
 %%DATADIR%%/tests/Console_Getopt/tests/bug10557.phpt
 %%DATADIR%%/tests/Console_Getopt/tests/bug11068.phpt
 %%DATADIR%%/tests/Console_Getopt/tests/bug13140.phpt
 %%DATADIR%%/tests/Structures_Graph/tests/AcyclicTestTest.php
-%%DATADIR%%/tests/Structures_Graph/tests/AllTests.php
 %%DATADIR%%/tests/Structures_Graph/tests/BasicGraphTest.php
 %%DATADIR%%/tests/Structures_Graph/tests/TopologicalSorterTest.php
 %%DATADIR%%/tests/Structures_Graph/tests/helper.inc
 @rmtry share/pear/.depdb
 @rmtry share/pear/.depdblock
 @rmtry share/pear/.filemap
 @rmtry share/pear/.lock
 @dir %%DATADIR%%/.registry/.channel.__uri
 @dir %%DATADIR%%/.registry/.channel.doc.php.net
 @dir %%DATADIR%%/.registry/.channel.pecl.php.net