From 549241e5949a50b7d4a5bf0ff1d7986a3f21b051 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Sat, 2 Sep 2000 08:39:13 +0000 Subject: [PATCH] Upgrade to 4.0.2. --- www/mod_php4/Makefile | 8 +--- www/mod_php4/distinfo | 3 +- www/mod_php4/files/patch-aq | 95 ++++++++++++++++++++++++------------- www/mod_php4/files/patch-ar | 4 +- www/mod_php5/Makefile | 8 +--- www/mod_php5/distinfo | 3 +- www/mod_php5/files/patch-aq | 95 ++++++++++++++++++++++++------------- www/mod_php5/files/patch-ar | 4 +- 8 files changed, 134 insertions(+), 86 deletions(-) diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index 082de119993a..b94d343df8d8 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_php -PORTVERSION= 4.0.1.2 +PORTVERSION= 4.0.2 CATEGORIES= www MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \ http://php.he.net/${PHP_DISTDIR}/ \ @@ -17,11 +17,7 @@ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \ http://php.easydns.com/${PHP_DISTDIR}/ \ http://www.php.cz/${PHP_DISTDIR}/ \ http://php3.globe.de/${PHP_DISTDIR}/ -DISTNAME= php-4.0.1 - -PATCHFILES= php-4.0.1-4.0.1pl2.diff.gz -PATCH_SITES= ${MASTER_SITES} -PATCH_DIST_STRIP= -p1 +DISTNAME= php-4.0.2 MAINTAINER= dirk@FreeBSD.org diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo index f5c8f7cb0e9f..a9a2e82297e8 100644 --- a/www/mod_php4/distinfo +++ b/www/mod_php4/distinfo @@ -1,2 +1 @@ -MD5 (php-4.0.1.tar.gz) = 81430cbc47f327d410b3ee64eb66dcbc -MD5 (php-4.0.1-4.0.1pl2.diff.gz) = 1561416363d759ac411a48a2cdcb78ee +MD5 (php-4.0.2.tar.gz) = 993b010eba7ed22509d576c3d481a2ca diff --git a/www/mod_php4/files/patch-aq b/www/mod_php4/files/patch-aq index 76e3a88b8c3e..9de9789e82b9 100644 --- a/www/mod_php4/files/patch-aq +++ b/www/mod_php4/files/patch-aq @@ -1,43 +1,72 @@ ---- configure.orig Wed Jun 28 20:37:28 2000 -+++ configure Fri Jun 30 09:30:38 2000 -@@ -36053,7 +36053,6 @@ - eval "LIBRARY$unique=set" - - +--- configure.orig Tue Aug 29 20:37:36 2000 ++++ configure Sat Sep 2 10:02:53 2000 +@@ -37824,18 +37824,6 @@ + fi + + +- case "cs" in +- c|c_r|pthread*) ;; +- *) +- +- - LIBS="-lcs $LIBS" - - - fi -@@ -36099,7 +36098,6 @@ - eval "LIBRARY$unique=set" - - -- LIBS="-lcomn $LIBS" - - - fi -@@ -36122,7 +36120,6 @@ - eval "LIBRARY$unique=set" - - -- LIBS="-lintl $LIBS" - - - fi -@@ -36131,7 +36128,7 @@ - ;; +- +- +- ;; +- esac +- +- + case "ct" in + c|c_r|pthread*) ;; + *) +@@ -37848,30 +37836,7 @@ esac + +- case "comn" in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lcomn $LIBS" +- +- +- ;; +- esac +- +- +- case "intl" in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lintl $LIBS" +- +- +- ;; +- esac +- - SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" + SYBASE_CT_LIBS="-lct" old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -@@ -36208,7 +36205,6 @@ - eval "LIBRARY$unique=set" - - +@@ -37923,18 +37888,6 @@ + + else + echo "$ac_t""no" 1>&6 +- +- case "sybtcl" in +- c|c_r|pthread*) ;; +- *) +- +- - LIBS="-lsybtcl $LIBS" +- +- +- ;; +- esac +- + fi - - fi + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 diff --git a/www/mod_php4/files/patch-ar b/www/mod_php4/files/patch-ar index 705c48a41f13..0deda6f1a3d7 100644 --- a/www/mod_php4/files/patch-ar +++ b/www/mod_php4/files/patch-ar @@ -1,5 +1,5 @@ ---- ext/sybase/sybase.c.orig Fri Jun 2 14:14:44 2000 -+++ ext/sybase/sybase.c Fri Jun 2 14:15:27 2000 +--- ext/sybase/php_sybase_db.c.orig Fri Jun 2 14:14:44 2000 ++++ ext/sybase/php_sybase_db.c Fri Jun 2 14:15:27 2000 @@ -357,7 +357,7 @@ RETURN_FALSE; } diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index 082de119993a..b94d343df8d8 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_php -PORTVERSION= 4.0.1.2 +PORTVERSION= 4.0.2 CATEGORIES= www MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \ http://php.he.net/${PHP_DISTDIR}/ \ @@ -17,11 +17,7 @@ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \ http://php.easydns.com/${PHP_DISTDIR}/ \ http://www.php.cz/${PHP_DISTDIR}/ \ http://php3.globe.de/${PHP_DISTDIR}/ -DISTNAME= php-4.0.1 - -PATCHFILES= php-4.0.1-4.0.1pl2.diff.gz -PATCH_SITES= ${MASTER_SITES} -PATCH_DIST_STRIP= -p1 +DISTNAME= php-4.0.2 MAINTAINER= dirk@FreeBSD.org diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo index f5c8f7cb0e9f..a9a2e82297e8 100644 --- a/www/mod_php5/distinfo +++ b/www/mod_php5/distinfo @@ -1,2 +1 @@ -MD5 (php-4.0.1.tar.gz) = 81430cbc47f327d410b3ee64eb66dcbc -MD5 (php-4.0.1-4.0.1pl2.diff.gz) = 1561416363d759ac411a48a2cdcb78ee +MD5 (php-4.0.2.tar.gz) = 993b010eba7ed22509d576c3d481a2ca diff --git a/www/mod_php5/files/patch-aq b/www/mod_php5/files/patch-aq index 76e3a88b8c3e..9de9789e82b9 100644 --- a/www/mod_php5/files/patch-aq +++ b/www/mod_php5/files/patch-aq @@ -1,43 +1,72 @@ ---- configure.orig Wed Jun 28 20:37:28 2000 -+++ configure Fri Jun 30 09:30:38 2000 -@@ -36053,7 +36053,6 @@ - eval "LIBRARY$unique=set" - - +--- configure.orig Tue Aug 29 20:37:36 2000 ++++ configure Sat Sep 2 10:02:53 2000 +@@ -37824,18 +37824,6 @@ + fi + + +- case "cs" in +- c|c_r|pthread*) ;; +- *) +- +- - LIBS="-lcs $LIBS" - - - fi -@@ -36099,7 +36098,6 @@ - eval "LIBRARY$unique=set" - - -- LIBS="-lcomn $LIBS" - - - fi -@@ -36122,7 +36120,6 @@ - eval "LIBRARY$unique=set" - - -- LIBS="-lintl $LIBS" - - - fi -@@ -36131,7 +36128,7 @@ - ;; +- +- +- ;; +- esac +- +- + case "ct" in + c|c_r|pthread*) ;; + *) +@@ -37848,30 +37836,7 @@ esac + +- case "comn" in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lcomn $LIBS" +- +- +- ;; +- esac +- +- +- case "intl" in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lintl $LIBS" +- +- +- ;; +- esac +- - SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" + SYBASE_CT_LIBS="-lct" old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -@@ -36208,7 +36205,6 @@ - eval "LIBRARY$unique=set" - - +@@ -37923,18 +37888,6 @@ + + else + echo "$ac_t""no" 1>&6 +- +- case "sybtcl" in +- c|c_r|pthread*) ;; +- *) +- +- - LIBS="-lsybtcl $LIBS" +- +- +- ;; +- esac +- + fi - - fi + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 diff --git a/www/mod_php5/files/patch-ar b/www/mod_php5/files/patch-ar index 705c48a41f13..0deda6f1a3d7 100644 --- a/www/mod_php5/files/patch-ar +++ b/www/mod_php5/files/patch-ar @@ -1,5 +1,5 @@ ---- ext/sybase/sybase.c.orig Fri Jun 2 14:14:44 2000 -+++ ext/sybase/sybase.c Fri Jun 2 14:15:27 2000 +--- ext/sybase/php_sybase_db.c.orig Fri Jun 2 14:14:44 2000 ++++ ext/sybase/php_sybase_db.c Fri Jun 2 14:15:27 2000 @@ -357,7 +357,7 @@ RETURN_FALSE; }