Update to 4.4.6 release.

7 files changed, 11 insertions, 63 deletions

diff --git a/databases/php4-interbase/files/patch-interbase.c b/databases/php4-interbase/files/patch-interbase.c
deleted file mode 100644
index a4f4d8946a91..000000000000
--- a/databases/php4-interbase/files/patch-interbase.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- interbase.c	2007/01/17 23:59:07	1.91.2.34.2.4
-+++ interbase.c	2007/02/16 07:11:33	1.91.2.34.2.5
-@@ -3048,9 +3048,9 @@
- */
- 
- 	/* Build buffer for isc_service_attach() */
--	snprintf(buf, sizeof(buf), "%c%c%c%d%s%c%d%s", isc_spb_version, isc_spb_current_version, isc_spb_user_name, 
-+	snprintf(spb_buffer, sizeof(spb_buffer), "%c%c%c%d%s%c%d%s", isc_spb_version, isc_spb_current_version, isc_spb_user_name, 
- 						strlen(dba_user_name), dba_user_name, isc_spb_password, strlen(dba_password), dba_password);
--	spb_length = strlen(buf);
-+	spb_length = strlen(spb_buffer);
- 
- 	/* Attach to the Service Manager */
- 	snprintf(service_name, sizeof(service_name), "%s:service_mgr", ib_server);
diff --git a/databases/php4-sybase_ct/Makefile b/databases/php4-sybase_ct/Makefile
index 1ce9d6d53e97..7b9ae7e8773c 100644
--- a/databases/php4-sybase_ct/Makefile
+++ b/databases/php4-sybase_ct/Makefile
@@ -11,6 +11,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php4
 
 PKGNAMESUFFIX=	-sybase_ct
 
-PORTREVISION=	2
-
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 18ea1498b309..52b401053203 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php4
-PORTVERSION=	4.4.5
-PORTREVISION?=	1
+PORTVERSION=	4.4.6
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
diff --git a/lang/php4/distinfo b/lang/php4/distinfo
index eaff9f35f88c..83c38fe8b2bf 100644
--- a/lang/php4/distinfo
+++ b/lang/php4/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-4.4.5.tar.bz2) = bf61d557c82962dc9533f6ef35283d4c
-SHA256 (php-4.4.5.tar.bz2) = fb3ca7887aaf1b77adeb623865d4ce452611c5fef849f78be2e2df1b22332af9
-SIZE (php-4.4.5.tar.bz2) = 4535091
-MD5 (suhosin-patch-4.4.5-0.9.6.patch.gz) = acaa585bbc0117910e214d333ce448df
-SHA256 (suhosin-patch-4.4.5-0.9.6.patch.gz) = 5e88b2b5c46f1501c46e7c2c920160711ab8cb119b817d45614bbb2bd16eb418
-SIZE (suhosin-patch-4.4.5-0.9.6.patch.gz) = 21523
-MD5 (php-4.4.5-mail-header.patch) = cd4917cad7d4acc4347080e8f178049d
-SHA256 (php-4.4.5-mail-header.patch) = bab05b5e034846c472678df487c31eb10b907a1b121728185a5aa4f775ac86ff
-SIZE (php-4.4.5-mail-header.patch) = 3420
+MD5 (php-4.4.6.tar.bz2) = 5db283824310c87efb18c76b4735c4bd
+SHA256 (php-4.4.6.tar.bz2) = c468c70e9536b5cbaf8a2615ab9e13c065da19944314633eef675be4d4e40065
+SIZE (php-4.4.6.tar.bz2) = 4559282
+MD5 (suhosin-patch-4.4.6-0.9.6.patch.gz) = da1c4d309b191bac78767cbf697d6c8d
+SHA256 (suhosin-patch-4.4.6-0.9.6.patch.gz) = c8501328b0c223b7fb3fc1af5df267dbe3722facef0e41bbe8b4b6178ae3855c
+SIZE (suhosin-patch-4.4.6-0.9.6.patch.gz) = 21537
+MD5 (php-4.4.6-mail-header.patch) = b3e8b0e223edc035d11e77c4aae0c3ce
+SHA256 (php-4.4.6-mail-header.patch) = 41477b1e0020e5c62eb95d71415d2a99c34dd728a6e532813fb691b314cf2076
+SIZE (php-4.4.6-mail-header.patch) = 3420
diff --git a/math/php4-gmp/Makefile b/math/php4-gmp/Makefile
index 867d7e8fdd12..1e1ce1033267 100644
--- a/math/php4-gmp/Makefile
+++ b/math/php4-gmp/Makefile
@@ -5,7 +5,6 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
 CATEGORIES=	math
 
 MASTERDIR=	${.CURDIR}/../../lang/php4
diff --git a/www/php4-session/Makefile b/www/php4-session/Makefile
index b138bfec0d78..613a2f07fad7 100644
--- a/www/php4-session/Makefile
+++ b/www/php4-session/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
-
 CATEGORIES=	www
 
 MASTERDIR=	${.CURDIR}/../../lang/php4
diff --git a/www/php4-session/files/patch-session.c b/www/php4-session/files/patch-session.c
deleted file mode 100644
index fc6bd3c092f2..000000000000
--- a/www/php4-session/files/patch-session.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- session.c	2007/01/09 15:31:36	1.336.2.53.2.13
-+++ session.c	2007/02/15 09:41:30	1.336.2.53.2.14
-@@ -271,8 +271,12 @@
- {
- 	zval **sym_track = NULL;
- 	
--	zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1, 
--			(void *) &sym_track);
-+	IF_SESSION_VARS() {
-+		zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1,
-+				(void *) &sym_track);
-+	} else {
-+		return;
-+	}
- 
- 	/*
- 	 * Set up a proper reference between $_SESSION["x"] and $x.
-@@ -281,11 +285,10 @@
- 	if (PG(register_globals)) {
- 		zval **sym_global = NULL;
- 		
--		zend_hash_find(&EG(symbol_table), name, namelen + 1, 
--				(void *) &sym_global);
--				
--		if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) {
--			return;
-+		if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void *) &sym_global) == SUCCESS) {
-+			if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) {
-+				return;
-+			}
- 		}
- 
- 		if (sym_global == NULL && sym_track == NULL) {