summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/php4-ldap/distinfo6
-rw-r--r--doc/CHANGES3
-rw-r--r--mail/php4-imap/distinfo6
-rw-r--r--math/php4-bcmath/distinfo6
-rw-r--r--net/php4-snmp/Makefile4
-rw-r--r--security/php4-openssl/Makefile9
-rw-r--r--textproc/php4-domxml/Makefile4
-rw-r--r--textproc/php4-wddx/Makefile4
-rw-r--r--textproc/php4-wddx/distinfo6
-rw-r--r--www/php4/Makefile4
-rw-r--r--www/php4/Makefile.common5
-rw-r--r--www/php4/Makefile.php4
-rw-r--r--www/php4/PLIST16
-rw-r--r--www/php4/buildlink2.mk4
-rw-r--r--www/php4/distinfo10
-rw-r--r--www/php4/patches/patch-ab14
-rw-r--r--www/php4/patches/patch-aj35
17 files changed, 67 insertions, 73 deletions
diff --git a/databases/php4-ldap/distinfo b/databases/php4-ldap/distinfo
index ea721ba2103..87d5045d21a 100644
--- a/databases/php4-ldap/distinfo
+++ b/databases/php4-ldap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/09/03 03:45:58 jmc Exp $
+$NetBSD: distinfo,v 1.9 2003/11/08 06:58:10 jdolecek Exp $
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
SHA1 (patch-aa) = 5c8011a8222920c07fbac8d95491eef767047eb4
diff --git a/doc/CHANGES b/doc/CHANGES
index ae3e39277a5..0f41d2e0361 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3793 2003/11/08 06:33:45 xtraeme Exp $
+$NetBSD: CHANGES,v 1.3794 2003/11/08 06:58:10 jdolecek Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -4316,3 +4316,4 @@ Changes to the packages collection and infrastructure in 2003:
Updated speedtouch to 1.2-beta2nb2 [abs 2003-11-06]
Updated wmweather to 2.4.2 [xtraeme 2003-11-08]
Updated lftp to 2.6.8 [xtraeme 2003-11-08]
+ Updated php to 4.3.4 [jdolecek 2003-11-08]
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
index dfe9fa34f50..9bc2114f527 100644
--- a/mail/php4-imap/distinfo
+++ b/mail/php4-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/08/31 19:55:48 jdolecek Exp $
+$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
SHA1 (patch-aa) = 88bdeff65b4a8c2abe46b969715702b31020bb28
SHA1 (patch-ab) = fbdb1acceacf4f514c28d7ef5dba61bcc451f308
diff --git a/math/php4-bcmath/distinfo b/math/php4-bcmath/distinfo
index 180cc1ecf69..fd1986d3ba5 100644
--- a/math/php4-bcmath/distinfo
+++ b/math/php4-bcmath/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/09/03 03:44:36 jmc Exp $
+$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
SHA1 (patch-aa) = 87d0642aaa4083e36844fb61065ab44dd33be0e5
diff --git a/net/php4-snmp/Makefile b/net/php4-snmp/Makefile
index 00dc7e54cbb..c5fb70895e8 100644
--- a/net/php4-snmp/Makefile
+++ b/net/php4-snmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/11/07 23:23:18 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2003/11/08 06:58:10 jdolecek Exp $
MODNAME= snmp
CATEGORIES+= net
-PKGREVISION= 1
+PKGREVISION= # empty
COMMENT= PHP4 extension for SNMP
USE_BUILDLINK2= YES
diff --git a/security/php4-openssl/Makefile b/security/php4-openssl/Makefile
index 2766d1267a2..37a77d95801 100644
--- a/security/php4-openssl/Makefile
+++ b/security/php4-openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/01 16:37:36 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/08 06:58:10 jdolecek Exp $
MODNAME= openssl
CATEGORIES+= security
@@ -11,5 +11,12 @@ USE_BUILDLINK2= YES
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openssl}
+# the config test for -lssl fails to link in -lcrypto; just force it
+# to succeed
+CONFIGURE_ENV+= ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
+
+post-extract:
+ cd ${WRKSRC} && ln -s config0.m4 config.m4
+
.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index 0dd1485ebc6..a4dae8beb6f 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/09/13 07:30:23 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2003/11/08 06:58:10 jdolecek Exp $
MODNAME= domxml
CATEGORIES+= textproc
-PKGREVISION= 1
+PKGREVISION= # empty
COMMENT= PHP4 extension for DOM support
USE_BUILDLINK2= YES
diff --git a/textproc/php4-wddx/Makefile b/textproc/php4-wddx/Makefile
index a2b19517c72..66d4b1e2077 100644
--- a/textproc/php4-wddx/Makefile
+++ b/textproc/php4-wddx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/10/11 13:40:19 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/08 06:58:10 jdolecek Exp $
MODNAME= wddx
CATEGORIES+= textproc
-PKGREVISION= 1
+PKGREVISION= # empty
COMMENT= PHP4 extension for WDDX support
USE_BUILDLINK2= YES
diff --git a/textproc/php4-wddx/distinfo b/textproc/php4-wddx/distinfo
index aec8a7182b0..6f95adda495 100644
--- a/textproc/php4-wddx/distinfo
+++ b/textproc/php4-wddx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/09/03 03:25:29 jmc Exp $
+$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
SHA1 (patch-ab) = 5c89db466aeeb6986eee3269c36df47cf2372da1
diff --git a/www/php4/Makefile b/www/php4/Makefile
index c7d0c377b7c..037a57ceef8 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/08/31 19:56:05 jdolecek Exp $
+# $NetBSD: Makefile,v 1.35 2003/11/08 06:58:10 jdolecek Exp $
PKGNAME= php-${PHP_BASE_VERS}
CATEGORIES+= lang
@@ -14,8 +14,6 @@ USE_GMAKE= YES
.include "Makefile.php"
-CONFIGURE_ARGS+= --enable-cli
-
CGIDIR= ${PREFIX}/libexec/cgi-bin
EGDIR= ${PREFIX}/share/examples/php
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 1777b8b5a87..99a378edd71 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.31 2003/08/31 19:56:05 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.32 2003/11/08 06:58:10 jdolecek Exp $
DISTNAME?= php-${PHP_DIST_VERS}
CATEGORIES+= www php4
MASTER_SITES?= http://www.php.net/distributions/ \
http://php3.de/distributions/ \
ftp://ftp.php.net/pub/distributions/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER?= jlam@NetBSD.org
HOMEPAGE?= http://www.php.net/
@@ -14,7 +15,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.3.3
+PHP_DIST_VERS= 4.3.4
PHP_BASE_VERS= ${PHP_DIST_VERS}
DISTFILES?= ${PHP_DISTFILE}
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 5138c0bc57d..0bf4054e23d 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.9 2003/09/05 19:39:52 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.10 2003/11/08 06:58:10 jdolecek Exp $
.include "../../www/php4/Makefile.common"
@@ -8,8 +8,6 @@ PATCHDIR= ${.CURDIR}/../../www/php4/patches
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --disable-cli
-
CONFIGURE_ARGS+= --without-mysql
CONFIGURE_ARGS+= --without-iconv
diff --git a/www/php4/PLIST b/www/php4/PLIST
index e3adac946c7..b293aa54f6d 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/09/01 15:41:45 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
bin/pear
bin/php
bin/php-config
@@ -131,24 +131,10 @@ 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/spprintf.h
diff --git a/www/php4/buildlink2.mk b/www/php4/buildlink2.mk
index 48b0de8471b..7bbfdcd7c06 100644
--- a/www/php4/buildlink2.mk
+++ b/www/php4/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/09/29 12:47:38 jdolecek Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/08 06:58:10 jdolecek Exp $
.if !defined(PHP4_BUILDLINK2_MK)
PHP4_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= php4
-BUILDLINK_DEPENDS.php4?= php>=4.3.3
+BUILDLINK_DEPENDS.php4?= php>=4.3.4
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 cda914a821b..4776996a40e 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2003/09/01 10:16:49 martti Exp $
+$NetBSD: distinfo,v 1.23 2003/11/08 06:58:10 jdolecek Exp $
-SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
-Size (php-4.3.3.tar.gz) = 4565509 bytes
-SHA1 (patch-ab) = b69b9ad226469300a885390db6e45dc43d8ae0d1
+SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
+Size (php-4.3.4.tar.bz2) = 3774324 bytes
+SHA1 (patch-ab) = a670f6f5dcc7a5624e89d9e39ae97a9e44747e42
SHA1 (patch-ae) = 21fb3fc613121bcfb35f2735870d142612e238dd
SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
SHA1 (patch-ai) = 7a73ba3b111c6c0437cb52c7044c367453f9c132
-SHA1 (patch-aj) = b517c66ad74d1f1394ce7dd8f9a9567811d30b00
+SHA1 (patch-aj) = 6b8dac60d1a513fc76cf97b63cca0e2a1d643f11
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index f6f4e055045..69135de6e4f 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,18 +1,20 @@
-$NetBSD: patch-ab,v 1.13 2003/09/01 10:17:38 cjep Exp $
---- 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 @@
+$NetBSD: patch-ab,v 1.14 2003/11/08 06:58:10 jdolecek Exp $
+
+--- scripts/phpize.in.orig 2003-08-27 19:57:32.000000000 +0200
++++ scripts/phpize.in 2003-11-07 21:44:48.000000000 +0100
+@@ -54,11 +54,15 @@
touch install-sh mkinstalldirs missing
-aclocal || exit 1
-autoconf || exit 1
-autoheader || exit 1
--libtoolize -f -c || exit 1
+-libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
+-$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
++if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=`$builddir/build/shtool path glibtoolize libtoolize`; fi
+
+$ACLOCAL || exit 1
+$AUTOCONF || exit 1
diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj
index 427e70ac439..76067e698f1 100644
--- a/www/php4/patches/patch-aj
+++ b/www/php4/patches/patch-aj
@@ -1,19 +1,20 @@
-$NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $
---- 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 @@
- };
- /* }}} */
-
-+#define CHECK(a) if (a == NULL) { \
-+ fprintf(stderr, "%s, %d: NULL value\n", __FILE__, __LINE__); \
-+ a = ""; \
+$NetBSD: patch-aj,v 1.6 2003/11/08 06:58:10 jdolecek Exp $
+
+--- ext/gettext/gettext.c.orig 2003-09-24 04:08:48.000000000 +0200
++++ ext/gettext/gettext.c 2003-11-07 21:47:25.000000000 +0100
+@@ -31,6 +31,11 @@
+ #include "ext/standard/info.h"
+ #include "php_gettext.h"
+
++#define CHECK(a) if (a == NULL) { \
++ fprintf(stderr, "%s, %d: NULL value\n", __FILE__, __LINE__); \
++ a = ""; \
+}
+
- zend_module_entry php_gettext_module_entry = {
- STANDARD_MODULE_HEADER,
- "gettext",
-@@ -104,6 +109,7 @@
+ /* {{{ php_gettext_functions[]
+ */
+ function_entry php_gettext_functions[] = {
+@@ -103,6 +108,7 @@
retval = textdomain(domain_name);
@@ -21,7 +22,7 @@ $NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $
RETURN_STRING(retval, 1);
}
/* }}} */
-@@ -141,6 +147,7 @@
+@@ -140,6 +146,7 @@
msgstr = dgettext(Z_STRVAL_PP(domain_name), Z_STRVAL_PP(msgid));
@@ -29,7 +30,7 @@ $NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $
RETURN_STRING(msgstr, 1);
}
/* }}} */
-@@ -161,6 +168,7 @@
+@@ -160,6 +167,7 @@
msgstr = dcgettext(Z_STRVAL_PP(domain_name), Z_STRVAL_PP(msgid), Z_LVAL_PP(category));
@@ -37,7 +38,7 @@ $NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $
RETURN_STRING(msgstr, 1);
}
/* }}} */
-@@ -191,6 +199,7 @@
+@@ -190,6 +198,7 @@
retval = bindtextdomain(Z_STRVAL_PP(domain_name), dir_name);
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-23 08:03:08 +0000