Sun May 28 11:18:08 2017 UTC ()
Update pear to 1.10.4.

pkgsrc change: instead of using old PEAR.php, use PEAR.php included in
a distfile.

PEAR 1.10.4			2017-04-26 14:39 UTC

Changelog:

* Bug #18102: pear install does not fail on error
* PR #67: fix warning during pecl list-all


(taca)
diff -r1.38 -r1.39 pkgsrc/lang/pear/Makefile
diff -r1.26 -r1.27 pkgsrc/lang/pear/distinfo
diff -r1.2 -r0 pkgsrc/lang/pear/files/PEAR.php
cvs diff -r1.38 -r1.39 pkgsrc/lang/pear/Makefile (switch to unified diff)

--- pkgsrc/lang/pear/Makefile 2017/03/12 13:19:12 1.38
+++ pkgsrc/lang/pear/Makefile 2017/05/28 11:18:08 1.39
@@ -1,90 +1,90 @@ @@ -1,90 +1,90 @@
1# $NetBSD: Makefile,v 1.38 2017/03/12 13:19:12 taca Exp $ 1# $NetBSD: Makefile,v 1.39 2017/05/28 11:18:08 taca Exp $
2# 2#
3 3
4DISTNAME= PEAR-1.10.3 4DISTNAME= PEAR-1.10.4
5PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/} 5PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://download.pear.php.net/package/ 7MASTER_SITES= http://download.pear.php.net/package/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9DIST_SUBDIR= pear20151210 9DIST_SUBDIR= pear20151210
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://pear.php.net/ 12HOMEPAGE= http://pear.php.net/
13COMMENT= PEAR Base System for PHP 13COMMENT= PEAR Base System for PHP
14LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
15 15
16USE_LANGUAGES= # none 16USE_LANGUAGES= # none
17EXTRACT_ONLY= # none 17EXTRACT_ONLY= # none
18USE_TOOLS+= gzcat 18USE_TOOLS+= gzcat
19 19
20.include "../../lang/php/phpversion.mk" 20.include "../../lang/php/phpversion.mk"
21 21
22CONFLICTS+= php<5.2.1nb2 22CONFLICTS+= php<5.2.1nb2
23 23
24PKG_SYSCONFVAR= php 24PKG_SYSCONFVAR= php
25CONF_FILES= ${PREFIX}/share/examples/pear/pear.conf \ 25CONF_FILES= ${PREFIX}/share/examples/pear/pear.conf \
26 ${PKG_SYSCONFDIR}/pear.conf 26 ${PKG_SYSCONFDIR}/pear.conf
27 27
28BUNDLE= ${WRKSRC}/install/go-pear-bundle 28BUNDLE= ${WRKSRC}/install/go-pear-bundle
29 29
30# everything else that forms a part of the "base" PEAR install 30# everything else that forms a part of the "base" PEAR install
31# 31#
32PEAR_SRCS= ${DISTNAME}${EXTRACT_SUFX} 32PEAR_SRCS= ${DISTNAME}${EXTRACT_SUFX}
33DISTFILES+= ${PEAR_SRCS} 33DISTFILES+= ${PEAR_SRCS}
34EXTRACT_ONLY+= ${PEAR_SRCS} 34EXTRACT_ONLY+= ${PEAR_SRCS}
35 35
36ARCHIVE_SRCS= Archive_Tar-1.4.2${EXTRACT_SUFX} 36ARCHIVE_SRCS= Archive_Tar-1.4.2${EXTRACT_SUFX}
37ARCHIVE_WRKSRC= ${WRKDIR}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}//} 37ARCHIVE_WRKSRC= ${WRKDIR}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}//}
38DISTFILES+= ${ARCHIVE_SRCS} 38DISTFILES+= ${ARCHIVE_SRCS}
39EXTRACT_ONLY+= ${ARCHIVE_SRCS} 39EXTRACT_ONLY+= ${ARCHIVE_SRCS}
40 40
41CONSOLE_SRCS= Console_Getopt-1.4.1${EXTRACT_SUFX} 41CONSOLE_SRCS= Console_Getopt-1.4.1${EXTRACT_SUFX}
42CONSOLE_WRKSRC= ${WRKDIR}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}//} 42CONSOLE_WRKSRC= ${WRKDIR}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}//}
43DISTFILES+= ${CONSOLE_SRCS} 43DISTFILES+= ${CONSOLE_SRCS}
44EXTRACT_ONLY+= ${CONSOLE_SRCS} 44EXTRACT_ONLY+= ${CONSOLE_SRCS}
45 45
46STRUCTURES_SRCS= Structures_Graph-1.1.1${EXTRACT_SUFX} 46STRUCTURES_SRCS= Structures_Graph-1.1.1${EXTRACT_SUFX}
47DISTFILES+= ${STRUCTURES_SRCS} 47DISTFILES+= ${STRUCTURES_SRCS}
48 48
49XMLUTIL_SRCS= XML_Util-1.4.2${EXTRACT_SUFX} 49XMLUTIL_SRCS= XML_Util-1.4.2${EXTRACT_SUFX}
50DISTFILES+= ${XMLUTIL_SRCS} 50DISTFILES+= ${XMLUTIL_SRCS}
51 51
52# 52#
53# end of base components 53# end of base components
54 54
55SUBST_CLASSES+= config 55SUBST_CLASSES+= config
56SUBST_STAGE.config= post-patch 56SUBST_STAGE.config= post-patch
57SUBST_FILES.config= install/go-pear.php 57SUBST_FILES.config= install/go-pear.php
58SUBST_SED.config= -e "s|@WRKSRC@|${WRKSRC}|g" 58SUBST_SED.config= -e "s|@WRKSRC@|${WRKSRC}|g"
59SUBST_SED.config+= -e "s|@PREFIX@|${PREFIX}|g" 59SUBST_SED.config+= -e "s|@PREFIX@|${PREFIX}|g"
60SUBST_MESSAGE.config= Fixing configuration files. 60SUBST_MESSAGE.config= Fixing configuration files.
61 61
62REPLACE_SH+= script/pear.sh 62REPLACE_SH+= script/pear.sh
63 63
64INSTALLATION_DIRS+= share/examples/pear 64INSTALLATION_DIRS+= share/examples/pear
65 65
66post-extract: 66pre-patch:
67 ${RM} ${WRKSRC}/INSTALL 67 ${RM} ${WRKSRC}/INSTALL
68 ${MKDIR} ${WRKSRC}/install 68 ${MKDIR} ${WRKSRC}/install
69 ${MKDIR} ${BUNDLE} 69 ${MKDIR} ${BUNDLE}
70 ${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install 70 ${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install
71 ${CP} ${FILESDIR}/PEAR.php ${BUNDLE} 71 ${CP} ${WRKSRC}/PEAR.php ${BUNDLE}
72 72
73do-build: 73do-build:
74.for f in ${DISTFILES} 74.for f in ${DISTFILES}
75 ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > \ 75 ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > \
76 ${BUNDLE}/${f:S/${EXTRACT_SUFX}/.tar/} 76 ${BUNDLE}/${f:S/${EXTRACT_SUFX}/.tar/}
77.endfor 77.endfor
78 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE} 78 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE}
79 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE} 79 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE}
80 80
81do-install: 81do-install:
82 ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local 82 ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local
83 ${INSTALL_DATA} ${WRKSRC}/pear.conf \ 83 ${INSTALL_DATA} ${WRKSRC}/pear.conf \
84 ${DESTDIR}${PREFIX}/share/examples/pear/pear.conf 84 ${DESTDIR}${PREFIX}/share/examples/pear/pear.conf
85 85
86.include "${PHPPKGSRCDIR}/buildlink3.mk" 86.include "${PHPPKGSRCDIR}/buildlink3.mk"
87 87
88BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2 88BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2
89 89
90.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/lang/pear/distinfo (switch to unified diff)

