diff options
author | jdolecek <jdolecek> | 2005-04-11 20:16:02 +0000 |
---|---|---|
committer | jdolecek <jdolecek> | 2005-04-11 20:16:02 +0000 |
commit | c589afaa8b24a0ba9bc48b88f18a1adcb39b1b3d (patch) | |
tree | 28b78ca2e89b9d5541c4ebd54ac89b3d86e55b58 /lang/php5 | |
parent | 71452ddfd0ec05ab0be5ef3dbe89fce76eea4b78 (diff) | |
download | pkgsrc-c589afaa8b24a0ba9bc48b88f18a1adcb39b1b3d.tar.gz |
Update php5 to 5.0.4. This is maintenance/bugfix release, full list of changes
available at:
http://www.php.net/ChangeLog-5.php#5.0.4
Diffstat (limited to 'lang/php5')
-rw-r--r-- | lang/php5/Makefile | 4 | ||||
-rw-r--r-- | lang/php5/Makefile.common | 4 | ||||
-rw-r--r-- | lang/php5/PLIST | 61 | ||||
-rw-r--r-- | lang/php5/buildlink3.mk | 6 | ||||
-rw-r--r-- | lang/php5/distinfo | 10 | ||||
-rw-r--r-- | lang/php5/patches/patch-aj | 22 |
6 files changed, 82 insertions, 25 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index ff539b836b5..2724459174f 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2005/04/08 20:58:49 jdolecek Exp $ +# $NetBSD: Makefile,v 1.11 2005/04/11 20:16:02 jdolecek Exp $ # PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 2 +PKGREVISION= # empty CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common index 92b57af4a68..3fbae5d7946 100644 --- a/lang/php5/Makefile.common +++ b/lang/php5/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/12/18 16:04:54 jdolecek Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/04/11 20:16:02 jdolecek Exp $ # DISTNAME?= php-${PHP_BASE_VERS} @@ -11,7 +11,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= jdolecek@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.0.3 +PHP_BASE_VERS= 5.0.4 PHP_EXTENSION_DIR= lib/php/20040412 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} diff --git a/lang/php5/PLIST b/lang/php5/PLIST index 6c8abf6d2cc..15cbe384d7f 100644 --- a/lang/php5/PLIST +++ b/lang/php5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2004/12/17 07:53:06 jdolecek Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/04/11 20:16:02 jdolecek Exp $ bin/pear bin/php bin/php-config @@ -67,6 +67,7 @@ include/php/Zend/zend_ts_hash.h include/php/Zend/zend_types.h include/php/Zend/zend_variables.h include/php/acconfig.h +include/php/ext/dom/xml_common.h include/php/ext/iconv/php_iconv.h include/php/ext/libxml/php_libxml.h include/php/ext/mbstring/mb_gpc.h @@ -74,6 +75,21 @@ include/php/ext/mbstring/mbstring.h include/php/ext/mbstring/php_mbregex.h include/php/ext/mbstring/php_unicode.h include/php/ext/mbstring/unicode_data.h +include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h +include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h +include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h +include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h +include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h +include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h include/php/ext/session/mod_files.h include/php/ext/session/mod_mm.h include/php/ext/session/mod_user.h @@ -193,10 +209,16 @@ lib/php/.filemap lib/php/.lock lib/php/.registry/archive_tar.reg lib/php/.registry/console_getopt.reg +lib/php/.registry/html_template_it.reg +lib/php/.registry/net_useragent_detect.reg lib/php/.registry/pear.reg lib/php/.registry/xml_rpc.reg lib/php/Archive/Tar.php lib/php/Console/Getopt.php +lib/php/HTML/Template/IT.php +lib/php/HTML/Template/ITX.php +lib/php/HTML/Template/IT_Error.php +lib/php/Net/UserAgent/Detect.php lib/php/OS/Guess.php lib/php/PEAR.php lib/php/PEAR/Autoloader.php @@ -222,11 +244,17 @@ lib/php/PEAR/Installer.php lib/php/PEAR/Packager.php lib/php/PEAR/Registry.php lib/php/PEAR/Remote.php +lib/php/PEAR/RunTest.php lib/php/System.php lib/php/XML/RPC.php +lib/php/XML/RPC/Dump.php lib/php/XML/RPC/Server.php lib/php/build/Makefile.global lib/php/build/acinclude.m4 +lib/php/build/config.guess +lib/php/build/config.sub +lib/php/build/libtool.m4 +lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 lib/php/build/scan_makefile_in.awk @@ -234,7 +262,25 @@ lib/php/build/shtool lib/php/data/PEAR/package.dtd lib/php/data/PEAR/template.spec lib/php/doc/Archive_Tar/docs/Archive_Tar.txt +lib/php/doc/HTML_Template_IT/examples/templates/main.tpl.htm +lib/php/doc/HTML_Template_IT/examples/sample_it.php lib/php/pearcmd.php +lib/php/test/HTML_Template_IT/tests/Console_TestListener.php +lib/php/test/HTML_Template_IT/tests/ITX_api_testcase.php +lib/php/test/HTML_Template_IT/tests/ITX_usage_testcase.php +lib/php/test/HTML_Template_IT/tests/IT_api_testcase.php +lib/php/test/HTML_Template_IT/tests/IT_usage_testcase.php +lib/php/test/HTML_Template_IT/tests/templates/__include.html +lib/php/test/HTML_Template_IT/tests/templates/addblock.html +lib/php/test/HTML_Template_IT/tests/templates/blockiteration.html +lib/php/test/HTML_Template_IT/tests/templates/blocks.html +lib/php/test/HTML_Template_IT/tests/templates/globals.html +lib/php/test/HTML_Template_IT/tests/templates/include.html +lib/php/test/HTML_Template_IT/tests/templates/loadtemplatefile.html +lib/php/test/HTML_Template_IT/tests/templates/replaceblock.html +lib/php/test/HTML_Template_IT/tests/test.php +lib/php/test/XML_RPC/tests/protoport.php +lib/php/test/XML_RPC/tests/test_Dump.php libexec/cgi-bin/php man/man1/php.1 share/examples/php/php.ini-dist @@ -242,6 +288,14 @@ share/examples/php/php.ini-recommended share/php/php.gif @dirrm share/php @dirrm share/examples/php +@dirrm lib/php/test/XML_RPC/tests +@dirrm lib/php/test/XML_RPC +@dirrm lib/php/test/HTML_Template_IT/tests/templates +@dirrm lib/php/test/HTML_Template_IT/tests +@dirrm lib/php/test/HTML_Template_IT +@dirrm lib/php/doc/HTML_Template_IT/examples/templates +@dirrm lib/php/doc/HTML_Template_IT/examples +@dirrm lib/php/doc/HTML_Template_IT @dirrm lib/php/doc/Archive_Tar/docs @dirrm lib/php/doc/Archive_Tar @dirrm lib/php/doc @@ -254,6 +308,8 @@ share/php/php.gif @dirrm lib/php/PEAR/Command @dirrm lib/php/PEAR @dirrm lib/php/OS +@dirrm lib/php/HTML/Template +@dirrm lib/php/HTML @dirrm lib/php/Console @dirrm lib/php/Archive @dirrm lib/php/.registry @@ -270,9 +326,12 @@ share/php/php.gif @dirrm include/php/ext/sqlite/libsqlite/src @dirrm include/php/ext/sqlite/libsqlite @dirrm include/php/ext/sqlite +@dirrm include/php/ext/mbstring/libmbfl/mbfl +@dirrm include/php/ext/mbstring/libmbfl @dirrm include/php/ext/mbstring @dirrm include/php/ext/libxml @dirrm include/php/ext/iconv +@dirrm include/php/ext/dom @dirrm include/php/ext @dirrm include/php/Zend @dirrm include/php/TSRM diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk index c414e8940c2..14b0d5c2a3e 100644 --- a/lang/php5/buildlink3.mk +++ b/lang/php5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/11/01 19:52:58 jdolecek Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/04/11 20:16:02 jdolecek Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PHP_BUILDLINK3_MK:= ${PHP_BUILDLINK3_MK}+ @@ -12,10 +12,8 @@ BUILDLINK_PACKAGES+= php .if !empty(PHP_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.php+= php-5.0.* +BUILDLINK_RECOMMENTED.php+= php-5.0.4 BUILDLINK_PKGSRCDIR.php?= ../../lang/php5 - -# Use full dependency for extension and pear modules -BUILDLINK_DEPMETHOD.php?= full .endif # PHP_BUILDLINK3_MK .include "../../textproc/libxml2/buildlink3.mk" diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 4aa5059aefd..16f15fe82f6 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 09:03:10 agc Exp $ +$NetBSD: distinfo,v 1.6 2005/04/11 20:16:02 jdolecek Exp $ -SHA1 (php-5.0.3.tar.bz2) = b717020a329a4e3b4714d5a290b9cb9f3dfda7d3 -RMD160 (php-5.0.3.tar.bz2) = fef65f7fe2c29c2a77b8fbcf235bdc1da6fa1da5 -Size (php-5.0.3.tar.bz2) = 4607759 bytes -SHA1 (patch-aj) = 88e456015f4d8e92ea57019df39195905b3f6c28 +SHA1 (php-5.0.4.tar.bz2) = 37780b89acbc492e0e5c0ace956d1dc1e93bf779 +RMD160 (php-5.0.4.tar.bz2) = c0e0126637527d2e7352b123e102a4231349784e +Size (php-5.0.4.tar.bz2) = 4731383 bytes +SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46 diff --git a/lang/php5/patches/patch-aj b/lang/php5/patches/patch-aj index 02b4c80f738..934b90c1b3d 100644 --- a/lang/php5/patches/patch-aj +++ b/lang/php5/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2004/10/31 21:14:54 jdolecek Exp $ +$NetBSD: patch-aj,v 1.2 2005/04/11 20:16:02 jdolecek Exp $ ---- ext/imap/config.m4.orig 2004-02-23 04:24:58.000000000 +0100 -+++ ext/imap/config.m4 2004-10-31 21:11:57.000000000 +0100 -@@ -42,6 +42,14 @@ +--- ext/imap/config.m4.orig 2005-04-08 20:55:11.000000000 +0200 ++++ ext/imap/config.m4 2005-04-08 20:55:01.000000000 +0200 +@@ -54,6 +54,14 @@ ]) ]) @@ -14,13 +14,13 @@ $NetBSD: patch-aj,v 1.1 2004/10/31 21:14:54 jdolecek Exp $ + AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ]) +fi + - AC_DEFUN(PHP_IMAP_KRB_CHK, [ - AC_ARG_WITH(kerberos, - [ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[ -@@ -78,7 +86,7 @@ - PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) - PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD) - PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include) + AC_DEFUN([PHP_IMAP_KRB_CHK], [ + if test "$PHP_KERBEROS" != "no"; then + PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD, +@@ -65,7 +73,7 @@ + Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) + ]) + ]) - else + elif test "$PHP_IMAP_LINKAGE" != "yes"; then AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ |