From 5b2dcdd24de2ce47dd56652a0c3854c8e4ee2cf5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Jul 2010 07:00:00 +0000
Subject: [PATCH] * Remove the old PHP.

svn path=/nixpkgs/trunk/; revision=22800
---
 pkgs/development/interpreters/php/builder.sh  | 24 --------
 pkgs/development/interpreters/php/default.nix | 23 --------
 pkgs/development/interpreters/php/fix.patch   | 56 -------------------
 pkgs/top-level/all-packages.nix               |  7 ---
 4 files changed, 110 deletions(-)
 delete mode 100644 pkgs/development/interpreters/php/builder.sh
 delete mode 100644 pkgs/development/interpreters/php/default.nix
 delete mode 100644 pkgs/development/interpreters/php/fix.patch

diff --git a/pkgs/development/interpreters/php/builder.sh b/pkgs/development/interpreters/php/builder.sh
deleted file mode 100644
index a5aadf2857f1..000000000000
--- a/pkgs/development/interpreters/php/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-
-alias lex=flex
-
-configureFlags="$configureFlags \
-  --with-libxml-dir=$libxml2 \
-  --with-apxs2=$apacheHttpd/bin/apxs \
-  --without-libexpat-dir"
-
-if test -n "$unixODBC"; then
-    configureFlags="$configureFlags --with-unixODBC=$unixODBC"
-fi
-
-if test -n "$postgresql"; then
-    configureFlags="$configureFlags --with-pgsql=$postgresql"
-fi
-
-if test -n "$mysql"; then
-    configureFlags="$configureFlags --with-mysql=$mysql"
-fi
-  
-makeFlags="APXS_LIBEXECDIR=$out/modules $makeFlags"
-        
-genericBuild
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
deleted file mode 100644
index dc704b768c91..000000000000
--- a/pkgs/development/interpreters/php/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd, unixODBC ? null, postgresql ? null, mysql ? null}:
-
-assert libxml2 != null;
-
-stdenv.mkDerivation {
-  name = "php-5.2.4";
-  src = fetchurl {
-    url = http://nl3.php.net/distributions/php-5.2.4.tar.bz2;
-    sha256 = "1h513j7crz08n7rlh8v7cvxfzisj87mvvyfrkiaa76v1wicm4bsh";
-  };
-  
-  inherit flex bison libxml2 apacheHttpd;
-
-  builder = ./builder.sh;
-
-  buildInputs = [flex bison libxml2 apacheHttpd];
-
-  inherit unixODBC postgresql mysql;
-  
-  odbcSupport = unixODBC != null;
-
-  patches = [./fix.patch];
-}
diff --git a/pkgs/development/interpreters/php/fix.patch b/pkgs/development/interpreters/php/fix.patch
deleted file mode 100644
index 1cec8fea0fe2..000000000000
--- a/pkgs/development/interpreters/php/fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- php-5.0.4/configure	2005-04-03 11:42:50.000000000 +0200
-+++ php-5.0.4-1/configure	2005-07-10 11:06:22.292271176 +0200
-@@ -3381,7 +3381,7 @@
- 
-   case $host_alias in
-   *aix*)
--    APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-     PHP_AIX_LDFLAGS="-Wl,-brtl"
-     build_type=shared
-@@ -3576,7 +3576,7 @@
-   if test "$?" != "0"; then
-     APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
--    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     if test -z `$APXS -q SYSCONFDIR`; then
-       APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -4680,7 +4680,7 @@
-     { echo "configure: error: Please note that Apache version >= 2.0.40 is required." 1>&2; exit 1; }
-   fi
- 
--  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+  APXS_LIBEXECDIR="$prefix/modules"
-   if test -z `$APXS -q SYSCONFDIR`; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -5510,7 +5510,7 @@
-     { echo "configure: error: Please note that Apache version >= 2.0.44 is required." 1>&2; exit 1; }
-   fi
- 
--  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+  APXS_LIBEXECDIR="$prefix/modules"
-   if test -z `$APXS -q SYSCONFDIR`; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -6327,7 +6327,7 @@
- 
-   case $host_alias in
-   *aix*)
--    APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-     PHP_AIX_LDFLAGS="-Wl,-brtl"
-     build_type=shared
-@@ -6522,7 +6522,7 @@
-   if test "$?" != "0"; then
-     APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
--    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     if test -z `$APXS -q SYSCONFDIR`; then
-       APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e023c0ea3452..24f166dd2c8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2843,13 +2843,6 @@ let
   perl = useFromStdenv "perl"
     (if system != "i686-cygwin" then perl510 else sysPerl);
 
-  # FIXME: unixODBC needs patching on Darwin (see darwinports)
-  phpOld = import ../development/interpreters/php {
-    inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
-    unixODBC =
-      if stdenv.isDarwin then null else unixODBC;
-  };
-
   php = makeOverridable (import ../development/interpreters/php_configurable) {
     inherit
       stdenv fetchurl lib composableDerivation autoconf automake