Skip to content

Commit 4a3fa88

Browse files
author
taca
committed
lang/pear: update to 1.10.17
pkgsrc change: move MESSAGE to README.pkgsrc. PEAR 1.10.17 (2025-12-14) * PR #152: Fix HTTP chunked encoding handling * PR #153: fix composer.json: typo in replace for pear_exception package * PR #154: switch to https by default * PR #156: Throw new Error instead of E_USER_ERROR on PHP 7.0+ * PR #159: update tests for https-first behavior
1 parent f9e823f commit 4a3fa88

4 files changed

Lines changed: 18 additions & 15 deletions

File tree

lang/pear/Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
# $NetBSD: Makefile,v 1.69 2025/06/16 09:21:45 jperkin Exp $
1+
# $NetBSD: Makefile,v 1.70 2026/01/02 09:09:36 taca Exp $
22
#
33
# This is super confusing, but the PEAR tarball does not include an installer,
44
# it is only available in a different installer package which bundles the PEAR
55
# tarball along with its dependencies. So our distfile is pearweb_phars, and
66
# we override the version to whatever PEAR it bundles.
77
#
88

9-
DISTNAME= pearweb_phars-1.10.24
10-
PKGREVISION= 3
11-
PKGNAME= ${PHP_PKG_PREFIX}-pear-1.10.16
9+
DISTNAME= pearweb_phars-1.10.25
10+
PKGNAME= ${PHP_PKG_PREFIX}-pear-1.10.17
1211
CATEGORIES= lang
1312
MASTER_SITES= http://download.pear.php.net/package/
1413
EXTRACT_SUFX= .tgz
@@ -30,12 +29,12 @@ CONF_FILES= ${PREFIX}/${PHP_EGDIR}/pear.conf \
3029

3130
SUBST_CLASSES+= config
3231
SUBST_STAGE.config= pre-configure
33-
SUBST_FILES.config= src/PEAR/Start.php
34-
SUBST_VARS.config+= PHP_LIBDIR PKGMANDIR PREFIX WRKSRC
32+
SUBST_FILES.config= src/PEAR/Start.php ${WRKDIR}/README.pkgsrc
33+
SUBST_VARS.config+= PHP_LIBDIR PKGMANDIR PREFIX WRKSRC PHP_VER
3534
SUBST_MESSAGE.config= Fixing configuration files.
3635

3736
PEAR_COMMANDS= pear peardev pecl
38-
INSTALLATION_DIRS+= ${PHP_EGDIR}
37+
INSTALLATION_DIRS+= ${PHP_EGDIR} ${PHP_SHAREDIR}
3938

4039
# TODO: This should probably be set in lang/php
4140
PHPBIN= ${PREFIX}/bin/php${PHP_VER}
@@ -46,6 +45,7 @@ post-extract:
4645
'$$p = new Phar("go-pear.phar"); \
4746
$$p->extractTo("src");'
4847
${MV} ${WRKSRC}/go-pear.phar ${WRKSRC}/go-pear-orig.phar
48+
${CP} ${FILESDIR}/README.pkgsrc ${WRKDIR}
4949

5050
# This does not actually build anything, just packs our patched source files
5151
# back to an updated .phar.
@@ -62,6 +62,8 @@ do-install:
6262
${PKGSRC_SETENV} ${INSTALL_ENV} ${PHPBIN} go-pear.phar
6363
${INSTALL_DATA} ${WRKSRC}/pear.conf \
6464
${DESTDIR}${PREFIX}/${PHP_EGDIR}/pear.conf
65+
${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \
66+
${DESTDIR}${PREFIX}/${PHP_SHAREDIR}
6567

6668
post-install:
6769
cd ${DESTDIR}${PREFIX}/bin && for f in ${PEAR_COMMANDS}; do \

lang/pear/PLIST

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.14 2025/06/16 09:21:45 jperkin Exp $
1+
@comment $NetBSD: PLIST,v 1.15 2026/01/02 09:09:36 taca Exp $
22
bin/pear${PHP_VER}
33
bin/peardev${PHP_VER}
44
bin/pecl${PHP_VER}
@@ -158,6 +158,7 @@ ${PHP_LIBDIR}/test/XML_Util/tests/ReplaceEntitiesTests.php
158158
${PHP_LIBDIR}/test/XML_Util/tests/ReverseEntitiesTests.php
159159
${PHP_LIBDIR}/test/XML_Util/tests/SplitQualifiedNameTests.php
160160
${PHP_EGDIR}/pear.conf
161+
${PHP_SHAREDIR}/README.pkgsrc
161162
@pkgdir ${PHP_LIBDIR}/.registry/.channel.pecl.php.net
162163
@pkgdir ${PHP_LIBDIR}/.registry/.channel.doc.php.net
163164
@pkgdir ${PHP_LIBDIR}/.registry/.channel.__uri

lang/pear/distinfo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
$NetBSD: distinfo,v 1.52 2025/06/16 09:21:45 jperkin Exp $
1+
$NetBSD: distinfo,v 1.53 2026/01/02 09:09:36 taca Exp $
22

3-
BLAKE2s (pearweb_phars-1.10.24.tgz) = 6e6b480f76485871130f8a6974808f96957a8506feaa64e8435c3406d44f5c19
4-
SHA512 (pearweb_phars-1.10.24.tgz) = 64b81b84b815f46cabebd5bba57ce67e86fbec9208e19438997e70dde9fdeaab5f517d2fb92889954f51040627f3188e9a37d86fa796dd51c65d38d804309cc5
5-
Size (pearweb_phars-1.10.24.tgz) = 1205796 bytes
3+
BLAKE2s (pearweb_phars-1.10.25.tgz) = 05deb2f555a094b58311890131245ffd195d7df3a6a4e64381d3ff9f57ce54e2
4+
SHA512 (pearweb_phars-1.10.25.tgz) = 8c6d64bce78ec3289844062ca48175c0533ad03eec58abb89819df709c8c32a32a6ca7f9603bb1efc76dfa820d0ed46d4a5541b0c8faa9c98434f152abb73e5b
5+
Size (pearweb_phars-1.10.25.tgz) = 1207381 bytes
66
SHA1 (patch-src_PEAR_Start.php) = d8038a23e5250e8b2c0a022ba5e8adfd73d1fcd7
77
SHA1 (patch-src_PEAR_Start_CLI.php) = 8dbd68bde4cea2c7688a4dc0e650cff8ccdeda4c
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
===========================================================================
2-
$NetBSD: MESSAGE,v 1.5 2025/02/08 03:24:29 taca Exp $
2+
$NetBSD: README.pkgsrc,v 1.1 2026/01/02 09:09:36 taca Exp $
33

44
In order to use PEAR packages you may want to alter the default
55
include_path of PHP to include the PEAR installation directory where the
66
packages are located. To do this you need to edit the include_path
77
directive in your php.ini file:
88

9-
${PKG_SYSCONFDIR}/php.ini
9+
@PKG_SYSCONFDIR@/php.ini
1010

1111
Change the "include_path" directive to read as follows:
1212

13-
include_path = ".:${PREFIX}/${PHP_LIBDIR}"
13+
include_path = ".:@PREFIX@/@PHP_LIBDIR@"
1414

1515
It should be done automatically.
1616
===========================================================================

0 commit comments

Comments
 (0)