--- pkgsrc/lang/pear/distinfo 2017/03/12 13:19:12 1.26
+++ pkgsrc/lang/pear/distinfo 2017/05/28 11:18:08 1.27
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.26 2017/03/12 13:19:12 taca Exp $ 1$NetBSD: distinfo,v 1.27 2017/05/28 11:18:08 taca Exp $
2 2
3SHA1 (pear20151210/Archive_Tar-1.4.2.tgz) = 07a93681a14fcc764fc6396cf66d9f4ec6db0bed 3SHA1 (pear20151210/Archive_Tar-1.4.2.tgz) = 07a93681a14fcc764fc6396cf66d9f4ec6db0bed
4RMD160 (pear20151210/Archive_Tar-1.4.2.tgz) = 003289c0950cf587c8925e35da86bc6ec4d1b282 4RMD160 (pear20151210/Archive_Tar-1.4.2.tgz) = 003289c0950cf587c8925e35da86bc6ec4d1b282
5SHA512 (pear20151210/Archive_Tar-1.4.2.tgz) = dad5872c82fb9fd961dc06d173610f60d0e05b4c05428e3410beb5a6cdf05de27704edf805e7db80c4031409af5d7d59e7abe43cef7aa11fd9d086b1c6e8e761 5SHA512 (pear20151210/Archive_Tar-1.4.2.tgz) = dad5872c82fb9fd961dc06d173610f60d0e05b4c05428e3410beb5a6cdf05de27704edf805e7db80c4031409af5d7d59e7abe43cef7aa11fd9d086b1c6e8e761
6Size (pear20151210/Archive_Tar-1.4.2.tgz) = 20624 bytes 6Size (pear20151210/Archive_Tar-1.4.2.tgz) = 20624 bytes
7SHA1 (pear20151210/Console_Getopt-1.4.1.tgz) = 1db5b48e15547be532a9c836cd7ef448a3758ddc 7SHA1 (pear20151210/Console_Getopt-1.4.1.tgz) = 1db5b48e15547be532a9c836cd7ef448a3758ddc
8RMD160 (pear20151210/Console_Getopt-1.4.1.tgz) = 54d397e321a0168a33a92c98cf39f9f6456d49ea 8RMD160 (pear20151210/Console_Getopt-1.4.1.tgz) = 54d397e321a0168a33a92c98cf39f9f6456d49ea
9SHA512 (pear20151210/Console_Getopt-1.4.1.tgz) = e66a78077593ade78a40c59297a24242b0177d21b0e02b08d4fb5e25d8a57a96353c50a9dcc968f60af7458d40443061e0c1cdb11ad3180c7ffed8f0b314b089 9SHA512 (pear20151210/Console_Getopt-1.4.1.tgz) = e66a78077593ade78a40c59297a24242b0177d21b0e02b08d4fb5e25d8a57a96353c50a9dcc968f60af7458d40443061e0c1cdb11ad3180c7ffed8f0b314b089
10Size (pear20151210/Console_Getopt-1.4.1.tgz) = 5672 bytes 10Size (pear20151210/Console_Getopt-1.4.1.tgz) = 5672 bytes
11SHA1 (pear20151210/PEAR-1.10.3.tgz) = f0f848e2b9dec270fb457512c92203524791c351 11SHA1 (pear20151210/PEAR-1.10.4.tgz) = d2f27706ee246dac307cfa1d25abca8e22046433
12RMD160 (pear20151210/PEAR-1.10.3.tgz) = 164b31cbfb49bb26ffcb229e8b1b59246f54381e 12RMD160 (pear20151210/PEAR-1.10.4.tgz) = c3f32b75638fa1b8568dc2e44c229c3f0d21fe80
13SHA512 (pear20151210/PEAR-1.10.3.tgz) = 1ad531a6e0ac30719b05e58f0758393bc6cdb0e89b4f99f843e7318a40ef18e74767e8ed63346b0ece9d6e8e71c8ebe15b08eaeb6f0c4f3169814bb4bb524332 13SHA512 (pear20151210/PEAR-1.10.4.tgz) = 6c191eef1ab20522485c7709af748f48b34397c4e1c3618aecfb5489c168cec43111588cf717fcc6ead18f220ad723457cbd62289bd67e614fab089c4b88f3b3
14Size (pear20151210/PEAR-1.10.3.tgz) = 291095 bytes 14Size (pear20151210/PEAR-1.10.4.tgz) = 291106 bytes
15SHA1 (pear20151210/Structures_Graph-1.1.1.tgz) = 2a9e5999e035aa3a6789011238b0a9a54806124a 15SHA1 (pear20151210/Structures_Graph-1.1.1.tgz) = 2a9e5999e035aa3a6789011238b0a9a54806124a
16RMD160 (pear20151210/Structures_Graph-1.1.1.tgz) = fff02cabb75ee3531eedae19a2dffe999258a96c 16RMD160 (pear20151210/Structures_Graph-1.1.1.tgz) = fff02cabb75ee3531eedae19a2dffe999258a96c
17SHA512 (pear20151210/Structures_Graph-1.1.1.tgz) = 28465396cd540fd1619e0c1bec68fa8c3dff440a6e89c3c5583570edbd3de285e101de7c00e60d49d791ff10d8311f8a38d73ea3cdf52cfc74ecbe2f1842693f 17SHA512 (pear20151210/Structures_Graph-1.1.1.tgz) = 28465396cd540fd1619e0c1bec68fa8c3dff440a6e89c3c5583570edbd3de285e101de7c00e60d49d791ff10d8311f8a38d73ea3cdf52cfc74ecbe2f1842693f
18Size (pear20151210/Structures_Graph-1.1.1.tgz) = 12579 bytes 18Size (pear20151210/Structures_Graph-1.1.1.tgz) = 12579 bytes
19SHA1 (pear20151210/XML_Util-1.4.2.tgz) = 0a3cec953f60a0db7a97808170f008a865500567 19SHA1 (pear20151210/XML_Util-1.4.2.tgz) = 0a3cec953f60a0db7a97808170f008a865500567
20RMD160 (pear20151210/XML_Util-1.4.2.tgz) = 5dd93a83e2fee5bc6ee73a751abb17379ff0f536 20RMD160 (pear20151210/XML_Util-1.4.2.tgz) = 5dd93a83e2fee5bc6ee73a751abb17379ff0f536
21SHA512 (pear20151210/XML_Util-1.4.2.tgz) = e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe 21SHA512 (pear20151210/XML_Util-1.4.2.tgz) = e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe
22Size (pear20151210/XML_Util-1.4.2.tgz) = 18993 bytes 22Size (pear20151210/XML_Util-1.4.2.tgz) = 18993 bytes
File Deleted: pkgsrc/lang/pear/files/Attic/PEAR.php