haskell/haskell-cgi: Updated for version 3001.3.0.1.

Signed-off-by: David Spencer <baildon.research@googlemail.com>

4 files changed, 7 insertions, 45 deletions

diff --git a/haskell/haskell-cgi/data-typeable.patch b/haskell/haskell-cgi/data-typeable.patch
deleted file mode 100644
index 226c202136..0000000000
--- a/haskell/haskell-cgi/data-typeable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Network/CGI/Protocol.hs.orig	2015-02-22 23:49:07.811998631 +0200
-+++ Network/CGI/Protocol.hs	2015-02-22 23:49:47.854998351 +0200
-@@ -44,7 +44,7 @@
- import qualified Data.ByteString.Lazy.Char8 as BS
- import Data.ByteString.Lazy.Char8 (ByteString)
- 
--import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
-+import Data.OldTypeable (Typeable(..), mkTyConApp, mkTyCon)
- 
- import Network.CGI.Header
- import Network.CGI.Multipart
---- Network/CGI/Monad.hs.orig	2015-02-22 23:49:22.836998526 +0200
-+++ Network/CGI/Monad.hs	2015-02-22 23:50:04.933998232 +0200
-@@ -40,7 +40,7 @@
- import Control.Monad.Reader (ReaderT(..), asks)
- import Control.Monad.Writer (WriterT(..), tell)
- import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift)
--import Data.Typeable (Typeable(..), Typeable1(..), 
-+import Data.OldTypeable (Typeable(..), Typeable1(..), 
-                       mkTyConApp, mkTyCon)
- 
- import Network.CGI.Protocol
diff --git a/haskell/haskell-cgi/haskell-cgi.SlackBuild b/haskell/haskell-cgi/haskell-cgi.SlackBuild
index aa73b56105..146f11d4ac 100644
--- a/haskell/haskell-cgi/haskell-cgi.SlackBuild
+++ b/haskell/haskell-cgi/haskell-cgi.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haskell-cgi
-VERSION=${VERSION:-3001.1.8.5}
+VERSION=${VERSION:-3001.3.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,11 +73,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# make it work with network-uri package, which was spun off from network 2.6
-patch -p0 <$CWD/network-uri.patch
-# make it work with base >= 4.7
-patch -p0 <$CWD/data-typeable.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 runghc Setup configure \
@@ -86,7 +81,8 @@ runghc Setup configure \
   --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
   --enable-shared \
   --enable-library-profiling \
-  --docdir=/usr/doc/$PRGNAM-$VERSION
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --flags="network-uri"
 
 runghc Setup build
 runghc Setup haddock
diff --git a/haskell/haskell-cgi/haskell-cgi.info b/haskell/haskell-cgi/haskell-cgi.info
index 38684befc7..c06ce36401 100644
--- a/haskell/haskell-cgi/haskell-cgi.info
+++ b/haskell/haskell-cgi/haskell-cgi.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-cgi"
-VERSION="3001.1.8.5"
+VERSION="3001.3.0.1"
 HOMEPAGE="http://hackage.haskell.org/package/cgi"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/cgi/3001.1.8.5/cgi-3001.1.8.5.tar.gz"
-MD5SUM="e01ef7ed24473d1550579e83a842b017"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/cgi/3001.3.0.1/cgi-3001.3.0.1.tar.gz"
+MD5SUM="acb7fdbbdba59b2cf33033c316a66346"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-extensible-exceptions haskell-MonadCatchIO-mtl haskell-mtl haskell-network haskell-network-uri haskell-parsec"
+REQUIRES="ghc haskell-exceptions haskell-multipart haskell-parsec haskell-network haskell-network-uri haskell-mtl"
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
diff --git a/haskell/haskell-cgi/network-uri.patch b/haskell/haskell-cgi/network-uri.patch
deleted file mode 100644
index d4f69d6675..0000000000
--- a/haskell/haskell-cgi/network-uri.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cgi.cabal.orig	2015-02-22 23:54:01.565996578 +0200
-+++ cgi.cabal	2015-02-22 23:54:35.682996339 +0200
-@@ -35,7 +35,8 @@
-   ghc-options: -Wall
- 
-   Build-depends:
--    network >= 2.0,
-+    network >= 2.6,
-+    network-uri >= 2.6,
-     parsec >= 2.0,
-     mtl >= 1.0,
-     MonadCatchIO-mtl,