Upgrade to 4.0.5.

8 files changed, 20 insertions, 100 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 587afd607611..2609f81fe45a 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	mod_php4
-PORTVERSION=	4.0.4pl1
-PORTREVISION=	3
+PORTVERSION=	4.0.5
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 770a3a662249..16cf89303e83 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,3 @@
-MD5 (php-4.0.4pl1.tar.gz) = ae3ab0105154dddea1fa2ca18a902f85
+MD5 (php-4.0.5.tar.gz) = 763739f64eeac7099035fd86c1d39ad2
 MD5 (php4_jstring-20010205.tar.gz) = 8b1f1b93fb7455096bc7c3c3839ddca2
 MD5 (php4_mbregex-1.2.tar.gz) = 5dee7665737a643ee5ac294423bd0894
diff --git a/www/mod_php4/files/patch-aq b/www/mod_php4/files/patch-aq
index 8629edc8032d..690602617f98 100644
--- a/www/mod_php4/files/patch-aq
+++ b/www/mod_php4/files/patch-aq
@@ -1,35 +1,6 @@
---- configure.orig	Tue Aug 29 20:37:36 2000
-+++ configure	Sat Sep  2 10:02:53 2000
-@@ -23088,12 +23088,7 @@
- 
-   LIBS=$old_LIBS
-   LDFLAGS="$old_LDFLAGS"
--  if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
--	cat >> confdefs.h <<\EOF
--#define HAVE_LIBMCRYPT22 1
--EOF
--
--  elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-+  if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-     
-  case "ltdl" in
-  c|c_r|pthread*) ;;
-@@ -23106,8 +23101,13 @@
-   ;;
-   esac
- 
--	cat >> confdefs.h <<\EOF
-+    cat >> confdefs.h <<\EOF
- #define HAVE_LIBMCRYPT24 1
-+EOF
-+
-+  elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
-+    cat >> confdefs.h <<\EOF
-+#define HAVE_LIBMCRYPT22 1
- EOF
- 
-   else
-@@ -37824,18 +37824,6 @@
+--- configure.orig	Mon Apr 30 15:47:59 2001
++++ configure	Fri May  4 00:14:24 2001
+@@ -45273,18 +45273,6 @@
    fi
  
  	
@@ -48,10 +19,11 @@
   case "ct" in
   c|c_r|pthread*) ;;
   *)
-@@ -37848,30 +37836,7 @@
+@@ -45296,31 +45284,7 @@
+   ;;
    esac
  
- 	
+-	
 - case "comn" in
 - c|c_r|pthread*) ;;
 - *)
@@ -80,7 +52,7 @@
      old_LDFLAGS=$LDFLAGS
      LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
      echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
-@@ -37923,18 +37888,6 @@
+@@ -45372,17 +45336,6 @@
   
  else
    echo "$ac_t""no" 1>&6
@@ -95,7 +67,6 @@
 -
 -  ;;
 -  esac
-- 
+  
  fi
  
-     echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
diff --git a/www/mod_php4/files/patch-pgsql b/www/mod_php4/files/patch-pgsql
deleted file mode 100644
index 7d9ccaa04ce0..000000000000
--- a/www/mod_php4/files/patch-pgsql
+++ /dev/null
@@ -1,10 +0,0 @@
---- ext/pgsql/php_pgsql.h~	Wed Sep 13 06:13:36 2000
-+++ ext/pgsql/php_pgsql.h	Sat Apr 21 20:26:21 2001
-@@ -29,7 +29,6 @@
- 
- #ifdef PHP_PGSQL_PRIVATE
- #undef SOCKET_SIZE_TYPE
--#include <postgres.h>
- #include <libpq-fe.h>
- 
- #ifdef PHP_WIN32
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 587afd607611..2609f81fe45a 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	mod_php4
-PORTVERSION=	4.0.4pl1
-PORTREVISION=	3
+PORTVERSION=	4.0.5
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 770a3a662249..16cf89303e83 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,3 @@
-MD5 (php-4.0.4pl1.tar.gz) = ae3ab0105154dddea1fa2ca18a902f85
+MD5 (php-4.0.5.tar.gz) = 763739f64eeac7099035fd86c1d39ad2
 MD5 (php4_jstring-20010205.tar.gz) = 8b1f1b93fb7455096bc7c3c3839ddca2
 MD5 (php4_mbregex-1.2.tar.gz) = 5dee7665737a643ee5ac294423bd0894
diff --git a/www/mod_php5/files/patch-aq b/www/mod_php5/files/patch-aq
index 8629edc8032d..690602617f98 100644
--- a/www/mod_php5/files/patch-aq
+++ b/www/mod_php5/files/patch-aq
@@ -1,35 +1,6 @@
---- configure.orig	Tue Aug 29 20:37:36 2000
-+++ configure	Sat Sep  2 10:02:53 2000
-@@ -23088,12 +23088,7 @@
- 
-   LIBS=$old_LIBS
-   LDFLAGS="$old_LDFLAGS"
--  if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
--	cat >> confdefs.h <<\EOF
--#define HAVE_LIBMCRYPT22 1
--EOF
--
--  elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-+  if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-     
-  case "ltdl" in
-  c|c_r|pthread*) ;;
-@@ -23106,8 +23101,13 @@
-   ;;
-   esac
- 
--	cat >> confdefs.h <<\EOF
-+    cat >> confdefs.h <<\EOF
- #define HAVE_LIBMCRYPT24 1
-+EOF
-+
-+  elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
-+    cat >> confdefs.h <<\EOF
-+#define HAVE_LIBMCRYPT22 1
- EOF
- 
-   else
-@@ -37824,18 +37824,6 @@
+--- configure.orig	Mon Apr 30 15:47:59 2001
++++ configure	Fri May  4 00:14:24 2001
+@@ -45273,18 +45273,6 @@
    fi
  
  	
@@ -48,10 +19,11 @@
   case "ct" in
   c|c_r|pthread*) ;;
   *)
-@@ -37848,30 +37836,7 @@
+@@ -45296,31 +45284,7 @@
+   ;;
    esac
  
- 	
+-	
 - case "comn" in
 - c|c_r|pthread*) ;;
 - *)
@@ -80,7 +52,7 @@
      old_LDFLAGS=$LDFLAGS
      LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
      echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
-@@ -37923,18 +37888,6 @@
+@@ -45372,17 +45336,6 @@
   
  else
    echo "$ac_t""no" 1>&6
@@ -95,7 +67,6 @@
 -
 -  ;;
 -  esac
-- 
+  
  fi
  
-     echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
diff --git a/www/mod_php5/files/patch-pgsql b/www/mod_php5/files/patch-pgsql
deleted file mode 100644
index 7d9ccaa04ce0..000000000000
--- a/www/mod_php5/files/patch-pgsql
+++ /dev/null
@@ -1,10 +0,0 @@
---- ext/pgsql/php_pgsql.h~	Wed Sep 13 06:13:36 2000
-+++ ext/pgsql/php_pgsql.h	Sat Apr 21 20:26:21 2001
-@@ -29,7 +29,6 @@
- 
- #ifdef PHP_PGSQL_PRIVATE
- #undef SOCKET_SIZE_TYPE
--#include <postgres.h>
- #include <libpq-fe.h>
- 
- #ifdef PHP_WIN32