git: d19fccc2e584 - main - devel/pear: update to 1.10.16 release (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Mon, 27 Oct 2025 20:13:03 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d19fccc2e584c2a15a4a7052edcb4c08ff1710a7

commit d19fccc2e584c2a15a4a7052edcb4c08ff1710a7
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-10-27 20:04:41 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-10-27 20:12:20 +0000

    devel/pear: update to 1.10.16 release (+)
    
    New package incoporate new versions of conponents:
    PEAR Package: PEAR-1.10.16
    PEAR Package: Archive_Tar-1.6.0
    PEAR Package: Console_Getopt-1.4.3
    PEAR Package: Structures_Graph-1.2.0
    PEAR Package: XML_Util-1.4.5
    
    While here, put all PEAR distfiles under PEAR subdir to consistency with other pear ports
    
    Big thanks for Mickael Maillot for submitting original update patch!
    
    Changelog:      https://pear.php.net/package/PEAR/download/1.10.14 \
                    https://pear.php.net/package/PEAR/download/1.10.15 \
                    https://pear.php.net/package/PEAR/download/1.10.16
    PR:             290320
---
 devel/pear/Makefile  | 47 ++++++++++++++++++++++++++++++++++++++---------
 devel/pear/distinfo  | 16 +++++++++++++---
 devel/pear/pkg-plist |  1 -
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/devel/pear/Makefile b/devel/pear/Makefile
index 4ec6f3d7dcfd..08372c38380a 100644
--- a/devel/pear/Makefile
+++ b/devel/pear/Makefile
@@ -1,10 +1,19 @@
 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
@@ -12,27 +21,47 @@ 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
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
@@ -127,7 +127,6 @@ bin/pecl
 %%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