From e12086c72a7cc5e217e25fcc579eb386054b0151 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 4 Apr 2005 21:13:21 +0000 Subject: [PATCH] update to 5.0.4; --- www/php5/Makefile.inc | 4 +- www/php5/core/Makefile | 6 +- .../core/patches/patch-scripts_php-config_in | 8 +-- www/php5/core/pkg/PLIST-pear | 64 ++++++++++++++++++- www/php5/distinfo | 8 +-- www/php5/extensions/Makefile | 6 +- .../patches/patch-ext_imap_config_m4 | 16 ----- .../extensions/patches/patch-ext_snmp_snmp_c | 21 ------ www/php5/extensions/pkg/DESCR | 2 +- www/php5/patches/patch-aclocal_m4 | 25 ++++++-- www/php5/patches/patch-configure_in | 23 ++++--- 11 files changed, 112 insertions(+), 71 deletions(-) delete mode 100644 www/php5/extensions/patches/patch-ext_imap_config_m4 delete mode 100644 www/php5/extensions/patches/patch-ext_snmp_snmp_c diff --git a/www/php5/Makefile.inc b/www/php5/Makefile.inc index 53b3a82ab30..c882f9283ae 100644 --- a/www/php5/Makefile.inc +++ b/www/php5/Makefile.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.3 2005/03/16 20:09:41 robert Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2005/04/04 21:13:21 robert Exp $ # This port currently only works with archs supporting dynamic loading # and has Apache that supports DSO's. NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} -V= 5.0.3 +V= 5.0.4 DISTNAME= php-${V} CATEGORIES= www lang diff --git a/www/php5/core/Makefile b/www/php5/core/Makefile index 7ffb1355cfa..ab0df9c789b 100644 --- a/www/php5/core/Makefile +++ b/www/php5/core/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.7 2005/03/16 20:09:41 robert Exp $ +# $OpenBSD: Makefile,v 1.8 2005/04/04 21:13:21 robert Exp $ MULTI_PACKAGES= -pear SUBPACKAGE?= COMMENT= "server-side HTML-embedded scripting language" COMMENT-pear= "base classes for common PHP tasks" -PKGNAME= php5-core-${V}p1 -FULLPKGNAME-pear= php5-pear-${V}p1 +PKGNAME= php5-core-${V} +FULLPKGNAME-pear= php5-pear-${V} CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \ --without-mysql \ diff --git a/www/php5/core/patches/patch-scripts_php-config_in b/www/php5/core/patches/patch-scripts_php-config_in index bc3f89d27c4..e72727885be 100644 --- a/www/php5/core/patches/patch-scripts_php-config_in +++ b/www/php5/core/patches/patch-scripts_php-config_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-scripts_php-config_in,v 1.1 2004/11/24 13:15:09 alek Exp $ ---- scripts/php-config.in.orig Thu Nov 18 21:50:05 2004 -+++ scripts/php-config.in Thu Nov 18 21:51:36 2004 +$OpenBSD: patch-scripts_php-config_in,v 1.2 2005/04/04 21:13:22 robert Exp $ +--- scripts/php-config.in.orig Wed Mar 16 07:36:54 2005 ++++ scripts/php-config.in Sun Apr 3 12:39:04 2005 @@ -1,8 +1,8 @@ #! /bin/sh @@ -9,6 +9,6 @@ $OpenBSD: patch-scripts_php-config_in,v 1.1 2004/11/24 13:15:09 alek Exp $ version="@PHP_VERSION@" -includedir="@includedir@/php" +includedir="@includedir@" - includes="-I$includedir -I$includedir/main -I$includedir/Zend" + includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend" ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" diff --git a/www/php5/core/pkg/PLIST-pear b/www/php5/core/pkg/PLIST-pear index acebe1d3c99..1ce4516de44 100644 --- a/www/php5/core/pkg/PLIST-pear +++ b/www/php5/core/pkg/PLIST-pear @@ -1,9 +1,13 @@ -@comment $OpenBSD: PLIST-pear,v 1.3 2004/12/29 21:53:14 espie Exp $ +@comment $OpenBSD: PLIST-pear,v 1.4 2005/04/04 21:13:22 robert Exp $ @conflict php4-pear-* pear/ pear/build/ pear/build/Makefile.global pear/build/acinclude.m4 +pear/build/config.guess +pear/build/config.sub +pear/build/libtool.m4 +pear/build/ltmain.sh pear/build/mkdep.awk pear/build/phpize.m4 pear/build/scan_makefile_in.awk @@ -16,6 +20,11 @@ pear/doc/ pear/doc/Archive_Tar/ pear/doc/Archive_Tar/docs/ pear/doc/Archive_Tar/docs/Archive_Tar.txt +pear/doc/HTML_Template_IT/ +pear/doc/HTML_Template_IT/examples/ +pear/doc/HTML_Template_IT/examples/sample_it.php +pear/doc/HTML_Template_IT/examples/templates/ +pear/doc/HTML_Template_IT/examples/templates/main.tpl.htm pear/include/ pear/include/TSRM/ pear/include/TSRM/TSRM.h @@ -82,6 +91,8 @@ pear/include/Zend/zend_types.h pear/include/Zend/zend_variables.h pear/include/acconfig.h pear/include/ext/ +pear/include/ext/dom/ +pear/include/ext/dom/xml_common.h pear/include/ext/iconv/ pear/include/ext/iconv/php_have_bsd_iconv.h pear/include/ext/iconv/php_have_glibc_iconv.h @@ -94,6 +105,23 @@ pear/include/ext/iconv/php_php_iconv_impl.h pear/include/ext/libxml/ pear/include/ext/libxml/php_libxml.h pear/include/ext/mbstring/ +pear/include/ext/mbstring/libmbfl/ +pear/include/ext/mbstring/libmbfl/mbfl/ +pear/include/ext/mbstring/libmbfl/mbfl/eaw_table.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfilter.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_ident.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h +pear/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h pear/include/ext/mbstring/mb_gpc.h pear/include/ext/mbstring/mbstring.h pear/include/ext/mbstring/php_mbregex.h @@ -229,12 +257,22 @@ pear/lib/ pear/lib/.registry/ pear/lib/.registry/archive_tar.reg pear/lib/.registry/console_getopt.reg +pear/lib/.registry/html_template_it.reg +pear/lib/.registry/net_useragent_detect.reg pear/lib/.registry/pear.reg pear/lib/.registry/xml_rpc.reg pear/lib/Archive/ pear/lib/Archive/Tar.php pear/lib/Console/ pear/lib/Console/Getopt.php +pear/lib/HTML/ +pear/lib/HTML/Template/ +pear/lib/HTML/Template/IT.php +pear/lib/HTML/Template/ITX.php +pear/lib/HTML/Template/IT_Error.php +pear/lib/Net/ +pear/lib/Net/UserAgent/ +pear/lib/Net/UserAgent/Detect.php pear/lib/OS/ pear/lib/OS/Guess.php pear/lib/PEAR/ @@ -264,9 +302,33 @@ pear/lib/PEAR/Installer.php pear/lib/PEAR/Packager.php pear/lib/PEAR/Registry.php pear/lib/PEAR/Remote.php +pear/lib/PEAR/RunTest.php pear/lib/System.php pear/lib/XML/ pear/lib/XML/RPC/ pear/lib/XML/RPC.php +pear/lib/XML/RPC/Dump.php pear/lib/XML/RPC/Server.php pear/lib/pearcmd.php +pear/tests/ +pear/tests/HTML_Template_IT/ +pear/tests/HTML_Template_IT/tests/ +pear/tests/HTML_Template_IT/tests/Console_TestListener.php +pear/tests/HTML_Template_IT/tests/ITX_api_testcase.php +pear/tests/HTML_Template_IT/tests/ITX_usage_testcase.php +pear/tests/HTML_Template_IT/tests/IT_api_testcase.php +pear/tests/HTML_Template_IT/tests/IT_usage_testcase.php +pear/tests/HTML_Template_IT/tests/templates/ +pear/tests/HTML_Template_IT/tests/templates/__include.html +pear/tests/HTML_Template_IT/tests/templates/addblock.html +pear/tests/HTML_Template_IT/tests/templates/blockiteration.html +pear/tests/HTML_Template_IT/tests/templates/blocks.html +pear/tests/HTML_Template_IT/tests/templates/globals.html +pear/tests/HTML_Template_IT/tests/templates/include.html +pear/tests/HTML_Template_IT/tests/templates/loadtemplatefile.html +pear/tests/HTML_Template_IT/tests/templates/replaceblock.html +pear/tests/HTML_Template_IT/tests/test.php +pear/tests/XML_RPC/ +pear/tests/XML_RPC/tests/ +pear/tests/XML_RPC/tests/protoport.php +pear/tests/XML_RPC/tests/test_Dump.php diff --git a/www/php5/distinfo b/www/php5/distinfo index a3a9c265c45..9abf32d4f5e 100644 --- a/www/php5/distinfo +++ b/www/php5/distinfo @@ -1,4 +1,4 @@ -MD5 (php-5.0.3.tar.gz) = bf89557056ce34d502e20e24071616c7 -RMD160 (php-5.0.3.tar.gz) = f002dc137af6cfd8c8f3a4bb6d4948fef6662694 -SHA1 (php-5.0.3.tar.gz) = bf1b5db0d3144caad3a74d8eefc3d15f9cb08bfd -SIZE (php-5.0.3.tar.gz) = 5666998 +MD5 (php-5.0.4.tar.gz) = 8edf259bcfab4cfc890a4bb4e7c3649f +RMD160 (php-5.0.4.tar.gz) = 444bee84db7d16fb35b0f88cf9ffae8d6f192802 +SHA1 (php-5.0.4.tar.gz) = 156409e7e84964565c38494c9193283b442cb34c +SIZE (php-5.0.4.tar.gz) = 5839214 diff --git a/www/php5/extensions/Makefile b/www/php5/extensions/Makefile index a77f17a9b0a..9f431c4b5d3 100644 --- a/www/php5/extensions/Makefile +++ b/www/php5/extensions/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.7 2005/03/16 21:09:21 robert Exp $ +# $OpenBSD: Makefile,v 1.8 2005/04/04 21:13:22 robert Exp $ -FULLPKGNAME= php5-extensions-${V}p1 +FULLPKGNAME= php5-extensions-${V} COMMENT= "informational package about PHP5 extensions" MULTI_PACKAGES= @@ -280,7 +280,7 @@ XMLRPC_WANTLIB= iconv .for i in ${MULTI_PACKAGES} .if !defined(FULLPKGNAME${i}) -FULLPKGNAME${i}= php5${i}-${V}p1 +FULLPKGNAME${i}= php5${i}-${V} .endif .endfor diff --git a/www/php5/extensions/patches/patch-ext_imap_config_m4 b/www/php5/extensions/patches/patch-ext_imap_config_m4 deleted file mode 100644 index 2da00236fd6..00000000000 --- a/www/php5/extensions/patches/patch-ext_imap_config_m4 +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-ext_imap_config_m4,v 1.1.1.1 2004/10/02 11:32:35 robert Exp $ ---- ext/imap/config.m4.orig Mon Feb 23 04:24:58 2004 -+++ ext/imap/config.m4 Tue Jul 27 00:43:50 2004 -@@ -73,10 +73,9 @@ - fi - AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) - PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD) - PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY(crypto, 1, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY(gssapi, 1, IMAP_SHARED_LIBADD) - PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include) - else - AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ diff --git a/www/php5/extensions/patches/patch-ext_snmp_snmp_c b/www/php5/extensions/patches/patch-ext_snmp_snmp_c deleted file mode 100644 index d2e73703d76..00000000000 --- a/www/php5/extensions/patches/patch-ext_snmp_snmp_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-ext_snmp_snmp_c,v 1.1 2004/10/13 01:47:32 danh Exp $ ---- ext/snmp/snmp.c.orig Tue Mar 23 18:12:50 2004 -+++ ext/snmp/snmp.c Tue Oct 12 14:32:44 2004 -@@ -819,7 +819,7 @@ static int netsnmp_session_gen_auth_key( - s->securityAuthKeyLen = USM_AUTH_KU_LEN; - if (s->securityAuthProto == NULL) { - /* get .conf set default */ -- oid *def = get_default_authtype(&(s->securityAuthProtoLen)); -+ const oid *def = get_default_authtype(&(s->securityAuthProtoLen)); - s->securityAuthProto = snmp_duplicate_objid(def, s->securityAuthProtoLen); - } - if (s->securityAuthProto == NULL) { -@@ -848,7 +848,7 @@ static int netsnmp_session_gen_sec_key(s - s->securityPrivKeyLen = USM_PRIV_KU_LEN; - if (s->securityPrivProto == NULL) { - /* get .conf set default */ -- oid *def = get_default_privtype(&(s->securityPrivProtoLen)); -+ const oid *def = get_default_privtype(&(s->securityPrivProtoLen)); - s->securityPrivProto = snmp_duplicate_objid(def, s->securityPrivProtoLen); - } - if (s->securityPrivProto == NULL) { diff --git a/www/php5/extensions/pkg/DESCR b/www/php5/extensions/pkg/DESCR index 7eabf21b587..61c09c50b90 100644 --- a/www/php5/extensions/pkg/DESCR +++ b/www/php5/extensions/pkg/DESCR @@ -3,7 +3,7 @@ now split into small sub-packages, designed to allow you to install modules independently of the main PHP engine. For example, to install the IMAP module, just pkg_add the -php5-imap-${V}p1.tgz package and activate it using the +php5-imap-${V}.tgz package and activate it using the 'phpxs' command. This package contains no files or dependencies and may be diff --git a/www/php5/patches/patch-aclocal_m4 b/www/php5/patches/patch-aclocal_m4 index c50a95b284c..adf9e849d93 100644 --- a/www/php5/patches/patch-aclocal_m4 +++ b/www/php5/patches/patch-aclocal_m4 @@ -1,7 +1,20 @@ -$OpenBSD: patch-aclocal_m4,v 1.2 2005/03/16 20:09:41 robert Exp $ ---- aclocal.m4.orig Wed Dec 15 07:58:45 2004 -+++ aclocal.m4 Mon Mar 14 23:32:17 2005 -@@ -1655,6 +1655,7 @@ +$OpenBSD: patch-aclocal_m4,v 1.3 2005/04/04 21:13:22 robert Exp $ +--- aclocal.m4.orig Wed Mar 30 23:45:38 2005 ++++ aclocal.m4 Sun Apr 3 21:38:56 2005 +@@ -1656,10 +1656,9 @@ + if test "$PHP_KERBEROS_DIR"; then + found_kerberos=yes + PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, $1) +- PHP_ADD_LIBRARY(gssapi_krb5, 1, $1) + PHP_ADD_LIBRARY(krb5, 1, $1) +- PHP_ADD_LIBRARY(k5crypto, 1, $1) +- PHP_ADD_LIBRARY(com_err, 1, $1) ++ PHP_ADD_LIBRARY(crypto, 1, $1) ++ PHP_ADD_LIBRARY(gssapi, 1, $1) + PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include) + fi + fi +@@ -1753,6 +1752,7 @@ PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ PHP_ADD_LIBRARY(crypto,,$1) @@ -9,7 +22,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2005/03/16 20:09:41 robert Exp $ ],[ AC_MSG_ERROR([libcrypto not found!]) ],[ -@@ -3946,7 +3947,7 @@ +@@ -4083,7 +4083,7 @@ need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' soname_spec='${libname}${release}.so$major' @@ -18,7 +31,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2005/03/16 20:09:41 robert Exp $ shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -@@ -4156,7 +4157,7 @@ +@@ -4313,7 +4313,7 @@ shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' diff --git a/www/php5/patches/patch-configure_in b/www/php5/patches/patch-configure_in index 42d128e9bb0..b970e75e78a 100644 --- a/www/php5/patches/patch-configure_in +++ b/www/php5/patches/patch-configure_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_in,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ ---- configure.in.orig Mon Jul 26 23:07:27 2004 -+++ configure.in Mon Jul 26 23:08:27 2004 +$OpenBSD: patch-configure_in,v 1.2 2005/04/04 21:13:22 robert Exp $ +--- configure.in.orig Wed Mar 30 23:43:12 2005 ++++ configure.in Sun Apr 3 12:37:35 2005 @@ -31,9 +31,7 @@ AC_INIT(README.CVS-RULES) @@ -10,9 +10,9 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ -done +CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree" - AC_CANONICAL_HOST + PHP_CANONICAL_HOST AC_CONFIG_HEADER(main/php_config.h) -@@ -830,14 +828,14 @@ +@@ -876,7 +874,7 @@ case $php_build_target in program|static) @@ -21,15 +21,18 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ if test -z "$PHP_MODULES"; then enable_shared=no fi - ;; +@@ -884,8 +882,8 @@ shared) enable_static=no -- standard_libtool_flag=-prefer-pic -+ standard_libtool_flag= + case $with_pic in +- yes) standard_libtool_flag='-prefer-pic';; +- no) standard_libtool_flag='-prefer-non-pic';; ++ yes) standard_libtool_flag='';; ++ no) standard_libtool_flag='';; + esac EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" ;; - esac -@@ -1019,7 +1017,7 @@ +@@ -1070,7 +1068,7 @@ EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`