[pkgsrc/trunk]: pkgsrc/lang/php5 Tarball on php.net has changed to include th...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/315576366bef
branches:  trunk
changeset: 512896:315576366bef
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Tue May 16 19:54:02 2006 +0000

description:
Tarball on php.net has changed to include the pear installation file
Modify the package to not seperately fetch the pear file from php.net
Problem found by Christopher W. Richardson on tech-pkg@
Bump PKGREVISION

diffstat:

 lang/php5/Makefile |  18 +++---------------
 lang/php5/distinfo |  10 ++++------
 2 files changed, 7 insertions(+), 21 deletions(-)

diffs (53 lines):

diff -r c7cfdd8eb74b -r 315576366bef lang/php5/Makefile
--- a/lang/php5/Makefile        Tue May 16 19:11:33 2006 +0000
+++ b/lang/php5/Makefile        Tue May 16 19:54:02 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2006/05/07 09:54:55 martti Exp $
+# $NetBSD: Makefile,v 1.33 2006/05/16 19:54:02 adrianp Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
-#PKGREVISION=          # empty
+PKGREVISION=           1
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
@@ -31,20 +31,8 @@
 CONF_FILES=            ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=              ${PREFIX}/${PHP_EXTENSION_DIR}
 
-# fetch pear PHAR explicitly; the PHP installation tries to wget it if it's not
-# present; use DIST_SUBDIR, since the pear file is not versioned
+# This can be removed once 5.1.5 is released
 DIST_SUBDIR=           ${PKGNAME}
-DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} \
-                       install-pear-nozlib.phar
-
-# do not checksum the pear file - it's not versioned and might (and
-# very probably will) change over time
-IGNOREFILES=           install-pear-nozlib.phar
-
-SITES.install-pear-nozlib.phar =       http://pear.php.net/
-
-post-extract:
-       ${CP} ${DISTDIR}/${DIST_SUBDIR}/install-pear-nozlib.phar ${WRKSRC}/pear/
 
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
diff -r c7cfdd8eb74b -r 315576366bef lang/php5/distinfo
--- a/lang/php5/distinfo        Tue May 16 19:11:33 2006 +0000
+++ b/lang/php5/distinfo        Tue May 16 19:54:02 2006 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.20 2006/05/07 09:41:56 jdolecek Exp $
+$NetBSD: distinfo,v 1.21 2006/05/16 19:54:02 adrianp Exp $
 
-SHA1 (php-5.1.4/php-5.1.4.tar.bz2) = 65c9cf8ddbcf023503c8bb618a95438f605b5098
-RMD160 (php-5.1.4/php-5.1.4.tar.bz2) = 5468a7d544285438c78a8f68f1169dc22e4e8a2b
-Size (php-5.1.4/php-5.1.4.tar.bz2) = 5992825 bytes
-SHA1 (php-5.1.4/install-pear-nozlib.phar) = IGNORE
-RMD160 (php-5.1.4/install-pear-nozlib.phar) = IGNORE
+SHA1 (php-5.1.4nb1/php-5.1.4.tar.bz2) = 83d4c5a4a3e8f3bcb0da841edd8d55893dbf5394
+RMD160 (php-5.1.4nb1/php-5.1.4.tar.bz2) = d4ab11884a3a899f21eef777767a553cf81584ce
+Size (php-5.1.4nb1/php-5.1.4.tar.bz2) = 6356171 bytes
 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
 SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc