Update some hs-* ports that were previously IGNORE'd.

Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D16308

32 files changed, 91 insertions, 136 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 3f202daf80f5..c66939fcd7ad 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1058,6 +1058,7 @@
     SUBDIR += hs-haskell-lexer
     SUBDIR += hs-haskell-src
     SUBDIR += hs-haskell-src-exts
+    SUBDIR += hs-haskell-src-exts-util
     SUBDIR += hs-haskell-src-meta
     SUBDIR += hs-hasktags
     SUBDIR += hs-hex
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 448bc5bb4a0c..ec3c575b93b4 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	darcs
-PORTVERSION=	2.14.0
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -20,8 +19,6 @@ USE_CABAL=	async attoparsec base16-bytestring cryptohash \
 
 EXECUTABLE=	darcs
 
-IGNORE=		Depends on graphics/hs-graphviz, which doesn't compile with recent GHC
-
 MAN1PAGES=	darcs.1
 
 FLAGS_DEFINE=		STATIC TERMINFO THREADED
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 78c410049662..dc4c1137373e 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525013682
-SHA256 (cabal/darcs-2.14.0.tar.gz) = 19fa0882a1485f03ab0552d6f01d538c2b286c4a38a1fe502e9cf2a78f782803
-SIZE (cabal/darcs-2.14.0.tar.gz) = 1063067
+TIMESTAMP = 1531854433
+SHA256 (cabal/darcs-2.14.1.tar.gz) = 61ddbc99acaf06df3a114437064e9241e0da467c23d1d3fb520a782eee32cd35
+SIZE (cabal/darcs-2.14.1.tar.gz) = 1061952
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.hs
index e37898d12a64..ff228241c106 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.hs
@@ -1,20 +1,20 @@
---- Setup.lhs.orig	2017-01-11 20:07:29 UTC
-+++ Setup.lhs
-@@ -26,7 +26,7 @@ import Distribution.Version
- import Data.Version( showVersion )
+--- Setup.hs.orig       2018-07-17 19:45:58 UTC
++++ Setup.hs
+@@ -17,7 +17,7 @@ import Distribution.Package
+ import Distribution.Version( Version )
  import Distribution.Simple.LocalBuildInfo
