aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
committerGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
commit109269205e521bb1d2d87678a391e5adefff88d6 (patch)
tree93f1f9278a9a48902904b7ff4a5ce711c10efe08 /www
parentad7295cafd0e46ece6fcbf594ef39a767c296d0e (diff)
downloadports-109269205e521bb1d2d87678a391e5adefff88d6.tar.gz
ports-109269205e521bb1d2d87678a391e5adefff88d6.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/Makefile2
-rw-r--r--www/hs-HTTP/Makefile5
-rw-r--r--www/hs-HTTP/distinfo4
-rw-r--r--www/hs-activehs/Makefile3
-rw-r--r--www/hs-activehs/files/patch-Converter.hs13
-rw-r--r--www/hs-activehs/files/patch-Main.hs10
-rw-r--r--www/hs-activehs/files/patch-Simple.hs19
-rw-r--r--www/hs-activehs/files/patch-Smart.hs10
-rw-r--r--www/hs-activehs/files/patch-Special.hs20
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal19
-rw-r--r--www/hs-authenticate/Makefile1
-rw-r--r--www/hs-cgi/Makefile8
-rw-r--r--www/hs-cgi/distinfo4
-rw-r--r--www/hs-cgi/pkg-descr2
-rw-r--r--www/hs-cookie/Makefile2
-rw-r--r--www/hs-css-text/Makefile2
-rw-r--r--www/hs-fastcgi/Makefile1
-rw-r--r--www/hs-gitit/Makefile1
-rw-r--r--www/hs-hS3/Makefile3
-rw-r--r--www/hs-hamlet/Makefile2
-rw-r--r--www/hs-hamlet/distinfo4
-rw-r--r--www/hs-happstack-server/Makefile11
-rw-r--r--www/hs-happstack-server/distinfo4
-rw-r--r--www/hs-happstack/Makefile5
-rw-r--r--www/hs-heist/Makefile4
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-hjsmin/Makefile3
-rw-r--r--www/hs-http-conduit/Makefile4
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-date/Makefile4
-rw-r--r--www/hs-http-reverse-proxy/Makefile4
-rw-r--r--www/hs-http-reverse-proxy/distinfo4
-rw-r--r--www/hs-http-server/Makefile3
-rw-r--r--www/hs-http-types/Makefile3
-rw-r--r--www/hs-oeis/Makefile5
-rw-r--r--www/hs-path-pieces/Makefile2
-rw-r--r--www/hs-recaptcha/Makefile2
-rw-r--r--www/hs-scgi/Makefile4
-rw-r--r--www/hs-shakespeare-css/Makefile2
-rw-r--r--www/hs-shakespeare-css/distinfo4
-rw-r--r--www/hs-shakespeare-i18n/Makefile4
-rw-r--r--www/hs-shakespeare-js/Makefile4
-rw-r--r--www/hs-shakespeare-js/distinfo4
-rw-r--r--www/hs-shakespeare-text/Makefile2
-rw-r--r--www/hs-shakespeare/Makefile5
-rw-r--r--www/hs-shakespeare/distinfo4
-rw-r--r--www/hs-snap-core/Makefile3
-rw-r--r--www/hs-snap-server/Makefile3
-rw-r--r--www/hs-snap/Makefile12
-rw-r--r--www/hs-snap/distinfo4
-rw-r--r--www/hs-url/Makefile4
-rw-r--r--www/hs-wai-app-static/Makefile1
-rw-r--r--www/hs-wai-extra/Makefile8
-rw-r--r--www/hs-wai-extra/distinfo4
-rw-r--r--www/hs-wai-logger/Makefile6
-rw-r--r--www/hs-wai-test/Makefile6
-rw-r--r--www/hs-wai-test/distinfo4
-rw-r--r--www/hs-wai/Makefile1
-rw-r--r--www/hs-warp/Makefile2
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-webkit/Makefile4
-rw-r--r--www/hs-xss-sanitize/Makefile2
-rw-r--r--www/hs-yesod-auth/Makefile18
-rw-r--r--www/hs-yesod-auth/distinfo4
-rw-r--r--www/hs-yesod-auth/pkg-descr6
-rw-r--r--www/hs-yesod-core/Makefile23
-rw-r--r--www/hs-yesod-core/distinfo4
-rw-r--r--www/hs-yesod-default/Makefile18
-rw-r--r--www/hs-yesod-default/distinfo2
-rw-r--r--www/hs-yesod-default/pkg-descr4
-rw-r--r--www/hs-yesod-form/Makefile10
-rw-r--r--www/hs-yesod-form/distinfo4
-rw-r--r--www/hs-yesod-json/Makefile18
-rw-r--r--www/hs-yesod-json/distinfo2
-rw-r--r--www/hs-yesod-json/pkg-descr3
-rw-r--r--www/hs-yesod-persistent/Makefile8
-rw-r--r--www/hs-yesod-persistent/distinfo4
-rw-r--r--www/hs-yesod-platform/Makefile257
-rw-r--r--www/hs-yesod-platform/distinfo4
-rw-r--r--www/hs-yesod-platform/files/patch-yesod-platform.cabal22
-rw-r--r--www/hs-yesod-routes/Makefile2
-rw-r--r--www/hs-yesod-routes/distinfo4
-rw-r--r--www/hs-yesod-static/Makefile9
-rw-r--r--www/hs-yesod-static/distinfo4
-rw-r--r--www/hs-yesod-test/Makefile4
-rw-r--r--www/hs-yesod-test/distinfo4
-rw-r--r--www/hs-yesod/Makefile25
-rw-r--r--www/hs-yesod/distinfo4
88 files changed, 327 insertions, 442 deletions
diff --git a/www/Makefile b/www/Makefile
index 24cc71a31336..fa268bfb36c9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -333,9 +333,7 @@
SUBDIR += hs-yesod
SUBDIR += hs-yesod-auth
SUBDIR += hs-yesod-core
- SUBDIR += hs-yesod-default
SUBDIR += hs-yesod-form
- SUBDIR += hs-yesod-json
SUBDIR += hs-yesod-persistent
SUBDIR += hs-yesod-platform
SUBDIR += hs-yesod-routes
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index d8ca325e4a70..80e569339c6b 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.2.5
-PORTREVISION= 1
+PORTVERSION= 4000.2.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for client-side HTTP
+COMMENT= Library for client-side HTTP
LICENSE= BSD
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index ae66c473fc49..b8b17ea35308 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HTTP-4000.2.5.tar.gz) = 67dd0e6b5b97657dcef8d906d329f73243b75b33ffeb90454783b0e9e70f320e
-SIZE (cabal/HTTP-4000.2.5.tar.gz) = 66587
+SHA256 (cabal/HTTP-4000.2.8.tar.gz) = 086a2aa771a31845b190e2f9651ab4d8e85116aa463de5bc5e0204c1e5e70c5c
+SIZE (cabal/HTTP-4000.2.8.tar.gz) = 67903
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 669699ee8b4d..f14114b0f4a7 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= activehs
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Haskell code presentation tool
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \
cmdargs>=0.7 data-pprint>=0.2 dia-base>=0.1 \
dia-functions>=0.2.1.1 haskell-src-exts>=1.12 \
diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs
new file mode 100644
index 000000000000..e4e7da82e900
--- /dev/null
+++ b/www/hs-activehs/files/patch-Converter.hs
@@ -0,0 +1,13 @@
+--- ./Converter.hs.orig 2013-02-12 20:23:45.000000000 +0100
++++ ./Converter.hs 2013-05-28 16:20:35.000000000 +0200
+@@ -249,8 +249,8 @@
+
+ mkName :: String -> HSyn.Name
+ mkName n@(c:_)
+- | isSymbol c = HSyn.Symbol n
+-mkName n = HSyn.Ident n
++ | isLetter c = HSyn.Ident n
++mkName n = HSyn.Symbol n
+
+ mkImport_ :: String -> String -> HSyn.ImportDecl
+ mkImport_ magic m
diff --git a/www/hs-activehs/files/patch-Main.hs b/www/hs-activehs/files/patch-Main.hs
deleted file mode 100644
index 0920ef39498b..000000000000
--- a/www/hs-activehs/files/patch-Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Main.hs.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./Main.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -31,7 +31,6 @@
- import System.Locale (defaultTimeLocale)
- import Data.Time (getCurrentTime, formatTime, diffUTCTime)
- import Data.Maybe (listToMaybe)
----import Prelude hiding (catch)
-
- ---------------------------------------------------------------
-
diff --git a/www/hs-activehs/files/patch-Simple.hs b/www/hs-activehs/files/patch-Simple.hs
deleted file mode 100644
index bc6f6eeca660..000000000000
--- a/www/hs-activehs/files/patch-Simple.hs
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./Simple.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Simple.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts #-}
-+{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts, CPP #-}
-
- module Simple
- ( Task (..), TaskChan
-@@ -23,7 +23,9 @@
- import Control.Monad (when, forever)
- import Control.Monad.Error (MonadError, catchError)
- import Data.List (isPrefixOf)
----import Prelude hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-
- -------------------------
-
diff --git a/www/hs-activehs/files/patch-Smart.hs b/www/hs-activehs/files/patch-Smart.hs
deleted file mode 100644
index ad3d8eb0ba59..000000000000
--- a/www/hs-activehs/files/patch-Smart.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Smart.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Smart.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -37,7 +37,6 @@
- import qualified Data.Data as D
- import Data.List (nub)
- import Data.Char (isAlpha)
----import Prelude hiding (catch)
-
-
- ----------------------------------------------------------------------
diff --git a/www/hs-activehs/files/patch-Special.hs b/www/hs-activehs/files/patch-Special.hs
deleted file mode 100644
index af4c8ebd5c92..000000000000
--- a/www/hs-activehs/files/patch-Special.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Special.hs.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./Special.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns #-}
-+{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns, CPP #-}
-
- module Special
- ( SpecialTask (..), exerciseServer'
-@@ -25,8 +25,9 @@
- import System.Directory (getTemporaryDirectory)
-
- import Control.Concurrent (threadDelay, forkIO, killThread)
----import Prelude hiding (catch)
--
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-
- ---------------------------------------------------------------
-
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 0528ec55bb35..68ed888b6f5d 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,6 +1,21 @@
--- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./activehs.cabal 2013-03-10 13:53:48.000000000 +0100
-@@ -76,11 +76,12 @@
++++ ./activehs.cabal 2013-05-28 16:18:31.000000000 +0200
+@@ -63,7 +63,7 @@
+ activehs-base >= 0.2 && < 0.4,
+ data-pprint >= 0.2 && < 0.3,
+ base >= 4.0 && < 4.7,
+- QuickCheck >= 2.4 && < 2.6,
++ QuickCheck >= 2.4 && < 2.7,
+ array >= 0.3 && < 0.5,
+ directory >= 1.1 && < 1.3,
+ containers >= 0.4 && < 0.6,
+@@ -71,16 +71,17 @@
+ text >= 0.11 && < 0.12,
+ snap-core >= 0.6 && < 0.10,
+ snap-server >= 0.6 && < 0.10,
+- syb >= 0.2 && < 0.4,
++ syb >= 0.2 && < 0.5,
+ haskell-src-exts >= 1.12 && < 1.14,
bytestring >= 0.9 && < 0.11,
utf8-string >= 0.3 && < 0.4,
xhtml >= 3000.2 && < 3000.3,
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 989957610dcc..e6d5083c66c4 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= authenticate
PORTVERSION= 1.3.2.6
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index bf0e3c7d2b87..2700b80a63e7 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -2,18 +2,16 @@
# $FreeBSD$
PORTNAME= cgi
-PORTVERSION= 3001.1.7.4
-PORTREVISION= 6
+PORTVERSION= 3001.1.7.5
PORTEPOCH= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for writing CGI programs
+COMMENT= Haskell library for writing CGI programs
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-USE_CABAL= mtl>=1 network>=2 parsec>=2 xhtml>=3000
+USE_CABAL= extensible-exceptions mtl>=1 network>=2 parsec>=2 xhtml>=3000
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo
index 936482382a00..f39abd85abc9 100644
--- a/www/hs-cgi/distinfo
+++ b/www/hs-cgi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cgi-3001.1.7.4.tar.gz) = 6de5da8be4bb8323a864761bbb604ca8c1cdc9048bf33990f91e7ed948a331ba
-SIZE (cabal/cgi-3001.1.7.4.tar.gz) = 21357
+SHA256 (cabal/cgi-3001.1.7.5.tar.gz) = 5126e2eaa53cd5de59572981c00aedae5790882afda67545228eb29fe76faffd
+SIZE (cabal/cgi-3001.1.7.5.tar.gz) = 21377
diff --git a/www/hs-cgi/pkg-descr b/www/hs-cgi/pkg-descr
index 2ce7f8f821f5..51768124759e 100644
--- a/www/hs-cgi/pkg-descr
+++ b/www/hs-cgi/pkg-descr
@@ -1,3 +1,3 @@
This is a Haskell library for writing CGI programs.
-WWW: http://hackage.haskell.org/package/cgi
+WWW: http://andersk.mit.edu/haskell/cgi/
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index a4f9f0cc64cb..19485d131435 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cookie
PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 8da00df73001..dd2de9c28e46 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= css-text
PORTVERSION= 0.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index a1fd23576fb3..7e9cbb585e93 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,6 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index 09a237d26d6e..f3f550891e78 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gitit
PORTVERSION= 0.10.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 9457a301e5d6..9f9b69fd4af4 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hS3
PORTVERSION= 0.5.7
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Interface to Amazon's Simple Storage Service (S3)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \
MissingH>=0.18.6 network random regex-compat utf8-string
diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile
index c692eaacddcc..8cd2e811e837 100644
--- a/www/hs-hamlet/Makefile
+++ b/www/hs-hamlet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hamlet
-PORTVERSION= 1.1.6.3
+PORTVERSION= 1.1.7.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hamlet/distinfo b/www/hs-hamlet/distinfo
index 8b9a6b4c84ac..28bf72ec048b 100644
--- a/www/hs-hamlet/distinfo
+++ b/www/hs-hamlet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hamlet-1.1.6.3.tar.gz) = 5a5b79cfaad1823a3a83384e1e563454430452b10e5862866b95457a8844f2ce
-SIZE (cabal/hamlet-1.1.6.3.tar.gz) = 20596
+SHA256 (cabal/hamlet-1.1.7.1.tar.gz) = b7e0549a2bfb4f76acba63f85a959f365785f1c42cbce3afc248c74ef5fe92cd
+SIZE (cabal/hamlet-1.1.7.1.tar.gz) = 21529
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index 83ccca8dbef1..b31a28f65aaf 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,20 +1,17 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.1.7
+PORTVERSION= 7.1.7.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Web-related tools and services
LICENSE= BSD
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
-
-USE_CABAL= base64-bytestring blaze-html>=0.5 hslogger>=1.0.2 html \
- monad-control>=0.3 mtl>=2 network>=2.2.3 parsec \
- sendfile>=0.7.1 syb system-filepath>=0.3.1 text>=0.10 \
+USE_CABAL= base64-bytestring blaze-html>=0.5 extensible-exceptions \
+ hslogger>=1.0.2 html monad-control>=0.3 mtl>=2 network>=2.2.3 \
+ parsec sendfile>=0.7.1 syb system-filepath>=0.3.1 text>=0.10 \
threads>=0.5 time-compat transformers>=0.1.3 \
transformers-base>=0.4 utf8-string>=0.3.4 xhtml zlib
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index 0bf201058c56..c2586de0b0d6 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-server-7.1.7.tar.gz) = e7d5bf684c7a9644cd87116f2639423c161f2f5cb939429457047c2284c2a7bd
-SIZE (cabal/happstack-server-7.1.7.tar.gz) = 76019
+SHA256 (cabal/happstack-server-7.1.7.1.tar.gz) = e2fc2bf7a78a25c3a24f965972cd78ffa8c66755b54249ac34d0590fb63a09e1
+SIZE (cabal/happstack-server-7.1.7.1.tar.gz) = 78293
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 1b294f53ff21..94d7247b1cba 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -2,16 +2,13 @@
PORTNAME= happstack
PORTVERSION= 7.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The haskell application server stack + code generation
LICENSE= BSD
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= happstack-server>=7.0
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 5b30430bc537..73446f70f0de 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.11.1
+PORTVERSION= 0.12.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Haskell template system supporting both HTML5 and XML
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \
blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 errors>=1.4 \
hashable>=1.1 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index cd8571e3d969..5c4ffd04db13 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.11.1.tar.gz) = 50e6f3586e0a757f17d6f8109428fa3b891a47b1d4f2d134faaef4fe9897a69d
-SIZE (cabal/heist-0.11.1.tar.gz) = 61291
+SHA256 (cabal/heist-0.12.0.tar.gz) = 49ba5adf1e223507eb965b79b22f3b211e33381523330719f592767d6fdcb839
+SIZE (cabal/heist-0.12.0.tar.gz) = 61816
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 0f2d1e58196b..587c361586c5 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hjsmin
PORTVERSION= 0.1.4.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Haskell implementation of a javascript minifier
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 text>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 828e7428bf9a..27964af5e60d 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 1.9.0
+PORTVERSION= 1.9.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ LICENSE= BSD
USE_CABAL= asn1-data>=0.5.1 base64-bytestring>=0.1 blaze-builder>=0.2.1 \
blaze-builder-conduit>=0.5 case-insensitive>=0.2 \
- certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.2 \
+ certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.3 \
data-default failure>=0.1 http-types>=0.7 lifted-base>=0.1 \
mime-types>=0.1 monad-control>=0.3 mtl network>=2.3 \
publicsuffixlist>=0.0.3 random regex-compat resourcet>=0.3 \
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index f94656487990..5687b6a73f39 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-1.9.0.tar.gz) = f365952e83dacfdb6218ae7a5c462bc904f493dc6bbbc57d99ad39939e16ceac
-SIZE (cabal/http-conduit-1.9.0.tar.gz) = 44423
+SHA256 (cabal/http-conduit-1.9.3.tar.gz) = 73e620353cf1f818cca9c755f79ccee2768b914616181e0bed339064a444800d
+SIZE (cabal/http-conduit-1.9.3.tar.gz) = 45412
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 141767655f00..6107850c3042 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= HTTP Date parser/formatter
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index 27c337f1b3e1..26bc3635dd63 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.1.1.3
+PORTVERSION= 0.1.1.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Reverse proxy HTTP requests, either over raw sockets or with WAI
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.3 case-insensitive>=0.4 classy-prelude>=0.3 \
conduit>=0.5 data-default http-conduit>=1.6 http-types>=0.6 \
lifted-base>=0.1 monad-control>=0.3 network network-conduit>=0.6 \
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index 7a5abb694f33..6632a92f105b 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-reverse-proxy-0.1.1.3.tar.gz) = f65adce5c858710ac2df048aa9183d4596fbc506ecc3019dd56480b75717507c
-SIZE (cabal/http-reverse-proxy-0.1.1.3.tar.gz) = 6357
+SHA256 (cabal/http-reverse-proxy-0.1.1.6.tar.gz) = 34ad0eab9ca014477fabf5372242dfe85837ad8b6f36a1e3871a80396a0e063a
+SIZE (cabal/http-reverse-proxy-0.1.1.6.tar.gz) = 6786
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 9437c99680a6..22c5c677eae6 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= http-server
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +11,6 @@ COMMENT= Library for writing Haskell web servers
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 36de4256ee8d..bcb75d70c57b 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= http-types
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Generic HTTP types for Haskell (for both client and server code)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index faf7d1e9f2a1..65fa0528f25e 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -3,15 +3,14 @@
PORTNAME= oeis
PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell interface to the Online Encyclopedia of Integer Sequences
+COMMENT= Haskell interface to the Online Encyclopedia of Integer Sequences
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= HTTP>=4000.0.2 network>=2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index b2caebb42c8e..87e13650f902 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -2,7 +2,7 @@
PORTNAME= path-pieces
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index 607dc03822a6..a013be71702b 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -2,7 +2,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index ed26a963b159..7af1a22a225f 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -5,11 +5,11 @@
PORTNAME= scgi
PORTVERSION= 0.3.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for writing SCGI programs
+COMMENT= Haskell library for writing SCGI programs
LICENSE= BSD
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
index 5c8013a5302b..d080161fa353 100644
--- a/www/hs-shakespeare-css/Makefile
+++ b/www/hs-shakespeare-css/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare-css
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.5.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-css/distinfo b/www/hs-shakespeare-css/distinfo
index 25694c0ff2fc..3eab08f37ee4 100644
--- a/www/hs-shakespeare-css/distinfo
+++ b/www/hs-shakespeare-css/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-css-1.0.3.tar.gz) = 7f81c6147f8eb2ef0a6a879ae36cc437f187afb30afff5e6dc04f4b4c9b2647e
-SIZE (cabal/shakespeare-css-1.0.3.tar.gz) = 14769
+SHA256 (cabal/shakespeare-css-1.0.5.1.tar.gz) = 5ae7e5e970affa31375e95b0d31564f0bfdaf0fdf8f3f6637bec449b2a3ba51b
+SIZE (cabal/shakespeare-css-1.0.5.1.tar.gz) = 16370
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
index f5a6b11147d7..77307ecd743e 100644
--- a/www/hs-shakespeare-i18n/Makefile
+++ b/www/hs-shakespeare-i18n/Makefile
@@ -2,11 +2,11 @@
PORTNAME= shakespeare-i18n
PORTVERSION= 1.0.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A type-based approach to internationalization
+COMMENT= Type-based approach to internationalization
LICENSE= MIT
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
index 48bceee10136..44816e77aed0 100644
--- a/www/hs-shakespeare-js/Makefile
+++ b/www/hs-shakespeare-js/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare-js
-PORTVERSION= 1.1.2.1
+PORTVERSION= 1.1.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Stick your Haskell variables into JavaScript at compile time
LICENSE= MIT
-USE_CABAL= aeson>=0.5 shakespeare>=1.0.3 text>=0.7
+USE_CABAL= aeson>=0.5 shakespeare>=1.0.5 text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-js/distinfo b/www/hs-shakespeare-js/distinfo
index d4c51b33abfb..18932dfa3cb8 100644
--- a/www/hs-shakespeare-js/distinfo
+++ b/www/hs-shakespeare-js/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-js-1.1.2.1.tar.gz) = 1ff94325635d2a7ba26efe1967732f061e26ec41304ea9aaa88b9b212eb03611
-SIZE (cabal/shakespeare-js-1.1.2.1.tar.gz) = 7857
+SHA256 (cabal/shakespeare-js-1.1.4.tar.gz) = c3bba5e4ebb914eded23a060beb68f6e76d134aa2a42c8f654c6b118dec51616
+SIZE (cabal/shakespeare-js-1.1.4.tar.gz) = 7942
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
index e8d24934005f..04104fce56b1 100644
--- a/www/hs-shakespeare-text/Makefile
+++ b/www/hs-shakespeare-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= shakespeare-text
PORTVERSION= 1.0.0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index 5ec3ff4b0e8e..3990ca07dacf 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 1.0.3.1
+PORTVERSION= 1.0.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,8 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
-USE_CABAL= parsec>=2 text>=0.7
+USE_CABAL= parsec>=2 system-fileio>=0.3 system-filepath>=0.4 \
+ text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index e5d47737d5ff..24c392adb8ff 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-1.0.3.1.tar.gz) = dae1111a232d02e50b06e291a64060506ec4629b62c8427cdb2ded3453788123
-SIZE (cabal/shakespeare-1.0.3.1.tar.gz) = 9807
+SHA256 (cabal/shakespeare-1.0.5.tar.gz) = 6e931034316149ace4a5aa2d035188786ba0d5a5763b20b62b04f65bc6f381b5
+SIZE (cabal/shakespeare-1.0.5.tar.gz) = 10552
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 45c988de0523..ef36ae8ba69a 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -2,6 +2,7 @@
PORTNAME= snap-core
PORTVERSION= 0.9.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Snap: A Haskell Web Framework (core interfaces and types)
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \
case-insensitive>=0.3 enumerator>=0.4.15 HUnit>=1.2 \
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index d8deab311304..a3c218ddda24 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -2,6 +2,7 @@
PORTNAME= snap-server
PORTVERSION= 0.9.3.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Fast, iteratee-based, epoll-enabled web server for the Snap Framework
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
case-insensitive>=0.3 enumerator>=0.4.15 \
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 6d49a52f63e0..40351d1b74d2 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.11.2
+PORTVERSION= 0.12.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,14 +9,12 @@ COMMENT= Top-level package for the Snap Web Framework
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
comonad>=1.1 configurator>=0.1 directory-tree>=0.10 \
- dlist>=0.5 errors>=1.4 hashable>=1.2 heist>=0.11 \
- lens>=3.7.6 logict>=0.4.2 MonadCatchIO-transformers>=0.2 \
- mtl>2.0 mwc-random>=0.8 pwstore-fast>=2.3 regex-posix>=0.95 \
- snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 \
+ dlist>=0.5 errors>=1.4 hashable heist>=0.12 lens>=3.7.6 \
+ logict>=0.4.2 MonadCatchIO-transformers>=0.2 mtl>2.0 \
+ mwc-random>=0.8 pwstore-fast>=2.2 regex-posix>=0.95 \
+ snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 tagged \
text>=0.11 transformers>=0.2 unordered-containers>=0.1.4 \
vector>=0.7.1 vector-algorithms>=0.4 xmlhtml>=0.1
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index eaa865f23df4..541a2af02690 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.11.2.tar.gz) = 2a143fe96e59a6e79c24ad9790c0f955f80e1bdc60c6c04e90e0f5055b0936fd
-SIZE (cabal/snap-0.11.2.tar.gz) = 79858
+SHA256 (cabal/snap-0.12.0.tar.gz) = cec5990f0063be66453941cf91226051c00a8260708573c89f8e650ef7aa8c59
+SIZE (cabal/snap-0.12.0.tar.gz) = 82197
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index a37e9518b2c9..faf100e05a04 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,11 +3,11 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A library for working with URLs
+COMMENT= Library for working with URLs
LICENSE= BSD
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 950d4fb3a0e8..9d492d38bfe4 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wai-app-static
PORTVERSION= 1.3.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index a4eda6827d2d..0214cb9a0852 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 1.3.2.4
+PORTVERSION= 1.3.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +10,11 @@ COMMENT= Provides some basic WAI handlers and middleware
LICENSE= MIT
USE_CABAL= ansi-terminal blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- case-insensitive>=0.2 conduit>=0.5 data-default \
- date-cache>=0.3 fast-logger>=0.2 http-types>=0.7 \
+ base64-bytestring case-insensitive>=0.2 conduit>=0.5 \
+ data-default date-cache>=0.3 fast-logger>=0.2 http-types>=0.7 \
network>=2.2.1.5 resourcet>=0.3 stringsearch>=0.3 \
text>=0.7 transformers>=0.2.2 void>=0.5 wai>=1.3 \
- wai-logger>=0.2 zlib-conduit>=0.5
+ wai-logger>=0.2 word8 zlib-conduit>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index 911e2b246842..c2d91cbbce98 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-1.3.2.4.tar.gz) = 69b56b36ee5434af030f8bcc481bb8363ddb8461b5545919b404cc4560790d8a
-SIZE (cabal/wai-extra-1.3.2.4.tar.gz) = 31566
+SHA256 (cabal/wai-extra-1.3.4.tar.gz) = ddbde27aa5bde76dc9e8d548ea71ff5b4ae1963f1f35023322ecc78b0a16c8ab
+SIZE (cabal/wai-extra-1.3.4.tar.gz) = 32600
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 0f3958b2b71f..849b27d9e7f2 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -2,16 +2,14 @@
PORTNAME= wai-logger
PORTVERSION= 0.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A logging system for WAI
+COMMENT= Logging system for WAI
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder byteorder case-insensitive date-cache>=0.3 \
fast-logger>=0.3 http-types network wai
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
index f626c8d4dda7..c69f7e0119ba 100644
--- a/www/hs-wai-test/Makefile
+++ b/www/hs-wai-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wai-test
-PORTVERSION= 1.3.0.4
+PORTVERSION= 1.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,8 @@ LICENSE= MIT
USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
case-insensitive>=0.2 conduit>=0.5 cookie>=0.2 \
- http-types>=0.7 HUnit>=1.2 text>=0.7 transformers>=0.2.2 \
- wai>=1.3
+ http-types>=0.7 HUnit>=1.2 network text>=0.7 \
+ transformers>=0.2.2 wai>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-test/distinfo b/www/hs-wai-test/distinfo
index 980bfb259cec..7952dc2b8996 100644
--- a/www/hs-wai-test/distinfo
+++ b/www/hs-wai-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-test-1.3.0.4.tar.gz) = c07b23c9a67ead44da427f6d260572572d9cc32930313c3dc84823abb32325ea
-SIZE (cabal/wai-test-1.3.0.4.tar.gz) = 3165
+SHA256 (cabal/wai-test-1.3.1.tar.gz) = 6f2ac40a1cd06eaad47a48b12856d90aef78c4c980d2384a1ad91fb1f8a28937
+SIZE (cabal/wai-test-1.3.1.tar.gz) = 3800
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index c11b48449e8b..c3d2fff97047 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wai
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 8d82bfdd8ad8..767ad3ada3c2 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 1.3.7.4
+PORTVERSION= 1.3.8.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 47ed54308209..9e21d9f00012 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-1.3.7.4.tar.gz) = 3daf8e0a0ed8c9b3f53bb8e3631c5f1f7315913cf74342ecdc8b2ee9c21e047c
-SIZE (cabal/warp-1.3.7.4.tar.gz) = 17755
+SHA256 (cabal/warp-1.3.8.1.tar.gz) = 7dc4b9d3d3a8590c19a17523a2bdf1086116f333d443391385d8f424d1767f1e
+SIZE (cabal/warp-1.3.8.1.tar.gz) = 19185
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index cdf077f90129..f6f4142a3f76 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -2,16 +2,14 @@
PORTNAME= webkit
PORTVERSION= 0.12.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to the Webkit library
LICENSE= LGPL21
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= cairo>=0.12 glib>=0.12 gtk>=0.12 mtl pango>=0.12
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index f8f52335fe40..fb40dcfea06e 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xss-sanitize
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 4a3052d080bc..0cb83a657f15 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.1.5.3
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,14 +10,14 @@ COMMENT= Authentication for Yesod
LICENSE= MIT
USE_CABAL= aeson>=0.5 authenticate>=1.3 blaze-html>=0.5 \
- blaze-markup>=0.5.1 file-embed hamlet>=1.1 http-conduit>=1.5 \
- http-types lifted-base>=0.1 mime-mail>=0.3 network \
- persistent>=1.0 persistent-template>=1.0 pureMD5>=2.0 \
- pwstore-fast>=2.2 random>=1.0.0.2 SHA>=1.4.1.3 \
- shakespeare-css>=1.0 shakespeare-js>=1.0.2 text>=0.7 \
- transformers>=0.2.2 unordered-containers wai>=1.3 \
- yesod-core>=1.1 yesod-form>=1.1 yesod-json>=1.1 \
- yesod-persistent>=1.1
+ blaze-markup>=0.5.1 data-default email-validate>=1.0 \
+ file-embed hamlet>=1.1 http-conduit>=1.5 http-types \
+ lifted-base>=0.1 mime-mail>=0.3 network persistent>=1.2 \
+ persistent-template>=1.2 pureMD5>=2.0 pwstore-fast>=2.2 \
+ random>=1.0.0.2 SHA>=1.4.1.3 shakespeare-css>=1.0 \
+ shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
+ unordered-containers wai>=1.4 yesod-core>=1.2 yesod-form>=1.3 \
+ yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index 8d428aaf0669..c07f593a5174 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.1.5.3.tar.gz) = 02fdd42abcb77a18f84f01855281a3f7cd04ab891945de051a1cd9793ff9591f
-SIZE (cabal/yesod-auth-1.1.5.3.tar.gz) = 23041
+SHA256 (cabal/yesod-auth-1.2.0.tar.gz) = 0740b3fc8825ca9d97ae3589cb86ff9d81e87c1703f8d2341fd45b9ed728b7aa
+SIZE (cabal/yesod-auth-1.2.0.tar.gz) = 26852
diff --git a/www/hs-yesod-auth/pkg-descr b/www/hs-yesod-auth/pkg-descr
index 84cc25320cd6..b3ba19883de8 100644
--- a/www/hs-yesod-auth/pkg-descr
+++ b/www/hs-yesod-auth/pkg-descr
@@ -1,3 +1,7 @@
-Authentication for Yesod.
+This package provides a pluggable mechanism for allowing users to
+authenticate with your site. It comes with a number of common plugins,
+such as OpenID, BrowserID (a.k.a., Mozilla Persona), and email. Other
+packages are available from Hackage as well. If you've written such an
+add-on, please notify me so that it can be added to this description.
WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 4d49b8c18043..5b8ab0c44672 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.1.8.2
+PORTVERSION= 1.2.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,16 +9,17 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= aeson>=0.5 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
- blaze-markup>=0.5.1 case-insensitive>=0.2 cereal>=0.3 \
- clientsession>=0.8 conduit>=0.5 cookie>=0.4 failure>=0.2 \
- fast-logger>=0.2 hamlet>=1.1 http-types>=0.7 lifted-base>=0.1 \
- monad-control>=0.3 monad-logger>=0.2.1 parsec>=2 \
- path-pieces>=0.1.2 random>=1.0.0.2 resourcet>=0.3 \
- shakespeare>=1.0 shakespeare-css>=1.0 shakespeare-i18n>=1.0 \
- shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
- transformers-base>=0.4 vector>=0.9 wai>=1.3 wai-extra>=1.3 \
- yesod-routes>=1.1
+USE_CABAL= aeson>=0.5 attoparsec-conduit blaze-builder>=0.2.1.4 \
+ blaze-html>=0.5 blaze-markup>=0.5.1 case-insensitive>=0.2 \
+ cereal>=0.3 clientsession>=0.9 conduit>=0.5 cookie>=0.4 \
+ data-default failure>=0.2 fast-logger>=0.2 hamlet>=1.1 \
+ http-types>=0.7 lifted-base>=0.1 monad-control>=0.3 \
+ monad-logger>=0.3.1 parsec>=2 path-pieces>=0.1.2 \
+ random>=1.0.0.2 resourcet>=0.4.6 safe shakespeare>=1.0 \
+ shakespeare-css>=1.0 shakespeare-i18n>=1.0 shakespeare-js>=1.0.2 \
+ text>=0.7 transformers>=0.2.2 transformers-base>=0.4 \
+ vector>=0.9 wai>=1.4 wai-extra>=1.3 warp>=1.3.8 \
+ yesod-routes>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index 9523f4b96b91..551574a78b89 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.1.8.2.tar.gz) = 5fa74a4fa1bc66688509631ef7324e87f4e0d48cd6db3df22fabd11d64dc392f
-SIZE (cabal/yesod-core-1.1.8.2.tar.gz) = 44289
+SHA256 (cabal/yesod-core-1.2.0.4.tar.gz) = b45c7a827472ea30b48e42687f6287df3cc8d43882fed6a35cc796224d455d25
+SIZE (cabal/yesod-core-1.2.0.4.tar.gz) = 54637
diff --git a/www/hs-yesod-default/Makefile b/www/hs-yesod-default/Makefile
deleted file mode 100644
index 2f78d67ed1a8..000000000000
--- a/www/hs-yesod-default/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= yesod-default
-PORTVERSION= 1.1.3.2
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Default config and main functions for your yesod application
-
-LICENSE= MIT
-
-USE_CABAL= data-default hamlet>=1.1 network-conduit>=0.5 safe \
- shakespeare-css>=1.0 shakespeare-js>=1.0 text>=0.9 \
- transformers>=0.2.2 unordered-containers wai>=1.3 \
- wai-extra>=1.3 warp>=1.3 yaml>=0.8 yesod-core>=1.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-yesod-default/distinfo b/www/hs-yesod-default/distinfo
deleted file mode 100644
index 09ac7191121b..000000000000
--- a/www/hs-yesod-default/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/yesod-default-1.1.3.2.tar.gz) = 0fb35bf68a029a00492998417bb8330a6f8e7470edacea6ae3610846a44ef51d
-SIZE (cabal/yesod-default-1.1.3.2.tar.gz) = 7082
diff --git a/www/hs-yesod-default/pkg-descr b/www/hs-yesod-default/pkg-descr
deleted file mode 100644
index 5d7241f4fbd6..000000000000
--- a/www/hs-yesod-default/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Convenient wrappers for your the configuration and execution of your yesod
-application.
-
-WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index a8b32056e242..6a941536e4c2 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.2.1.3
+PORTVERSION= 1.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,12 +9,12 @@ COMMENT= Form handling support for Yesod Web Framework
LICENSE= MIT
-USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
+USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 crypto-api>=0.8 data-default \
- email-validate>=0.2.6 hamlet>=1.1 network>=2.2 \
- persistent>=1.0 shakespeare-css>=1.0 shakespeare-js>=1.0.2 \
+ email-validate>=1.0 hamlet>=1.1 network>=2.2 persistent>=1.2 \
+ resourcet shakespeare-css>=1.0 shakespeare-js>=1.0.2 \
text>=0.9 transformers>=0.2.2 wai>=1.3 xss-sanitize>=0.3.0.1 \
- yesod-core>=1.1 yesod-persistent>=1.1
+ yesod-core>=1.2 yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index a85a2c4a0889..7a77230b936b 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.2.1.3.tar.gz) = f87aec0ccbbedde53466b2e2a8b286a1211663e7a4419af60673c2ecaec938d7
-SIZE (cabal/yesod-form-1.2.1.3.tar.gz) = 19573
+SHA256 (cabal/yesod-form-1.3.0.tar.gz) = cc9a11a07d182656dd59fd4b63a10587b577c238e2a8cd2a891e0c1e0c4ce2f8
+SIZE (cabal/yesod-form-1.3.0.tar.gz) = 18892
diff --git a/www/hs-yesod-json/Makefile b/www/hs-yesod-json/Makefile
deleted file mode 100644
index 05c67bcd96b0..000000000000
--- a/www/hs-yesod-json/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= yesod-json
-PORTVERSION= 1.1.2.1
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Generate content for Yesod using the aeson package
-
-LICENSE= MIT
-
-USE_CABAL= aeson>=0.5 attoparsec-conduit>=0.5 blaze-builder \
- conduit>=0.5 safe>=0.2 shakespeare-js>=1.0 text>=0.8 \
- transformers>=0.2.2 vector>=0.9 wai>=1.3 wai-extra>=1.3 \
- yesod-core>=1.1 yesod-routes>=1.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-yesod-json/distinfo b/www/hs-yesod-json/distinfo
deleted file mode 100644
index 5f6f131aab3f..000000000000
--- a/www/hs-yesod-json/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/yesod-json-1.1.2.1.tar.gz) = 0db7f3981fd4365af8b1fe7d1cb7ed7e278057f418a6a41bc7ec6023f6b0306f
-SIZE (cabal/yesod-json-1.1.2.1.tar.gz) = 3150
diff --git a/www/hs-yesod-json/pkg-descr b/www/hs-yesod-json/pkg-descr
deleted file mode 100644
index 3c3f7ba0c2bc..000000000000
--- a/www/hs-yesod-json/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Generate content for Yesod using the aeson package.
-
-WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index 6a4610181c23..2a667fca2989 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Some helpers for using Persistent from Yesod
LICENSE= MIT
-USE_CABAL= persistent>=1.0 persistent-template>=1.0 transformers>=0.2.2 \
- yesod-core>=1.1
+USE_CABAL= blaze-builder conduit lifted-base persistent>=1.2 \
+ persistent-template>=1.2 pool-conduit resourcet \
+ transformers>=0.2.2 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 8f37ac5e578d..012fce1e320d 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-persistent-1.1.0.1.tar.gz) = 374c51b8ba61480053bbbed9f64118139fdcfd286cee252121c64535cf0aed4d
-SIZE (cabal/yesod-persistent-1.1.0.1.tar.gz) = 1899
+SHA256 (cabal/yesod-persistent-1.2.0.tar.gz) = 1334f48f1386003699a08f4e24505c633e89519874c351750958745b85d1ffbf
+SIZE (cabal/yesod-persistent-1.2.0.tar.gz) = 3926
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index cd4bce5d236f..27b5d7bdfb12 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-platform
-PORTVERSION= 1.1.8
+PORTVERSION= 1.2.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,137 +9,130 @@ COMMENT= Meta package for Yesod
LICENSE= MIT
-USE_CABAL= aeson==0.6.1.0_1 \
- ansi-terminal==0.6 \
- asn1-data==0.7.1_1 \
- attoparsec==0.10.4.0 \
- attoparsec-conduit==1.0.0 \
- authenticate==1.3.2.6 \
- base-unicode-symbols==0.2.2.4_1 \
- base64-bytestring==1.0.0.1 \
- base64-conduit==1.0.0 \
- basic-prelude==0.3.4.0 \
- blaze-builder==0.3.1.0_4 \
- blaze-builder-conduit==1.0.0 \
- blaze-html==0.6.0.0 \
- blaze-markup==0.5.1.4 \
- byteorder==1.0.3_4 \
- case-insensitive==1.0 \
- cereal==0.3.5.2_2 \
- certificate==1.3.5_1 \
- cipher-aes==0.1.7 \
- cipher-rc4==0.1.2 \
- classy-prelude==0.5.3 \
- clientsession==0.8.1_1 \
- conduit==1.0.2 \
- cookie==0.4.0.1_1 \
- cprng-aes==0.3.4_1 \
- crypto-api==0.11 \
- crypto-conduit==0.5.0 \
- crypto-numbers==0.1.3 \
- crypto-pubkey==0.1.2_1 \
- crypto-pubkey-types==0.2.0_1 \
- crypto-random-api==0.2.0 \
- cryptohash==0.8.3_1 \
- css-text==0.1.1_5 \
- data-default==0.5.0_1 \
- date-cache==0.3.0_1 \
- dlist==0.5_8 \
- email-validate==1.0.0 \
- entropy==0.2.1_4 \
- failure==0.2.0.1_3 \
- fast-logger==0.3.1_2 \
- file-embed==0.0.4.7 \
- filesystem-conduit==1.0.0 \
- fsnotify==0.0.6 \
- ghc-paths==0.1.0.9 \
- hamlet==1.1.6.3 \
- hashable==1.2.0.5 \
- hjsmin==0.1.4.1 \
- hspec==1.4.4 \
- hspec-expectations==0.3.0.3_1 \
- html-conduit==1.1.0 \
- http-conduit==1.9.0 \
- http-date==0.0.4_1 \
- http-reverse-proxy==0.1.1.3 \
- http-types==0.8.0 \
- language-javascript==0.5.7_1 \
- lifted-base==0.2.0.2 \
- mime-mail==0.4.1.2_2 \
- mime-types==0.1.0.3 \
- monad-control==0.3.1.4_1 \
- monad-logger==0.3.0.1 \
- network-conduit==1.0.0 \
- optparse-applicative==0.5.2.1 \
- path-pieces==0.1.2_1 \
- pem==0.1.2_1 \
- persistent==1.1.5.1 \
- persistent-template==1.1.2.4 \
- pool-conduit==0.1.1_1 \
- primitive==0.5.0.1_1 \
- project-template==0.1.3 \
- publicsuffixlist==0.0.3 \
- pureMD5==2.1.2.1_2 \
- pwstore-fast==2.3_2 \
- ReadArgs==1.2.1_1 \
- resource-pool==0.2.1.1_1 \
- resourcet==0.4.5 \
- safe==0.3.3_4 \
- semigroups==0.9 \
- setenv==0.1.0_1 \
- SHA==1.6.1_1 \
- shakespeare==1.0.3.1 \
- shakespeare-css==1.0.3 \
- shakespeare-i18n==1.0.0.2_4 \
- shakespeare-js==1.1.2.1 \
- shakespeare-text==1.0.0.5_2 \
- silently==1.2.4.1 \
- simple-sendfile==0.2.11 \
- skein==0.1.0.12 \
- socks==0.5.0 \
- split==0.2.1.1_1 \
- stringsearch==0.3.6.4_1 \
- system-fileio==0.3.11 \
- system-filepath==0.4.7_1 \
- tagged==0.4.4_1 \
- tagsoup==0.12.8_1 \
- tagstream-conduit==0.5.4 \
- tar==0.4.0.1_1 \
- tls==1.1.2 \
- tls-extra==0.6.1_1 \
- transformers-base==0.4.1_4 \
- unix-compat==0.4.1.0 \
- unordered-containers==0.2.3.0 \
- utf8-light==0.4.0.1_3 \
- utf8-string==0.3.7_4 \
- vault==0.2.0.4 \
- vector==0.10.0.1_1 \
- void==0.5.11 \
- wai==1.4.0 \
- wai-app-static==1.3.1.2 \
- wai-extra==1.3.2.4 \
- wai-logger==0.3.0_2 \
- wai-test==1.3.0.4 \
- warp==1.3.7.4 \
- word8==0.0.3 \
- xml-conduit==1.1.0.3 \
- xml-types==0.3.3_1 \
- xss-sanitize==0.3.3_1 \
- yaml==0.8.2.3 \
- yesod==1.1.9.2 \
- yesod-auth==1.1.5.3 \
- yesod-core==1.1.8.2 \
- yesod-default==1.1.3.2 \
- yesod-form==1.2.1.3 \
- yesod-json==1.1.2.1 \
- yesod-persistent==1.1.0.1_1 \
- yesod-routes==1.1.2 \
- yesod-static==1.1.2.2 \
- yesod-test==0.3.5 \
- zlib-bindings==0.1.1.3 \
- zlib-conduit==1.0.0
-
-IGNORE_DYNAMIC= yes
+USE_CABAL= aeson==0.6.1.0_2 \
+ ansi-terminal==0.6_1 \
+ asn1-data==0.7.1_2 \
+ asn1-types==0.1.3 \
+ attoparsec==0.10.4.0_1 \
+ attoparsec-conduit==1.0.1 \
+ authenticate==1.3.2.6_1 \
+ base-unicode-symbols==0.2.2.4_2 \
+ base64-bytestring==1.0.0.1_1 \
+ blaze-builder==0.3.1.1 \
+ blaze-builder-conduit==1.0.0_1 \
+ blaze-html==0.6.1.1 \
+ blaze-markup==0.5.1.5 \
+ byteorder==1.0.4 \
+ case-insensitive==1.0.0.2 \
+ cereal==0.3.5.2_3 \
+ certificate==1.3.7 \
+ cipher-aes==0.1.8 \
+ cipher-rc4==0.1.2_1 \
+ clientsession==0.9 \
+ conduit==1.0.5 \
+ cookie==0.4.0.1_2 \
+ cprng-aes==0.3.4_2 \
+ crypto-api==0.12.1 \
+ crypto-conduit==0.5.2 \
+ crypto-numbers==0.1.3_1 \
+ crypto-pubkey==0.1.3 \
+ crypto-pubkey-types==0.3.2 \
+ crypto-random-api==0.2.0_1 \
+ cryptohash==0.9.0 \
+ css-text==0.1.1_6 \
+ data-default==0.5.3 \
+ data-default-class==0.0.1 \
+ data-default-instances-base==0.0.1 \
+ data-default-instances-containers==0.0.1 \
+ data-default-instances-dlist==0.0.1 \
+ data-default-instances-old-locale==0.0.1 \
+ date-cache==0.3.0_2 \
+ dlist==0.5_9 \
+ email-validate==1.0.0_1 \
+ entropy==0.2.1_5 \
+ failure==0.2.0.1_4 \
+ fast-logger==0.3.1_3 \
+ file-embed==0.0.4.7_1 \
+ filesystem-conduit==1.0.0_1 \
+ hamlet==1.1.7.1 \
+ hashable==1.1.2.5,1 \
+ hjsmin==0.1.4.1_1 \
+ hspec==1.5.4 \
+ hspec-expectations==0.3.2 \
+ html-conduit==1.1.0_1 \
+ http-conduit==1.9.3 \
+ http-date==0.0.4_2 \
+ http-types==0.8.0_1 \
+ language-javascript==0.5.7_2 \
+ lifted-base==0.2.0.5 \
+ mime-mail==0.4.1.2_3 \
+ mime-types==0.1.0.3_1 \
+ mmorph==1.0.0 \
+ monad-control==0.3.2.1 \
+ monad-logger==0.3.1.1 \
+ network-conduit==1.0.0_1 \
+ path-pieces==0.1.2_2 \
+ pem==0.1.2_2 \
+ persistent==1.2.0.1 \
+ persistent-template==1.2.0 \
+ pool-conduit==0.1.2 \
+ primitive==0.5.0.1_2 \
+ publicsuffixlist==0.1 \
+ pureMD5==2.1.2.1_3 \
+ pwstore-fast==2.3_3 \
+ quickcheck-io==0.1.0 \
+ resource-pool==0.2.1.1_2 \
+ resourcet==0.4.7.1 \
+ safe==0.3.3_5 \
+ semigroups==0.9.1 \
+ setenv==0.1.0_2 \
+ SHA==1.6.1_2 \
+ shakespeare==1.0.5 \
+ shakespeare-css==1.0.5.1 \
+ shakespeare-i18n==1.0.0.2_5 \
+ shakespeare-js==1.1.4 \
+ shakespeare-text==1.0.0.5_3 \
+ silently==1.2.4.1_1 \
+ simple-sendfile==0.2.11_1 \
+ skein==1.0.3 \
+ socks==0.5.1 \
+ stringsearch==0.3.6.4_2 \
+ system-fileio==0.3.11_1 \
+ system-filepath==0.4.7_2 \
+ tagged==0.6 \
+ tagsoup==0.12.8_2 \
+ tagstream-conduit==0.5.4_1 \
+ tls==1.1.2_1 \
+ tls-extra==0.6.1_2 \
+ transformers-base==0.4.1_5 \
+ unix-compat==0.4.1.1 \
+ unordered-containers==0.2.3.1 \
+ utf8-light==0.4.0.1_4 \
+ utf8-string==0.3.7_5 \
+ vault==0.2.0.4_1 \
+ vector==0.10.0.1_2 \
+ void==0.6 \
+ wai==1.4.0_1 \
+ wai-app-static==1.3.1.2_1 \
+ wai-extra==1.3.4 \
+ wai-logger==0.3.0_3 \
+ wai-test==1.3.1 \
+ warp==1.3.8.1 \
+ word8==0.0.3_1 \
+ xml-conduit==1.1.0.3_1 \
+ xml-types==0.3.3_2 \
+ xss-sanitize==0.3.3_2 \
+ yaml==0.8.2.4 \
+ yesod==1.2.0.1 \
+ yesod-auth==1.2.0 \
+ yesod-core==1.2.0.4 \
+ yesod-form==1.3.0 \
+ yesod-persistent==1.2.0 \
+ yesod-routes==1.2.0 \
+ yesod-static==1.2.0 \
+ yesod-test==1.2.0 \
+ zlib-bindings==0.1.1.3_1 \
+ zlib-conduit==1.0.0_1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
index 66486c86b4b1..da99efc3d3c3 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.1.8.tar.gz) = 50a863685942745b530c77957ac75d0d5cd4af211a0e183eee58e74ed1941108
-SIZE (cabal/yesod-platform-1.1.8.tar.gz) = 2670
+SHA256 (cabal/yesod-platform-1.2.0.1.tar.gz) = 253ce16ed96383f11959f3b345a211999c93fc86ff5b777cede88756fa44ce41
+SIZE (cabal/yesod-platform-1.2.0.1.tar.gz) = 2583
diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
index 2daf8095e1b9..33a0aebc30b5 100644
--- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal
+++ b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
@@ -1,11 +1,11 @@
---- ./yesod-platform.cabal.orig 2013-03-04 09:57:32.000000000 +0100
-+++ ./yesod-platform.cabal 2013-03-07 22:27:51.000000000 +0100
-@@ -102,7 +102,7 @@
- , simple-sendfile == 0.2.11
- , skein == 0.1.0.12
- , socks == 0.5.0
-- , split == 0.2.1.2
-+ , split == 0.2.1.1
- , stringsearch == 0.3.6.4
- , system-fileio == 0.3.11
- , system-filepath == 0.4.7
+--- ./yesod-platform.cabal.orig 2013-04-25 08:09:38.000000000 +0200
++++ ./yesod-platform.cabal 2013-05-03 19:11:59.000000000 +0200
+@@ -67,7 +67,7 @@
+ , fsnotify == 0.0.11
+ , ghc-paths == 0.1.0.9
+ , hamlet == 1.1.7.1
+- , hashable == 1.2.0.7
++ , hashable == 1.1.2.5
+ , hjsmin == 0.1.4.1
+ , hspec == 1.5.3
+ , hspec-expectations == 0.3.2
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
index d0c47af2d7ac..9c1d8035451a 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-routes
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo
index 855e875f15ce..54b19c75d08a 100644
--- a/www/hs-yesod-routes/distinfo
+++ b/www/hs-yesod-routes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-routes-1.1.2.tar.gz) = 5b96189ab0e4ae07fd3904a9b8a7d53b5ecec0bc5c94627d4725e930cf17db9f
-SIZE (cabal/yesod-routes-1.1.2.tar.gz) = 17709
+SHA256 (cabal/yesod-routes-1.2.0.tar.gz) = 62c5aa9a212a467c5918e250247c2801efa1b56cfcaaf1f1e108d02ccd06ffb4
+SIZE (cabal/yesod-routes-1.2.0.tar.gz) = 20175
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 7043a8602b95..091179f9f1f5 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.1.2.2
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +10,11 @@ COMMENT= Static file serving subsite for Yesod Web Framework
LICENSE= MIT
USE_CABAL= base64-bytestring>=0.1.0.1 cereal>=0.3 conduit>=0.5 \
- crypto-conduit>=0.4 cryptohash>=0.6.1 file-embed>=0.0.4.1 \
- http-types>=0.7 system-filepath>=0.4.6 text>=0.9 \
+ crypto-conduit>=0.4 cryptohash>=0.6.1 data-default \
+ file-embed>=0.0.4.1 http-types>=0.7 shakespeare-css>=1.0.3 \
+ system-fileio>=0.3 system-filepath>=0.4.6 text>=0.9 \
transformers>=0.2.2 unix-compat>=0.2 wai>=1.3 \
- wai-app-static>=1.3 yesod-core>=1.1
+ wai-app-static>=1.3 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index f3f7af392133..980979c2e51b 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.1.2.2.tar.gz) = e198f1909fc47d872dc4b04303f2dec11cc48f3bda2fca35bf94ad9ef2752afc
-SIZE (cabal/yesod-static-1.1.2.2.tar.gz) = 6304
+SHA256 (cabal/yesod-static-1.2.0.tar.gz) = 5f72dfc5c72de6eac00b4e7f82aac185eeba2aa5bbed0872a9507f8c26bcd3a1
+SIZE (cabal/yesod-static-1.2.0.tar.gz) = 8505
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index f739f22c482b..2267254655ac 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 0.3.5
+PORTVERSION= 1.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +14,7 @@ USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 monad-control \
network>=2.2 persistent>=1.0 pool-conduit text \
transformers>=0.2.2 wai>=1.3 wai-test>=1.3 xml-conduit>=1.0 \
- xml-types>=0.3
+ xml-types>=0.3 yesod-core>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index 754d62a5d41a..b0921e9d0b98 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-0.3.5.tar.gz) = 721c615066f4119591b580ce018c29800149231d1d19458f21b392da02e5b024
-SIZE (cabal/yesod-test-0.3.5.tar.gz) = 11113
+SHA256 (cabal/yesod-test-1.2.0.tar.gz) = 7894450772e93995bb156ffaba53024669d6f644dad0603d8b024b612e7490a0
+SIZE (cabal/yesod-test-1.2.0.tar.gz) = 11914
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index 675e0f18d841..623ef0e10cfa 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.1.9.2
+PORTVERSION= 1.2.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,23 +9,12 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= attoparsec>=0.10 base64-bytestring blaze-builder>=0.2.1.4 \
- blaze-html>=0.5 blaze-markup>=0.5.1 conduit>=0.5.1 file-embed \
- fsnotify>=0.0 ghc-paths>=0.1 hamlet>=1.1 http-conduit \
- http-reverse-proxy>=0.1.0.4 http-types>=0.7 lifted-base \
- monad-control>=0.3 network network-conduit \
- optparse-applicative>=0.4 parsec>=2.1 project-template>=0.1.1 \
- resourcet>=0.3 shakespeare>=1.0.2 shakespeare-css>=1.0.2 \
- shakespeare-js>=1.0.2 shakespeare-text>=1.0 split>=0.2 \
- system-fileio>=0.3 system-filepath>=0.4 tar>=0.4 text>=0.11 \
- transformers>=0.2.2 unix-compat>=0.2 unordered-containers \
- wai>=1.3 wai-extra>=1.3 warp>=1.3 yaml>=0.8 yesod-auth>=1.1 \
- yesod-core>=1.1.5 yesod-default>=1.1.3 yesod-form>=1.1 \
- yesod-json>=1.1 yesod-persistent>=1.1 zlib>=0.5
-
-EXECUTABLE= yesod yesod-ar-wrapper yesod-ghc-wrapper yesod-ld-wrapper
-
-IGNORE_DYNAMIC= yes
+USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 data-default \
+ hamlet>=1.1 monad-control>=0.3 network-conduit safe \
+ shakespeare-css>=1.0 shakespeare-js>=1.0.2 text \
+ transformers>=0.2.2 unordered-containers wai>=1.3 \
+ wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 yesod-core>=1.2 \
+ yesod-form>=1.3 yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index 79dbba1e995a..e02b4ba9d926 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.1.9.2.tar.gz) = b2c1432de8e0e9d5c39300189088a159fcf28565c527aa7ee3382d41d0ac69e7
-SIZE (cabal/yesod-1.1.9.2.tar.gz) = 338371
+SHA256 (cabal/yesod-1.2.0.1.tar.gz) = a32a88bd9cd2fcda76965c66457241acc25a652e8eb9b58d144afa5929e013f2
+SIZE (cabal/yesod-1.2.0.1.tar.gz) = 7652