aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2018-05-25 21:44:12 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2018-05-25 21:44:12 +0000
commitfff1aa535b4a18a05d872de7c9afb3dbf9f6013b (patch)
tree86e71c0056b8414191c8b421101694a177fec03e /www
parentb782168218ce43588149523e6d12003aa68ad324 (diff)
downloadports-fff1aa535b4a18a05d872de7c9afb3dbf9f6013b.tar.gz
ports-fff1aa535b4a18a05d872de7c9afb3dbf9f6013b.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/hs-DAV/Makefile3
-rw-r--r--www/hs-DAV/distinfo6
-rw-r--r--www/hs-HTTP/Makefile6
-rw-r--r--www/hs-HTTP/distinfo6
-rw-r--r--www/hs-activehs/Makefile4
-rw-r--r--www/hs-authenticate/Makefile5
-rw-r--r--www/hs-authenticate/distinfo6
-rw-r--r--www/hs-cgi/Makefile4
-rw-r--r--www/hs-cgi/files/patch-cgi.cabal16
-rw-r--r--www/hs-cookie/Makefile5
-rw-r--r--www/hs-cookie/distinfo6
-rw-r--r--www/hs-css-text/Makefile5
-rw-r--r--www/hs-css-text/distinfo6
-rw-r--r--www/hs-fastcgi/Makefile2
-rw-r--r--www/hs-gitit/Makefile8
-rw-r--r--www/hs-hS3/Makefile2
-rw-r--r--www/hs-happstack-server/Makefile9
-rw-r--r--www/hs-happstack-server/distinfo6
-rw-r--r--www/hs-happstack/Makefile2
-rw-r--r--www/hs-heist/Makefile5
-rw-r--r--www/hs-heist/distinfo6
-rw-r--r--www/hs-heist/files/patch-heist.cabal29
-rw-r--r--www/hs-hjsmin/Makefile4
-rw-r--r--www/hs-http-api-data/Makefile7
-rw-r--r--www/hs-http-api-data/distinfo6
-rw-r--r--www/hs-http-client-tls/Makefile2
-rw-r--r--www/hs-http-client/Makefile7
-rw-r--r--www/hs-http-client/distinfo6
-rw-r--r--www/hs-http-conduit/Makefile3
-rw-r--r--www/hs-http-conduit/distinfo6
-rw-r--r--www/hs-http-date/Makefile2
-rw-r--r--www/hs-http-reverse-proxy/Makefile5
-rw-r--r--www/hs-http-reverse-proxy/distinfo6
-rw-r--r--www/hs-http-server/Makefile4
-rw-r--r--www/hs-http-types/Makefile5
-rw-r--r--www/hs-http-types/distinfo6
-rw-r--r--www/hs-http2/Makefile4
-rw-r--r--www/hs-multipart/Makefile4
-rw-r--r--www/hs-oeis/Makefile2
-rw-r--r--www/hs-path-pieces/Makefile4
-rw-r--r--www/hs-recaptcha/Makefile2
-rw-r--r--www/hs-shakespeare/Makefile5
-rw-r--r--www/hs-shakespeare/distinfo6
-rw-r--r--www/hs-snap-core/Makefile5
-rw-r--r--www/hs-snap-core/distinfo6
-rw-r--r--www/hs-snap-server/Makefile5
-rw-r--r--www/hs-snap-server/distinfo6
-rw-r--r--www/hs-snap/Makefile6
-rw-r--r--www/hs-url/Makefile2
-rw-r--r--www/hs-wai-app-static/Makefile5
-rw-r--r--www/hs-wai-app-static/distinfo6
-rw-r--r--www/hs-wai-extra/Makefile5
-rw-r--r--www/hs-wai-extra/distinfo6
-rw-r--r--www/hs-wai-logger/Makefile3
-rw-r--r--www/hs-wai-logger/distinfo6
-rw-r--r--www/hs-wai/Makefile5
-rw-r--r--www/hs-wai/distinfo6
-rw-r--r--www/hs-wai/files/patch-wai.cabal10
-rw-r--r--www/hs-warp-tls/Makefile2
-rw-r--r--www/hs-warp/Makefile9
-rw-r--r--www/hs-warp/distinfo6
-rw-r--r--www/hs-warp/files/patch-warp.cabal18
-rw-r--r--www/hs-webkit/Makefile4
-rw-r--r--www/hs-xss-sanitize/Makefile4
-rw-r--r--www/hs-yesod-auth-hashdb/Makefile5
-rw-r--r--www/hs-yesod-auth-hashdb/distinfo6
-rw-r--r--www/hs-yesod-auth/Makefile5
-rw-r--r--www/hs-yesod-auth/distinfo6
-rw-r--r--www/hs-yesod-bin/Makefile8
-rw-r--r--www/hs-yesod-core/Makefile7
-rw-r--r--www/hs-yesod-core/distinfo6
-rw-r--r--www/hs-yesod-form/Makefile5
-rw-r--r--www/hs-yesod-form/distinfo6
-rw-r--r--www/hs-yesod-persistent/Makefile3
-rw-r--r--www/hs-yesod-persistent/distinfo6
-rw-r--r--www/hs-yesod-persistent/files/patch-yesod-persistent.cabal13
-rw-r--r--www/hs-yesod-static/Makefile13
-rw-r--r--www/hs-yesod-static/distinfo6
-rw-r--r--www/hs-yesod-test/Makefile5
-rw-r--r--www/hs-yesod-test/distinfo6
-rw-r--r--www/hs-yesod/Makefile5
-rw-r--r--www/hs-yesod/distinfo6
82 files changed, 203 insertions, 282 deletions
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
index a9c599ba2c4a..16a8b62a2293 100644
--- a/www/hs-DAV/Makefile
+++ b/www/hs-DAV/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= DAV
-PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTVERSION= 1.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo
index 1602983f2b91..b7079ff0d6b7 100644
--- a/www/hs-DAV/distinfo
+++ b/www/hs-DAV/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625369
-SHA256 (cabal/DAV-1.3.1.tar.gz) = 5c80faa58f8bbfb4bbdf7f3db6f23a3a4d26a199831ceb27dd5f69fef21bc009
-SIZE (cabal/DAV-1.3.1.tar.gz) = 20003
+TIMESTAMP = 1524938205
+SHA256 (cabal/DAV-1.3.2.tar.gz) = 613314357579b29e1d3fa8451b51e8b9a1307a2b33b65a3f2b2ef2bece025169
+SIZE (cabal/DAV-1.3.2.tar.gz) = 19992
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index 5e82756ef2cd..3a0e98979b10 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.3.7
-PORTREVISION= 1
+PORTVERSION= 4000.3.11
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,7 @@ COMMENT= Library for client-side HTTP
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 \
- parsec>=2.0
+USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0
FLAGS_ENABLE= network-uri
FLAGS_DISABLE= mtl1 warn-as-error network23 conduit10 warp-tests
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index 0036ef459eee..3c79a7260ff7 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538127
-SHA256 (cabal/HTTP-4000.3.7.tar.gz) = d5c0cceb84e84434e851e97b3c2fce4b3e600d0410e7ac4427df44c541adeae8
-SIZE (cabal/HTTP-4000.3.7.tar.gz) = 71709
+TIMESTAMP = 1523302416
+SHA256 (cabal/HTTP-4000.3.11.tar.gz) = fad22b39d8027107158407a3af73907dbb66e403d9aa7b9fd778db171c65b645
+SIZE (cabal/HTTP-4000.3.11.tar.gz) = 71747
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 01d054058024..c3ff4d77d56c 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= activehs
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +14,7 @@ USE_CABAL= activehs-base blaze-html blaze-markup cmdargs data-pprint \
dia-base dia-functions exceptions haskell-src-exts \
highlighting-kate hint hoogle mtl pandoc pureMD5 \
QuickCheck simple-reflect snap-core snap-server split syb \
- text utf8-string
+ utf8-string
STANDALONE= yes
EXECUTABLE= activehs
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 7a41fd196fac..93d5021d6754 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= authenticate
-PORTVERSION= 1.3.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \
conduit>=0.5 http-conduit>=1.5 http-types>=0.6 monad-control \
network>=2.6 network-uri>=2.6 resourcet \
- tagstream-conduit>=0.5.5 text unordered-containers \
+ tagstream-conduit>=0.5.5 unordered-containers \
xml-conduit>=1.0
FLAGS_ENABLE= network-uri
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index 6b17aafaf3bc..8f46fb0234c5 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625370
-SHA256 (cabal/authenticate-1.3.3.2.tar.gz) = a65ff7791e646ea847fc6b8369addeecf6d2c3055a0b7ebe1421881103656e30
-SIZE (cabal/authenticate-1.3.3.2.tar.gz) = 8785
+TIMESTAMP = 1525184608
+SHA256 (cabal/authenticate-1.3.4.tar.gz) = 3fd566dbfdf75d81ad1bebd19facb9f01509ead6e27d9aed802404ecde932fb8
+SIZE (cabal/authenticate-1.3.4.tar.gz) = 8814
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 055678dd23d6..9ff290481f9c 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cgi
PORTVERSION= 3001.3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www haskell
@@ -13,7 +13,7 @@ COMMENT= Library for writing CGI programs
LICENSE= BSD3CLAUSE
USE_CABAL= exceptions mtl>=2.2.1 multipart>=0.1.2 network>=2.6 \
- network-uri>=2.6 old-locale old-time parsec>=2.0
+ network-uri>=2.6 old-locale old-time
FLAGS_ENABLE= network-uri
FLAGS_DISABLE= old-mtl
diff --git a/www/hs-cgi/files/patch-cgi.cabal b/www/hs-cgi/files/patch-cgi.cabal
new file mode 100644
index 000000000000..77c886321dbf
--- /dev/null
+++ b/www/hs-cgi/files/patch-cgi.cabal
@@ -0,0 +1,16 @@
+--- cgi.cabal.orig 2018-04-22 18:05:14 UTC
++++ cgi.cabal
+@@ -44,11 +44,11 @@ Library
+
+ Build-depends:
+ parsec >= 2.0 && < 3.2,
+- exceptions < 0.9,
++ exceptions < 0.11,
+ xhtml >= 3000.0.0 && < 3000.3,
+ bytestring < 0.11,
+ base >= 4.5 && < 5,
+- time >= 1.5 && < 1.7,
++ time >= 1.5 && < 1.9,
+ containers < 0.6,
+ multipart >= 0.1.2 && < 0.2
+ If flag(network-uri)
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index b514ebb45f5f..181c26a77aaa 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cookie
-PORTVERSION= 0.4.2.1
-PORTREVISION= 1
+PORTVERSION= 0.4.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= HTTP cookie parsing and rendering
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder data-default-class old-locale text
+USE_CABAL= blaze-builder data-default-class old-locale
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo
index 465efe1e29dd..4a85c10ee780 100644
--- a/www/hs-cookie/distinfo
+++ b/www/hs-cookie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625371
-SHA256 (cabal/cookie-0.4.2.1.tar.gz) = 06413091908e20ce154effdcd354d7eea1447380e29a8acdb15c3347512852e4
-SIZE (cabal/cookie-0.4.2.1.tar.gz) = 5774
+TIMESTAMP = 1523784609
+SHA256 (cabal/cookie-0.4.4.tar.gz) = 3245ed04ae933cf7becede816d1f76043b851472700abf558ae90b28414cc0e3
+SIZE (cabal/cookie-0.4.4.tar.gz) = 5996
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 9bb5b6cbe5e1..0f4d8a0636f4 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= css-text
-PORTVERSION= 0.1.2.2
-PORTREVISION= 1
+PORTVERSION= 0.1.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= CSS parser and renderer
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.2.0 text>=0.11
+USE_CABAL= attoparsec>=0.10.2.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-css-text/distinfo b/www/hs-css-text/distinfo
index 237086d00b9b..383dd60ddb06 100644
--- a/www/hs-css-text/distinfo
+++ b/www/hs-css-text/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625372
-SHA256 (cabal/css-text-0.1.2.2.tar.gz) = dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987
-SIZE (cabal/css-text-0.1.2.2.tar.gz) = 4033
+TIMESTAMP = 1523784892
+SHA256 (cabal/css-text-0.1.3.0.tar.gz) = 5ff507bf3863219f41e7f2d215e5511fe15ee13d1e28bd3ee64e0b0b894bcd7a
+SIZE (cabal/css-text-0.1.3.0.tar.gz) = 4594
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 60e552333610..419f182bbf49 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index e7e2ddc4e93b..cbcd0e9a084f 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gitit
PORTVERSION= 0.12.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,12 +13,14 @@ LICENSE= GPLv2
USE_CABAL= ConfigFile HStringTemplate HTTP SHA aeson base64-bytestring \
blaze-html feed filestore happstack-server highlighting-kate \
hoauth2 hslogger http-client-tls http-conduit json mtl \
- old-locale old-time pandoc pandoc-types parsec random \
- recaptcha safe split syb tagsoup text uri url utf8-string \
+ old-locale old-time pandoc pandoc-types random \
+ recaptcha safe split syb tagsoup uri url utf8-string \
uuid xml xss-sanitize zlib
EXECUTABLE= expireGititCache gitit
+IGNORE= Doesn't build with newest packages
+
FLAGS_DEFINE= PLUGINS
FLAGS_DEFAULT= PLUGINS
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 05900bc542ac..7d197bc84861 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hS3
PORTVERSION= 0.5.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index ce4c70a3c013..d5406f6546b7 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.4.6.4
-PORTREVISION= 1
+PORTVERSION= 7.5.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,9 +11,9 @@ LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring>=1.0 blaze-html>=0.5 exceptions \
extensible-exceptions hslogger>=1.0.2 html monad-control>=0.3 \
- mtl>=2 network>=2.6 network-uri>=2.6 parsec sendfile>=0.7.1 \
- syb system-filepath>=0.3.1 text>=0.10 threads>=0.5 \
- time-compat transformers-base>=0.4 utf8-string>=0.3.4 zlib
+ mtl>=2 network>=2.6 network-uri>=2.6 semigroups sendfile>=0.7.1 \
+ syb system-filepath>=0.3.1 threads>=0.5 time-compat \
+ transformers-base>=0.4 utf8-string>=0.3.4 zlib
FLAGS_ENABLE= network-uri template_haskell
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index 748b0dcb23bd..51096e975054 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499538462
-SHA256 (cabal/happstack-server-7.4.6.4.tar.gz) = b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9
-SIZE (cabal/happstack-server-7.4.6.4.tar.gz) = 81123
+TIMESTAMP = 1524594391
+SHA256 (cabal/happstack-server-7.5.1.tar.gz) = 32877ec758149dd3ffbd2a03f3fecd3a69bcac8f6c499e3a08e43bee1c9f8ea1
+SIZE (cabal/happstack-server-7.5.1.tar.gz) = 81810
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 0b6b6b7cbc92..5e1651980ec9 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -12,5 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= happstack-server>=7.0
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 213570cd5f39..618093ccae8d 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 1.0.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson attoparsec blaze-builder blaze-html directory-tree \
dlist hashable lifted-base map-syntax monad-control mtl \
- random text transformers-base unordered-containers vector \
+ random transformers-base unordered-containers vector \
xmlhtml
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index 4ea7affa6dbf..58a49974dbf6 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625374
-SHA256 (cabal/heist-1.0.1.0.tar.gz) = fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb
-SIZE (cabal/heist-1.0.1.0.tar.gz) = 71050
+TIMESTAMP = 1524939588
+SHA256 (cabal/heist-1.1.tar.gz) = 78c939ca5dfc33e399b964b514f77c1f262efa36b625677c06f00602e2c00d96
+SIZE (cabal/heist-1.1.tar.gz) = 71239
diff --git a/www/hs-heist/files/patch-heist.cabal b/www/hs-heist/files/patch-heist.cabal
deleted file mode 100644
index 59facc7f3c36..000000000000
--- a/www/hs-heist/files/patch-heist.cabal
+++ /dev/null
@@ -1,29 +0,0 @@
---- heist.cabal.orig 2016-10-28 08:41:35 UTC
-+++ heist.cabal
-@@ -151,14 +151,14 @@ Library
- Heist.Interpreted.Internal
-
- build-depends:
-- aeson >= 0.6 && < 1.1,
-+ aeson >= 0.6 && < 1.3,
- attoparsec >= 0.10 && < 0.14,
- base >= 4 && < 5,
- blaze-builder >= 0.2 && < 0.5,
-- blaze-html >= 0.4 && < 0.9,
-+ blaze-html >= 0.4 && < 0.10,
- bytestring >= 0.9 && < 0.11,
- containers >= 0.2 && < 0.6,
-- directory >= 1.1 && < 1.3,
-+ directory >= 1.1 && < 1.4,
- directory-tree >= 0.10 && < 0.13,
- dlist >= 0.5 && < 0.9,
- filepath >= 1.3 && < 1.5,
-@@ -174,7 +174,7 @@ Library
- transformers >= 0.3 && < 0.6,
- transformers-base >= 0.4 && < 0.5,
- unordered-containers >= 0.1.4 && < 0.3,
-- vector >= 0.9 && < 0.12,
-+ vector >= 0.9 && < 0.13,
- xmlhtml >= 0.2.3.5 && < 0.3
-
- if impl(ghc >= 6.12.0)
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index b81ba2811ed4..61200a87ddc2 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hjsmin
PORTVERSION= 0.2.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Haskell implementation of a javascript minifier
LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.14 \
- optparse-applicative>=0.7 text>=0.8
+ optparse-applicative>=0.7
EXECUTABLE= hjsmin
diff --git a/www/hs-http-api-data/Makefile b/www/hs-http-api-data/Makefile
index 0365a209387b..99ab8a5250db 100644
--- a/www/hs-http-api-data/Makefile
+++ b/www/hs-http-api-data/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-api-data
-PORTVERSION= 0.3.7.1
-PORTREVISION= 1
+PORTVERSION= 0.3.8.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Convert Haskell data types to and from HTTP API data
LICENSE= GPLv3
USE_CABAL= attoparsec attoparsec-iso8601 hashable http-types \
- text time-locale-compat unordered-containers \
- uri-bytestring uuid-types
+ time-locale-compat unordered-containers uri-bytestring \
+ uuid-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-api-data/distinfo b/www/hs-http-api-data/distinfo
index 4e253b5daa0a..f3da4d21c498 100644
--- a/www/hs-http-api-data/distinfo
+++ b/www/hs-http-api-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625375
-SHA256 (cabal/http-api-data-0.3.7.1.tar.gz) = 8c633e95113c8ab655f4ba67e51e41a2c9035f0122ea68bfbb876b37277075fd
-SIZE (cabal/http-api-data-0.3.7.1.tar.gz) = 18907
+TIMESTAMP = 1524685052
+SHA256 (cabal/http-api-data-0.3.8.1.tar.gz) = 6eeaba4b29a00407cb20b865825b17b8d884c26b09c5bbe7b6e673b4522106b3
+SIZE (cabal/http-api-data-0.3.8.1.tar.gz) = 19427
diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile
index 0cc953d2afa6..cce987f7f32d 100644
--- a/www/hs-http-client-tls/Makefile
+++ b/www/hs-http-client-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-client-tls
PORTVERSION= 0.3.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile
index ea01c51d80b8..5ebbef5820fd 100644
--- a/www/hs-http-client/Makefile
+++ b/www/hs-http-client/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-client
-PORTVERSION= 0.5.7.0
-PORTREVISION= 1
+PORTVERSION= 0.5.12.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,8 +11,8 @@ LICENSE= MIT
USE_CABAL= base64-bytestring>=1.0 blaze-builder>=0.3 case-insensitive>=1.0 \
cookie data-default-class exceptions>=0.4 http-types>=0.8 \
- mime-types network>=2.6 network-uri>=2.6 random \
- streaming-commons>=0.1.0.2 text>=0.11
+ memory mime-types network>=2.6 network-uri>=2.6 random \
+ streaming-commons>=0.1.0.2
FLAGS_ENABLE= network-uri
diff --git a/www/hs-http-client/distinfo b/www/hs-http-client/distinfo
index a9aada3bf649..d9eca7ef4c2d 100644
--- a/www/hs-http-client/distinfo
+++ b/www/hs-http-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625375
-SHA256 (cabal/http-client-0.5.7.0.tar.gz) = e241eac22c55cd851de534b9d84149702a8b3990d10afc282bd6955df550ffa3
-SIZE (cabal/http-client-0.5.7.0.tar.gz) = 86010
+TIMESTAMP = 1524400718
+SHA256 (cabal/http-client-0.5.12.1.tar.gz) = 4b5116324d217f0498d258d37135a52f3e69103d3a951b0999618b263c9bd63e
+SIZE (cabal/http-client-0.5.12.1.tar.gz) = 87578
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 983b0ab68d62..0b975d9111d9 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 2.2.3.1
-PORTREVISION= 1
+PORTVERSION= 2.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index d230a1ad1f22..7d34d06f9853 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625376
-SHA256 (cabal/http-conduit-2.2.3.1.tar.gz) = 53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e
-SIZE (cabal/http-conduit-2.2.3.1.tar.gz) = 37632
+TIMESTAMP = 1524934706
+SHA256 (cabal/http-conduit-2.3.1.tar.gz) = 8251c3f0ab2a42b998bda4aaf2805e8c3325f0084462502661ce964f671f7859
+SIZE (cabal/http-conduit-2.3.1.tar.gz) = 27332
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 9f6735017a82..d90884849a5f 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index e395021c3c16..8eb54818c091 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= async blaze-builder>=0.3 case-insensitive>=0.4 conduit>=1.1 \
conduit-extra data-default-class http-client>=0.3 \
http-types>=0.6 lifted-base>=0.1 monad-control>=0.3 \
- network resourcet streaming-commons text>=0.11 wai>=3.0 \
+ network resourcet streaming-commons wai>=3.0 unliftio \
wai-logger word8>=0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index 18972d2eda0a..27d4dd379fea 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625376
-SHA256 (cabal/http-reverse-proxy-0.4.4.tar.gz) = 1caa943a7b9704a73ae9fa14606f96a6b9eec7312c424dd59574515a8c954978
-SIZE (cabal/http-reverse-proxy-0.4.4.tar.gz) = 10394
+TIMESTAMP = 1524852143
+SHA256 (cabal/http-reverse-proxy-0.6.0.tar.gz) = fb1c913111478384c4f23647810b8c3c01c79e9276a08a1ea46215e4a42dd1a8
+SIZE (cabal/http-reverse-proxy-0.6.0.tar.gz) = 10538
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 8790ec76ed43..42728d0cd8c9 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= http-server
PORTVERSION= 1.0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ COMMENT= Library for writing Haskell web servers
LICENSE= BSD3CLAUSE
USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.6 network-uri>=2.6 \
- text>=1.0 url>=2.0 utf8-string>=0.3.4
+ url>=2.0 utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 715e56934d76..925e96145adc 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTVERSION= 0.12.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Generic HTTP types for Haskell (for both client and server code)
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2
+USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index c4a5448e9ca5..46fc0b089092 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625376
-SHA256 (cabal/http-types-0.9.1.tar.gz) = 7bed648cdc1c69e76bf039763dbe1074b55fd2704911dd0cb6b7dfebf1b6f550
-SIZE (cabal/http-types-0.9.1.tar.gz) = 12284
+TIMESTAMP = 1523783338
+SHA256 (cabal/http-types-0.12.1.tar.gz) = 3fa7715428f375b6aa4998ef17822871d7bfe1b55ebd9329efbacd4dad9969f3
+SIZE (cabal/http-types-0.12.1.tar.gz) = 13189
diff --git a/www/hs-http2/Makefile b/www/hs-http2/Makefile
index 7cd6038548e6..ef763e157bea 100644
--- a/www/hs-http2/Makefile
+++ b/www/hs-http2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http2
PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= HTTP/2.0 library including frames and HPACK
LICENSE= BSD3CLAUSE
USE_CABAL= aeson aeson-pretty case-insensitive hex mwc-random psqueues \
- stm text unordered-containers vector word8
+ unordered-containers vector word8
FLAGS_DISABLE= devel
diff --git a/www/hs-multipart/Makefile b/www/hs-multipart/Makefile
index 074b2ba84ea9..3b57a3f90992 100644
--- a/www/hs-multipart/Makefile
+++ b/www/hs-multipart/Makefile
@@ -2,7 +2,7 @@
PORTNAME= multipart
PORTVERSION= 0.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= HTTP multipart split out of the cgi package
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec>=2.0
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index d57fc7c17b2d..6b47be32dec0 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= oeis
PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index 9e5c9addc79f..600499666552 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -2,7 +2,7 @@
PORTNAME= path-pieces
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= Components of paths
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.5
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index 513eea7f5900..3ad13f3a6913 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -2,7 +2,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index cf7cc6c3bfbc..de6fcfb9b3ba 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 2.0.13
-PORTREVISION= 1
+PORTVERSION= 2.0.15
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
-USE_CABAL= aeson blaze-html blaze-markup exceptions parsec text
+USE_CABAL= aeson blaze-html blaze-markup exceptions
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index d25d7c0177f4..d842e51d2bd7 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543938
-SHA256 (cabal/shakespeare-2.0.13.tar.gz) = a67e7f3186a7f33b90f97377b5e68ed20f76daedc564fcf578cf17a7f7ac580e
-SIZE (cabal/shakespeare-2.0.13.tar.gz) = 65054
+TIMESTAMP = 1524400477
+SHA256 (cabal/shakespeare-2.0.15.tar.gz) = 4354c6eebbfa89103c8090aae3bc7be5fceae6a0e327acf8adc4f3fd535864ee
+SIZE (cabal/shakespeare-2.0.15.tar.gz) = 65369
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 00764ef8eb78..97e0d5f6e530 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap-core
-PORTVERSION= 1.0.2.1
-PORTREVISION= 1
+PORTVERSION= 1.0.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec case-insensitive hashable HUnit io-streams \
lifted-base monad-control mtl network-uri old-locale \
- random readable regex-posix text time-locale-compat \
+ random readable regex-posix time-locale-compat \
transformers-base unix-compat unordered-containers \
vector
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 5ff85b7f8886..4ec9f3cfb0d0 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499544248
-SHA256 (cabal/snap-core-1.0.2.1.tar.gz) = de903d5dc4640f49cfebb41b4442f4901057a8627694373639d3972ccdcca11d
-SIZE (cabal/snap-core-1.0.2.1.tar.gz) = 142939
+TIMESTAMP = 1524419838
+SHA256 (cabal/snap-core-1.0.3.2.tar.gz) = 4c4398476fe882122ce8adc03f69509588d071fc011f50162cd69706093dd88c
+SIZE (cabal/snap-core-1.0.3.2.tar.gz) = 149530
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 4d0e9f60910d..f6aa848f40b9 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap-server
-PORTVERSION= 1.0.2.2
-PORTREVISION= 1
+PORTVERSION= 1.1.0.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec blaze-builder case-insensitive clock io-streams \
io-streams-haproxy lifted-base mtl network old-locale snap-core \
- text unix-compat vector
+ unix-compat vector
FLAGS_DEFINE= OPENSSL
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index 8b20917a87a4..5bef910ac318 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499544292
-SHA256 (cabal/snap-server-1.0.2.2.tar.gz) = 27de5fb962e88fbc4285015c2e7f7abf0e06dac64e8f9737ad6ece6074fa837f
-SIZE (cabal/snap-server-1.0.2.2.tar.gz) = 74372
+TIMESTAMP = 1524853220
+SHA256 (cabal/snap-server-1.1.0.0.tar.gz) = 249ea390a4e54899b310c0dd13b91af007a2b685bd0d9769c3e208dd914d7c6f
+SIZE (cabal/snap-server-1.1.0.0.tar.gz) = 74090
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 9f1fc90bd6b3..558e1e0bc8a8 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= snap
PORTVERSION= 1.0.0.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,8 +13,10 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson attoparsec cereal clientsession configurator \
directory-tree dlist hashable heist lens lifted-base \
map-syntax monad-control mtl mwc-random pwstore-fast \
- snap-core snap-server stm text transformers-base \
+ snap-core snap-server transformers-base \
unordered-containers xmlhtml
+IGNORE= Doesn't build with recent GHC version
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index f36afb722805..5c02961c704e 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,7 +3,7 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 37baf4e3959b..98eb667f2f96 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-app-static
-PORTVERSION= 3.1.6.1
-PORTREVISION= 1
+PORTVERSION= 3.1.6.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 byteable cryptohash>=0.11 \
cryptohash-conduit file-embed>=0.0.3.1 http-date \
http-types>=0.7 mime-types>=0.1 optparse-applicative>=0.7 \
- text>=0.7 unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \
+ unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \
wai-extra>=3.0 warp>=3.0.11 zlib>=0.5
EXECUTABLE= warp
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index c2fddb83753b..61df9d101078 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625380
-SHA256 (cabal/wai-app-static-3.1.6.1.tar.gz) = b318acf31e2e809411f119744a016ba0a78f52554ac7321a3a1410a218886668
-SIZE (cabal/wai-app-static-3.1.6.1.tar.gz) = 22686
+TIMESTAMP = 1525035879
+SHA256 (cabal/wai-app-static-3.1.6.2.tar.gz) = d0b0a566be61ef4c8f800922a71dbc4de64287f8f73782b1461cd5d294c1dc3e
+SIZE (cabal/wai-app-static-3.1.6.2.tar.gz) = 22509
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index f3184a58600c..3cbe974ea008 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 3.0.20.0
-PORTREVISION= 1
+PORTVERSION= 3.0.22.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= aeson ansi-terminal base64-bytestring blaze-builder \
case-insensitive cookie data-default-class \
fast-logger http-types iproute lifted-base \
network old-locale resourcet streaming-commons \
- stringsearch text unix-compat vault void \
+ stringsearch unix-compat vault void \
wai wai-logger word8 zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index da5c80ccadb7..4bfc199b9fa9 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625381
-SHA256 (cabal/wai-extra-3.0.20.0.tar.gz) = ad63ca529e812f5edec84e197a58433095a1376a127f8e9416235028bf021971
-SIZE (cabal/wai-extra-3.0.20.0.tar.gz) = 60542
+TIMESTAMP = 1524842206
+SHA256 (cabal/wai-extra-3.0.22.1.tar.gz) = 7e7c9075455015b90e079d7c1d16110f2fb27e33ff66620d84248c3a9805722f
+SIZE (cabal/wai-extra-3.0.22.1.tar.gz) = 61594
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index bb4510634f32..4aa61a390066 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-logger
-PORTVERSION= 2.3.0
-PORTREVISION= 1
+PORTVERSION= 2.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-logger/distinfo b/www/hs-wai-logger/distinfo
index 292c96cd3142..696f866f084b 100644
--- a/www/hs-wai-logger/distinfo
+++ b/www/hs-wai-logger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625381
-SHA256 (cabal/wai-logger-2.3.0.tar.gz) = 90cd993c657e72a0480a988220b288aeb2561efa53d2c8f819197b6de3060bf0
-SIZE (cabal/wai-logger-2.3.0.tar.gz) = 5379
+TIMESTAMP = 1524842605
+SHA256 (cabal/wai-logger-2.3.2.tar.gz) = 8dd4ff875d9ac2c115f5d45cc4375635a6c3e55a75c632ff3781d1fb086eb470
+SIZE (cabal/wai-logger-2.3.2.tar.gz) = 5386
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index 12649a9868df..6e78211a1480 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai
-PORTVERSION= 3.2.1.1
-PORTREVISION= 1
+PORTVERSION= 3.2.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Web Application Interface
LICENSE= MIT
USE_CABAL= blaze-builder>=0.2.1.4 http-types>=0.7 network>=2.2.1.5 \
- text>=0.7 vault>=0.3
+ vault>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index 5ee6267b1bb7..61ad245f2915 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625379
-SHA256 (cabal/wai-3.2.1.1.tar.gz) = 5d80a68f5d8806682d8267b7dacc383d094e3ef7ecd705f20e42c91cad564e21
-SIZE (cabal/wai-3.2.1.1.tar.gz) = 10039
+TIMESTAMP = 1524252958
+SHA256 (cabal/wai-3.2.1.2.tar.gz) = 282351461f19fbac26aa0a7896d7ab583b4abef522fcd9aba944f1848e58234b
+SIZE (cabal/wai-3.2.1.2.tar.gz) = 9938
diff --git a/www/hs-wai/files/patch-wai.cabal b/www/hs-wai/files/patch-wai.cabal
deleted file mode 100644
index 739389af330b..000000000000
--- a/www/hs-wai/files/patch-wai.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- wai.cabal.orig 2017-07-09 19:57:56 UTC
-+++ wai.cabal
-@@ -21,7 +21,6 @@ Source-repository head
- Library
- Build-Depends: base >= 4 && < 5
- , bytestring >= 0.10
-- , bytestring-builder >= 0.10.4.0 && < 0.11
- , blaze-builder >= 0.2.1.4 && < 0.5
- , network >= 2.2.1.5
- , http-types >= 0.7
diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile
index f9b26ed9922c..cb69f1834691 100644
--- a/www/hs-warp-tls/Makefile
+++ b/www/hs-warp-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= warp-tls
PORTVERSION= 3.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 679be7122af4..5c47c1800a52 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 3.2.13
-PORTREVISION= 1
+PORTVERSION= 3.2.22
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +9,11 @@ COMMENT= Fast, light-weight web server for WAI applications
LICENSE= MIT
-USE_CABAL= auto-update>=0.1.1 blaze-builder>=0.4 case-insensitive>=0.2 \
+USE_CABAL= auto-update>=0.1.1 bsb-http-chunked case-insensitive>=0.2 \
hashable http-date http-types>=0.8.5 http2>=1.0.2 \
iproute>=1.3.1 network>=2.3 old-locale simple-sendfile>=0.2.7 \
- stm>=2.3 streaming-commons>=0.1.10 text unix-compat>=0.2 \
- vault>=0.3 wai>=3.0 word8
+ streaming-commons>=0.1.10 unix-compat>=0.2 vault>=0.3 \
+ wai>=3.0 word8
FLAGS_ENABLE= allow-sendfilefd
FLAGS_DISABLE= network-bytestring warp-debug use-bytestring-builder
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 12af17495a45..68e738127d11 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625382
-SHA256 (cabal/warp-3.2.13.tar.gz) = 92395bf42d012e5c4deaea7f9e1fc2271a63c5380b4c5bc1cf16b7c53aa2c424
-SIZE (cabal/warp-3.2.13.tar.gz) = 78441
+TIMESTAMP = 1524927920
+SHA256 (cabal/warp-3.2.22.tar.gz) = 645b230c32050da227e4c2486a0ae6b6866706f563d2ba5e3761f581855f590e
+SIZE (cabal/warp-3.2.22.tar.gz) = 77658
diff --git a/www/hs-warp/files/patch-warp.cabal b/www/hs-warp/files/patch-warp.cabal
deleted file mode 100644
index bf0c57a64148..000000000000
--- a/www/hs-warp/files/patch-warp.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
---- warp.cabal.orig 2015-08-18 02:00:41 UTC
-+++ warp.cabal
-@@ -36,7 +36,6 @@ Library
- , auto-update >= 0.1.1 && < 0.2
- , blaze-builder >= 0.4
- , bytestring >= 0.9.1.4
-- , bytestring-builder
- , case-insensitive >= 0.2
- , containers
- , ghc-prim
-@@ -134,7 +133,6 @@ Test-Suite spec
- , auto-update
- , blaze-builder >= 0.4
- , bytestring >= 0.9.1.4
-- , bytestring-builder
- , case-insensitive >= 0.2
- , ghc-prim
- , HTTP
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index 2e33e2cb90dc..fe27573d40d5 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webkit
PORTVERSION= 0.14.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= LGPL21
USES= pkgconfig
USE_CABAL= cairo>=0.13.0.0 glib>=0.13.1.0 gtk>=0.13.0.0 mtl \
- pango>=0.13.0.0 text>=1.0.0.0
+ pango>=0.13.0.0
LIB_DEPENDS+= libwebkitgtk-1.0.so:www/webkit-gtk2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index eccb65aea02b..981647276efe 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xss-sanitize
PORTVERSION= 0.3.5.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Sanitize untrusted HTML to prevent XSS attacks
LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2.6 \
- network-uri>=2.6 tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3
+ network-uri>=2.6 tagsoup>=0.12.2 utf8-string>=0.3
FLAGS_ENABLE= network-uri
diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile
index 4213cca768a8..11ba0677fa72 100644
--- a/www/hs-yesod-auth-hashdb/Makefile
+++ b/www/hs-yesod-auth-hashdb/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth-hashdb
-PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTVERSION= 1.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Authentication plugin for Yesod
LICENSE= MIT
-USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 text>=0.7 \
+USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 \
yesod-auth>=1.4 yesod-core>=1.4 yesod-form>=1.4 \
yesod-persistent>=1.2
diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo
index 2e5e46fd24c2..2d8e795dfb6d 100644
--- a/www/hs-yesod-auth-hashdb/distinfo
+++ b/www/hs-yesod-auth-hashdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625384
-SHA256 (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 694405dea4e644acb74d6ad4ec8806d0f4b3779c5b36a430ebcf111542d35af8
-SIZE (cabal/yesod-auth-hashdb-1.6.1.tar.gz) = 15615
+TIMESTAMP = 1525187444
+SHA256 (cabal/yesod-auth-hashdb-1.7.tar.gz) = 65b9a941a9eb87421dfc57f817a7e4dd46bb204b0f27438084f7417805434f1c
+SIZE (cabal/yesod-auth-hashdb-1.7.tar.gz) = 15493
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 89156ace84b8..8a240ce8dabb 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.4.17.2
-PORTREVISION= 1
+PORTVERSION= 1.6.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +16,7 @@ USE_CABAL= aeson>=0.7 authenticate>=1.3 base16-bytestring \
http-conduit>=1.5 http-types lifted-base>=0.1 mime-mail>=0.3 \
network>=2.6 network-uri>=2.6 nonce>=1.0.2 persistent>=2.1 \
persistent-template>=2.1 random>=1.0.0.2 resourcet safe \
- shakespeare text>=0.7 unordered-containers wai>=1.4 \
+ shakespeare unordered-containers wai>=1.4 \
yesod-core>=1.4 yesod-form>=1.4 yesod-persistent>=1.4
FLAGS_ENABLE= network-uri
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index c354a5785c08..63c4a97f60a6 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625384
-SHA256 (cabal/yesod-auth-1.4.17.2.tar.gz) = 63a4273faed4bb7ddf3b196e30ae54bcc4b228e388f11cca71d5005c9ea19983
-SIZE (cabal/yesod-auth-1.4.17.2.tar.gz) = 50569
+TIMESTAMP = 1525183168
+SHA256 (cabal/yesod-auth-1.6.3.tar.gz) = a0df427bfd95374957435f56561787d0bc66f978a7ea7cb017ec64f59c8698b8
+SIZE (cabal/yesod-auth-1.6.3.tar.gz) = 50951
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index ac5fd1ac3b15..38b348b1026a 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= yesod-bin
PORTVERSION= 1.5.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,9 +15,9 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring \
data-default-class file-embed fsnotify>=0.0 ghc-paths>=0.1 \
http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \
http-types>=0.7 lifted-base network \
- optparse-applicative>=0.11 parsec>=2.1 \
+ optparse-applicative>=0.11 \
project-template>=0.1.1 resourcet>=0.3 safe-exceptions say shakespeare>=2.0 \
- split>=0.2 streaming-commons tar>=0.4 text>=0.11 \
+ split>=0.2 streaming-commons tar>=0.4 \
transformers-compat typed-process unix-compat>=0.2 unordered-containers \
wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \
zlib>=0.5
@@ -25,5 +25,7 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring \
EXECUTABLE= yesod
STANDALONE= yes
+IGNORE= Doesn't build with recent Cabal
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 571c9b3bed9f..cb38f99b7738 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.4.35
-PORTREVISION= 1
+PORTVERSION= 1.6.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,9 +14,9 @@ USE_CABAL= aeson>=0.5 auto-update blaze-builder>=0.2.1.4 blaze-html>=0.5 \
clientsession>=0.9.1 conduit>=1.2 conduit-extra cookie>=0.4.1 \
data-default deepseq-generics exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \
lifted-base>=0.1.2 monad-control>=0.3 monad-logger>=0.3.1 mtl \
- mwc-random old-locale>=1.0.0.2 parsec>=2 path-pieces>=0.1.2 \
+ mwc-random old-locale>=1.0.0.2 path-pieces>=0.1.2 \
primitive random>=1.0.0.2 resourcet>=0.4.9 safe semigroups \
- shakespeare>=2.0 text>=0.7 transformers-base>=0.4 unix-compat \
+ shakespeare>=2.0 transformers-base>=0.4 unix-compat unliftio \
unordered-containers>=0.2 vector>=0.9 wai>=3.0 \
wai-extra>=3.0.5 wai-logger>=0.2 warp>=3.0.2 word8
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index ff6ba7be2a00..ab9aed5ec225 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625385
-SHA256 (cabal/yesod-core-1.4.35.tar.gz) = 7e5d0bead1a415aeb8a1d5c62930506c81b8e5209f179d7f19c5627e45bb5cf1
-SIZE (cabal/yesod-core-1.4.35.tar.gz) = 93503
+TIMESTAMP = 1525033997
+SHA256 (cabal/yesod-core-1.6.4.tar.gz) = 8d7e42b70f18ee7a154d351df0bd3b6b025598f593598817ae88d6bb22092727
+SIZE (cabal/yesod-core-1.6.4.tar.gz) = 94604
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index 69ec36dd9cc6..0e3e930b159f 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.4.12
-PORTREVISION= 1
+PORTVERSION= 1.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= MIT
USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 byteable data-default email-validate>=1.0 \
network>=2.6 network-uri>=2.6 persistent resourcet semigroups \
- shakespeare>=2.0 text>=0.9 wai>=1.3 xss-sanitize>=0.3.0.1 \
+ shakespeare>=2.0 wai>=1.3 xss-sanitize>=0.3.0.1 \
yesod-core>=1.4 yesod-persistent>=1.4
FLAGS_ENABLE= network-uri
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index 9fcf7c8d2ddb..b0186c2e1c65 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625386
-SHA256 (cabal/yesod-form-1.4.12.tar.gz) = 731638c1541b112f78ffeef05e11a57f518b6a6a15aa306779f6840e989b8a51
-SIZE (cabal/yesod-form-1.4.12.tar.gz) = 31515
+TIMESTAMP = 1525181435
+SHA256 (cabal/yesod-form-1.6.1.tar.gz) = b8ff14eafff4bb6c2b01b235e8ebeafe9802f545979c1c1227076b06edd3f616
+SIZE (cabal/yesod-form-1.6.1.tar.gz) = 32873
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index f1367e876a66..f1cbb5fdb562 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index 445a92e0f131..21afddd170b4 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625386
-SHA256 (cabal/yesod-persistent-1.4.2.tar.gz) = d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056
-SIZE (cabal/yesod-persistent-1.4.2.tar.gz) = 4887
+TIMESTAMP = 1525180776
+SHA256 (cabal/yesod-persistent-1.6.0.tar.gz) = 42be2b4277fb265e18273503f3592259feb69ce5bfa2d2a862639b755c4fa5bd
+SIZE (cabal/yesod-persistent-1.6.0.tar.gz) = 4935
diff --git a/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal b/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal
deleted file mode 100644
index ccaf7973e3f9..000000000000
--- a/www/hs-yesod-persistent/files/patch-yesod-persistent.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
---- yesod-persistent.cabal.orig 2017-07-10 15:13:02 UTC
-+++ yesod-persistent.cabal
-@@ -16,8 +16,8 @@ extra-source-files: README.md ChangeLog.md
- library
- build-depends: base >= 4 && < 5
- , yesod-core >= 1.4.0 && < 1.5
-- , persistent >= 2.1 && < 2.7
-- , persistent-template >= 2.1 && < 2.7
-+ , persistent >= 2.1 && < 2.8
-+ , persistent-template >= 2.1 && < 2.8
- , transformers >= 0.2.2
- , blaze-builder
- , conduit
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 702bb022ba8c..7fe66f47d6ac 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.5.3
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,11 +11,11 @@ LICENSE= MIT
USE_CABAL= async attoparsec>=0.10 base64-bytestring>=0.1.0.1 \
blaze-builder>=0.3 byteable>=0.1 conduit>=0.5 conduit-extra \
- cryptohash>=0.11 cryptohash-conduit>=0.1 css-text>=0.1.2 \
- data-default file-embed>=0.0.4.1 hashable>=1.1 hjsmin \
- http-types>=0.7 mime-types>=0.1 old-time>=1.0 resourcet>=0.4 \
- text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 wai>=1.3 \
- wai-app-static>=3.1 yesod-core>=1.4
+ cryptohash>=0.11 cryptohash-conduit>=0.1 cryptonite-conduit \
+ css-text>=0.1.2 data-default file-embed>=0.0.4.1 hashable>=1.1 \
+ hjsmin http-types>=0.7 mime-types>=0.1 old-time>=1.0 \
+ resourcet>=0.4 unix-compat>=0.2 unordered-containers>=0.2 \
+ wai>=1.3 wai-app-static>=3.1 yesod-core>=1.4
.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 2f52b2e8bfea..da2a619eadee 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625386
-SHA256 (cabal/yesod-static-1.5.3.tar.gz) = b486aea2b24bc0497ace32b6318da3737d7f8ea8434327608eafdf1eb25d5d65
-SIZE (cabal/yesod-static-1.5.3.tar.gz) = 25521
+TIMESTAMP = 1525169575
+SHA256 (cabal/yesod-static-1.6.0.tar.gz) = bd0bf5924bb9c27fe24047816018158e92fc687053c190221af2f03bac94880e
+SIZE (cabal/yesod-static-1.6.0.tar.gz) = 25416
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index a2453ce0e81a..a4dac935fef8 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 1.5.7
-PORTREVISION= 1
+PORTVERSION= 1.6.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
blaze-markup>=0.5.1 case-insensitive>=0.2 cookie \
hspec-core>=2.0 html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 \
- monad-control network>=2.2 persistent>=1.0 pretty-show text wai>=3.0 \
+ monad-control network>=2.2 persistent>=1.0 pretty-show wai>=3.0 \
wai-extra xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index ed6e0a7931c8..78e1b45aaced 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625387
-SHA256 (cabal/yesod-test-1.5.7.tar.gz) = 426b2aaf777b4c18aee150ed5bbe7ab95c987e622609b0cff1242f9ec0850113
-SIZE (cabal/yesod-test-1.5.7.tar.gz) = 19365
+TIMESTAMP = 1525176699
+SHA256 (cabal/yesod-test-1.6.4.tar.gz) = cffa1639237646836be0ead1bc0b1787a3fccb384cbb7e77dcbcf54c1ed3b95b
+SIZE (cabal/yesod-test-1.6.4.tar.gz) = 21745
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index fd601f8037aa..80d98bea8fe2 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.4.5
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= MIT
USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 conduit-extra \
data-default fast-logger monad-control>=0.3 monad-logger \
- safe shakespeare>=2.0 streaming-commons text \
+ safe shakespeare>=2.0 streaming-commons \
unordered-containers wai>=1.3 wai-extra>=1.3 wai-logger \
warp>=1.3 yaml yesod-auth>=1.4 yesod-core>=1.4 \
yesod-form>=1.3 yesod-persistent>=1.4
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index fcddf8a19d0b..770ac6ad21e0 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625383
-SHA256 (cabal/yesod-1.4.5.tar.gz) = 267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9
-SIZE (cabal/yesod-1.4.5.tar.gz) = 9105
+TIMESTAMP = 1525179938
+SHA256 (cabal/yesod-1.6.0.tar.gz) = 8a242ffe1df10bc2c5dffb6e255ad21b11e96a9c4794bac20504b67f973da773
+SIZE (cabal/yesod-1.6.0.tar.gz) = 9072