-          ( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
+          ( LocalBuildInfo(..), absoluteInstallDirs )
 -import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
 +import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
- import Distribution.Simple.PackageIndex ( topologicalOrder )
- import Distribution.Simple.Program ( gccProgram, rawSystemProgramStdoutConf )
  import Distribution.Simple.Setup
-@@ -217,7 +217,7 @@ installManpage :: PackageDescription -> LocalBuildInfo
+     (buildVerbosity, copyDest, copyVerbosity, fromFlag,
+      haddockVerbosity, installVerbosity, sDistVerbosity, replVerbosity )
+@@ -145,7 +145,7 @@ installManpage :: PackageDescription -> LocalBuildInfo
                    -> Verbosity -> CopyDest -> IO ()
  installManpage pkg lbi verbosity copy =
      copyFiles verbosity
 -              (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
 +              (prefix (absoluteInstallDirs pkg lbi copy) </> "man" </> "man1")
                [(buildDir lbi </> "darcs", "darcs.1")]
- 
+
  -- ---------------------------------------------------------------------
diff --git a/devel/hs-haskell-src-exts-util/Makefile b/devel/hs-haskell-src-exts-util/Makefile
new file mode 100644
index 000000000000..ce4d24ec961a
--- /dev/null
+++ b/devel/hs-haskell-src-exts-util/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	haskell-src-exts-util
+PORTVERSION=	0.2.3
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Manipulating Haskell source
+
+LICENSE=	BSD3CLAUSE
+
+USE_CABAL=	data-default haskell-src-exts semigroups uniplate
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-exts-util/distinfo b/devel/hs-haskell-src-exts-util/distinfo
new file mode 100644
index 000000000000..8cc1aec9957d
--- /dev/null
+++ b/devel/hs-haskell-src-exts-util/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1531825609
+SHA256 (cabal/haskell-src-exts-util-0.2.3.tar.gz) = e833ef33423645fee4a300ff4e1354618a0d115a954cd62e72096175513803a0
+SIZE (cabal/haskell-src-exts-util-0.2.3.tar.gz) = 6202
diff --git a/devel/hs-haskell-src-exts-util/pkg-descr b/devel/hs-haskell-src-exts-util/pkg-descr
new file mode 100644
index 000000000000..29b2fa1249f5
--- /dev/null
+++ b/devel/hs-haskell-src-exts-util/pkg-descr
@@ -0,0 +1,6 @@
+Haskell-Source with Extensions (HSE, haskell-src-exts) is an extension of
+the standard haskell-src package, and handles most registered syntactic
+extensions to Haskell. This package contains helper functions for working
+with haskell-src-exts trees.
+
+WWW: https://github.com/haskell-suite/haskell-src-exts-util
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 8f6ced3c4b7c..a353e96e92e9 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hint
-PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -12,9 +11,7 @@ COMMENT=	Runtime Haskell interpreter (GHC API wrapper)
 LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	exceptions extensible-exceptions ghc-mtl>=1.2.1 ghc-paths \
-		mtl random utf8-string
-
-IGNORE=		Doesn't build with recent GHC version
+		mtl random temporary utf8-string
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index a86f3e935bad..973e078fc8a8 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499544799
-SHA256 (cabal/hint-0.7.0.tar.gz) = 299a735848bd6b2e0bdeeee4b47d9d52f865198fbb9403df3f6571801b3e8155
-SIZE (cabal/hint-0.7.0.tar.gz) = 28138
+TIMESTAMP = 1531857801
+SHA256 (cabal/hint-0.8.0.tar.gz) = 2e702d62c8f56b799d767f3d3707bec12597bc529a051ad90bd5840581551c41
+SIZE (cabal/hint-0.8.0.tar.gz) = 31126
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index b63aa2235910..84304936e977 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hlint
-PORTVERSION=	2.0.9
-PORTREVISION=	2
+PORTVERSION=	2.1.8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,12 +9,11 @@ COMMENT=	Source code suggestions
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	ansi-terminal>=0.6.2 cmdargs>=0.10 cpphs>=1.18.1 extra>=0.5 \
-		haskell-src-exts>=1.16 hscolour>=1.21 refact uniplate>=1.5 yaml
+USE_CABAL=	ansi-terminal>=0.6.2 cmdargs>=0.10 cpphs>=1.18.1 data-default \
+		extra>=0.5 haskell-src-exts>=1.16 haskell-src-exts-util \
+		hscolour>=1.21 refact uniplate>=1.5 yaml
 
 EXECUTABLE=	hlint
 
-IGNORE=		Doesn't build with recent GHC version
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index 87c73ce3021c..3ca7c1ca7069 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627842
-SHA256 (cabal/hlint-2.0.9.tar.gz) = 252993e74def5caae29a546f39ce37ce2cf2b6bcafa6cc5c867fb5d07fb4a5ad
-SIZE (cabal/hlint-2.0.9.tar.gz) = 102835
+TIMESTAMP = 1531821668
+SHA256 (cabal/hlint-2.1.8.tar.gz) = 9713ebf3d0ae16c169d0e02486ba93bfdc6349d9b82dccf8a19a58c1177e75ce
+SIZE (cabal/hlint-2.1.8.tar.gz) = 111934
diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile
index 24eb0e10426e..156c5a2a84ac 100644
--- a/devel/hs-preprocessor-tools/Makefile
+++ b/devel/hs-preprocessor-tools/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	preprocessor-tools
-PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTVERSION=	2.0.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -12,7 +11,5 @@ LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	mtl>=1 syb>=0
 
-IGNORE=		Doesn't build with recent GHC version
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-preprocessor-tools/distinfo b/devel/hs-preprocessor-tools/distinfo
index 4c431d9d228c..a28a38023b47 100644
--- a/devel/hs-preprocessor-tools/distinfo
+++ b/devel/hs-preprocessor-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499627854
-SHA256 (cabal/preprocessor-tools-1.0.1.tar.gz) = c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59
-SIZE (cabal/preprocessor-tools-1.0.1.tar.gz) = 9895
+TIMESTAMP = 1531854206
+SHA256 (cabal/preprocessor-tools-2.0.2.tar.gz) = 9753b0b490af005092a73a1a537892c6290ae4f1dfd107825643eff32d2f0255
+SIZE (cabal/preprocessor-tools-2.0.2.tar.gz) = 9892
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 7674ba841b3d..558d7e5d1570 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	threadscope
-PORTVERSION=	0.2.8
-PORTREVISION=	3
+PORTVERSION=	0.2.11.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,13 +9,11 @@ COMMENT=	Graphical tool for profiling parallel Haskell programs
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	cairo ghc-events glib gtk mtl pango
+USE_CABAL=	cairo file-embed ghc-events glib gtk mtl pango temporary
 
 EXECUTABLE=	threadscope
 
 STANDALONE=	yes
 
-IGNORE=		Doesn't build with recent GHC version
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo
index 8e4294c912fb..ff50f40220b2 100644
--- a/devel/hs-threadscope/distinfo
+++ b/devel/hs-threadscope/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501147826
-SHA256 (cabal/threadscope-0.2.8.tar.gz) = c27e15011d4630b77ed51e725e7668e06f6e06b73c2b9b601560af0e60e3f218
-SIZE (cabal/threadscope-0.2.8.tar.gz) = 79624
+TIMESTAMP = 1531835173
+SHA256 (cabal/threadscope-0.2.11.1.tar.gz) = 7063406df98c49985182d9fb6c7ea5c2d60329bfbfc53af8d67f0430d89841a3
+SIZE (cabal/threadscope-0.2.11.1.tar.gz) = 82210
diff --git a/devel/hs-wl-pprint-text/Makefile b/devel/hs-wl-pprint-text/Makefile
index 9c04ceeceefb..8f1f67ad1d3b 100644
--- a/devel/hs-wl-pprint-text/Makefile
+++ b/devel/hs-wl-pprint-text/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	wl-pprint-text
-PORTVERSION=	1.1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.2.0.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-wl-pprint-text/distinfo b/devel/hs-wl-pprint-text/distinfo
index 0205d08a6bd0..7e532b8d6949 100644
--- a/devel/hs-wl-pprint-text/distinfo
+++ b/devel/hs-wl-pprint-text/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525013982
-SHA256 (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 8bdeeaef7e1f55ba582cd4ea104dcd9346b461da09431f3b366b4522583e42ec
-SIZE (cabal/wl-pprint-text-1.1.1.1.tar.gz) = 16621
+TIMESTAMP = 1531855823
+SHA256 (cabal/wl-pprint-text-1.2.0.0.tar.gz) = 40dd4c2d2b8a2884616f3a240f01143d0aadd85f5988e5ee55a59ba6b2487c3c
+SIZE (cabal/wl-pprint-text-1.2.0.0.tar.gz) = 16758
diff --git a/graphics/hs-graphviz/Makefile b/graphics/hs-graphviz/Makefile
index 2e2b8f8886bb..0471fe8da314 100644
--- a/graphics/hs-graphviz/Makefile
+++ b/graphics/hs-graphviz/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	graphviz
-PORTVERSION=	2999.19.0.0
-PORTREVISION=	2
+PORTVERSION=	2999.20.0.2
 CATEGORIES=	graphics haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -13,8 +12,6 @@ LICENSE=	BSD3CLAUSE
 USES=		pkgconfig
 USE_CABAL=	colour dlist fgl polyparse temporary wl-pprint-text
 
-IGNORE=		Doesn't build with recent GHC version
-
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libxdot.pc:graphics/graphviz
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/graphics/hs-graphviz/distinfo b/graphics/hs-graphviz/distinfo
index dc7d055f6df9..111afe1e564a 100644
--- a/graphics/hs-graphviz/distinfo
+++ b/graphics/hs-graphviz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499541633
-SHA256 (cabal/graphviz-2999.19.0.0.tar.gz) = af0a7ff197c9de3f23e6653541446f755c824083ced04b629df6d19523fe04ea
-SIZE (cabal/graphviz-2999.19.0.0.tar.gz) = 223144
+TIMESTAMP = 1531855574
+SHA256 (cabal/graphviz-2999.20.0.2.tar.gz) = e7662eb82d1e5b22b467fb6e9094b65731036ae04c5374058e3b52fbc055474e
+SIZE (cabal/graphviz-2999.20.0.2.tar.gz) = 225118
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index fc1c9ed9a75f..e2fb6e86921b 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -281,6 +281,7 @@ hashtables_port?=                                devel/hs-hashtables
 haskell-lexer_port?=                             devel/hs-haskell-lexer
 haskell-src_port?=                               devel/hs-haskell-src
 haskell-src-exts_port?=                          devel/hs-haskell-src-exts
+haskell-src-exts-util_port?=                     devel/hs-haskell-src-exts-util
 haskell-src-meta_port?=                          devel/hs-haskell-src-meta
 haskell-xmpp_port?=                              net-im/hs-haskell-xmpp
 hasktags_port?=                                  devel/hs-hasktags                               # executable
diff --git a/math/hs-Agda-stdlib/Makefile b/math/hs-Agda-stdlib/Makefile
index b7882c0d8665..c1016f495885 100644
--- a/math/hs-Agda-stdlib/Makefile
+++ b/math/hs-Agda-stdlib/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	Agda-stdlib
-PORTVERSION=	0.13
+DISTVERSION=	0.16
 
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-Agda-stdlib/distinfo b/math/hs-Agda-stdlib/distinfo
index 6389d83a9e26..5f07569058fa 100644
--- a/math/hs-Agda-stdlib/distinfo
+++ b/math/hs-Agda-stdlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499623372
-SHA256 (cabal/agda-agda-stdlib-v0.13_GH0.tar.gz) = e7cffc2b8b168c3584b6d1e760d2b49850835444e4777caa69eb29b3677ef8bb
-SIZE (cabal/agda-agda-stdlib-v0.13_GH0.tar.gz) = 264701
+TIMESTAMP = 1531820029
+SHA256 (cabal/agda-agda-stdlib-v0.16_GH0.tar.gz) = fecd28d835434f2a0307391dda336a22929b1a405471de5cc7d8ed44bcd8e10d
+SIZE (cabal/agda-agda-stdlib-v0.16_GH0.tar.gz) = 337450
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 802a03b7751e..9c991387bc79 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -2,17 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	Agda
-PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTVERSION=	2.5.4
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Dependently typed functional programming language and proof assistant
 
-USE_CABAL=	EdisonCore boxes data-hash edit-distance equivalence \
-		geniplate-mirror gitrev hashable hashtables ieee754 \
+USE_CABAL=	async EdisonCore blaze-html boxes data-hash edit-distance \
+		equivalence geniplate-mirror gitrev hashable hashtables ieee754 \
 		mtl murmur-hash parallel regex-tdfa strict \
-		unordered-containers zlib
+		unordered-containers uri-encode zlib
 
 USE_ALEX=	yes
 USE_HAPPY=	yes
@@ -26,7 +25,5 @@ FLAGS_ENABLE=		cpphs
 SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST=	DATADIR=${DATADIR}
 
-IGNORE=		Doesn't build with recent GHC version
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo
index 5d6083b21fd5..a7288c16c642 100644
--- a/math/hs-Agda/distinfo
+++ b/math/hs-Agda/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500999185
-SHA256 (cabal/Agda-2.5.2.tar.gz) = d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439
-SIZE (cabal/Agda-2.5.2.tar.gz) = 1240885
+TIMESTAMP = 1531764592
+SHA256 (cabal/Agda-2.5.4.tar.gz) = b40971e3312461771e36a11aaf4002424178301cf315b21a679f527b79c09e09
+SIZE (cabal/Agda-2.5.4.tar.gz) = 1993562
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
deleted file mode 100644
index a7e0d60526de..000000000000
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- Agda.cabal.orig	2016-12-22 12:18:52 UTC
-+++ Agda.cabal
-@@ -160,7 +160,7 @@ library
-                 -- some cases.
-                 , hashtables >= 1.0.1.8 && < 1.2 || >= 1.2.0.2 && < 1.3
-                 , haskeline >= 0.7.1.3 && < 0.8
--                , ieee754 >= 0.7.8 && < 0.8
-+                , ieee754 >= 0.7.8 && < 0.9
-                 , monadplus >= 1.4 && < 1.5
-                 -- mtl-2.1 contains a severe bug.
-                 --
diff --git a/net/hs-aws/Makefile b/net/hs-aws/Makefile
index 88bac8bb9c44..0666f84b4715 100644
--- a/net/hs-aws/Makefile
+++ b/net/hs-aws/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aws
-PORTVERSION=	0.19
-PORTREVISION=	1
+PORTVERSION=	0.20
 CATEGORIES=	net haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -21,7 +20,5 @@ USE_CABAL=	aeson>=0.6 attoparsec>=0.11 base16-bytestring \
 
 FLAGS_DISABLE=	examples
 
-IGNORE=		Doesn't build with recent hs-conduit and hs-resourcet
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/net/hs-aws/distinfo b/net/hs-aws/distinfo
index f3ccb6c1a89a..cb6c9b52d2a5 100644
--- a/net/hs-aws/distinfo
+++ b/net/hs-aws/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525086517
-SHA256 (cabal/aws-0.19.tar.gz) = b43b1215405a2c34b9e7ddac8a9f3cf80fff0f031b365a5c0e4e423f45b5777a
-SIZE (cabal/aws-0.19.tar.gz) = 104207
+TIMESTAMP = 1531827848
+SHA256 (cabal/aws-0.20.tar.gz) = c079d860d6bf235b134286fb8620d1539664df52dce1146d463cc4ebeb52975f
+SIZE (cabal/aws-0.20.tar.gz) = 104559
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 5167eb360e64..dae2fbf023ff 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	snap
-PORTVERSION=	1.0.0.1
-PORTREVISION=	4
+PORTVERSION=	1.1.1.0
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -16,7 +15,5 @@ USE_CABAL=	aeson attoparsec cereal clientsession configurator \
 		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-snap/distinfo b/www/hs-snap/distinfo
index 4a2104e9fdc8..4debd81b9c46 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625379
-SHA256 (cabal/snap-1.0.0.1.tar.gz) = 293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8
-SIZE (cabal/snap-1.0.0.1.tar.gz) = 81400
+TIMESTAMP = 1531830411
+SHA256 (cabal/snap-1.1.1.0.tar.gz) = e74b645ed6f97c47ce55e68d416d86363a99f891c876e1e2d5d34d147cde6f22
+SIZE (cabal/snap-1.1.1.0.tar.gz) = 82418
diff --git a/www/hs-snap/files/patch-snap.cabal b/www/hs-snap/files/patch-snap.cabal
deleted file mode 100644
index 281c9182d169..000000000000
--- a/www/hs-snap/files/patch-snap.cabal
+++ /dev/null
@@ -1,29 +0,0 @@
---- snap.cabal.orig	2016-09-23 03:03:09 UTC
-+++ snap.cabal
-@@ -103,7 +103,7 @@ Library
-     Snap.Snaplet.Session.SecureCookie
- 
-   build-depends:
--    aeson                     >= 0.6      && < 1.1,
-+    aeson                     >= 0.6      && < 1.3,
-     attoparsec                >= 0.10     && < 0.14,
-     base                      >= 4        && < 5,
-     bytestring                >= 0.9.1    && < 0.11,
-@@ -111,7 +111,7 @@ Library
-     clientsession             >= 0.8      && < 0.10,
-     configurator              >= 0.1      && < 0.4,
-     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,
-@@ -120,7 +120,7 @@ Library
-     -- the version disjunction causes problems with dependency resolution.
-     hashable                  >= 1.2.0.6  && < 1.3,
-     heist                     >= 1.0      && < 1.1,
--    lens                      >= 3.7.6    && < 4.15,
-+    lens                      >= 3.7.6    && < 4.16,
-     lifted-base               >= 0.2      && < 0.3,
-     map-syntax                >= 0.2      && < 0.3,
-     monad-control             >= 0.3      && < 1.1,
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index dd0160f83ecf..389c1a623379 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yesod-bin
-PORTVERSION=	1.5.2.3
-PORTREVISION=	3
+PORTVERSION=	1.6.0.3
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -25,7 +24,5 @@ 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-bin/distinfo b/www/hs-yesod-bin/distinfo
index 0383d8eaae2f..3ad59b0e8f99 100644
--- a/www/hs-yesod-bin/distinfo
+++ b/www/hs-yesod-bin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499625384
-SHA256 (cabal/yesod-bin-1.5.2.3.tar.gz) = eeabc3579d7834c6fc0890c5bdf27c52f84cc2bd3b44b4153f4a9320d3d123f6
-SIZE (cabal/yesod-bin-1.5.2.3.tar.gz) = 25237
+TIMESTAMP = 1531832614
+SHA256 (cabal/yesod-bin-1.6.0.3.tar.gz) = e4db295b4c651c205a1730df38501c217d9b600f3dbc1eea21d5fa47e832aedc
+SIZE (cabal/yesod-bin-1.6.0.3.tar.gz) = 22319