diff options
| author | jdolecek <jdolecek@pkgsrc.org> | 2003-08-31 19:55:21 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@pkgsrc.org> | 2003-08-31 19:55:21 +0000 |
| commit | 90c1c1709f137ef730166f682c109e69f84211d9 (patch) | |
| tree | 33c9301fff79082d1d83e91e87ace097146292cf | |
| parent | 5fe36a85b0cab2671cffc7b1c348535a43ce38f7 (diff) | |
| download | pkgsrc-90c1c1709f137ef730166f682c109e69f84211d9.tar.gz | |
Update PHP to final 4.3.3
Some highlights of changes since 4.2.3:
* PCRE updated to 4.3, GD to 2.0.15
* improved Apache2 support
* much improved stream & URL wrapper support, output compression support
* added CLI (Command Line Interface) SAPI
* debug_backtrace() backported from ZendEngine2
* faster build system
* huge number of other bug fixes and improvements
Packaging changes:
* 'pcre', 'xml', and 'session' modules folded back into main package -
'pcre' and 'xml' is required by PEAR, and 'session' is just too essential
to be separate
* 'gd' module now uses bundled PHP GD library, which is better integrated
* PHP modules use shared distinfo when possible to ease future PHP updates
* ${PREFIX}/bin/php is now CLI version, ${PREFIX}/libexec/cgi-big/php
remains CGI version
87 files changed, 481 insertions, 874 deletions
diff --git a/archivers/php4-bz2/distinfo b/archivers/php4-bz2/distinfo deleted file mode 100644 index 1e6fb63e7ab..00000000000 --- a/archivers/php4-bz2/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:05 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/archivers/php4-zlib/distinfo b/archivers/php4-zlib/distinfo deleted file mode 100644 index 05ad947ae79..00000000000 --- a/archivers/php4-zlib/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:06 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/converters/php4-iconv/Makefile b/converters/php4-iconv/Makefile index 0dfb229e269..65a2b831b45 100644 --- a/converters/php4-iconv/Makefile +++ b/converters/php4-iconv/Makefile @@ -1,15 +1,21 @@ -# $NetBSD: Makefile,v 1.2 2003/07/13 13:50:53 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2003/08/31 19:55:26 jdolecek Exp $ MODNAME= iconv CATEGORIES+= devel -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for character set conversion USE_BUILDLINK2= YES .include "../../www/php4/Makefile.module" -CONFIGURE_ARGS+= --with-iconv=shared,${BUILDLINK_PREFIX.iconv} +# this is necessary so that PHP would find either the libc iconv +# or use the packaged iconv, as appropriate; using +# --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists +# the PHP_ICONV in environment is to make configure find alternative +# libiconv +CONFIGURE_ARGS+= --with-iconv +CONFIGURE_ENV+= PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q} .include "../../converters/libiconv/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/php4-iconv/distinfo b/converters/php4-iconv/distinfo deleted file mode 100644 index 74398e499c4..00000000000 --- a/converters/php4-iconv/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/02/13 19:11:52 jdolecek Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-dba/Makefile b/databases/php4-dba/Makefile index c2a3448c10c..9c34e5f441d 100644 --- a/databases/php4-dba/Makefile +++ b/databases/php4-dba/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2002/11/01 16:34:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/08/31 19:55:27 jdolecek Exp $ MODNAME= dba CATEGORIES+= databases -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for DBM database access USE_BUILDLINK2= YES diff --git a/databases/php4-dba/distinfo b/databases/php4-dba/distinfo deleted file mode 100644 index d3cd2b54cbe..00000000000 --- a/databases/php4-dba/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 06:21:06 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (patch-aa) = 6b3d4fdd6bd4874238d6a8f99ebaafb7e422d866 -SHA1 (patch-ab) = 1b272a7f3b94ff934389a1c224befdfdd259051b diff --git a/databases/php4-dba/patches/patch-aa b/databases/php4-dba/patches/patch-aa deleted file mode 100644 index 798c1a202d1..00000000000 --- a/databases/php4-dba/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/10/27 21:31:32 jlam Exp $ - ---- dba_gdbm.c.orig Mon Jul 10 06:09:14 2000 -+++ dba_gdbm.c -@@ -31,2 +31,6 @@ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" diff --git a/databases/php4-dba/patches/patch-ab b/databases/php4-dba/patches/patch-ab deleted file mode 100644 index 6a6ee69504c..00000000000 --- a/databases/php4-dba/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/10/27 21:31:32 jlam Exp $ - ---- dba_ndbm.c.orig Mon Jul 10 06:09:14 2000 -+++ dba_ndbm.c -@@ -31,2 +31,6 @@ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" diff --git a/databases/php4-dbase/distinfo b/databases/php4-dbase/distinfo deleted file mode 100644 index 77323891834..00000000000 --- a/databases/php4-dbase/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-filepro/distinfo b/databases/php4-filepro/distinfo deleted file mode 100644 index 77323891834..00000000000 --- a/databases/php4-filepro/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-ldap/Makefile b/databases/php4-ldap/Makefile index 2a10b9e93ac..8fa03b4cbf9 100644 --- a/databases/php4-ldap/Makefile +++ b/databases/php4-ldap/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/31 19:55:31 jdolecek Exp $ MODNAME= ldap CATEGORIES+= databases -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for LDAP database access USE_BUILDLINK2= YES +DISTINFO_FILE= ${PKGDIR}/distinfo .include "../../www/php4/Makefile.module" diff --git a/databases/php4-ldap/distinfo b/databases/php4-ldap/distinfo index 6d4fb3557a2..cc1c478b535 100644 --- a/databases/php4-ldap/distinfo +++ b/databases/php4-ldap/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $ +$NetBSD: distinfo,v 1.7 2003/08/31 19:55:31 jdolecek Exp $ -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (patch-aa) = 29c55477c62a3776b56cc6976f43cc8e5d4de390 +SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d +Size (php-4.3.3.tar.gz) = 4565509 bytes +SHA1 (patch-aa) = 8087a4c588d3c5c02dc702654567d1cce5250f33 diff --git a/databases/php4-ldap/patches/patch-aa b/databases/php4-ldap/patches/patch-aa index 2148af071a1..1e62bcebeaa 100644 --- a/databases/php4-ldap/patches/patch-aa +++ b/databases/php4-ldap/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2002/02/01 19:22:55 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2003/08/31 19:55:31 jdolecek Exp $ ---- config.m4.orig Mon May 21 15:47:15 2001 -+++ config.m4 -@@ -41,13 +41,16 @@ +--- config.m4.orig 2003-08-31 13:11:08.000000000 +0200 ++++ config.m4 2003-08-31 13:12:20.000000000 +0200 +@@ -42,13 +42,16 @@ dnl these here if necessary. -RL dnl Is this really necessary? -Troels Arvin @@ -13,8 +13,8 @@ $NetBSD: patch-aa,v 1.2 2002/02/01 19:22:55 jlam Exp $ LDAP_PTHREAD= fi - if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.so -o -f $LDAP_LIBDIR/liblber.sl; then -+ if test -n "$LDAP_PTHREAD"; then + if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then ++ if test -n "$LDAP_PTHREAD"; then + PHP_ADD_LIBRARY_WITH_PATH($LDAP_PTHREAD, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + fi PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) diff --git a/databases/php4-mysql/distinfo b/databases/php4-mysql/distinfo deleted file mode 100644 index 25e79876b87..00000000000 --- a/databases/php4-mysql/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-odbc/Makefile b/databases/php4-odbc/Makefile index 2f79921e93c..35f34618990 100644 --- a/databases/php4-odbc/Makefile +++ b/databases/php4-odbc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:14 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2003/08/31 19:55:35 jdolecek Exp $ MODNAME= odbc CATEGORIES+= databases -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for ODBC access USE_BUILDLINK2= YES diff --git a/databases/php4-odbc/distinfo b/databases/php4-odbc/distinfo deleted file mode 100644 index 25e79876b87..00000000000 --- a/databases/php4-odbc/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-pgsql/Makefile b/databases/php4-pgsql/Makefile index 5b1df1b80d0..0b9870a0b5f 100644 --- a/databases/php4-pgsql/Makefile +++ b/databases/php4-pgsql/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2003/01/05 20:14:26 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2003/08/31 19:55:37 jdolecek Exp $ MODNAME= pgsql CATEGORIES+= databases -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for PostgreSQL databases USE_BUILDLINK2= YES diff --git a/databases/php4-pgsql/distinfo b/databases/php4-pgsql/distinfo deleted file mode 100644 index 25e79876b87..00000000000 --- a/databases/php4-pgsql/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/Makefile b/devel/Makefile index f1f95304188..b5bb139abec 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.418 2003/08/30 19:02:17 he Exp $ +# $NetBSD: Makefile,v 1.419 2003/08/31 19:55:23 jdolecek Exp $ # COMMENT= Development utilities @@ -317,9 +317,7 @@ SUBDIR+= pedisassem SUBDIR+= php3-pcre SUBDIR+= php4-gettext SUBDIR+= php4-gmp -SUBDIR+= php4-pcre SUBDIR+= php4-posix -SUBDIR+= php4-session SUBDIR+= php4-sysvsem SUBDIR+= php4-sysvshm SUBDIR+= physfs diff --git a/devel/php4-gettext/Makefile b/devel/php4-gettext/Makefile index 302b8b408f0..3395c4b12f7 100644 --- a/devel/php4-gettext/Makefile +++ b/devel/php4-gettext/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2003/07/13 13:51:25 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/31 19:55:38 jdolecek Exp $ MODNAME= gettext CATEGORIES+= devel -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for gettext support USE_BUILDLINK2= YES diff --git a/devel/php4-gettext/distinfo b/devel/php4-gettext/distinfo deleted file mode 100644 index 266a5b04cbe..00000000000 --- a/devel/php4-gettext/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:09 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-gmp/distinfo b/devel/php4-gmp/distinfo deleted file mode 100644 index 266a5b04cbe..00000000000 --- a/devel/php4-gmp/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:09 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-pcre/DESCR b/devel/php4-pcre/DESCR deleted file mode 100644 index d1281db8c11..00000000000 --- a/devel/php4-pcre/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -PHP is a programming language designed to be embedded into web pages. -This module provides Perl-compatible regular expression support for PHP4. diff --git a/devel/php4-pcre/Makefile b/devel/php4-pcre/Makefile deleted file mode 100644 index b6be4d9e339..00000000000 --- a/devel/php4-pcre/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2003/06/29 14:29:34 grant Exp $ - -MODNAME= pcre -CATEGORIES+= devel -PKGREVISION= # empty -COMMENT= PHP4 extension for Perl-compatible regular expressions - -USE_BUILDLINK2= YES - -.include "../../www/php4/Makefile.module" - -CONFIGURE_ARGS+= --with-pcre-regex=shared,${BUILDLINK_PREFIX.pcre} - -.include "../../devel/pcre/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/php4-pcre/distinfo b/devel/php4-pcre/distinfo deleted file mode 100644 index 5749270a0c6..00000000000 --- a/devel/php4-pcre/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:10 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-posix/distinfo b/devel/php4-posix/distinfo deleted file mode 100644 index ecb12519e11..00000000000 --- a/devel/php4-posix/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 06:21:10 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-session/DESCR b/devel/php4-session/DESCR deleted file mode 100644 index 6ecd16601fe..00000000000 --- a/devel/php4-session/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -PHP is a programming language designed to be embedded into web pages. -This module provides support for session-handling in PHP4. diff --git a/devel/php4-session/Makefile b/devel/php4-session/Makefile deleted file mode 100644 index b17dc6b74c2..00000000000 --- a/devel/php4-session/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: Makefile,v 1.9 2002/10/14 06:21:10 martti Exp $ - -MODNAME= session -CATEGORIES+= devel -PKGREVISION= # empty -COMMENT= PHP4 extension for session-handling - -USE_BUILDLINK2= YES - -.include "../../www/php4/Makefile.module" - -CONFIGURE_ARGS+= --enable-${MODNAME} -CONFIGURE_ARGS+= --enable-trans-sid -#CONFIGURE_ARGS+= --with-mm=shared,${BUILDLINK_DIR} - -#.include "../../devel/libmm/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/php4-session/distinfo b/devel/php4-session/distinfo deleted file mode 100644 index 5a54395daf4..00000000000 --- a/devel/php4-session/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:11 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-sysvsem/distinfo b/devel/php4-sysvsem/distinfo deleted file mode 100644 index 5a54395daf4..00000000000 --- a/devel/php4-sysvsem/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:11 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-sysvshm/distinfo b/devel/php4-sysvshm/distinfo deleted file mode 100644 index 5a54395daf4..00000000000 --- a/devel/php4-sysvshm/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:11 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/doc/CHANGES b/doc/CHANGES index 0498d158fa6..2d6e3b48221 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.3179 2003/08/31 19:48:42 jschauma Exp $ +$NetBSD: CHANGES,v 1.3180 2003/08/31 19:55:21 jdolecek Exp $ Changes to the packages collection and infrastructure in 2003: @@ -3433,3 +3433,4 @@ Changes to the packages collection and infrastructure in 2003: Updated buildtool to 0.13 [jmmv 2003-08-31] Updated buildtool-doc to 0.13 [jmmv 2003-08-31] Updated tcl-tclcl to 1.0rc13 [jschauma 2003-08-31] + Updated php to 4.3.3 [jdolecek 2003-08-31] diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile index b28c2dd4b97..cd356c1387e 100644 --- a/graphics/php4-gd/Makefile +++ b/graphics/php4-gd/Makefile @@ -1,27 +1,30 @@ -# $NetBSD: Makefile,v 1.13 2003/06/23 10:01:34 adam Exp $ +# $NetBSD: Makefile,v 1.14 2003/08/31 19:55:46 jdolecek Exp $ MODNAME= gd CATEGORIES+= graphics -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for GD graphics library -PATCHFILES+= php-4.2.3-gd-2.0.8.patch -PATCH_DIST_STRIP= -p3 -SITES_php-4.2.3-gd-2.0.8.patch= http://www.boutell.com/gd/ - USE_BUILDLINK2= YES USE_X11= YES .include "../../www/php4/Makefile.module" -CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.gd} -CONFIGURE_ARGS+= --with-jpeg-dir=shared,${BUILDLINK_PREFIX.jpeg} -CONFIGURE_ARGS+= --with-png-dir=shared,${BUILDLINK_PREFIX.png} -CONFIGURE_ARGS+= --with-xpm-dir=shared,${BUILDLINK_PREFIX.xpm} -CONFIGURE_ARGS+= --with-ttf=shared,${BUILDLINK_PREFIX.freetype} +CONFIGURE_ARGS+= --with-${MODNAME} # use bundled libgd +CONFIGURE_ARGS+= --with-jpeg-dir=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-png-dir=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-xpm-dir=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-ttf=${BUILDLINK_DIR} CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf +CONFIGURE_ARGS+= --enable-${MODNAME}-jis-conv CONFIGURE_ARGS+= --without-freetype-dir CONFIGURE_ARGS+= --without-t1lib -.include "../../graphics/gd/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/php4-gd/distinfo b/graphics/php4-gd/distinfo deleted file mode 100644 index 004485b1090..00000000000 --- a/graphics/php4-gd/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.7 2003/06/23 10:01:35 adam Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (php-4.2.3-gd-2.0.8.patch) = 6c907c8e3ce5ad75845e25f5de8714d9a006a4bf -Size (php-4.2.3-gd-2.0.8.patch) = 4439 bytes diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile index e739a92e934..bbda670c2ce 100644 --- a/mail/php4-imap/Makefile +++ b/mail/php4-imap/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2003/07/28 15:52:22 adam Exp $ +# $NetBSD: Makefile,v 1.11 2003/08/31 19:55:47 jdolecek Exp $ MODNAME= imap CATEGORIES+= mail -PKGREVISION= 2 +PKGREVISION= # empty COMMENT= PHP4 extension for IMAP (Internet Mailbox Access Protocol) USE_BUILDLINK2= YES +DISTINFO_FILE= ${PKGDIR}/distinfo .include "../../www/php4/Makefile.module" diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo index aac57b58157..dfe9fa34f50 100644 --- a/mail/php4-imap/distinfo +++ b/mail/php4-imap/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/11/02 00:05:04 elric Exp $ +$NetBSD: distinfo,v 1.7 2003/08/31 19:55:48 jdolecek Exp $ -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (patch-aa) = 237256b28c175aa71e5fe76e3df363f9c8203682 -SHA1 (patch-ab) = d3df38e0ff0d818db39f5fe1980318eac2738bcd +SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d +Size (php-4.3.3.tar.gz) = 4565509 bytes +SHA1 (patch-aa) = 88bdeff65b4a8c2abe46b969715702b31020bb28 +SHA1 (patch-ab) = fbdb1acceacf4f514c28d7ef5dba61bcc451f308 diff --git a/mail/php4-imap/patches/patch-aa b/mail/php4-imap/patches/patch-aa index e0aba512a23..134ea4634a8 100644 --- a/mail/php4-imap/patches/patch-aa +++ b/mail/php4-imap/patches/patch-aa @@ -1,38 +1,18 @@ -$NetBSD: patch-aa,v 1.3 2002/11/02 00:05:05 elric Exp $ +$NetBSD: patch-aa,v 1.4 2003/08/31 19:55:48 jdolecek Exp $ ---- config.m4.orig Tue Aug 20 19:09:01 2002 -+++ config.m4 Thu Oct 31 17:59:46 2002 -@@ -40,12 +40,6 @@ - PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD) +--- config.m4.orig 2003-08-31 15:11:49.000000000 +0200 ++++ config.m4 2003-08-31 15:12:05.000000000 +0200 +@@ -91,13 +91,6 @@ PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD) + PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include) - else - AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ -- AC_MSG_ERROR(This c-client library is built with Kerberos support. +- AC_MSG_ERROR([This c-client library is built with Kerberos support. - -- Add --with-kerberos<=DIR> to your configure line. Check config.log for details.) +- Add --with-kerberos to your configure line. Check config.log for details. +- ]) - ]) fi ]) -@@ -65,8 +59,8 @@ - if test "$PHP_IMAP_SSL" != "no"; then - AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) - PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(crypto, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(ssl, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) - else - old_LIBS=$LIBS - LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" -@@ -162,8 +156,7 @@ - fi - - PHP_ADD_INCLUDE($IMAP_INC_DIR) -- PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD) - PHP_IMAP_KRB_CHK - PHP_IMAP_SSL_CHK - fi diff --git a/mail/php4-imap/patches/patch-ab b/mail/php4-imap/patches/patch-ab index 2adba67c508..ef2efa0e6dc 100644 --- a/mail/php4-imap/patches/patch-ab +++ b/mail/php4-imap/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2002/10/14 06:21:12 martti Exp $ +$NetBSD: patch-ab,v 1.4 2003/08/31 19:55:48 jdolecek Exp $ ---- php_imap.c.orig Mon Aug 26 01:58:31 2002 -+++ php_imap.c Sat Oct 12 10:49:37 2002 -@@ -421,6 +421,11 @@ +--- php_imap.c.orig 2003-06-17 16:13:25.000000000 +0200 ++++ php_imap.c 2003-08-31 15:12:30.000000000 +0200 +@@ -408,6 +408,11 @@ ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) @@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.3 2002/10/14 06:21:12 martti Exp $ #ifndef PHP_WIN32 mail_link(&unixdriver); /* link in the unix driver */ mail_link(&mhdriver); /* link in the mh driver */ -@@ -436,6 +441,10 @@ +@@ -423,6 +428,10 @@ mail_link(&tenexdriver); /* link in the tenex driver */ mail_link(&mtxdriver); /* link in the mtx driver */ mail_link(&dummydriver); /* link in the dummy driver */ diff --git a/math/php4-bcmath/Makefile b/math/php4-bcmath/Makefile index ead8ecbc3c5..ef8c464d2a4 100644 --- a/math/php4-bcmath/Makefile +++ b/math/php4-bcmath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:16 martti Exp $ +# $NetBSD: Makefile,v 1.5 2003/08/31 19:55:49 jdolecek Exp $ MODNAME= bcmath CATEGORIES+= math @@ -6,6 +6,7 @@ PKGREVISION= # empty COMMENT= PHP4 extension for bc-style arbitrary precision math USE_BUILDLINK2= YES +DISTINFO_FILE= ${PKGDIR}/distinfo .include "../../www/php4/Makefile.module" diff --git a/math/php4-bcmath/distinfo b/math/php4-bcmath/distinfo index 0c572cf7ca0..10610a411cd 100644 --- a/math/php4-bcmath/distinfo +++ b/math/php4-bcmath/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:12 martti Exp $ +$NetBSD: distinfo,v 1.6 2003/08/31 19:55:49 jdolecek Exp $ -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (patch-aa) = 96aed03b5187adc3f02df4ffae1f9e9a14bbd144 +SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d +Size (php-4.3.3.tar.gz) = 4565509 bytes +SHA1 (patch-aa) = 9b38909d03e00107e9895b6fc207f656c3b49654 diff --git a/math/php4-bcmath/patches/patch-aa b/math/php4-bcmath/patches/patch-aa index 18238ac5edf..7ac23bdd03a 100644 --- a/math/php4-bcmath/patches/patch-aa +++ b/math/php4-bcmath/patches/patch-aa @@ -1,12 +1,18 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 07:00:05 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2003/08/31 19:55:50 jdolecek Exp $ ---- Makefile.in.orig Sun Nov 26 04:34:01 2000 -+++ Makefile.in -@@ -1,6 +1,6 @@ +--- config.m4.orig 2002-03-07 15:18:01.000000000 +0100 ++++ config.m4 2003-08-31 18:24:27.000000000 +0200 +@@ -7,11 +7,11 @@ - LTLIBRARY_NAME = libbcmath.la --LTLIBRARY_SOURCES = bcmath.c number.c -+LTLIBRARY_SOURCES = bcmath.c - LTLIBRARY_SHARED_NAME = bcmath.la - LTLIBRARY_DEPENDENCIES = libbcmath/libbcmath.la - LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) + if test "$PHP_BCMATH" != "no"; then + AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath]) +- PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \ ++ PHP_NEW_EXTENSION(bcmath, bcmath.c \ + libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ + libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ + libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ + libbcmath/src/rmzero.c libbcmath/src/str2num.c, +- $ext_shared,,-I@ext_srcdir@/libbcmath/src) ++ $ext_shared,,-I@ext_srcdir@ -I@ext_srcdir@/../.. -I@ext_srcdir@/libbcmath/src) + PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src) + fi diff --git a/misc/php4-calendar/distinfo b/misc/php4-calendar/distinfo deleted file mode 100644 index 769d7150f50..00000000000 --- a/misc/php4-calendar/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:13 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/misc/php4-mbstring/Makefile b/misc/php4-mbstring/Makefile index e82d12b89a2..ec3eeceac72 100644 --- a/misc/php4-mbstring/Makefile +++ b/misc/php4-mbstring/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2002/11/30 15:13:24 taca Exp $ +# $NetBSD: Makefile,v 1.6 2003/08/31 19:55:51 jdolecek Exp $ MODNAME= mbstring CATEGORIES+= misc -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for multibyte characters support (currently, Japanese only) USE_BUILDLINK2= YES diff --git a/misc/php4-mbstring/patches/patch-aa b/misc/php4-mbstring/patches/patch-aa deleted file mode 100644 index 7bc59ff4ba4..00000000000 --- a/misc/php4-mbstring/patches/patch-aa +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2002/11/30 15:13:26 taca Exp $ - ---- mbstring.c.orig Thu Aug 1 14:47:56 2002 -+++ mbstring.c -@@ -1031,14 +1031,19 @@ php_mbstr_encoding_handler(zval *arg, ch - var = php_strtok_r(res, separator, &strtok_buf); - while (var) { - val = strchr(var, '='); -- val_list[n] = var; -- len_list[n] = php_url_decode(var, strlen(var)); -- n++; - if (val) { /* have a value */ -+ len_list[n] = php_url_decode(var, val-var); -+ val_list[n] = var; -+ n++; -+ - *val++ = '\0'; - val_list[n] = val; - len_list[n] = php_url_decode(val, strlen(val)); - } else { -+ len_list[n] = php_url_decode(var, strlen(var)); -+ val_list[n] = var; -+ n++; -+ - val_list[n] = ""; - len_list[n] = 0; - } -@@ -1375,7 +1380,7 @@ PHP_FUNCTION(mb_parse_str) - str_list[n] = var; - len_list[n] = php_url_decode(var, strlen(var)); - n++; -- str_list[n] = NULL; -+ str_list[n] = ""; - len_list[n] = 0; - } - n++; diff --git a/net/php4-ftp/distinfo b/net/php4-ftp/distinfo deleted file mode 100644 index fa0c0a72d39..00000000000 --- a/net/php4-ftp/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:14 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/net/php4-snmp/distinfo b/net/php4-snmp/distinfo deleted file mode 100644 index ec53c3ed7e0..00000000000 --- a/net/php4-snmp/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.2 2002/10/14 06:21:14 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/net/php4-sockets/distinfo b/net/php4-sockets/distinfo deleted file mode 100644 index fa0c0a72d39..00000000000 --- a/net/php4-sockets/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:14 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/net/php4-yp/distinfo b/net/php4-yp/distinfo deleted file mode 100644 index b134cee5cd3..00000000000 --- a/net/php4-yp/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:15 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/print/php4-pdflib/Makefile b/print/php4-pdflib/Makefile index 09701b6c29b..027bc35184e 100644 --- a/print/php4-pdflib/Makefile +++ b/print/php4-pdflib/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2002/10/09 12:18:39 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/31 19:55:56 jdolecek Exp $ MODNAME= pdf PKGNAME= php-pdflib-${PHP_BASE_VERS} -PKGREVISION= 1 CATEGORIES+= print PKGREVISION= # empty COMMENT= PHP4 extension for PDFlib on-the-fly PDF generation diff --git a/print/php4-pdflib/distinfo b/print/php4-pdflib/distinfo deleted file mode 100644 index b134cee5cd3..00000000000 --- a/print/php4-pdflib/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:15 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/security/php4-mcrypt/Makefile b/security/php4-mcrypt/Makefile index 3ba6ab45b23..6c530cb7916 100644 --- a/security/php4-mcrypt/Makefile +++ b/security/php4-mcrypt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2003/03/05 09:07:23 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2003/08/31 19:55:57 jdolecek Exp $ MODNAME= mcrypt CATEGORIES+= security -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= PHP4 extension for the mcrypt crypto algorithms library USE_BUILDLINK2= YES diff --git a/security/php4-mcrypt/distinfo b/security/php4-mcrypt/distinfo deleted file mode 100644 index 3a01b5faffc..00000000000 --- a/security/php4-mcrypt/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.6 2003/03/05 09:07:23 wiz Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (patch-aa) = 1aae3f30992fa85342e5939184e963a0c377024a diff --git a/security/php4-mcrypt/patches/patch-aa b/security/php4-mcrypt/patches/patch-aa deleted file mode 100644 index 740f67d1980..00000000000 --- a/security/php4-mcrypt/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/03/05 09:07:24 wiz Exp $ - ---- config.m4.orig Fri Jan 4 15:13:53 2002 -+++ config.m4 -@@ -31,7 +31,7 @@ if test "$PHP_MCRYPT" != "no"; then - ],[ - PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, - [ -- AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) -+ AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) - ],[ - AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.]) - ],[ diff --git a/security/php4-mhash/distinfo b/security/php4-mhash/distinfo deleted file mode 100644 index 77274a40808..00000000000 --- a/security/php4-mhash/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.2 2002/10/14 06:21:16 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/textproc/Makefile b/textproc/Makefile index b9fd84ace4d..0dec5689b0b 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.207 2003/08/31 09:43:49 cjep Exp $ +# $NetBSD: Makefile,v 1.208 2003/08/31 19:55:24 jdolecek Exp $ # COMMENT= Text processing utilities (does not include desktop publishing) @@ -161,7 +161,6 @@ SUBDIR+= p5-libxml-enno SUBDIR+= par SUBDIR+= php4-domxml SUBDIR+= php4-wddx -SUBDIR+= php4-xml SUBDIR+= php4-xslt SUBDIR+= postgresql-autodoc SUBDIR+= psgml-mode diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile index 68b720003c2..cebb849dc37 100644 --- a/textproc/php4-domxml/Makefile +++ b/textproc/php4-domxml/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:35 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/31 19:55:59 jdolecek Exp $ MODNAME= domxml CATEGORIES+= textproc -PHP_PKG_VERS= # empty -PKGREVISION= 3 +PKGREVISION= # empty COMMENT= PHP4 extension for DOM support USE_BUILDLINK2= YES @@ -12,6 +11,8 @@ USE_BUILDLINK2= YES CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-dom=shared,${BUILDLINK_PREFIX.libxml2} +CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib} +.include "../../devel/zlib/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/php4-domxml/distinfo b/textproc/php4-domxml/distinfo deleted file mode 100644 index 51afccc3d6f..00000000000 --- a/textproc/php4-domxml/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.3 2002/10/14 06:21:16 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/textproc/php4-wddx/Makefile b/textproc/php4-wddx/Makefile index dd89550962a..73b1f0bac9d 100644 --- a/textproc/php4-wddx/Makefile +++ b/textproc/php4-wddx/Makefile @@ -1,14 +1,12 @@ -# $NetBSD: Makefile,v 1.6 2002/10/09 19:25:50 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/08/31 19:56:00 jdolecek Exp $ MODNAME= wddx CATEGORIES+= textproc PKGREVISION= # empty COMMENT= PHP4 extension for WDDX support -DEPENDS+= php-session>=${PHP_BASE_VERS}:../../devel/php4-session -DEPENDS+= php-xml>=${PHP_BASE_VERS}:../../textproc/php4-xml - USE_BUILDLINK2= YES +DISTINFO_FILE= ${PKGDIR}/distinfo .include "../../www/php4/Makefile.module" diff --git a/textproc/php4-wddx/distinfo b/textproc/php4-wddx/distinfo index ce30cb0a118..928ebbfd474 100644 --- a/textproc/php4-wddx/distinfo +++ b/textproc/php4-wddx/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:17 martti Exp $ +$NetBSD: distinfo,v 1.6 2003/08/31 19:56:00 jdolecek Exp $ -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (patch-aa) = 6d5a269572190be29252cf018fa1d33fa5d49984 -SHA1 (patch-ab) = 91276083c16070fd1df3aca05c2dbd2b6585c592 -SHA1 (patch-ac) = b60bc98dced23db2445c663517d510fd0124aeb2 +SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d +Size (php-4.3.3.tar.gz) = 4565509 bytes +SHA1 (patch-ab) = db0b22dcd9ed44d050135b2160661d5ba6792b7d diff --git a/textproc/php4-wddx/patches/patch-aa b/textproc/php4-wddx/patches/patch-aa deleted file mode 100644 index 1ed08b49da4..00000000000 --- a/textproc/php4-wddx/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 06:28:06 jlam Exp $ - ---- Makefile.in.orig Mon May 1 18:38:34 2000 -+++ Makefile.in -@@ -1,5 +1,7 @@ - - LTLIBRARY_NAME = libwddx.la - LTLIBRARY_SOURCES = wddx.c -+LTLIBRARY_SHARED_NAME = wddx.la -+LTLIBRARY_SHARED_LIBADD = $(WDDX_SHARED_LIBADD) - - include $(top_srcdir)/build/dynlib.mk diff --git a/textproc/php4-wddx/patches/patch-ab b/textproc/php4-wddx/patches/patch-ab index 116154c526b..1194c126c35 100644 --- a/textproc/php4-wddx/patches/patch-ab +++ b/textproc/php4-wddx/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2002/10/14 06:21:17 martti Exp $ +$NetBSD: patch-ab,v 1.3 2003/08/31 19:56:01 jdolecek Exp $ ---- config.m4.orig Fri Nov 30 19:00:04 2001 -+++ config.m4 Sat Oct 12 10:54:29 2002 +--- config.m4.orig 2003-08-31 19:07:34.000000000 +0200 ++++ config.m4 2003-08-31 19:06:32.000000000 +0200 @@ -5,6 +5,9 @@ PHP_ARG_ENABLE(wddx,whether to enable WDDX support, [ --enable-wddx Enable WDDX support.]) @@ -15,8 +15,7 @@ $NetBSD: patch-ab,v 1.2 2002/10/14 06:21:17 martti Exp $ @@ -12,4 +15,17 @@ fi AC_DEFINE(HAVE_WDDX, 1, [ ]) - PHP_EXTENSION(wddx, $ext_shared) -+ PHP_SUBST(WDDX_SHARED_LIBADD) + PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared) + + if test "$PHP_EXPAT_DIR" != "no"; then + if test -f $PHP_EXPAT_DIR/lib/libexpat.a -o -f $PHP_EXPAT_DIR/lib/libexpat.s?; then @@ -29,4 +28,5 @@ $NetBSD: patch-ab,v 1.2 2002/10/14 06:21:17 martti Exp $ + PHP_ADD_INCLUDE($PHP_EXPAT_DIR/include) + fi + fi ++ fi diff --git a/textproc/php4-wddx/patches/patch-ac b/textproc/php4-wddx/patches/patch-ac deleted file mode 100644 index 28e8a4d2dfd..00000000000 --- a/textproc/php4-wddx/patches/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2002/10/14 06:21:17 martti Exp $ - ---- wddx.c.orig Thu Feb 28 08:26:57 2002 -+++ wddx.c Sun Oct 13 12:59:27 2002 -@@ -20,2 +20,8 @@ - -+#define IS_EXT_MODULE -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" -@@ -106,2 +112,6 @@ - /* }}} */ -+ -+#ifdef COMPILE_DL_WDDX -+ZEND_GET_MODULE(wddx) -+#endif /* COMPILE_DL_WDDX */ - diff --git a/textproc/php4-xml/DESCR b/textproc/php4-xml/DESCR deleted file mode 100644 index d5afff9cf73..00000000000 --- a/textproc/php4-xml/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -PHP is a programming language designed to be embedded into web pages. -This module provides an XML parser for PHP4. diff --git a/textproc/php4-xml/Makefile b/textproc/php4-xml/Makefile deleted file mode 100644 index 7c5af7ceb39..00000000000 --- a/textproc/php4-xml/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2002/10/09 19:27:39 wiz Exp $ - -MODNAME= xml -CATEGORIES+= textproc -PKGREVISION= # empty -COMMENT= PHP4 extension for parsing XML - -USE_BUILDLINK2= YES - -.include "../../www/php4/Makefile.module" - -CONFIGURE_ARGS+= --enable-${MODNAME} -CONFIGURE_ARGS+= --with-expat-dir=shared,${BUILDLINK_PREFIX.expat} - -.include "../../textproc/expat/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/textproc/php4-xml/distinfo b/textproc/php4-xml/distinfo deleted file mode 100644 index dac623ef9a9..00000000000 --- a/textproc/php4-xml/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:17 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile index 154c72d8b6a..15c7b178c12 100644 --- a/textproc/php4-xslt/Makefile +++ b/textproc/php4-xslt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2003/08/29 15:49:14 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2003/08/31 19:56:04 jdolecek Exp $ MODNAME= xslt -PKGREVISION= 2 +PKGREVISION= # empty CATEGORIES+= textproc COMMENT= PHP4 extension for XSLT functions (Sablotron backend) @@ -10,9 +10,12 @@ USE_BUILDLINK2= YES .include "../../www/php4/Makefile.module" CONFIGURE_ARGS+= --enable-${MODNAME} -CONFIGURE_ARGS+= --with-${MODNAME}-sablot=shared,${BUILDLINK_PREFIX.sablotron} -CONFIGURE_ARGS+= --with-expat-dir=shared,${BUILDLINK_PREFIX.expat} -# to make configure find libiconv +CONFIGURE_ARGS+= --with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron} +CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat} + +# this is necessary so that PHP would find either the libc iconv +# or use the packaged iconv, as appropriate; see also converters/php4-iconv +CONFIGURE_ARGS+= --with-iconv-dir CONFIGURE_ENV+= PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q} PLIST_SRC+= ${.CURDIR}/PLIST.extras diff --git a/textproc/php4-xslt/distinfo b/textproc/php4-xslt/distinfo deleted file mode 100644 index a083876a1df..00000000000 --- a/textproc/php4-xslt/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.4 2002/10/30 15:28:12 wiz Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile index 98d434e29df..39a421949ca 100644 --- a/www/ap-php4/Makefile +++ b/www/ap-php4/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2003/08/23 14:22:44 grant Exp $ +# $NetBSD: Makefile,v 1.30 2003/08/31 19:56:04 jdolecek Exp $ # PKGNAME= ap-php-${PHP_BASE_VERS} -PKGREVISION= 1 +PKGREVISION= # empty COMMENT= Apache 1.x module for PHP4 DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4 diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile index f0790957db4..8cda579d6f4 100644 --- a/www/php4-apc/Makefile +++ b/www/php4-apc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:55:59 grant Exp $ +# $NetBSD: Makefile,v 1.7 2003/08/31 19:56:08 jdolecek Exp $ DISTNAME= apc-1.1.0pl1 PKGNAME= php-apc-1.1.0.1 @@ -14,6 +14,7 @@ COMMENT= Alternative PHP Cache for PHP4 EXTRACT_ELEMENTS= # empty USE_BUILDLINK2= YES +DISTINFO_FILE= ${PKGDIR}/distinfo .include "../../www/php4/Makefile.module" diff --git a/www/php4-curl/distinfo b/www/php4-curl/distinfo deleted file mode 100644 index 5abcf6eaf45..00000000000 --- a/www/php4-curl/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/14 06:40:53 martti Exp $ - -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/www/php4/MESSAGE b/www/php4/MESSAGE index 0e3ddf4f71a..4affd0f1a8c 100644 --- a/www/php4/MESSAGE +++ b/www/php4/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2003/08/21 05:55:10 grant Exp $ +$NetBSD: MESSAGE,v 1.4 2003/08/31 19:56:05 jdolecek Exp $ To process PHP scripts, you will need a PHP-enabled HTTP server. You may either configure the HTTP server to use PHP as a CGI program, or install a @@ -8,8 +8,5 @@ PHP module for your HTTP server, e.g. ap-php4. Some additional packages you may wish to install are: php4-dba DBM database access - php4-pcre Perl-compatible regular expressions - php4-posix Extension for POSIX-like functions - php4-session Session ID support - php4-xml XML parsing extension + php4-iconv DBM database access =========================================================================== diff --git a/www/php4/Makefile b/www/php4/Makefile index c3807850762..c7d0c377b7c 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2003/06/29 16:30:32 grant Exp $ +# $NetBSD: Makefile,v 1.34 2003/08/31 19:56:05 jdolecek Exp $ PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 2 CATEGORIES+= lang COMMENT= HTML-embedded scripting language @@ -9,10 +8,14 @@ CONFLICTS+= ap-php-4.0.3pl1 USE_BUILDLINK2= YES USE_PKGINSTALL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +# PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now +# LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +USE_GMAKE= YES .include "Makefile.php" +CONFIGURE_ARGS+= --enable-cli + CGIDIR= ${PREFIX}/libexec/cgi-bin EGDIR= ${PREFIX}/share/examples/php @@ -35,8 +38,10 @@ CONF_FILES= ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR} post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php + ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1 ${INSTALL_DATA_DIR} ${CGIDIR} - ${LN} -sf ../../bin/php ${CGIDIR}/php + ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php ${CGIDIR} ${INSTALL_DATA_DIR} ${EGDIR} cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/php diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index a71984d738f..1777b8b5a87 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2003/07/17 22:55:59 grant Exp $ +# $NetBSD: Makefile.common,v 1.31 2003/08/31 19:56:05 jdolecek Exp $ DISTNAME?= php-${PHP_DIST_VERS} CATEGORIES+= www php4 @@ -14,7 +14,7 @@ HOMEPAGE?= http://www.php.net/ # PHP_DIST_VERS version number on the php distfile # PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .) # -PHP_DIST_VERS= 4.2.3 +PHP_DIST_VERS= 4.3.3 PHP_BASE_VERS= ${PHP_DIST_VERS} DISTFILES?= ${PHP_DISTFILE} diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index 00ad9b7c499..2db844316f5 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.22 2003/02/03 23:53:24 jlam Exp $ +# $NetBSD: Makefile.module,v 1.23 2003/08/31 19:56:05 jdolecek Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -23,6 +23,7 @@ PLIST_SUBST+= MODNAME=${PKGMODNAME} EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME} WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS} +DISTINFO_FILE?= ${PKGDIR}/../../www/php4/distinfo PHPIZE?= ${BUILDLINK_PREFIX.php4}/bin/phpize PHP_CONFIG?= ${BUILDLINK_PREFIX.php4}/bin/php-config diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 0f4870ae716..de75d52a9de 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.7 2003/01/08 01:52:43 jlam Exp $ +# $NetBSD: Makefile.php,v 1.8 2003/08/31 19:56:05 jdolecek Exp $ .include "../../www/php4/Makefile.common" @@ -8,12 +8,12 @@ PATCHDIR= ${.CURDIR}/../../www/php4/patches USE_LIBTOOL= YES GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --disable-cli + CONFIGURE_ARGS+= --without-mysql -CONFIGURE_ARGS+= --without-pcre-regex +CONFIGURE_ARGS+= --without-iconv CONFIGURE_ARGS+= --disable-posix -CONFIGURE_ARGS+= --disable-session -CONFIGURE_ARGS+= --disable-xml CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4 diff --git a/www/php4/PLIST b/www/php4/PLIST index 2e6f81769c8..819b8f4dd78 100644 --- a/www/php4/PLIST +++ b/www/php4/PLIST @@ -1,267 +1,339 @@ -@comment $NetBSD: PLIST,v 1.5 2002/10/14 06:21:18 martti Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/08/31 19:56:05 jdolecek Exp $ bin/pear -bin/pearize bin/php bin/php-config bin/phpextdist bin/phpize -bin/phptar -include/php/TSRM/TSRM.h -include/php/TSRM/acconfig.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_strtok_r.h -include/php/TSRM/tsrm_virtual_cwd.h -include/php/TSRM/tsrm_win32.h +etc/pear.conf include/php/Zend/FlexLexer.h -include/php/Zend/acconfig.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_compile.h -include/php/Zend/zend_config.h -include/php/Zend/zend_config.w32.h -include/php/Zend/zend_constants.h -include/php/Zend/zend_dynamic_array.h -include/php/Zend/zend_errors.h -include/php/Zend/zend_execute.h -include/php/Zend/zend_execute_locks.h -include/php/Zend/zend_extensions.h -include/php/Zend/zend_fast_cache.h -include/php/Zend/zend_globals.h -include/php/Zend/zend_globals_macros.h +include/php/Zend/zend_types.h +include/php/Zend/zend_static_allocator.h +include/php/Zend/zend_stack.h +include/php/Zend/zend_qsort.h +include/php/Zend/zend_ptr_stack.h +include/php/Zend/zend_operators.h +include/php/Zend/zend_multiply.h +include/php/Zend/zend_multibyte.h +include/php/Zend/zend_modules.h +include/php/Zend/zend_llist.h +include/php/Zend/zend_list.h +include/php/Zend/zend_language_scanner.h +include/php/Zend/zend_language_parser.h +include/php/Zend/zend_istdiostream.h +include/php/Zend/zend_ini_scanner.h +include/php/Zend/zend_ini_parser.h +include/php/Zend/zend_ini.h include/php/Zend/zend_hash.h -include/php/Zend/zend_highlight.h include/php/Zend/zend_indent.h -include/php/Zend/zend_ini.h -include/php/Zend/zend_ini_parser.h -include/php/Zend/zend_ini_scanner.h -include/php/Zend/zend_istdiostream.h -include/php/Zend/zend_language_parser.h -include/php/Zend/zend_language_scanner.h -include/php/Zend/zend_list.h -include/php/Zend/zend_llist.h -include/php/Zend/zend_modules.h -include/php/Zend/zend_operators.h -include/php/Zend/zend_ptr_stack.h -include/php/Zend/zend_qsort.h -include/php/Zend/zend_stack.h -include/php/Zend/zend_static_allocator.h +include/php/Zend/zend_highlight.h +include/php/Zend/zend_globals_macros.h +include/php/Zend/zend_globals.h +include/php/Zend/zend_fast_cache.h +include/php/Zend/zend_extensions.h +include/php/Zend/zend_execute_locks.h +include/php/Zend/zend_execute_globals.h +include/php/Zend/zend_execute.h +include/php/Zend/zend_errors.h +include/php/Zend/zend_dynamic_array.h +include/php/Zend/zend_constants.h +include/php/Zend/zend_config.w32.h +include/php/Zend/zend_config.h +include/php/Zend/zend_compile.h +include/php/Zend/zend_builtin_functions.h +include/php/Zend/zend_alloc.h +include/php/Zend/zend_API.h +include/php/Zend/zend.h +include/php/Zend/acconfig.h include/php/Zend/zend_variables.h -include/php/acconfig.h -include/php/ext/mbstring/cp932_table.h -include/php/ext/mbstring/mbfilter.h -include/php/ext/mbstring/mbfilter_ja.h -include/php/ext/mbstring/mbregex.h -include/php/ext/mbstring/mbstring.h -include/php/ext/mbstring/unicode_table.h -include/php/ext/mbstring/unicode_table_ja.h -include/php/ext/session/mod_files.h -include/php/ext/session/mod_mm.h -include/php/ext/session/mod_user.h -include/php/ext/session/php_session.h +include/php/TSRM/TSRM.h +include/php/TSRM/tsrm_virtual_cwd.h +include/php/TSRM/tsrm_strtok_r.h +include/php/TSRM/tsrm_nw.h +include/php/TSRM/tsrm_config_common.h +include/php/TSRM/tsrm_config.w32.h +include/php/TSRM/tsrm_config.nw.h +include/php/TSRM/tsrm_config.h +include/php/TSRM/readdir.h +include/php/TSRM/acconfig.h +include/php/TSRM/tsrm_win32.h include/php/ext/standard/aggregation.h -include/php/ext/standard/base64.h -include/php/ext/standard/basic_functions.h -include/php/ext/standard/crc32.h -include/php/ext/standard/credits.h -include/php/ext/standard/credits_ext.h -include/php/ext/standard/credits_sapi.h -include/php/ext/standard/cyr_convert.h -include/php/ext/standard/datetime.h -include/php/ext/standard/dl.h -include/php/ext/standard/dns.h -include/php/ext/standard/exec.h -include/php/ext/standard/file.h -include/php/ext/standard/flock_compat.h -include/php/ext/standard/fsock.h -include/php/ext/standard/head.h -include/php/ext/standard/html.h -include/php/ext/standard/info.h -include/php/ext/standard/md5.h -include/php/ext/standard/microtime.h -include/php/ext/standard/pack.h -include/php/ext/standard/pageinfo.h -include/php/ext/standard/parsedate.h -include/php/ext/standard/php_array.h -include/php/ext/standard/php_assert.h -include/php/ext/standard/php_browscap.h -include/php/ext/standard/php_crypt.h -include/php/ext/standard/php_dir.h -include/php/ext/standard/php_ext_syslog.h -include/php/ext/standard/php_filestat.h -include/php/ext/standard/php_fopen_wrappers.h -include/php/ext/standard/php_ftok.h -include/php/ext/standard/php_image.h -include/php/ext/standard/php_incomplete_class.h -include/php/ext/standard/php_iptc.h -include/php/ext/standard/php_lcg.h -include/php/ext/standard/php_link.h -include/php/ext/standard/php_mail.h -include/php/ext/standard/php_math.h -include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_parsedate.h -include/php/ext/standard/php_rand.h -include/php/ext/standard/php_smart_str.h -include/php/ext/standard/php_smart_str_public.h -include/php/ext/standard/php_standard.h -include/php/ext/standard/php_string.h -include/php/ext/standard/php_type.h -include/php/ext/standard/php_var.h -include/php/ext/standard/php_versioning.h -include/php/ext/standard/quot_print.h -include/php/ext/standard/reg.h -include/php/ext/standard/scanf.h -include/php/ext/standard/uniqid.h -include/php/ext/standard/url.h include/php/ext/standard/url_scanner.h +include/php/ext/standard/url.h +include/php/ext/standard/uniqid.h +include/php/ext/standard/sha1.h +include/php/ext/standard/scanf.h +include/php/ext/standard/reg.h +include/php/ext/standard/quot_print.h +include/php/ext/standard/php_versioning.h +include/php/ext/standard/php_var.h +include/php/ext/standard/php_type.h +include/php/ext/standard/php_string.h +include/php/ext/standard/php_standard.h +include/php/ext/standard/php_smart_str_public.h +include/php/ext/standard/php_smart_str.h +include/php/ext/standard/php_rand.h +include/php/ext/standard/php_parsedate.h +include/php/ext/standard/php_metaphone.h +include/php/ext/standard/php_math.h +include/php/ext/standard/php_mail.h +include/php/ext/standard/php_link.h +include/php/ext/standard/php_lcg.h +include/php/ext/standard/php_iptc.h +include/php/ext/standard/php_incomplete_class.h +include/php/ext/standard/php_image.h +include/php/ext/standard/php_ftok.h +include/php/ext/standard/php_fopen_wrappers.h +include/php/ext/standard/php_filestat.h +include/php/ext/standard/php_ext_syslog.h +include/php/ext/standard/php_dir.h +include/php/ext/standard/php_crypt.h +include/php/ext/standard/php_browscap.h +include/php/ext/standard/php_assert.h +include/php/ext/standard/php_array.h +include/php/ext/standard/parsedate.h +include/php/ext/standard/pageinfo.h +include/php/ext/standard/pack.h +include/php/ext/standard/microtime.h +include/php/ext/standard/md5.h +include/php/ext/standard/info.h +include/php/ext/standard/html.h +include/php/ext/standard/head.h +include/php/ext/standard/fsock.h +include/php/ext/standard/flock_compat.h +include/php/ext/standard/file.h +include/php/ext/standard/exec.h +include/php/ext/standard/dns.h +include/php/ext/standard/dl.h +include/php/ext/standard/datetime.h +include/php/ext/standard/cyr_convert.h +include/php/ext/standard/css.h +include/php/ext/standard/credits_sapi.h +include/php/ext/standard/credits_ext.h +include/php/ext/standard/credits.h +include/php/ext/standard/crc32.h +include/php/ext/standard/basic_functions.h +include/php/ext/standard/base64.h include/php/ext/standard/url_scanner_ex.h +include/php/ext/session/php_session.h +include/php/ext/session/mod_user.h +include/php/ext/session/mod_mm.h +include/php/ext/session/mod_files.h include/php/ext/xml/expat/ascii.h -include/php/ext/xml/expat/asciitab.h -include/php/ext/xml/expat/expat.h -include/php/ext/xml/expat/iasciitab.h -include/php/ext/xml/expat/latin1tab.h -include/php/ext/xml/expat/nametab.h -include/php/ext/xml/expat/utf8tab.h -include/php/ext/xml/expat/winconfig.h -include/php/ext/xml/expat/xmlrole.h include/php/ext/xml/expat/xmltok.h +include/php/ext/xml/expat/xmlrole.h +include/php/ext/xml/expat/winconfig.h +include/php/ext/xml/expat/utf8tab.h +include/php/ext/xml/expat/nametab.h +include/php/ext/xml/expat/latin1tab.h +include/php/ext/xml/expat/internal.h +include/php/ext/xml/expat/iasciitab.h +include/php/ext/xml/expat/expat.h +include/php/ext/xml/expat/asciitab.h include/php/ext/xml/expat/xmltok_impl.h include/php/ext/xml/php_xml.h +include/php/ext/mbstring/cp932_table.h +include/php/ext/mbstring/unicode_table_ru.h +include/php/ext/mbstring/unicode_table_kr.h +include/php/ext/mbstring/unicode_table_ja.h +include/php/ext/mbstring/unicode_table_cn.h +include/php/ext/mbstring/unicode_table.h +include/php/ext/mbstring/unicode_data.h +include/php/ext/mbstring/php_unicode.h +include/php/ext/mbstring/php_mbregex.h +include/php/ext/mbstring/mbstring.h +include/php/ext/mbstring/mbregex.h +include/php/ext/mbstring/mbfilter_tw.h +include/php/ext/mbstring/mbfilter_ru.h +include/php/ext/mbstring/mbfilter_kr.h +include/php/ext/mbstring/mbfilter_ja.h +include/php/ext/mbstring/mbfilter_cn.h +include/php/ext/mbstring/mbfilter.h +include/php/ext/mbstring/unicode_table_tw.h +include/php/ext/pgsql/php_pgsql.h include/php/main/SAPI.h -include/php/main/build-defs.h -include/php/main/config.w32.h -include/php/main/fopen_wrappers.h -include/php/main/internal_functions_registry.h -include/php/main/logos.h -include/php/main/php.h -include/php/main/php3_compat.h -include/php/main/php_compat.h -include/php/main/php_config.h -include/php/main/php_content_types.h -include/php/main/php_globals.h -include/php/main/php_ini.h -include/php/main/php_logos.h -include/php/main/php_main.h -include/php/main/php_network.h -include/php/main/php_open_temporary_file.h -include/php/main/php_output.h -include/php/main/php_reentrancy.h -include/php/main/php_regex.h -include/php/main/php_streams.h -include/php/main/php_syslog.h -include/php/main/php_ticks.h -include/php/main/php_variables.h -include/php/main/php_version.h -include/php/main/rfc1867.h -include/php/main/safe_mode.h +include/php/main/spprintf.h include/php/main/snprintf.h +include/php/main/safe_mode.h +include/php/main/rfc1867.h +include/php/main/php_version.h +include/php/main/php_variables.h +include/php/main/php_ticks.h +include/php/main/php_syslog.h +include/php/main/php_streams.h +include/php/main/php_scandir.h +include/php/main/php_regex.h +include/php/main/php_reentrancy.h +include/php/main/php_output.h +include/php/main/php_open_temporary_file.h +include/php/main/php_network.h +include/php/main/php_memory_streams.h +include/php/main/php_main.h +include/php/main/php_logos.h +include/php/main/php_ini.h +include/php/main/php_globals.h +include/php/main/php_content_types.h +include/php/main/php_config.h +include/php/main/php_compat.h +include/php/main/php3_compat.h +include/php/main/php.h +include/php/main/logos.h +include/php/main/internal_functions_registry.h +include/php/main/fopen_wrappers.h +include/php/main/config.w32.h +include/php/main/config.nw.h +include/php/main/build-defs.h include/php/main/win95nt.h -include/php/php_version.h -include/php/regex/cclass.h -include/php/regex/cname.h -include/php/regex/regex.h -include/php/regex/regex2.h -include/php/regex/regex_extra.h +include/php/main/php_embed.h include/php/regex/utils.h +include/php/regex/regex_extra.h +include/php/regex/regex2.h +include/php/regex/regex.h +include/php/regex/cname.h +include/php/regex/cclass.h +include/php/acconfig.h +lib/php/.lock +lib/php/.registry/archive_tar.reg +lib/php/.registry/console_getopt.reg +lib/php/.registry/pear.reg +lib/php/.registry/db.reg +lib/php/.registry/http.reg +lib/php/.registry/mail.reg +lib/php/.registry/net_smtp.reg +lib/php/.registry/net_socket.reg +lib/php/.registry/xml_parser.reg +lib/php/.registry/xml_rpc.reg +lib/php/.filemap lib/php/Archive/Tar.php lib/php/Console/Getopt.php -lib/php/Crypt/CBC.php -lib/php/Crypt/HCEMD5.php -lib/php/DB.php -lib/php/DB/common.php -lib/php/DB/fbsql.php -lib/php/DB/ibase.php -lib/php/DB/ifx.php -lib/php/DB/msql.php -lib/php/DB/mssql.php -lib/php/DB/mysql.php -lib/php/DB/oci8.php -lib/php/DB/odbc.php -lib/php/DB/pgsql.php -lib/php/DB/storage.php -lib/php/DB/sybase.php -lib/php/Date/Calc.php -lib/php/Date/Human.php -lib/php/File/Find.php -lib/php/File/Passwd.php -lib/php/File/SearchReplace.php -lib/php/HTML/Common.php -lib/php/HTML/Form.php -lib/php/HTML/IT.php -lib/php/HTML/ITX.php -lib/php/HTML/IT_Error.php -lib/php/HTML/Page.php -lib/php/HTML/Processor.php -lib/php/HTML/Select.php -lib/php/HTML/Table.php -lib/php/HTTP.php -lib/php/HTTP/Compress.php -lib/php/Mail.php -lib/php/Mail/RFC822.php -lib/php/Mail/sendmail.php -lib/php/Mail/smtp.php -lib/php/Net/Curl.php -lib/php/Net/Dig.php -lib/php/Net/SMTP.php -lib/php/PEAR.php -lib/php/PEAR/Autoloader.php lib/php/PEAR/Command.php -lib/php/PEAR/Command/Auth.php +lib/php/PEAR/Common.php +lib/php/PEAR/Command/Build.php lib/php/PEAR/Command/Common.php lib/php/PEAR/Command/Config.php lib/php/PEAR/Command/Install.php lib/php/PEAR/Command/Package.php lib/php/PEAR/Command/Registry.php lib/php/PEAR/Command/Remote.php -lib/php/PEAR/Common.php +lib/php/PEAR/Command/Mirror.php +lib/php/PEAR/Command/Auth.php lib/php/PEAR/Config.php lib/php/PEAR/Dependency.php +lib/php/PEAR/Builder.php lib/php/PEAR/Frontend/CLI.php lib/php/PEAR/Installer.php lib/php/PEAR/Packager.php lib/php/PEAR/Registry.php lib/php/PEAR/Remote.php -lib/php/Schedule/At.php +lib/php/PEAR/Autoloader.php +lib/php/doc/Archive_Tar/docs/Archive_Tar.txt +lib/php/doc/DB/doc/MAINTAINERS +lib/php/doc/DB/doc/STATUS +lib/php/doc/DB/doc/TESTERS +lib/php/doc/DB/doc/IDEAS +lib/php/DB/dbase.php +lib/php/DB/fbsql.php +lib/php/DB/ibase.php +lib/php/DB/ifx.php +lib/php/DB/msql.php +lib/php/DB/mssql.php +lib/php/DB/mysql.php +lib/php/DB/oci8.php +lib/php/DB/odbc.php +lib/php/DB/pgsql.php +lib/php/DB/sybase.php +lib/php/DB/storage.php +lib/php/DB/sqlite.php +lib/php/DB/common.php +lib/php/data/PEAR/template.spec +lib/php/data/PEAR/package.dtd lib/php/System.php +lib/php/pearcmd.php +lib/php/Net/SMTP.php +lib/php/Net/Socket.php +lib/php/OS/Guess.php lib/php/XML/Parser.php +lib/php/XML/RPC/Server.php +lib/php/XML/RPC.php +lib/php/DB.php +lib/php/Mail/sendmail.php +lib/php/Mail/smtp.php +lib/php/Mail/RFC822.php +lib/php/Mail/mail.php +lib/php/test/DB/tests/db_parsedsn.phpt +lib/php/test/DB/tests/db_factory.phpt +lib/php/test/DB/tests/db_ismanip.phpt +lib/php/test/DB/tests/db_error2.phpt +lib/php/test/DB/tests/errors.inc +lib/php/test/DB/tests/fetchmode_object.inc +lib/php/test/DB/tests/fetchmodes.inc +lib/php/test/DB/tests/fetchrow.inc +lib/php/test/DB/tests/include.inc +lib/php/test/DB/tests/limit.inc +lib/php/test/DB/tests/numcols.inc +lib/php/test/DB/tests/numrows.inc +lib/php/test/DB/tests/prepexe.inc +lib/php/test/DB/tests/sequences.inc +lib/php/test/DB/tests/simplequery.inc +lib/php/test/DB/tests/tableinfo.inc +lib/php/test/DB/tests/transactions.inc +lib/php/test/DB/tests/driver/02fetch.phpt +lib/php/test/DB/tests/driver/03simplequery.phpt +lib/php/test/DB/tests/driver/04numcols.phpt +lib/php/test/DB/tests/driver/05sequences.phpt +lib/php/test/DB/tests/driver/06prepexec.phpt +lib/php/test/DB/tests/driver/08affectedrows.phpt +lib/php/test/DB/tests/driver/09numrows.phpt +lib/php/test/DB/tests/driver/10errormap.phpt +lib/php/test/DB/tests/driver/13limit.phpt +lib/php/test/DB/tests/driver/14fetchmode_object.phpt +lib/php/test/DB/tests/driver/15quote.phpt +lib/php/test/DB/tests/driver/bug22328.phpt +lib/php/test/DB/tests/driver/connect.inc +lib/php/test/DB/tests/driver/mktable.inc +lib/php/test/DB/tests/driver/setup.inc +lib/php/test/DB/tests/driver/skipif.inc +lib/php/test/DB/tests/driver/01connect.phpt +lib/php/test/DB/tests/db_error.phpt +lib/php/test/XML_Parser/tests/002.phpt +lib/php/test/XML_Parser/tests/003.phpt +lib/php/test/XML_Parser/tests/004.phpt +lib/php/test/XML_Parser/tests/005.phpt +lib/php/test/XML_Parser/tests/test2.xml +lib/php/test/XML_Parser/tests/test3.xml +lib/php/test/XML_Parser/tests/001.phpt +lib/php/PEAR.php +lib/php/HTTP.php +lib/php/Mail.php lib/php/build/acinclude.m4 -lib/php/build/dynlib.m4 -lib/php/build/dynlib.mk -lib/php/build/fastgen.sh -lib/php/build/library.mk -lib/php/build/ltlib.mk -lib/php/build/mkdep.awk -lib/php/build/pear.m4 -lib/php/build/program.mk -lib/php/build/rules.mk -lib/php/build/rules_common.mk -lib/php/build/rules_pear.mk +lib/php/build/scan_makefile_in.awk +lib/php/build/Makefile.global lib/php/build/shtool +lib/php/build/mkdep.awk +lib/php/build/phpize.m4 libexec/cgi-bin/php +man/man1/php.1 share/examples/php/php.ini-dist share/examples/php/php.ini-recommended share/php/php.gif @dirrm share/php @dirrm share/examples/php +@dirrm lib/php/.registry @dirrm lib/php/build +@dirrm lib/php/data/PEAR +@dirrm lib/php/data +@dirrm lib/php/doc/Archive_Tar/docs +@dirrm lib/php/doc/Archive_Tar +@dirrm lib/php/doc/DB/doc +@dirrm lib/php/doc/DB +@dirrm lib/php/doc +@dirrm lib/php/XML/RPC @dirrm lib/php/XML -@dirrm lib/php/Schedule @dirrm lib/php/PEAR/Command @dirrm lib/php/PEAR/Frontend @dirrm lib/php/PEAR @dirrm lib/php/Net @dirrm lib/php/Mail -@dirrm lib/php/Image -@dirrm lib/php/HTTP -@dirrm lib/php/HTML -@dirrm lib/php/File -@dirrm lib/php/Date @dirrm lib/php/DB -@dirrm lib/php/Crypt @dirrm lib/php/Console @dirrm lib/php/Archive @dirrm include/php/regex @@ -269,6 +341,7 @@ share/php/php.gif @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml @dirrm include/php/ext/mbstring +@dirrm include/php/ext/pgsql @dirrm include/php/ext/standard @dirrm include/php/ext/session @dirrm include/php/ext diff --git a/www/php4/buildlink2.mk b/www/php4/buildlink2.mk index 2168f363054..13bf931fd6e 100644 --- a/www/php4/buildlink2.mk +++ b/www/php4/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:25 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/08/31 19:56:06 jdolecek Exp $ .if !defined(PHP4_BUILDLINK2_MK) PHP4_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= php4 -BUILDLINK_DEPENDS.php4?= php>=4.1.0 +BUILDLINK_DEPENDS.php4?= php>=${PHP_BASE_VERS} BUILDLINK_PKGSRCDIR.php4?= ../../www/php4 # This adds a build-dependency as php4 has no libraries. diff --git a/www/php4/distinfo b/www/php4/distinfo index ddf72a5b910..7ff9da2bfb9 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.20 2003/06/03 19:17:20 epg Exp $ +$NetBSD: distinfo,v 1.21 2003/08/31 19:56:06 jdolecek Exp $ -SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc -Size (php-4.2.3.tar.gz) = 3413829 bytes -SHA1 (patch-aa) = 09fb15fde09bf866d9be016839f33c889d9cefb9 -SHA1 (patch-ab) = daac6888e758b39bc40abed41eba9e55a0fa30e5 -SHA1 (patch-ac) = f3a3a4a5af6f03a6274aa4875a922b838f1bde1b -SHA1 (patch-ad) = 452ee7c2ef9cb9456653f376c5cc350e227bf10d -SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78 -SHA1 (patch-ag) = a1948af6361e898880e4598654a8ac15fd193b7d -SHA1 (patch-ah) = 27ac564d2d378852ba328fbc0458d222a4bfdb22 -SHA1 (patch-ai) = 26cbc90ef8478e38c4d201f1dd2318c04991318e -SHA1 (patch-aj) = 9a40719571301c093548a4dec3429a2cc36fdce4 -SHA1 (patch-ak) = 417c4ef9110d4aec717b39e1ab9a415c1557a4b4 +SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d +Size (php-4.3.3.tar.gz) = 4565509 bytes +SHA1 (patch-aa) = 9113822bee51345891758b5e354b79fd3e5e8d2d +SHA1 (patch-ab) = b69b9ad226469300a885390db6e45dc43d8ae0d1 +SHA1 (patch-ae) = 21fb3fc613121bcfb35f2735870d142612e238dd +SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4 +SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931 +SHA1 (patch-ai) = 7a73ba3b111c6c0437cb52c7044c367453f9c132 +SHA1 (patch-aj) = b517c66ad74d1f1394ce7dd8f9a9567811d30b00 +SHA1 (patch-ak) = 1608457aa7d1ae649f62170a18974e87fee29116 diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa deleted file mode 100644 index 8c517419aa1..00000000000 --- a/www/php4/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2002/09/04 14:47:40 agc Exp $ - ---- Makefile.in.orig Sat Apr 21 21:09:12 2001 -+++ Makefile.in -@@ -19,7 +19,7 @@ - PROGRAM_NAME = php - PROGRAM_SOURCES = stub.c - PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) --PROGRAM_LDFLAGS = -export-dynamic -+PROGRAM_LDFLAGS = -static ${EXPORT_SYMBOLS_LDFLAGS} $(LINK_LIBGCC_LDFLAGS) - PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) - - targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index 815a3dd2772..d9ff6b69ab6 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,21 +1,22 @@ -$NetBSD: patch-ab,v 1.11 2003/02/03 23:53:25 jlam Exp $ - ---- pear/scripts/phpize.in.orig Wed Apr 17 06:35:59 2002 -+++ pear/scripts/phpize.in -@@ -25,7 +25,12 @@ sed \ +--- scripts/phpize.in.orig 2003-08-30 22:28:44.000000000 +0200 ++++ scripts/phpize.in 2003-08-30 22:29:39.000000000 +0200 +@@ -54,10 +54,15 @@ touch install-sh mkinstalldirs missing --aclocal --autoconf --autoheader --libtoolize -f -c +-aclocal || exit 1 +-autoconf || exit 1 +-autoheader || exit 1 +-libtoolize -f -c || exit 1 +if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi +if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=libtoolize; fi + -+$ACLOCAL -+$AUTOCONF -+$AUTOHEADER -+$LIBTOOLIZE -f -c ++$ACLOCAL || exit 1 ++$AUTOCONF || exit 1 ++$AUTOHEADER || exit 1 ++$LIBTOOLIZE -f -c || exit 1 + + # dumping API NOs: + PHP_API_VERSION=`egrep '#define PHP_API_VERSION' $includedir/main/php.h|sed 's/#define PHP_API_VERSION//'` diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac deleted file mode 100644 index d120f510f29..00000000000 --- a/www/php4/patches/patch-ac +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2002/10/14 06:21:19 martti Exp $ - ---- acinclude.m4.orig Mon Jul 29 02:15:18 2002 -+++ acinclude.m4 Sat Oct 12 09:25:51 2002 -@@ -364,10 +364,19 @@ - ;; - esac - -+dnl Having php_always_shared=yes override the configure options breaks -+dnl because it's assumed that the answer to every question is yes. We -+dnl really only want just the ext_shared=yes to denote that we'll be -+dnl using outside shared libraries. -+dnl -+dnl if test "$php_always_shared" = "yes"; then -+dnl ext_output="yes, shared" -+dnl ext_shared=yes -+dnl test "[$]$1" = "no" && $1=yes -+dnl fi -+ - if test "$php_always_shared" = "yes"; then -- ext_output="yes, shared" - ext_shared=yes -- test "[$]$1" = "no" && $1=yes - fi - - if test -n "$2"; then -@@ -704,7 +713,7 @@ - if test "$1" != "/usr/lib"; then - PHP_EXPAND_PATH($1, ai_p) - if test "$ext_shared" = "yes" && test -n "$2"; then -- $2="-R$1 -L$1 [$]$2" -+ $2="-L$1 [$]$2" - else - AC_PHP_ONCE(LIBPATH, $ai_p, [ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" diff --git a/www/php4/patches/patch-ae b/www/php4/patches/patch-ae index f603980eec2..ac3e1f2854e 100644 --- a/www/php4/patches/patch-ae +++ b/www/php4/patches/patch-ae @@ -1,8 +1,6 @@ -$NetBSD: patch-ae,v 1.3 2001/10/16 04:54:24 jlam Exp $ - ---- main/php_open_temporary_file.c.orig Mon Apr 30 08:43:40 2001 -+++ main/php_open_temporary_file.c -@@ -110,7 +110,7 @@ +--- main/php_open_temporary_file.c.orig 2003-08-30 21:45:02.000000000 +0200 ++++ main/php_open_temporary_file.c 2003-08-30 21:45:13.000000000 +0200 +@@ -132,7 +132,7 @@ trailing_slash = "/"; } diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag index d55e8853186..68ebc075b54 100644 --- a/www/php4/patches/patch-ag +++ b/www/php4/patches/patch-ag @@ -1,20 +1,18 @@ -$NetBSD: patch-ag,v 1.4 2002/10/14 06:21:20 martti Exp $ - ---- php.ini-dist.orig Sat Aug 24 00:57:06 2002 -+++ php.ini-dist Sat Oct 12 09:29:27 2002 -@@ -367,8 +367,9 @@ +--- php.ini-dist.orig 2003-07-10 00:38:36.000000000 +0200 ++++ php.ini-dist 2003-08-30 21:59:51.000000000 +0200 +@@ -424,8 +424,9 @@ ; if nonempty. user_dir = -; Directory in which the loadable extensions (modules) reside. --extension_dir = ./ -+; Directory in which the loadable extensions (modules) reside. If not +-extension_dir = "./" ++; Directory in which the loadable extensions (modules) reside. If not +; defined, then use the extension directory specified at compile-time. -+;extension_dir = ./ ++; extension_dir = "./" ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -396,7 +397,7 @@ +@@ -476,7 +477,7 @@ ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah index f2b54b1338b..70533cc48a8 100644 --- a/www/php4/patches/patch-ah +++ b/www/php4/patches/patch-ah @@ -1,17 +1,15 @@ -$NetBSD: patch-ah,v 1.5 2002/10/14 06:21:20 martti Exp $ - ---- php.ini-recommended.orig Sat Aug 24 00:57:06 2002 -+++ php.ini-recommended Sat Oct 12 09:29:54 2002 -@@ -373,7 +373,7 @@ +--- php.ini-recommended.orig 2003-07-10 00:38:36.000000000 +0200 ++++ php.ini-recommended 2003-08-30 22:01:36.000000000 +0200 +@@ -440,7 +440,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. --extension_dir = ./ -+;extension_dir = ./ +-extension_dir = "./" ++; extension_dir = "./" ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -403,7 +403,7 @@ +@@ -491,7 +491,7 @@ ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai index ba02e6acb5e..ac6b0466ab4 100644 --- a/www/php4/patches/patch-ai +++ b/www/php4/patches/patch-ai @@ -1,13 +1,11 @@ -$NetBSD: patch-ai,v 1.3 2003/01/12 14:29:07 christos Exp $ - ---- ext/standard/filestat.c.orig Tue Aug 20 15:02:59 2002 -+++ ext/standard/filestat.c Sun Jan 12 09:15:21 2003 -@@ -559,7 +559,7 @@ +--- ext/standard/filestat.c.orig 2003-08-30 21:48:56.000000000 +0200 ++++ ext/standard/filestat.c 2003-08-30 21:49:03.000000000 +0200 +@@ -576,7 +576,7 @@ RETURN_FALSE; } -#ifndef PHP_WIN32 -+#ifdef notdef - switch (type) { - case FS_IS_W: - RETURN_BOOL (!access (filename, W_OK)); ++#ifdef notdef + + switch (type) { + case FS_IS_W: diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj index b1147480f4b..278636ec32e 100644 --- a/www/php4/patches/patch-aj +++ b/www/php4/patches/patch-aj @@ -1,7 +1,5 @@ -$NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ - ---- ext/gettext/gettext.c.orig Sat Dec 15 09:22:59 2001 -+++ ext/gettext/gettext.c Tue Jan 14 16:37:25 2003 +--- ext/gettext/gettext.c.orig 2003-08-30 21:56:34.000000000 +0200 ++++ ext/gettext/gettext.c 2003-08-30 21:57:13.000000000 +0200 @@ -58,6 +58,11 @@ }; /* }}} */ @@ -14,23 +12,14 @@ $NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ zend_module_entry php_gettext_module_entry = { STANDARD_MODULE_HEADER, "gettext", -@@ -103,7 +108,7 @@ - } +@@ -104,6 +109,7 @@ retval = textdomain(domain_name); -- + + CHECK(retval); RETURN_STRING(retval, 1); } /* }}} */ -@@ -122,6 +127,7 @@ - - msgstr = gettext(Z_STRVAL_PP(msgid)); - -+ CHECK(msgstr); - RETURN_STRING(msgstr, 1); - } - /* }}} */ @@ -141,6 +147,7 @@ msgstr = dgettext(Z_STRVAL_PP(domain_name), Z_STRVAL_PP(msgid)); @@ -47,7 +36,7 @@ $NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ RETURN_STRING(msgstr, 1); } /* }}} */ -@@ -186,6 +194,7 @@ +@@ -191,6 +199,7 @@ retval = bindtextdomain(Z_STRVAL_PP(domain_name), dir_name); @@ -55,14 +44,3 @@ $NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ RETURN_STRING(retval, 1); } /* }}} */ -@@ -291,6 +300,10 @@ - - retval = bind_textdomain_codeset(Z_STRVAL_PP(domain), Z_STRVAL_PP(codeset)); - -+ CHECK(retval); -+ fprintf(stderr, "%s, %s: (%s, %s) -> %s\n", -+ __FILE__, __LINE__, -+ Z_STRVAL_PP(domain), Z_STRVAL_PP(codeset), retval); - RETURN_STRING(retval, 1); - } - } diff --git a/www/php4/patches/patch-ak b/www/php4/patches/patch-ak deleted file mode 100644 index 3f185c5c488..00000000000 --- a/www/php4/patches/patch-ak +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2003/02/21 05:39:04 lukem Exp $ - ---- ext/standard/string.c.orig Mon Jun 24 18:19:43 2002 -+++ ext/standard/string.c -@@ -616,7 +616,7 @@ PHP_FUNCTION(wordwrap) - { - const char *text, *breakchar = "\n"; - char *newtext; -- int textlen, breakcharlen = 1, newtextlen; -+ int textlen, breakcharlen = 1, newtextlen, alloced, chk; - long current = 0, laststart = 0, lastspace = 0; - long linelength = 75; - zend_bool docut = 0; -@@ -642,38 +642,40 @@ PHP_FUNCTION(wordwrap) - for (current = 0; current < textlen; current++) { - if (text[current] == breakchar[0]) { - laststart = lastspace = current; -- } -- else if (text[current] == ' ') { -+ } else if (text[current] == ' ') { - if (current - laststart >= linelength) { - newtext[current] = breakchar[0]; - laststart = current; - } - lastspace = current; -- } -- else if (current - laststart >= linelength -- && laststart != lastspace) { -+ } else if (current - laststart >= linelength && laststart != lastspace) { - newtext[lastspace] = breakchar[0]; - laststart = lastspace; - } - } - - RETURN_STRINGL(newtext, textlen, 0); -- } -- else { -+ } else { - /* Multiple character line break or forced cut */ - if (linelength > 0) { -- newtextlen = textlen + (textlen/linelength + 1) * breakcharlen + 1; -- } -- else { -- newtextlen = textlen * (breakcharlen + 1) + 1; -+ chk = (int)(textlen/linelength + 1); -+ alloced = textlen + chk * breakcharlen + 1; -+ } else { -+ chk = textlen; -+ alloced = textlen * (breakcharlen + 1) + 1; - } -- newtext = emalloc(newtextlen); -+ newtext = emalloc(alloced); - - /* now keep track of the actual new text length */ - newtextlen = 0; - - laststart = lastspace = 0; - for (current = 0; current < textlen; current++) { -+ if (chk <= 0) { -+ alloced += (int) (((textlen - current + 1)/linelength + 1) * breakcharlen) + 1; -+ newtext = erealloc(newtext, alloced); -+ chk = (int) ((textlen - current)/linelength) + 1; -+ } - /* when we hit an existing break, copy to new buffer, and - * fix up laststart and lastspace */ - if (text[current] == breakchar[0] -@@ -683,6 +685,7 @@ PHP_FUNCTION(wordwrap) - newtextlen += current-laststart+breakcharlen; - current += breakcharlen - 1; - laststart = lastspace = current + 1; -+ chk--; - } - /* if it is a space, check if it is at the line boundary, - * copy and insert a break, or just keep track of it */ -@@ -693,6 +696,7 @@ PHP_FUNCTION(wordwrap) - memcpy(newtext+newtextlen, breakchar, breakcharlen); - newtextlen += breakcharlen; - laststart = current + 1; -+ chk--; - } - lastspace = current; - } -@@ -706,6 +710,7 @@ PHP_FUNCTION(wordwrap) - memcpy(newtext+newtextlen, breakchar, breakcharlen); - newtextlen += breakcharlen; - laststart = lastspace = current; -+ chk--; - } - /* if the current word puts us over the linelength, copy - * back up until the last space, insert a break, and move -@@ -717,6 +722,7 @@ PHP_FUNCTION(wordwrap) - memcpy(newtext+newtextlen, breakchar, breakcharlen); - newtextlen += breakcharlen; - laststart = lastspace = lastspace + 1; -+ chk--; - } - } - -@@ -727,6 +733,8 @@ PHP_FUNCTION(wordwrap) - } - - newtext[newtextlen] = '\0'; -+ /* free unused memory */ -+ newtext = erealloc(newtext, newtextlen+1); - - RETURN_STRINGL(newtext, newtextlen, 0); - } |