--- cgi/cgi.cabal~	2010-01-05 09:18:32.000000000 -0800
+++ cgi/cgi.cabal	2010-01-05 09:06:46.000000000 -0800
@@ -29,15 +29,7 @@
   Extensions: MultiParamTypeClasses
   ghc-options: -Wall
 
-  Build-depends: network>=2.0, parsec >= 2.0, mtl >= 1.0, xhtml >= 3000.0.0
-  If flag(split-base)
-    Build-depends: base == 3.*, old-time, old-locale, containers
-  Else
-    Build-depends: base < 3
-  If flag(bytestring-in-base)
-    Build-depends: base >= 2 && < 3
-  Else
-    Build-depends: base < 2 || == 3.*, bytestring
+  Build-depends: base, bytestring, containers, old-time, old-locale, network>=2.0, parsec >= 2.0, mtl >= 1.0, xhtml >= 3000.0.0
 
 --Executable:     printinput
 --Main-Is:        printinput.hs
--- haskell-cgi-3001.1.7.1/Network/CGI/Compat.hs~	2010-01-05 09:19:23.000000000 -0800
+++ haskell-cgi-3001.1.7.1/Network/CGI/Compat.hs	2010-01-05 09:07:55.000000000 -0800
@@ -20,7 +20,7 @@
   ) where
 
 import Control.Concurrent (forkIO)
-import Control.Exception as Exception (Exception,throw,catch,finally)
+import Control.OldException as Exception (Exception,throw,catch,finally)
 import Control.Monad (unless)
 import Control.Monad.Trans (MonadIO, liftIO)
 import qualified Data.Map as Map
--- haskell-cgi-3001.1.7.1/Network/CGI/Monad.hs~	2010-01-05 09:19:15.000000000 -0800
+++ haskell-cgi-3001.1.7.1/Network/CGI/Monad.hs	2010-01-05 09:07:13.000000000 -0800
@@ -27,7 +27,7 @@
   throwCGI, catchCGI, tryCGI, handleExceptionCGI,
  ) where
 
-import Control.Exception as Exception (Exception, try, throwIO)
+import Control.OldException as Exception (Exception, try, throwIO)
 import Control.Monad (liftM)
 import Control.Monad.Error (MonadError(..))
 import Control.Monad.Reader (ReaderT(..), asks)
--- haskell-cgi-3001.1.7.1/Network/CGI.hs~	2010-01-05 09:19:04.000000000 -0800
+++ haskell-cgi-3001.1.7.1/Network/CGI.hs	2010-01-05 09:08:15.000000000 -0800
@@ -94,7 +94,7 @@
   , module Network.CGI.Compat
   ) where
 
-import Control.Exception (Exception(..))
+import Control.OldException (Exception(..))
 import Control.Monad (liftM)
 import Control.Monad.Trans (MonadIO, liftIO)
 import Data.Char (toUpper)