diff options
| author | adrianp <adrianp> | 2006-05-16 19:54:02 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2006-05-16 19:54:02 +0000 |
| commit | baf37b215d0d8e95372b56a14009e88dc20a34df (patch) | |
| tree | 9e07d8b6cf81740b1a683627693fa0524c24e6d5 /lang | |
| parent | 54e7aaade5c0ca537264b106af81a7f18fee131c (diff) | |
| download | pkgsrc-baf37b215d0d8e95372b56a14009e88dc20a34df.tar.gz | |
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 (limited to 'lang')
| -rw-r--r-- | lang/php5/Makefile | 18 | ||||
| -rw-r--r-- | lang/php5/distinfo | 10 |
2 files changed, 7 insertions, 21 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index a5f014dbe1d..48afb4dbddb 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -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 @@ EGDIR= ${PREFIX}/share/examples/php 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 --git a/lang/php5/distinfo b/lang/php5/distinfo index b40c8549ccb..3f224178ce2 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -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 |