ports/55990: [Maintainer Update] Port: lang/php4

[Alex Dupre]

>Number:         55990
>Category:       ports
>Synopsis:       [Maintainer Update] Port: lang/php4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 26 03:50:05 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Update to 4.3.3 final release.
>How-To-Repeat:
>Fix:

--- php4.diff begins here ---
diff -ruN php4.orig/Makefile php4/Makefile
--- php4.orig/Makefile	Tue Aug 26 10:59:47 2003
+++ php4/Makefile	Tue Aug 26 11:44:52 2003
@@ -20,7 +20,7 @@
 #
 
 PORTNAME=	php4
-PORTVERSION=	4.3.3.r4
+PORTVERSION=	4.3.3
 PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
@@ -45,7 +45,7 @@
 .endif
 .endif
 DISTNAME=	php-${PORTVERSION:S/.r/RC/}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:rc
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	sysadmin at alexdupre.com
 COMMENT=	PHP Scripting Language (Apache Module and CLI)
diff -ruN php4.orig/distinfo php4/distinfo
--- php4.orig/distinfo	Tue Aug 26 10:59:47 2003
+++ php4/distinfo	Tue Aug 26 11:44:58 2003
@@ -1 +1 @@
-MD5 (php-4.3.3RC4.tar.bz2) = 7d362a89977891f76b54179787b981de
+MD5 (php-4.3.3.tar.bz2) = 1171d96104e2ff2cff9e19789a4a1536
diff -ruN php4.orig/files/patch-configure php4/files/patch-configure
--- php4.orig/files/patch-configure	Tue Aug 26 10:59:46 2003
+++ php4/files/patch-configure	Tue Aug 26 11:32:23 2003
@@ -228,7 +228,7 @@
 @@ -58977,8 +59151,8 @@
    
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
- echo "configure:58981: checking Oracle version" >&5
+ echo "configure:58982: checking Oracle version" >&5
 -  if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
 -  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 +  if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
diff -ruN php4.orig/files/patch-ext::standard::datetime.c php4/files/patch-ext::standard::datetime.c
--- php4.orig/files/patch-ext::standard::datetime.c	Thu Jan  1 01:00:00 1970
+++ php4/files/patch-ext::standard::datetime.c	Tue Aug 26 11:08:08 2003
@@ -0,0 +1,17 @@
+--- ext/standard/datetime.c.orig	Tue Aug 26 11:06:04 2003
++++ ext/standard/datetime.c	Tue Aug 26 11:07:27 2003
+@@ -116,7 +116,13 @@
+ 	/* Let DST be unknown. mktime() should compute the right value
+ 	** and behave correctly. Unless the user overrides this.
+ 	*/
+-	ta->tm_isdst = -1;
++	if (gm) {
++		ta->tm_isdst = 0;
++		is_dst = 0;
++	} else {
++		ta->tm_isdst = -1;
++		is_dst = -1;
++	}
+ 
+ 	/*
+ 	** Now change date values with supplied parameters.
--- php4.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: