3 files changed, 6 insertions, 7 deletions
diff --git a/sysutils/puppetserver5/Makefile b/sysutils/puppetserver5/Makefile
index a7af5b06d785..c9ed7a93f045 100644
--- a/sysutils/puppetserver5/Makefile
+++ b/sysutils/puppetserver5/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
-PORTVERSION=	5.2.0
+PORTVERSION=	5.3.0
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
@@ -11,12 +11,11 @@ COMMENT=	Puppet Server running in the JVM
 
 LICENSE=	APACHE20
 
-USES=		shebangfix
-
 RUN_DEPENDS=	bash>=0:shells/bash \
 		puppet5>=0:sysutils/puppet5
 BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 
+USES=		shebangfix
 USE_RC_SUBR=	puppetserver
 
 USE_JAVA=	yes
diff --git a/sysutils/puppetserver5/distinfo b/sysutils/puppetserver5/distinfo
index bb343f469969..ae0850a1bb0c 100644
--- a/sysutils/puppetserver5/distinfo
+++ b/sysutils/puppetserver5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518696104
-SHA256 (puppetserver-5.2.0.tar.gz) = 9ccc65784b059552c1c077ffc49135eda6be5dc4af55770691a22a38f87f6c6e
-SIZE (puppetserver-5.2.0.tar.gz) = 66776488
+TIMESTAMP = 1521881608
+SHA256 (puppetserver-5.3.0.tar.gz) = 444c6570cbf06bbcacb99afb1649e3adece1d992bc7477e6233fa1d75559f7ed
+SIZE (puppetserver-5.3.0.tar.gz) = 66913938
diff --git a/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
index e79cadd229c2..501434a522b5 100644
--- a/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
+++ b/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
@@ -19,7 +19,7 @@
      # This setting defines the complete "GEM_PATH" for jruby.  If set, it should include
      # the gem-home directory as well as any other directories that gems can be loaded
      # from (including the vendored gems directory for gems that ship with puppetserver)
--    gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems"]
+-    gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems", "/opt/puppetlabs/puppet/lib/ruby/vendor_gems"]
 +    gem-path: [${jruby-puppet.gem-home}, "/var/puppet/server/data/puppetserver/vendored-jruby-gems"]
  
      # PLEASE NOTE: Use caution when modifying the below settings. Modifying
diff --git a/MOVED b/MOVED
index a1388c295cdb..c1b5ec8c6db0 100644
--- a/MOVED
+++ b/MOVED
@@ -9497,3 +9497,8 @@ security/greenbone-security-assistant|security/greenbone-security-assistant8|201
 sysutils/consolekit|sysutils/consolekit2|2017-08-05|Continuation of the consolekit project
 mail/dovecot2|mail/dovecot|2017-08-07|Renamed to mail/dovecot
 mail/dovecot2-pigeonhole|mail/dovecot-pigeonhole|2017-08-07|Renamed to mail/dovecot-pigeonhole
+devel/hs-MonadCatchIO-mtl||2017-08-08|Deprecated in favor of the exceptions package
+devel/hs-MonadCatchIO-transformers||2017-08-08|Deprecated in favor of the exceptions package
+devel/hs-directory||2017-08-08|Part of the bundled packages in ghc
+devel/hs-syb-with-class-instances-text||2017-08-08|Upstream is unmaintained
+textproc/hs-citeproc-hs||2017-08-08|Upstream is unmaintained, use pandoc-citeproc instead
diff --git a/Mk/Scripts/check_leftovers.sh b/Mk/Scripts/check_leftovers.sh
index 3233e23f25e4..c7d00121006e 100644
--- a/Mk/Scripts/check_leftovers.sh
+++ b/Mk/Scripts/check_leftovers.sh
@@ -150,6 +150,12 @@ while read modtype path extra; do
 			# xmlcatmgr is constantly updating catalog.ports ignore
 			# modification to that file
 			share/xml/catalog.ports) ;;
+			# Ignore ghc's doc index
+			share/doc/ghc-%%GHC_VERSION%%/*) ;;
+			share/doc/ghc-%%GHC_VERSION%%/html/libraries/%%PORTNAME%%-%%PORTVERSION%%/html) ;;
+			# Ignore ghc's package conf
+			lib/ghc-%%GHC_VERSION%%/package.conf.d/*) ;;
+			lib/ghc-%%GHC_VERSION%%/package.conf.d/%%PORTNAME%%-%%PORTVERSION%%.conf) ;;
 			# Ignore common system config files
 			/etc/group|\
 			/etc/make.conf|\
diff --git a/UPDATING b/UPDATING
index 89d78de2a850..fc595b1f36ab 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,31 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20170808:
+  AFFECTS: users of lang/ghc and */hs-*
+  AUTHOR: haskell@FreeBSD.org
+
+  The Glorious Glasgow Haskell Compiler has been updated to version
+  8.0.2.  Hence it is recommended to rebuild or reinstall all the
+  dependent ports and the lang/ghc port itself in one of the following
+  ways:
+
+  # portmaster -w -r ghc
+    or
+  # portupgrade -fr lang/ghc
+
+  In case of pkg(8), it is probably safer to remove all the GHC-dependent
+  packages along with GHC and reinstall everything from scratch.  For
+  example:
+
+  # pkg query "%ro" ghc > ghc-pkgs.txt
+  # pkg delete -y lang/ghc
+
+  In ghc-pkgs.txt, check and remove all the packages that have been moved
+  on the update, then use this command:
+
+  # pkg install -y `cat ghc-pkgs.txt`
+
 20170807:
   AFFECTS: users of mail/dovecot2 and mail/dovecot2-pigeonhole
   AUTHOR: adamw@FreeBSD.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index fffe7ba16007..195de84e0b24 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tar
-PORTVERSION=	0.4.2.1
+PORTVERSION=	0.5.0.3
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-tar/distinfo b/archivers/hs-tar/distinfo
index 49518ad3b8ba..9ac9e98c54a1 100644
--- a/archivers/hs-tar/distinfo
+++ b/archivers/hs-tar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/tar-0.4.2.1.tar.gz) = 2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080
-SIZE (cabal/tar-0.4.2.1.tar.gz) = 29825
+TIMESTAMP = 1499611841
+SHA256 (cabal/tar-0.5.0.3.tar.gz) = d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3
+SIZE (cabal/tar-0.5.0.3.tar.gz) = 38764
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 45898063e42d..518bbad51621 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zip-archive
-PORTVERSION=	0.2.3.7
+PORTVERSION=	0.3.1.1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index 8631b49fbfcc..07ec19cd0301 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/zip-archive-0.2.3.7.tar.gz) = 41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699
-SIZE (cabal/zip-archive-0.2.3.7.tar.gz) = 12902
+TIMESTAMP = 1499611845
+SHA256 (cabal/zip-archive-0.3.1.1.tar.gz) = 9e868e649e6fd06cf50c2f0f1e480ce36640494449e415abf2509f9347f08325
+SIZE (cabal/zip-archive-0.3.1.1.tar.gz) = 16107
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 7f54a488e3e9..70d4e7fa5a47 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	zlib-bindings
 PORTVERSION=	0.1.1.5
+PORTREVISION=	1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index cf394a4c09ce..7fa838abfc22 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zlib-enum
 PORTVERSION=	0.2.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/files/patch-zlib-enum.cabal b/archivers/hs-zlib-enum/files/patch-zlib-enum.cabal
new file mode 100644
index 000000000000..3ea88a3a86c2
--- /dev/null
+++ b/archivers/hs-zlib-enum/files/patch-zlib-enum.cabal
@@ -0,0 +1,44 @@
+--- zlib-enum.cabal.orig	2017-07-09 15:22:07 UTC
++++ zlib-enum.cabal
+@@ -14,40 +14,14 @@ build-type:     Simple
+ homepage:       http://github.com/maltem/zlib-enum
+ 
+ -------------------------------------------------------------------------------
+-flag test
+-  description: Build the test executable.
+-  default: False
+-
+--------------------------------------------------------------------------------
+ library
+-    if flag(test)
+-         Buildable: False
+     build-depends: base                  >= 4   && < 5
+                  , bytestring            >= 0.9 && < 0.11
+-                 , transformers          >= 0.2 && < 0.5
++                 , transformers          >= 0.2 && < 0.6
+                  , enumerator            == 0.4.*
+                  , zlib-bindings         == 0.1.*
+     exposed-modules: Codec.Zlib.Enum
+     ghc-options:     -Wall
+-
+--------------------------------------------------------------------------------
+-executable zlib-enum-test
+-    main-is: test.hs
+-    if flag(test)
+-        Buildable: True
+-        build-depends:
+-              base                       >= 4.0      &&   < 5.0
+-            , bytestring                 >= 0.9      &&   < 0.11
+-            , transformers               >= 0.2      &&   < 0.5
+-            , enumerator                 >= 0.4      &&   < 0.5
+-            , zlib-bindings              >= 0.1
+-            , test-framework             >= 0.6      &&   < 0.7
+-            , test-framework-quickcheck2 >= 0.2.12.1 &&   < 0.3.0
+-            , QuickCheck                 >= 2.4      &&   < 2.5
+-    else
+-        Buildable: False
+-    ghc-options:     -Wall
+-
+ -------------------------------------------------------------------------------
+ source-repository head
+   type:     git
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index 0f5fa62b93f3..84348d68b577 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zlib
-PORTVERSION=	0.5.4.2
+PORTVERSION=	0.6.1.2
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo
index 12c07cf5af21..d1cc5d2620fb 100644
--- a/archivers/hs-zlib/distinfo
+++ b/archivers/hs-zlib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/zlib-0.5.4.2.tar.gz) = 75d617d8a77d85ba5a0d69e42c2cd5371b56140b5fb028be3e75bff1cfd41096
-SIZE (cabal/zlib-0.5.4.2.tar.gz) = 127818
+TIMESTAMP = 1499611868
+SHA256 (cabal/zlib-0.6.1.2.tar.gz) = e4eb4e636caf07a16a9730ce469a00b65d5748f259f43edd904dd457b198a2bb
+SIZE (cabal/zlib-0.6.1.2.tar.gz) = 142413
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index 6f600f16d8af..bb7e0001c131 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ALUT
-PORTVERSION=	2.4.0.0
-PORTREVISION=	1
+PORTVERSION=	2.4.0.2
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/distinfo b/audio/hs-ALUT/distinfo
index 7c1b34161100..2e6cad4ceab1 100644
--- a/audio/hs-ALUT/distinfo
+++ b/audio/hs-ALUT/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ALUT-2.4.0.0.tar.gz) = 0f5cf9362ace34a9739cd3a45015782a0102015e62c8dd8e290d7952e6ff193d
-SIZE (cabal/ALUT-2.4.0.0.tar.gz) = 26075
+TIMESTAMP = 1499612631
+SHA256 (cabal/ALUT-2.4.0.2.tar.gz) = b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87
+SIZE (cabal/ALUT-2.4.0.2.tar.gz) = 26231
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index 241725d1d8f3..3b31e7e0178a 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	OpenAL
-PORTVERSION=	1.7.0.0
+PORTVERSION=	1.7.0.4
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/distinfo b/audio/hs-OpenAL/distinfo
index 84422e2299f3..7527203781c2 100644
--- a/audio/hs-OpenAL/distinfo
+++ b/audio/hs-OpenAL/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/OpenAL-1.7.0.0.tar.gz) = 5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984
-SIZE (cabal/OpenAL-1.7.0.0.tar.gz) = 41297
+TIMESTAMP = 1499612648
+SHA256 (cabal/OpenAL-1.7.0.4.tar.gz) = 3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118
+SIZE (cabal/OpenAL-1.7.0.4.tar.gz) = 40801
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index cb3d2696a994..8dd1a1713047 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmpd
-PORTVERSION=	0.9.0.2
+PORTVERSION=	0.9.0.6
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index 65d5291ebf97..6a36eac296bd 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/libmpd-0.9.0.2.tar.gz) = 5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0
-SIZE (cabal/libmpd-0.9.0.2.tar.gz) = 38392
+TIMESTAMP = 1499538914
+SHA256 (cabal/libmpd-0.9.0.6.tar.gz) = bdebb946bba078ed85de12d71ef2e7efa7f28c1ed806d9a390a20d5e4590c937
+SIZE (cabal/libmpd-0.9.0.6.tar.gz) = 38707
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 589010d47ed6..78affc26a4ab 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	criterion
-PORTVERSION=	1.1.0.0
+PORTVERSION=	1.2.1.0
 CATEGORIES=	benchmarks haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,15 +10,17 @@ COMMENT=	Robust, reliable performance measurement and analysis
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	aeson>=0.8 ansi-wl-pprint>=0.6.7.2 cassava>=0.3.0.0 \
-		Glob>=0.7.2 hastache>=0.6.0 mtl>=2 mwc-random>=0.8.0.3 \
-		optparse-applicative>=0.11 parsec>=3.1.0 statistics>=0.13.2.1 \
-		text>=0.11 vector>=0.7.1 vector-algorithms>=0.4
+USE_CABAL=	aeson ansi-wl-pprint base-compat cassava code-page \
+		exceptions Glob js-flot js-jquery microstache mtl mwc-random \
+		optparse-applicative parsec statistics text transformers-compat \
+		vector vector-algorithms
 
 INSTALL_PORTEXAMPLES=	\
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 
 INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR}
 
+EXECUTABLE=	criterion-report
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index dc7ddf9dec48..c6ecf2f20f28 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/criterion-1.1.0.0.tar.gz) = 5cedd41bb6e5a85e65b51fdb00cb32038b826b8d18af072a8319cab43a452d38
-SIZE (cabal/criterion-1.1.0.0.tar.gz) = 1004534
+TIMESTAMP = 1499613825
+SHA256 (cabal/criterion-1.2.1.0.tar.gz) = d9f4bb88a8762f91ce305896cd7e964d25f007949f7e05514503eec59ca97041
+SIZE (cabal/criterion-1.2.1.0.tar.gz) = 126663
diff --git a/converters/Makefile b/converters/Makefile
index 634aa96aec10..917228318d73 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -33,6 +33,7 @@
     SUBDIR += gbase
     SUBDIR += gbsdconv
     SUBDIR += hs-aeson
+    SUBDIR += hs-aeson-compat
     SUBDIR += hs-aeson-pretty
     SUBDIR += hs-dataenc
     SUBDIR += hs-json
diff --git a/converters/hs-aeson-compat/Makefile b/converters/hs-aeson-compat/Makefile
new file mode 100644
index 000000000000..4dda8e90408e
--- /dev/null
+++ b/converters/hs-aeson-compat/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	aeson-compat
+PORTVERSION=	0.3.7
+CATEGORIES=	converters haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Fast JSON parsing and encoding
+
+LICENSE=	BSD3CLAUSE
+
+USE_CABAL=	aeson attoparsec attoparsec-iso8601 base-compat exceptions \
+		hashable scientific semigroups tagged text time-locale-compat \
+		unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/converters/hs-aeson-compat/distinfo b/converters/hs-aeson-compat/distinfo
new file mode 100644
index 000000000000..e22062605592
--- /dev/null
+++ b/converters/hs-aeson-compat/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499691052
+SHA256 (cabal/aeson-compat-0.3.7.tar.gz) = 1bf2c2a3d38caba5d3336757f60702afb5dcac6a77aa3d86c9d55f81e4517c14
+SIZE (cabal/aeson-compat-0.3.7.tar.gz) = 6900
diff --git a/converters/hs-aeson-compat/files/patch-aeson-compat.cabal b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
new file mode 100644
index 000000000000..8b11ebe2fea3
--- /dev/null
+++ b/converters/hs-aeson-compat/files/patch-aeson-compat.cabal
@@ -0,0 +1,18 @@
+--- aeson-compat.cabal.orig	2017-06-07 12:52:36 UTC
++++ aeson-compat.cabal
+@@ -42,7 +42,6 @@ library
+     , containers               >=0.5  && <0.6
+     , exceptions               >=0.8  && <0.9
+     , hashable                 >=1.2  && <1.3
+-    , nats                     >=1 && <1.2
+     , scientific               >=0.3  && <0.4
+     , text                     >=1.2  && <1.3
+     , time                     >=1.4.2 && <1.9
+@@ -70,7 +69,6 @@ test-suite aeson-compat-test
+     , containers
+     , exceptions
+     , hashable
+-    , nats
+     , scientific
+     , text
+     , time
diff --git a/converters/hs-aeson-compat/pkg-descr b/converters/hs-aeson-compat/pkg-descr
new file mode 100644
index 000000000000..e63d60d4528a
--- /dev/null
+++ b/converters/hs-aeson-compat/pkg-descr
@@ -0,0 +1,3 @@
+Compatibility layer for aeson
+
+WWW: https://hackage.haskell.org/package/aeson-compat
diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile
index 77e6a9b0141a..ef644e2833f9 100644
--- a/converters/hs-aeson-pretty/Makefile
+++ b/converters/hs-aeson-pretty/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aeson-pretty
-PORTVERSION=	0.7.2
+PORTVERSION=	0.8.5
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,9 +9,10 @@ COMMENT=	JSON pretty-printing library and command-line tool
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	aeson>=0.7 attoparsec>=0.10 cmdargs>=0.7 text>=0.11 \
-		unordered-containers>=0.1.3.0 vector>=0.9
+USE_CABAL=	aeson attoparsec base-compat cmdargs scientific text \
+		unordered-containers vector
 
+FLAGS_DISABLE=	lib-only
 EXECUTABLE=	aeson-pretty
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/converters/hs-aeson-pretty/distinfo b/converters/hs-aeson-pretty/distinfo
index 21548d0679b1..1ee8ffeee3c1 100644
--- a/converters/hs-aeson-pretty/distinfo
+++ b/converters/hs-aeson-pretty/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/aeson-pretty-0.7.2.tar.gz) = 6408b8b2bcd12cf591e4b93b4d9f5143449b33a59fbd3653f328e2515040570d
-SIZE (cabal/aeson-pretty-0.7.2.tar.gz) = 4838
+TIMESTAMP = 1499545723
+SHA256 (cabal/aeson-pretty-0.8.5.tar.gz) = dd17e86c64b3fe2efb7a855b27b0e5490e42dc58194ae1809d8b662d4e42a9f9
+SIZE (cabal/aeson-pretty-0.8.5.tar.gz) = 5568
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 8cd0e7c8c45c..f5b77570373b 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aeson
-PORTVERSION=	0.8.0.2
+PORTVERSION=	1.2.1.0
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT=	Fast JSON parsing and encoding
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	attoparsec>=0.11.3.4 dlist>=0.2 hashable>=1.1.2.0 mtl \
-		old-locale scientific>=0.3.1 syb text>=1.1.1.0 \
-		unordered-containers>=0.2.3.0 vector>=0.7.1
+USE_CABAL=	attoparsec>=0.13.0.1 base-compat>=0.9.1 dlist>=0.6 hashable>=1.1.2.0 \
+		scientific>=0.3.1 syb tagged text>=1.1.1.0  time-locale-compat>=0.1.1 \
+		unordered-containers>=0.2.3.0 uuid-types>=1.0.3  vector>=0.8
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo
index 5d67e7c53185..5de020c43d3c 100644
--- a/converters/hs-aeson/distinfo
+++ b/converters/hs-aeson/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/aeson-0.8.0.2.tar.gz) = 0707588dfb5fdfe787eba5b3d5a9950acb224a8dae9dcdcfc9c974ae2b6788d5
-SIZE (cabal/aeson-0.8.0.2.tar.gz) = 143850
+TIMESTAMP = 1499459814
+SHA256 (cabal/aeson-1.2.1.0.tar.gz) = 96170fdbed9bf52357bd6eada0173c4ae8086df01522ed2b8a070f2f51148a73
+SIZE (cabal/aeson-1.2.1.0.tar.gz) = 272206
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index c5129650ef0b..4ff865b1cdea 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	dataenc
 PORTVERSION=	0.14.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/files/patch-dataenc.cabal b/converters/hs-dataenc/files/patch-dataenc.cabal
index cc9b9c0d34ab..68be7dfcc6a7 100644
--- a/converters/hs-dataenc/files/patch-dataenc.cabal
+++ b/converters/hs-dataenc/files/patch-dataenc.cabal
@@ -1,11 +1,11 @@
---- dataenc.cabal.orig	2014-04-22 18:38:41 UTC
+--- dataenc.cabal.orig	2017-07-07 17:18:23 UTC
 +++ dataenc.cabal
 @@ -21,7 +21,7 @@ flag tests
  
  library
      hs-source-dirs: src
 -    build-depends: array, base >= 3.0.0 && < 4.8, containers
-+    build-depends: array, base >= 3.0.0 && < 4.9, containers
++    build-depends: array, base >= 3.0.0 && < 5, containers
      exposed-modules:
              Codec.Binary.Base16
              Codec.Binary.Base32
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 96c8e3493f38..e4d4fb6f247e 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	json
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT=	Support for serialising Haskell to and from JSON
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	mtl parsec syb>=0.3.3 text
+USE_CABAL=	mtl parsec syb text
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/converters/hs-sandi/Makefile b/converters/hs-sandi/Makefile
index 258cf2014640..e95f7c3bdc0d 100644
--- a/converters/hs-sandi/Makefile
+++ b/converters/hs-sandi/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sandi
-PORTVERSION=	0.3.5
+PORTVERSION=	0.4.0
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Data encoding library
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	conduit exceptions>=0.6
+USE_CABAL=	conduit exceptions stringsearch
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/converters/hs-sandi/distinfo b/converters/hs-sandi/distinfo
index a49a5d2b4ed8..d21da2d3c0c8 100644
--- a/converters/hs-sandi/distinfo
+++ b/converters/hs-sandi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/sandi-0.3.5.tar.gz) = 856ed995bad4183a69f65c70a78c4be37cf614c906097ea126bae75ce08daea5
-SIZE (cabal/sandi-0.3.5.tar.gz) = 18700
+TIMESTAMP = 1499619802
+SHA256 (cabal/sandi-0.4.0.tar.gz) = 40c895a4b26904e3a4b4488e93f37225bdb48e6787dffed627d16242f01aaeea
+SIZE (cabal/sandi-0.4.0.tar.gz) = 19319
diff --git a/databases/hs-esqueleto/Makefile b/databases/hs-esqueleto/Makefile
index e2283ef17948..86407ac19b2f 100644
--- a/databases/hs-esqueleto/Makefile
+++ b/databases/hs-esqueleto/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	esqueleto
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.3
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT=	Type-safe EDSL for SQL queries on persistent backends
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	blaze-html conduit>=1.1 monad-logger persistent>=2.1.1.7 \
-		resourcet>=1.1 tagged>=0.2 text>=0.11 unordered-containers>=0.2
+USE_CABAL=	blaze-html conduit monad-logger persistent \
+		resourcet tagged text unordered-containers
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/databases/hs-esqueleto/distinfo b/databases/hs-esqueleto/distinfo
index ef71a71d1a91..c40bdd28fc6a 100644
--- a/databases/hs-esqueleto/distinfo
+++ b/databases/hs-esqueleto/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/esqueleto-2.4.1.tar.gz) = 12cc83bd2774906c29df20be8b77d11e0fc6efedadf208714494dc406cd8f7fd
-SIZE (cabal/esqueleto-2.4.1.tar.gz) = 39113
+TIMESTAMP = 1499619928
+SHA256 (cabal/esqueleto-2.5.3.tar.gz) = 3d997551fe9e42b39b5eb8215d5daf4c59e33d55da5bc9eff193ae8a7f4ec482
+SIZE (cabal/esqueleto-2.5.3.tar.gz) = 40259
diff --git a/databases/hs-hedis/Makefile b/databases/hs-hedis/Makefile
index cd043fd6242e..7c8b4f5ece67 100644
--- a/databases/hs-hedis/Makefile
+++ b/databases/hs-hedis/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hedis
-PORTVERSION=	0.6.9
+PORTVERSION=	0.9.8
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,8 +10,8 @@ COMMENT=	Client library for the Redis datastore
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	attoparsec>=0.12 BoundedChan>=1.0 bytestring-lexing>=0.5 \
-		mtl>=2 network>=2 resource-pool>=0.2 vector>=0.9
+USE_CABAL=	async bytestring-lexing mtl network resource-pool scanner stm \
+		text unordered-containers vector
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/databases/hs-hedis/distinfo b/databases/hs-hedis/distinfo
index 07042c46f016..45ae6d783f31 100644
--- a/databases/hs-hedis/distinfo
+++ b/databases/hs-hedis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hedis-0.6.9.tar.gz) = ead8c36dcb7093be9e414da900e2b6fa2f4bc8723a3a5346020d316c75e79179
-SIZE (cabal/hedis-0.6.9.tar.gz) = 27140
+TIMESTAMP = 1499619995
+SHA256 (cabal/hedis-0.9.8.tar.gz) = 822e298c2fe55f7edf0e3a005e901fe7b107c4734eb0dd8f1ab6382330d3ae62
+SIZE (cabal/hedis-0.9.8.tar.gz) = 40058
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index f26a3249b529..26bfc6400b69 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTVERSION=	0.1.1.8
+PORTVERSION=	0.1.4
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/databases/hs-mysql/distinfo b/databases/hs-mysql/distinfo
index 7fdc00902e05..9df0cddfc532 100644
--- a/databases/hs-mysql/distinfo
+++ b/databases/hs-mysql/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mysql-0.1.1.8.tar.gz) = 90f02af1c81e2189f65dcef0f78327eba4b0ef40bea5bde5cb74920727f9bd84
-SIZE (cabal/mysql-0.1.1.8.tar.gz) = 14092
+TIMESTAMP = 1499450806
+SHA256 (cabal/mysql-0.1.4.tar.gz) = 9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e
+SIZE (cabal/mysql-0.1.4.tar.gz) = 16219
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index b13fb2fdcee8..1f54d0f1cf5a 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	persistent-sqlite
-PORTVERSION=	2.2
+PORTVERSION=	2.6.2
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT=	Backend for the persistent library using sqlite3
 
 LICENSE=	MIT
 
-USE_CABAL=	aeson>=0.6.2 conduit>=0.5.3 monad-control>=0.2 \
-		monad-logger>=0.2.4 persistent>=2.2 resourcet>=1.1 \
-		text>=0.7
+USE_CABAL=	aeson conduit microlens-th monad-control monad-logger \
+		old-locale persistent resource-pool resourcet text \
+		unordered-containers
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index 362c952802bc..18e946c2798a 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/persistent-sqlite-2.2.tar.gz) = f11005a23df9ad0740111e675aab42f40eda7e37f4996ebae15e1fe48692c794
-SIZE (cabal/persistent-sqlite-2.2.tar.gz) = 1460775
+TIMESTAMP = 1499620122
+SHA256 (cabal/persistent-sqlite-2.6.2.tar.gz) = 6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf
+SIZE (cabal/persistent-sqlite-2.6.2.tar.gz) = 3568400
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 3bb0f65abebc..2527c2d3ed3d 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	persistent-template
-PORTVERSION=	2.1.3.4
+PORTVERSION=	2.5.2
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT=	Type-safe, non-relational, multi-backend persistence
 
 LICENSE=	MIT
 
-USE_CABAL=	aeson>=0.7 monad-control>=0.2 monad-logger path-pieces \
-		persistent>=2.1.3 tagged text>=0.5 unordered-containers
+USE_CABAL=	aeson aeson-compat http-api-data monad-control monad-logger \
+		path-pieces persistent tagged text unordered-containers
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo
index 69211f2d05a3..351c8ead4fb0 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/persistent-template-2.1.3.4.tar.gz) = 4f28c9ef478e3835de5bc0105907582b2e0229cecc84ffa895c67c1a59ae2172
-SIZE (cabal/persistent-template-2.1.3.4.tar.gz) = 19084
+TIMESTAMP = 1499620138
+SHA256 (cabal/persistent-template-2.5.2.tar.gz) = de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011
+SIZE (cabal/persistent-template-2.5.2.tar.gz) = 20403
diff --git a/databases/hs-persistent-template/files/patch-persistent-template.cabal b/databases/hs-persistent-template/files/patch-persistent-template.cabal
new file mode 100644
index 000000000000..9d1b31b66c25
--- /dev/null
+++ b/databases/hs-persistent-template/files/patch-persistent-template.cabal
@@ -0,0 +1,11 @@
+--- persistent-template.cabal.orig	2017-07-10 13:31:32 UTC
++++ persistent-template.cabal
+@@ -23,7 +23,7 @@ library
+                    , text                     >= 0.5
+                    , transformers             >= 0.2       && < 0.6
+                    , containers
+-                   , aeson                    >= 0.7       && < 1.2
++                   , aeson                    >= 0.7       && < 1.3
+                    , aeson-compat             >= 0.3.2.0   && < 0.4
+                    , monad-logger
+                    , unordered-containers
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 0df540ba667b..030f629d830b 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	persistent
-PORTVERSION=	2.2
+PORTVERSION=	2.7.0
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,8 +11,8 @@ LICENSE=	MIT
 
 USE_CABAL=	aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
 		blaze-markup>=0.5.1 conduit>=1.0 exceptions>=0.6 \
-		fast-logger>=2.1 lifted-base>=0.1 monad-control>=0.3 \
-		monad-logger>=0.3 mtl path-pieces>=0.1 resource-pool \
+		fast-logger>=2.1 http-api-data lifted-base>=0.1 monad-control>=0.3 \
+		monad-logger>=0.3 mtl old-locale path-pieces>=0.1 resource-pool \
 		resourcet>=1.1 scientific silently tagged text>=0.8 \
 		transformers-base unordered-containers vector
 
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index d76c723c69a4..2f8e6adf207d 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/persistent-2.2.tar.gz) = 174047d7f140571081459713fbdeeabbd4a52bbc02dbf35969a0daec491a8512
-SIZE (cabal/persistent-2.2.tar.gz) = 43419
+TIMESTAMP = 1499620101
+SHA256 (cabal/persistent-2.7.0.tar.gz) = cebc4d51d362ce329cb29cb3873eacc01a1453c54d356c4115a7488543e3deea
+SIZE (cabal/persistent-2.7.0.tar.gz) = 69320
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 6216f5592ce3..bac6937328e3 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -114,6 +114,7 @@
     SUBDIR += horde-nag
     SUBDIR += hot-babe
     SUBDIR += howm
+    SUBDIR += hs-fdo-notify
     SUBDIR += ical
     SUBDIR += ithought
     SUBDIR += jjclient
diff --git a/deskutils/hs-fdo-notify/Makefile b/deskutils/hs-fdo-notify/Makefile
new file mode 100644
index 000000000000..6371020f6eb3
--- /dev/null
+++ b/deskutils/hs-fdo-notify/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	fdo-notify
+PORTVERSION=	0.3.1
+CATEGORIES=	deskutils haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Desktop Notifications client
+
+LICENSE=	BSD3CLAUSE
+
+USE_CABAL=	dbus
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/deskutils/hs-fdo-notify/distinfo b/deskutils/hs-fdo-notify/distinfo
new file mode 100644
index 000000000000..7550fabf49e9
--- /dev/null
+++ b/deskutils/hs-fdo-notify/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501336223
+SHA256 (cabal/fdo-notify-0.3.1.tar.gz) = 7083414bb25e3057f6444722288cebf4ad3e4c2616f95f26079c8c7762989fd8
+SIZE (cabal/fdo-notify-0.3.1.tar.gz) = 4882
diff --git a/deskutils/hs-fdo-notify/pkg-descr b/deskutils/hs-fdo-notify/pkg-descr
new file mode 100644
index 000000000000..b8766c4c6390
--- /dev/null
+++ b/deskutils/hs-fdo-notify/pkg-descr
@@ -0,0 +1,7 @@
+A library for issuing notifications using FreeDesktop.org's Desktop
+Notifications protcol. This protocol is supported by services such
+as Ubuntu's NotifyOSD.
+
+WWW: http://bitbucket.org/taejo/fdo-notify/
+
+
diff --git a/devel/Makefile b/devel/Makefile
index 69242f6aa5da..5778b3b82145 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -889,16 +889,18 @@
     SUBDIR += hs-BoundedChan
     SUBDIR += hs-ConfigFile
     SUBDIR += hs-DrIFT
+    SUBDIR += hs-EdisonAPI
+    SUBDIR += hs-EdisonCore
     SUBDIR += hs-Glob
     SUBDIR += hs-HUnit
     SUBDIR += hs-IfElse
     SUBDIR += hs-List
+    SUBDIR += hs-ListLike
     SUBDIR += hs-MemoTrie
     SUBDIR += hs-MissingH
-    SUBDIR += hs-MonadCatchIO-mtl
-    SUBDIR += hs-MonadCatchIO-transformers
     SUBDIR += hs-MonadRandom
     SUBDIR += hs-ObjectName
+    SUBDIR += hs-Only
     SUBDIR += hs-PSQueue
     SUBDIR += hs-QuickCheck
     SUBDIR += hs-ReadArgs
@@ -922,6 +924,7 @@
     SUBDIR += hs-async
     SUBDIR += hs-atomic-primops
     SUBDIR += hs-auto-update
+    SUBDIR += hs-base-compat
     SUBDIR += hs-base-orphans
     SUBDIR += hs-base-unicode-symbols
     SUBDIR += hs-base16-bytestring
@@ -943,12 +946,17 @@
     SUBDIR += hs-bytestring-show
     SUBDIR += hs-c2hs
     SUBDIR += hs-cabal-install
+    SUBDIR += hs-call-stack
     SUBDIR += hs-cereal
     SUBDIR += hs-checkers
     SUBDIR += hs-chunked-data
     SUBDIR += hs-classy-prelude
     SUBDIR += hs-classy-prelude-conduit
+    SUBDIR += hs-clock
     SUBDIR += hs-cmdargs
+    SUBDIR += hs-code-page
+    SUBDIR += hs-colour
+    SUBDIR += hs-concurrent-output
     SUBDIR += hs-conduit
     SUBDIR += hs-conduit-combinators
     SUBDIR += hs-conduit-extra
@@ -963,13 +971,14 @@
     SUBDIR += hs-data-default-instances-containers
     SUBDIR += hs-data-default-instances-dlist
     SUBDIR += hs-data-default-instances-old-locale
+    SUBDIR += hs-data-endian
     SUBDIR += hs-data-hash
     SUBDIR += hs-data-ordlist
     SUBDIR += hs-data-pprint
     SUBDIR += hs-date-cache
     SUBDIR += hs-datetime
+    SUBDIR += hs-dbus
     SUBDIR += hs-deepseq-generics
-    SUBDIR += hs-directory
     SUBDIR += hs-directory-tree
     SUBDIR += hs-dlist
     SUBDIR += hs-dlist-instances
@@ -988,6 +997,8 @@
     SUBDIR += hs-file-embed
     SUBDIR += hs-filemanip
     SUBDIR += hs-filestore
+    SUBDIR += hs-fmlist
+    SUBDIR += hs-foundation
     SUBDIR += hs-free
     SUBDIR += hs-fsnotify
     SUBDIR += hs-gconf
@@ -998,6 +1009,7 @@
     SUBDIR += hs-ghc-paths
     SUBDIR += hs-gio
     SUBDIR += hs-git-annex
+    SUBDIR += hs-gitrev
     SUBDIR += hs-glib
     SUBDIR += hs-gtk2hs-buildtools
     SUBDIR += hs-haddock
@@ -1007,6 +1019,7 @@
     SUBDIR += hs-hashable
     SUBDIR += hs-hashed-storage
     SUBDIR += hs-hashtables
+    SUBDIR += hs-haskell-lexer
     SUBDIR += hs-haskell-src
     SUBDIR += hs-haskell-src-exts
     SUBDIR += hs-hasktags
@@ -1025,6 +1038,8 @@
     SUBDIR += hs-hspec-core
     SUBDIR += hs-hspec-discover
     SUBDIR += hs-hspec-expectations
+    SUBDIR += hs-iostreams
+    SUBDIR += hs-iostreams-haproxy
     SUBDIR += hs-js-flot
     SUBDIR += hs-js-jquery
     SUBDIR += hs-keys
@@ -1039,6 +1054,9 @@
     SUBDIR += hs-logict
     SUBDIR += hs-map-syntax
     SUBDIR += hs-memory
+    SUBDIR += hs-microlens
+    SUBDIR += hs-microlens-th
+    SUBDIR += hs-microstache
     SUBDIR += hs-mmap
     SUBDIR += hs-mmorph
     SUBDIR += hs-monad-control
@@ -1046,12 +1064,16 @@
     SUBDIR += hs-monad-loops
     SUBDIR += hs-monad-par
     SUBDIR += hs-monad-par-extras
+    SUBDIR += hs-monad-unlift
+    SUBDIR += hs-monadplus
     SUBDIR += hs-monads-tf
     SUBDIR += hs-mono-traversable
+    SUBDIR += hs-mono-traversable-instances
     SUBDIR += hs-mtl
     SUBDIR += hs-mueval
     SUBDIR += hs-murmur-hash
     SUBDIR += hs-mutable-containers
+    SUBDIR += hs-newtype-generics
     SUBDIR += hs-ncurses
     SUBDIR += hs-newtype
     SUBDIR += hs-old-locale
@@ -1063,15 +1085,21 @@
     SUBDIR += hs-preprocessor-tools
     SUBDIR += hs-prettyclass
     SUBDIR += hs-primitive
+    SUBDIR += hs-process-extras
     SUBDIR += hs-profunctors
     SUBDIR += hs-project-template
+    SUBDIR += hs-psqueues
     SUBDIR += hs-quickcheck-io
     SUBDIR += hs-random
+    SUBDIR += hs-readable
     SUBDIR += hs-readline
+    SUBDIR += hs-refact
     SUBDIR += hs-reflection
     SUBDIR += hs-resource-pool
     SUBDIR += hs-resourcet
     SUBDIR += hs-safe
+    SUBDIR += hs-safe-exceptions
+    SUBDIR += hs-say
     SUBDIR += hs-scientific
     SUBDIR += hs-securemem
     SUBDIR += hs-setenv
@@ -1088,17 +1116,21 @@
     SUBDIR += hs-strict
     SUBDIR += hs-syb
     SUBDIR += hs-syb-with-class
-    SUBDIR += hs-syb-with-class-instances-text
     SUBDIR += hs-system-fileio
     SUBDIR += hs-system-filepath
     SUBDIR += hs-tagged
     SUBDIR += hs-temporary
+    SUBDIR += hs-terminal-size
     SUBDIR += hs-test-framework
     SUBDIR += hs-test-framework-hunit
     SUBDIR += hs-test-framework-quickcheck2
     SUBDIR += hs-text
     SUBDIR += hs-text-icu
+    SUBDIR += hs-text-short
     SUBDIR += hs-tf-random
+    SUBDIR += hs-th-abstraction
+    SUBDIR += hs-th-lift
+    SUBDIR += hs-th-lift-instances
     SUBDIR += hs-threads
     SUBDIR += hs-threadscope
     SUBDIR += hs-time-compat
@@ -1107,7 +1139,9 @@
     SUBDIR += hs-timezone-series
     SUBDIR += hs-transformers-base
     SUBDIR += hs-transformers-compat
+    SUBDIR += hs-typed-process
     SUBDIR += hs-unamb
+    SUBDIR += hs-unexceptionalio
     SUBDIR += hs-uniplate
     SUBDIR += hs-unix-compat
     SUBDIR += hs-unix-time
@@ -1128,6 +1162,7 @@
     SUBDIR += hs-vector-instances
     SUBDIR += hs-vector-th-unbox
     SUBDIR += hs-void
+    SUBDIR += hs-wl-pprint-text
     SUBDIR += hs-word8
     SUBDIR += htable
     SUBDIR += hub
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index 84eafee9333a..7b442f52bfe8 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	BNFC
-PORTVERSION=	2.8
+PORTVERSION=	2.8.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo
index b8879a264d2b..2ef77ad5a36d 100644
--- a/devel/hs-BNFC/distinfo
+++ b/devel/hs-BNFC/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/BNFC-2.8.tar.gz) = 21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34
-SIZE (cabal/BNFC-2.8.tar.gz) = 183591
+TIMESTAMP = 1499627811
+SHA256 (cabal/BNFC-2.8.1.tar.gz) = 2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920
+SIZE (cabal/BNFC-2.8.1.tar.gz) = 225015
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 7ec21fea8b64..8e98e83311de 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Boolean
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index 1e079675c174..c378fc89b008 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Boolean-0.2.3.tar.gz) = f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3
-SIZE (cabal/Boolean-0.2.3.tar.gz) = 6608
+TIMESTAMP = 1499627811
+SHA256 (cabal/Boolean-0.2.4.tar.gz) = 67216013b02b8ac5b534a1ef25f409f930eea1a85eae801933a01ad43145eef8
+SIZE (cabal/Boolean-0.2.4.tar.gz) = 6634
diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile
index c8119ab585fb..5a155f970635 100644
--- a/devel/hs-BoundedChan/Makefile
+++ b/devel/hs-BoundedChan/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	BoundedChan
 PORTVERSION=	1.0.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-BoundedChan/distinfo b/devel/hs-BoundedChan/distinfo
index 1c925cc39a3d..83dce08f57aa 100644
--- a/devel/hs-BoundedChan/distinfo
+++ b/devel/hs-BoundedChan/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627811
 SHA256 (cabal/BoundedChan-1.0.3.0.tar.gz) = 531ceaed7f62844c2a63a7cbfdcab332ea5eaa218e9922ca3305580438adc46d
 SIZE (cabal/BoundedChan-1.0.3.0.tar.gz) = 3591
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 4c6a953287ff..00c596cbacf0 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ConfigFile
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/distinfo b/devel/hs-ConfigFile/distinfo
index e680782c4d10..182b274e7f00 100644
--- a/devel/hs-ConfigFile/distinfo
+++ b/devel/hs-ConfigFile/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627812
 SHA256 (cabal/ConfigFile-1.1.4.tar.gz) = ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514
 SIZE (cabal/ConfigFile-1.1.4.tar.gz) = 28969
diff --git a/devel/hs-DrIFT/Makefile b/devel/hs-DrIFT/Makefile
index d95e146dd200..c89e13532287 100644
--- a/devel/hs-DrIFT/Makefile
+++ b/devel/hs-DrIFT/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	DrIFT
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-DrIFT/distinfo b/devel/hs-DrIFT/distinfo
index ba543f98badf..bfedcf3f127c 100644
--- a/devel/hs-DrIFT/distinfo
+++ b/devel/hs-DrIFT/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627812
 SHA256 (cabal/DrIFT-2.4.2.tar.gz) = 742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0
 SIZE (cabal/DrIFT-2.4.2.tar.gz) = 69676
diff --git a/devel/hs-EdisonAPI/Makefile b/devel/hs-EdisonAPI/Makefile
new file mode 100644
index 000000000000..c17c2f457a0a
--- /dev/null
+++ b/devel/hs-EdisonAPI/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	EdisonAPI
+PORTVERSION=	1.3.1
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	A library of efficient, purely-functional data structures (API)
+
+LICENSE=	MIT
+
+USE_CABAL=	mtl
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-EdisonAPI/distinfo b/devel/hs-EdisonAPI/distinfo
new file mode 100644
index 000000000000..c3562b5b71c7
--- /dev/null
+++ b/devel/hs-EdisonAPI/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996490
+SHA256 (cabal/EdisonAPI-1.3.1.tar.gz) = 95a3b8d01599520a50456219b5a2e9f7832bcddaaeb8e94ce777bd87a4a6b56e
+SIZE (cabal/EdisonAPI-1.3.1.tar.gz) = 30512
diff --git a/devel/hs-EdisonAPI/pkg-descr b/devel/hs-EdisonAPI/pkg-descr
new file mode 100644
index 000000000000..e83fa3d6151d
--- /dev/null
+++ b/devel/hs-EdisonAPI/pkg-descr
@@ -0,0 +1,11 @@
+Edison is a library of purely functional data structures written by Chris
+Okasaki.  It is named after Thomas Alva Edison and for the mnemonic value
+EDiSon (Efficient Data Structures).  Edison provides several families of
+abstractions, each with multiple implementations.  The main abstractions
+provided by Edison are: Sequences such as stacks, queues, and dequeues;
+Collections such as sets, bags and heaps; and Associative Collections such
+as finite maps and priority queues where the priority and element are
+distinct.
+
+WWW: http://rwd.rdockins.name/edison/home/
+
diff --git a/devel/hs-EdisonCore/Makefile b/devel/hs-EdisonCore/Makefile
new file mode 100644
index 000000000000..c3b5618ffc27
--- /dev/null
+++ b/devel/hs-EdisonCore/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	EdisonCore
+PORTVERSION=	1.3.1.1
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	A library of efficent, purely-functional data structures (Core Implementations)
+
+USE_CABAL=	EdisonAPI mtl QuickCheck
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-EdisonCore/distinfo b/devel/hs-EdisonCore/distinfo
new file mode 100644
index 000000000000..539ff6b5ab70
--- /dev/null
+++ b/devel/hs-EdisonCore/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996696
+SHA256 (cabal/EdisonCore-1.3.1.1.tar.gz) = 3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b
+SIZE (cabal/EdisonCore-1.3.1.1.tar.gz) = 80699
diff --git a/devel/hs-EdisonCore/pkg-descr b/devel/hs-EdisonCore/pkg-descr
new file mode 100644
index 000000000000..1cb6cdaded6e
--- /dev/null
+++ b/devel/hs-EdisonCore/pkg-descr
@@ -0,0 +1,7 @@
+This package provides the core Edison data structure implementations,
+including multiple sequence, set, bag, and finite map concrete implementations
+with various performance characteristics.  The implementations in this package
+have no dependencies other than those commonly bundled with Haskell compilers.
+
+WWW: http://rwd.rdockins.name/edison/home/
+
diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile
index 9897d6cf1463..67d65b16d356 100644
--- a/devel/hs-Glob/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Glob
-PORTVERSION=	0.7.5
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT=	Globbing library
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	dlist>=0.4
+USE_CABAL=	dlist>=0.4 transformers-compat
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-Glob/distinfo b/devel/hs-Glob/distinfo
index 0b910e5ee196..af2aff5a2e01 100644
--- a/devel/hs-Glob/distinfo
+++ b/devel/hs-Glob/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Glob-0.7.5.tar.gz) = 0063bbc680d90f522455c0dec1121837689da542f4d9c70924d98bfb1389be41
-SIZE (cabal/Glob-0.7.5.tar.gz) = 23443
+TIMESTAMP = 1499452388
+SHA256 (cabal/Glob-0.8.0.tar.gz) = 38f011be0e7818ab1e76880882b15217cd7d5be56a3dab631c14d614e2b2e896
+SIZE (cabal/Glob-0.8.0.tar.gz) = 23943
diff --git a/devel/hs-Glob/files/patch-Glob.cabal b/devel/hs-Glob/files/patch-Glob.cabal
deleted file mode 100644
index 70ad0f1072e2..000000000000
--- a/devel/hs-Glob/files/patch-Glob.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- Glob.cabal.orig	2014-05-08 18:30:42 UTC
-+++ Glob.cabal
-@@ -28,7 +28,7 @@ Library
-                 , containers   <  0.6
-                 , directory    <  1.3
-                 , dlist        >= 0.4 && < 0.8
--                , filepath     >= 1.1 && < 1.4
-+                , filepath     >= 1.1 && < 1.5
-                 , transformers >= 0.2 && < 0.6
- 
-    if os(windows)
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 3c35bfea1d77..448c20235a8a 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	HUnit
-PORTVERSION=	1.2.5.2
-PORTREVISION=	7
+PORTVERSION=	1.6.0.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT=	Unit testing framework for Haskell
 
 LICENSE=	BSD3CLAUSE
 
+USE_CABAL=	call-stack
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-HUnit/distinfo b/devel/hs-HUnit/distinfo
index 647d173b8527..6ecf2c9fe5ff 100644
--- a/devel/hs-HUnit/distinfo
+++ b/devel/hs-HUnit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HUnit-1.2.5.2.tar.gz) = 0af5ad34dba27de48b94ce6d5f7ee3aa6af6183bdc4a3967b811e28520369a41
-SIZE (cabal/HUnit-1.2.5.2.tar.gz) = 24889
+TIMESTAMP = 1499627813
+SHA256 (cabal/HUnit-1.6.0.0.tar.gz) = 7448e6b966e98e84b7627deba23f71b508e9a61e7bc571d74304a25d30e6d0de
+SIZE (cabal/HUnit-1.6.0.0.tar.gz) = 21937
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index b32219be07da..a7b996c75fa9 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	IfElse
 PORTVERSION=	0.85
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/distinfo b/devel/hs-IfElse/distinfo
index 102e361d482b..630846fea58a 100644
--- a/devel/hs-IfElse/distinfo
+++ b/devel/hs-IfElse/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627813
 SHA256 (cabal/IfElse-0.85.tar.gz) = 8ad3bfc3e2c867e6330d9bff874b3105476c35b2e1638fd448f233e9f80addcd
 SIZE (cabal/IfElse-0.85.tar.gz) = 2865
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 1dec721ed587..1f111663be02 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	List
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo
index 4ce3b381a902..c9acc7f2cffd 100644
--- a/devel/hs-List/distinfo
+++ b/devel/hs-List/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/List-0.5.2.tar.gz) = 27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac
-SIZE (cabal/List-0.5.2.tar.gz) = 6242
+TIMESTAMP = 1499627813
+SHA256 (cabal/List-0.6.0.tar.gz) = 03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889
+SIZE (cabal/List-0.6.0.tar.gz) = 6189
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-ListLike/Makefile
index cbc9815e0cc3..e3f0031f57e0 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-ListLike/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-PORTNAME=	MonadCatchIO-transformers
-PORTVERSION=	0.3.1.3
+PORTNAME=	ListLike
+PORTVERSION=	4.5.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Monad-transformer-compatible version of Control.Exception
+COMMENT=	Generic support for list-like structures in Haskell
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	extensible-exceptions monads-tf
+USE_CABAL=	dlist fmlist text utf8-string vector
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-ListLike/distinfo b/devel/hs-ListLike/distinfo
new file mode 100644
index 000000000000..010c4cdb2e97
--- /dev/null
+++ b/devel/hs-ListLike/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719758
+SHA256 (cabal/ListLike-4.5.1.tar.gz) = b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d
+SIZE (cabal/ListLike-4.5.1.tar.gz) = 29600
diff --git a/devel/hs-ListLike/pkg-descr b/devel/hs-ListLike/pkg-descr
new file mode 100644
index 000000000000..c4d10f36ce76
--- /dev/null
+++ b/devel/hs-ListLike/pkg-descr
@@ -0,0 +1,12 @@
+Generic support for list-like structures in Haskell.
+
+The ListLike module provides a common interface to the various Haskell types
+that are list-like. Predefined interfaces include standard Haskell lists,
+Arrays, ByteStrings, and lazy ByteStrings. Custom types can easily be made
+ListLike instances as well.
+
+ListLike also provides for String-like types, such as String and ByteString,
+for types that support input and output, and for types that can handle
+infinite lists.
+
+WWW: http://hackage.haskell.org/package/ListLike
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index a94f819844d2..3d31ce647676 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MemoTrie
-PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTVERSION=	0.6.8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT=	Trie-based memo functions
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	void
+USE_CABAL=	newtype-generics void
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo
index 0633cd874e39..1962e7a19fc2 100644
--- a/devel/hs-MemoTrie/distinfo
+++ b/devel/hs-MemoTrie/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MemoTrie-0.6.2.tar.gz) = 9ddc11172db26a54681f14dd8ce881c87a3b0e72dcc7a15b74132f30b4408bbc
-SIZE (cabal/MemoTrie-0.6.2.tar.gz) = 6250
+TIMESTAMP = 1499627814
+SHA256 (cabal/MemoTrie-0.6.8.tar.gz) = 5fd9495722d94ff61aa6cde0287fe8222926f5adf929d52fef0532d483429da4
+SIZE (cabal/MemoTrie-0.6.8.tar.gz) = 8399
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 6566861950cb..a19fe4fba5ef 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MissingH
-PORTVERSION=	1.3.0.1
+PORTVERSION=	1.4.0.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index 5093588314db..5028956bb8f7 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MissingH-1.3.0.1.tar.gz) = ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3
-SIZE (cabal/MissingH-1.3.0.1.tar.gz) = 116812
+TIMESTAMP = 1499544768
+SHA256 (cabal/MissingH-1.4.0.1.tar.gz) = 283f2afd46625d98b4e29f77edadfa5e6009a227812ee2ece10091ad6a7e9b71
+SIZE (cabal/MissingH-1.4.0.1.tar.gz) = 109582
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
deleted file mode 100644
index 6a337d038cc9..000000000000
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	MonadCatchIO-mtl
-PORTVERSION=	0.3.1.0
-PORTREVISION=	2
-CATEGORIES=	devel haskell
-
-MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Monad-transformer version of the Control.Exception module
-
-LICENSE=	BSD3CLAUSE
-
-USE_CABAL=	extensible-exceptions MonadCatchIO-transformers>=0.3.1.0
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-MonadCatchIO-mtl/distinfo b/devel/hs-MonadCatchIO-mtl/distinfo
deleted file mode 100644
index 4d2ec948365b..000000000000
--- a/devel/hs-MonadCatchIO-mtl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/MonadCatchIO-mtl-0.3.1.0.tar.gz) = 18c24e23bcb14ccfe3d46012b7935a0f7927eff298c7d6f76b087fc4c6715961
-SIZE (cabal/MonadCatchIO-mtl-0.3.1.0.tar.gz) = 1730
diff --git a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal b/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
deleted file mode 100644
index 987af20bcd8c..000000000000
--- a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- MonadCatchIO-mtl.cabal.orig	2014-01-04 20:24:53 UTC
-+++ MonadCatchIO-mtl.cabal
-@@ -18,7 +18,7 @@ build-type:         Simple
- tested-with:        GHC==6.12.3, GHC==7.0.3, GHC==7.2.1, GHC==7.4.2, GHC==7.6.0
- 
- Library
--  build-depends:    base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.0
-+  build-depends:    base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.*
-   extensions:       PackageImports
- 
-   exposed-modules: Control.Monad.CatchIO
diff --git a/devel/hs-MonadCatchIO-mtl/pkg-descr b/devel/hs-MonadCatchIO-mtl/pkg-descr
deleted file mode 100644
index 706083b2d48c..000000000000
--- a/devel/hs-MonadCatchIO-mtl/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Provides a monad-transformer version of the Control.Exception.catch
-Haskell function. For this, it defines the MonadCatchIO class, a subset
-of MonadIO. It defines proper instances for most monad transformers in
-the 'mtl' library.
-
-WWW: http://darcsden.com/jcpetruzza/MonadCatchIO-mtl
diff --git a/devel/hs-MonadCatchIO-transformers/distinfo b/devel/hs-MonadCatchIO-transformers/distinfo
deleted file mode 100644
index d18607148b86..000000000000
--- a/devel/hs-MonadCatchIO-transformers/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 10a49c32c22123e053377fe558d0c136c2b3746d15954d60f66f6bc80f0404bd
-SIZE (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 4526
diff --git a/devel/hs-MonadCatchIO-transformers/pkg-descr b/devel/hs-MonadCatchIO-transformers/pkg-descr
deleted file mode 100644
index 500453cc9c70..000000000000
--- a/devel/hs-MonadCatchIO-transformers/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Provides functions to throw and catch exceptions. Unlike the functions from
-Control.Exception, which work in IO, these work in any stack of monad
-transformers (from the 'transformers' package) with IO as the base monad.
-You can extend this functionality to other monads, by creating an instance
-of the MonadCatchIO class.
-
-WWW: http://hackage.haskell.org/package/MonadCatchIO-transformers
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index eb2e52ed4391..b91a7fe5938a 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	MonadRandom
-PORTVERSION=	0.4
+PORTVERSION=	0.5.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Random-number generation monad
 
-USE_CABAL=	mtl random transformers-compat>=0.4
+USE_CABAL=	mtl primitive random transformers-compat>=0.4
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
index ab6bac382761..6143b7ff832e 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MonadRandom-0.4.tar.gz) = d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93
-SIZE (cabal/MonadRandom-0.4.tar.gz) = 5064
+TIMESTAMP = 1499445934
+SHA256 (cabal/MonadRandom-0.5.1.tar.gz) = 9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87
+SIZE (cabal/MonadRandom-0.5.1.tar.gz) = 10326
diff --git a/devel/hs-MonadRandom/files/patch-MonadRandom.cabal b/devel/hs-MonadRandom/files/patch-MonadRandom.cabal
new file mode 100644
index 000000000000..35793f2304ed
--- /dev/null
+++ b/devel/hs-MonadRandom/files/patch-MonadRandom.cabal
@@ -0,0 +1,10 @@
+--- MonadRandom.cabal.orig	2017-07-10 13:35:15 UTC
++++ MonadRandom.cabal
+@@ -37,7 +37,6 @@ library
+     transformers-compat >=0.4 && <0.6,
+     mtl                 >=2.1 && <2.3,
+     primitive           >=0.6 && <0.7,
+-    fail                >=4.9        ,
+     random
+   ghc-options:         -Wall
+   default-language:    Haskell2010
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 968768c567ae..02cfb6d44354 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ObjectName
-PORTVERSION=	1.1.0.0
+PORTVERSION=	1.1.0.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/distinfo b/devel/hs-ObjectName/distinfo
index ecc51246047a..7a7335392455 100644
--- a/devel/hs-ObjectName/distinfo
+++ b/devel/hs-ObjectName/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ObjectName-1.1.0.0.tar.gz) = afa91a31b325d2d70b27c367cf0447410f31f8e80bb851b5cbe6a9e9d372054e
-SIZE (cabal/ObjectName-1.1.0.0.tar.gz) = 2583
+TIMESTAMP = 1499547842
+SHA256 (cabal/ObjectName-1.1.0.1.tar.gz) = 72dbef237580fd4e8567de2de752835bbadd3629f486d1586486d49a49aad210
+SIZE (cabal/ObjectName-1.1.0.1.tar.gz) = 2557
diff --git a/devel/hs-directory/Makefile b/devel/hs-Only/Makefile
index f2e27108d421..16b851916edc 100644
--- a/devel/hs-directory/Makefile
+++ b/devel/hs-Only/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-PORTNAME=	directory
-PORTVERSION=	1.3.0.1
+PORTNAME=	Only
+PORTVERSION=	0.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Library for manipulating files and directories in a portable way
+COMMENT=	This package provides a canonical anonymous 1-tuple type
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/devel/hs-Only/distinfo b/devel/hs-Only/distinfo
new file mode 100644
index 000000000000..f2d151814ae7
--- /dev/null
+++ b/devel/hs-Only/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499539872
+SHA256 (cabal/Only-0.1.tar.gz) = ab7aa193e8c257d3bda6b0b3c1cbcf74cdaa85ab08cb20c2dd62ba248c1ab265
+SIZE (cabal/Only-0.1.tar.gz) = 1960
diff --git a/devel/hs-Only/pkg-descr b/devel/hs-Only/pkg-descr
new file mode 100644
index 000000000000..afce2902a3be
--- /dev/null
+++ b/devel/hs-Only/pkg-descr
@@ -0,0 +1,11 @@
+This package provides a canonical anonymous 1-tuple type missing from Haskell
+for attaching typeclass instances.
+
+NOTE: There is also the OneTuple package which by using a boxed data-type
+provides a 1-tuple type which has laziness properties which are more faithful
+to the ones of Haskell's native tuples; whereas the primary purpose of Only is
+to provide the traditionally so named type-wrapper for attaching typeclass
+instances.
+
+WWW: https://github.com/haskell/Only
+
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index d1e061850da4..8535add3acd8 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	PSQueue
 PORTVERSION=	1.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-PSQueue/distinfo b/devel/hs-PSQueue/distinfo
index 42f31babc8ea..d9dda354b543 100644
--- a/devel/hs-PSQueue/distinfo
+++ b/devel/hs-PSQueue/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627814
 SHA256 (cabal/PSQueue-1.1.tar.gz) = a8e0871ad10f916f55c3b9baec53eff23c4e97e09cf96d6c66771789e00a49cc
 SIZE (cabal/PSQueue-1.1.tar.gz) = 6280
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index fe1fad80de34..62533977baaa 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	QuickCheck
-PORTVERSION=	2.8.1
+PORTVERSION=	2.10.0.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 87c1a1a57ee3..154ed1dcf6f6 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/QuickCheck-2.8.1.tar.gz) = 7073aa3635660476aa31df7cf0476926a1ac0231235020122eb276070675763b
-SIZE (cabal/QuickCheck-2.8.1.tar.gz) = 38999
+TIMESTAMP = 1499459639
+SHA256 (cabal/QuickCheck-2.10.0.1.tar.gz) = 00d50522cd9550b1e8ae31ccddf2749d39a533807f4207abf1d36f231e00b42e
+SIZE (cabal/QuickCheck-2.10.0.1.tar.gz) = 54415
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index 146a4d2074ce..1a13c0e3e085 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ReadArgs
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/distinfo b/devel/hs-ReadArgs/distinfo
index 37d4784294c4..0f78f81e16d7 100644
--- a/devel/hs-ReadArgs/distinfo
+++ b/devel/hs-ReadArgs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ReadArgs-1.2.2.tar.gz) = 47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec
-SIZE (cabal/ReadArgs-1.2.2.tar.gz) = 5102
+TIMESTAMP = 1499627815
+SHA256 (cabal/ReadArgs-1.2.3.tar.gz) = 9f4b2a9dfa9f0d851f79853a56ffde3b35e218d5f2bf8354c91a1344a1251a69
+SIZE (cabal/ReadArgs-1.2.3.tar.gz) = 5100
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
index 25128f80d3f0..bdf8a77db120 100644
--- a/devel/hs-STMonadTrans/Makefile
+++ b/devel/hs-STMonadTrans/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	STMonadTrans
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-STMonadTrans/distinfo b/devel/hs-STMonadTrans/distinfo
index 6b2f9f9399e9..77b76fa18b1e 100644
--- a/devel/hs-STMonadTrans/distinfo
+++ b/devel/hs-STMonadTrans/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/STMonadTrans-0.3.3.tar.gz) = d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315
-SIZE (cabal/STMonadTrans-0.3.3.tar.gz) = 4820
+TIMESTAMP = 1499627815
+SHA256 (cabal/STMonadTrans-0.4.3.tar.gz) = 574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db
+SIZE (cabal/STMonadTrans-0.4.3.tar.gz) = 5786
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 09e5c1586efd..72ccc5daf7c0 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	SafeSemaphore
 PORTVERSION=	0.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-SafeSemaphore/distinfo b/devel/hs-SafeSemaphore/distinfo
index 16e51a6a6991..ae661b9fd032 100644
--- a/devel/hs-SafeSemaphore/distinfo
+++ b/devel/hs-SafeSemaphore/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627815
 SHA256 (cabal/SafeSemaphore-0.10.1.tar.gz) = 21e5b737a378cae9e1faf85cab015316d4c84d4b37e6d9d202111cef8c4cef66
 SIZE (cabal/SafeSemaphore-0.10.1.tar.gz) = 24007
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index e83eab93b573..610620b73873 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ShellCheck
-PORTVERSION=	0.4.5
+PORTVERSION=	0.4.6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	luca.pizzamiglio@gmail.com
diff --git a/devel/hs-ShellCheck/distinfo b/devel/hs-ShellCheck/distinfo
index 5d28dfe87657..c527598c5e5e 100644
--- a/devel/hs-ShellCheck/distinfo
+++ b/devel/hs-ShellCheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487064735
-SHA256 (cabal/ShellCheck-0.4.5.tar.gz) = 53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7
-SIZE (cabal/ShellCheck-0.4.5.tar.gz) = 109721
+TIMESTAMP = 1499627816
+SHA256 (cabal/ShellCheck-0.4.6.tar.gz) = 11eb9b2794363fbccc6fbd18601db49680e2c439440a9b103eebfda1aa86b1bc
+SIZE (cabal/ShellCheck-0.4.6.tar.gz) = 116618
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index 1bbf8dd20161..41f903e94301 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	StateVar
-PORTVERSION=	1.1.0.1
+PORTVERSION=	1.1.0.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	State variables
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	stm>=2.0
+USE_CABAL=	stm
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
index 584800b0abf3..ecf2f362f8b5 100644
--- a/devel/hs-StateVar/distinfo
+++ b/devel/hs-StateVar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/StateVar-1.1.0.1.tar.gz) = 0eae79ccc58509f2302cb90f2306d6bb2f1805a2847058fa643d18cc370be5aa
-SIZE (cabal/StateVar-1.1.0.1.tar.gz) = 4462
+TIMESTAMP = 1499443877
+SHA256 (cabal/StateVar-1.1.0.4.tar.gz) = 7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7
+SIZE (cabal/StateVar-1.1.0.4.tar.gz) = 4587
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index a1a634bb31d6..df0145fcd6c0 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Stream
 PORTVERSION=	0.4.7.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index 04b62c912e14..06a32567de7f 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627816
 SHA256 (cabal/Stream-0.4.7.2.tar.gz) = 990be249b3ef1b0075563026d4d2c803b86e3cbf168965ba6f9f2b4227a007d1
 SIZE (cabal/Stream-0.4.7.2.tar.gz) = 6543
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 4c9b28156e6e..17d37e1c4ff0 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	TypeCompose
-PORTVERSION=	0.9.10
-PORTREVISION=	2
+PORTVERSION=	0.9.12
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,5 +10,7 @@ COMMENT=	Type composition classes and instances
 
 LICENSE=	BSD3CLAUSE
 
+USE_CABAL=	base-orphans
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-TypeCompose/distinfo b/devel/hs-TypeCompose/distinfo
index 46f4bbd8f229..fa65760e56f1 100644
--- a/devel/hs-TypeCompose/distinfo
+++ b/devel/hs-TypeCompose/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/TypeCompose-0.9.10.tar.gz) = b8775cdd8239bfba32b9cc62abf44124bc39be907b5fa29d19f433e31a6ef4f2
-SIZE (cabal/TypeCompose-0.9.10.tar.gz) = 17866
+TIMESTAMP = 1499627817
+SHA256 (cabal/TypeCompose-0.9.12.tar.gz) = 3a182c2cc93f8291b3aedfc32c0b1faa84a982601c1a24cbe7fe1ecc50e333e2
+SIZE (cabal/TypeCompose-0.9.12.tar.gz) = 17946
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 7ac40b058d85..b5f7caa610b2 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	abstract-deque
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/distinfo b/devel/hs-abstract-deque/distinfo
index 917676268041..a00a333060ae 100644
--- a/devel/hs-abstract-deque/distinfo
+++ b/devel/hs-abstract-deque/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627817
 SHA256 (cabal/abstract-deque-0.3.tar.gz) = 09aa10f38193a8275a7791b92a4f3a7192a304874637e2a35c897dde25d75ca2
 SIZE (cabal/abstract-deque-0.3.tar.gz) = 7219
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index f0b52453e552..31d3881c7e90 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	abstract-par
 PORTVERSION=	0.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/distinfo b/devel/hs-abstract-par/distinfo
index 122e180581d2..bc3bebb4f1a6 100644
--- a/devel/hs-abstract-par/distinfo
+++ b/devel/hs-abstract-par/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627817
 SHA256 (cabal/abstract-par-0.3.3.tar.gz) = 248a8739bd902462cb16755b690b55660e196e58cc7e6ef8157a72c2a3d5d860
 SIZE (cabal/abstract-par-0.3.3.tar.gz) = 4714
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 2d421bb0b27e..8f9186cbc56c 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	activehs-base
-PORTVERSION=	0.3.0.2
-PORTREVISION=	9
+PORTVERSION=	0.3.0.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/distinfo b/devel/hs-activehs-base/distinfo
index c10fe3b3e237..94603a8b3acf 100644
--- a/devel/hs-activehs-base/distinfo
+++ b/devel/hs-activehs-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/activehs-base-0.3.0.2.tar.gz) = bb65782c7c29a745c435e7857b5f466017c622a57a604ef8ee645fad5cd75973
-SIZE (cabal/activehs-base-0.3.0.2.tar.gz) = 1873
+TIMESTAMP = 1499538392
+SHA256 (cabal/activehs-base-0.3.0.4.tar.gz) = 92d516583737ceb2272807eab8280ebb3b36e679c5a219ca9813d0c695efb13e
+SIZE (cabal/activehs-base-0.3.0.4.tar.gz) = 1881
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
index 9f24f99262fc..47ab808ddeba 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -1,12 +1,10 @@
---- activehs-base.cabal.orig	2012-09-11 07:56:08 UTC
+--- activehs-base.cabal.orig	2017-07-11 16:35:24 UTC
 +++ activehs-base.cabal
-@@ -21,7 +21,7 @@ Library 
-   Exposed-Modules:
+@@ -22,6 +22,6 @@ Library 
      ActiveHs.Base
    Build-Depends:
--    base >= 4.0 && < 4.7,
--    QuickCheck >= 2.4 && < 2.6
-+    base >= 4.0 && < 4.9,
-+    QuickCheck >= 2.4 && < 2.9
+     base >= 4.0 && < 4.10,
+-    QuickCheck >= 2.4 && < 2.9
++    QuickCheck >= 2.4 && < 2.11
  
  
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 48134fc0ad15..5ab31ca763ce 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alex
-PORTVERSION=	3.1.4
+PORTVERSION=	3.2.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index be00f43be4a9..881bf30b7a29 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/alex-3.1.4.tar.gz) = d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f
-SIZE (cabal/alex-3.1.4.tar.gz) = 101827
+TIMESTAMP = 1499627818
+SHA256 (cabal/alex-3.2.1.tar.gz) = a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c
+SIZE (cabal/alex-3.2.1.tar.gz) = 111167
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index 400c6373755e..0b000eeb7539 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ansi-terminal
-PORTVERSION=	0.6.2.1
+PORTVERSION=	0.6.3.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index 718b46e311b6..3455706769c7 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ansi-terminal-0.6.2.1.tar.gz) = 965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6
-SIZE (cabal/ansi-terminal-0.6.2.1.tar.gz) = 14652
+TIMESTAMP = 1499627818
+SHA256 (cabal/ansi-terminal-0.6.3.1.tar.gz) = 458f98e0c9217897f0ff07f730cfc3ed380089936fb31942aec31bb336608095
+SIZE (cabal/ansi-terminal-0.6.3.1.tar.gz) = 30199
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index d9fb74075c8b..f96a30c34aaf 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ansi-wl-pprint
 PORTVERSION=	0.6.7.3
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index fed41c5cffce..2e0a4c19b235 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627819
 SHA256 (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708
 SIZE (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 14983
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index aa861a9d666f..319b0d5e7931 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	arrows
 PORTVERSION=	0.4.4.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-arrows/distinfo b/devel/hs-arrows/distinfo
index 84946a03c6fa..800754e96563 100644
--- a/devel/hs-arrows/distinfo
+++ b/devel/hs-arrows/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627819
 SHA256 (cabal/arrows-0.4.4.1.tar.gz) = 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2
 SIZE (cabal/arrows-0.4.4.1.tar.gz) = 12261
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index ebef297582c3..5611019f36fb 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asn1-data
-PORTVERSION=	0.7.1
-PORTREVISION=	9
+PORTVERSION=	0.7.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/distinfo b/devel/hs-asn1-data/distinfo
index e9b1c130d835..febb43807e12 100644
--- a/devel/hs-asn1-data/distinfo
+++ b/devel/hs-asn1-data/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-data-0.7.1.tar.gz) = f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783
-SIZE (cabal/asn1-data-0.7.1.tar.gz) = 17500
+TIMESTAMP = 1499627819
+SHA256 (cabal/asn1-data-0.7.2.tar.gz) = 83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1
+SIZE (cabal/asn1-data-0.7.2.tar.gz) = 17672
diff --git a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs b/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
deleted file mode 100644
index 2ead06800a21..000000000000
--- a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- Data/ASN1/Parse.hs.orig	2012-08-28 06:24:31 UTC
-+++ Data/ASN1/Parse.hs
-@@ -25,7 +25,7 @@ import Control.Applicative ((<$>))
- 
- -- | Parse ASN1 Monad
- newtype ParseASN1 a = P { runP :: ErrorT String (State [ASN1]) a }
--        deriving (Functor, Monad, MonadError String)
-+        deriving (Functor, Applicative, Monad, MonadError String)
- 
- -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream.
- runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1])
diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile
index 1eec53a2bd02..3560322bf356 100644
--- a/devel/hs-asn1-encoding/Makefile
+++ b/devel/hs-asn1-encoding/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asn1-encoding
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-asn1-encoding/distinfo b/devel/hs-asn1-encoding/distinfo
index a96bb12cd1ec..1124f6df4982 100644
--- a/devel/hs-asn1-encoding/distinfo
+++ b/devel/hs-asn1-encoding/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-encoding-0.9.0.tar.gz) = 17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b
-SIZE (cabal/asn1-encoding-0.9.0.tar.gz) = 15997
+TIMESTAMP = 1499545891
+SHA256 (cabal/asn1-encoding-0.9.5.tar.gz) = 1e863bfd363f6c3760cc80f2c0d422e17845a9f79fe006030db202ecab5aaf29
+SIZE (cabal/asn1-encoding-0.9.5.tar.gz) = 16114
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
index e341cd39d2ba..ffef6afeff27 100644
--- a/devel/hs-asn1-parse/Makefile
+++ b/devel/hs-asn1-parse/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asn1-parse
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-asn1-parse/distinfo b/devel/hs-asn1-parse/distinfo
index 1f5f1e111793..1a0d7c24539a 100644
--- a/devel/hs-asn1-parse/distinfo
+++ b/devel/hs-asn1-parse/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-parse-0.9.1.tar.gz) = e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de
-SIZE (cabal/asn1-parse-0.9.1.tar.gz) = 2785
+TIMESTAMP = 1499545839
+SHA256 (cabal/asn1-parse-0.9.4.tar.gz) = c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708
+SIZE (cabal/asn1-parse-0.9.4.tar.gz) = 2860
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index e3d8a8217615..6c79415782b0 100644
--- a/devel/hs-asn1-types/Makefile
+++ b/devel/hs-asn1-types/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asn1-types
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	ASN.1 types
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	hourglass
+USE_CABAL=	hourglass memory
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-asn1-types/distinfo b/devel/hs-asn1-types/distinfo
index 784bf5efbedb..764c93c5dea3 100644
--- a/devel/hs-asn1-types/distinfo
+++ b/devel/hs-asn1-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-types-0.3.0.tar.gz) = b998dad88b94f8da7058df52f03936d66c81a2d012549c87affeecac5cb5a8aa
-SIZE (cabal/asn1-types-0.3.0.tar.gz) = 5391
+TIMESTAMP = 1499545858
+SHA256 (cabal/asn1-types-0.3.2.tar.gz) = 0c571fff4a10559c6a630d4851ba3cdf1d558185ce3dcfca1136f9883d647217
+SIZE (cabal/asn1-types-0.3.2.tar.gz) = 6424
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index 0477a9e43e80..91ffe88ba1e9 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	async
-PORTVERSION=	2.0.2
+PORTVERSION=	2.1.1.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index ff48c0540e0f..4955e17e4c19 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/async-2.0.2.tar.gz) = db54d384259eee2f3ca525821f45fe509b9a101fbf3a8df7132aa9622626fd2b
-SIZE (cabal/async-2.0.2.tar.gz) = 8565
+TIMESTAMP = 1499444628
+SHA256 (cabal/async-2.1.1.1.tar.gz) = cd83e471466ea6885b2e8fb60f452db3ac3fdf3ea2d6370aa1e071ebc37544e2
+SIZE (cabal/async-2.1.1.1.tar.gz) = 10608
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
index 17672a1cee03..1e2b39e935e7 100644
--- a/devel/hs-atomic-primops/Makefile
+++ b/devel/hs-atomic-primops/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	atomic-primops
-PORTVERSION=	0.8
+PORTVERSION=	0.8.0.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo
index 8ec74aa1c2b7..b74ee8e82196 100644
--- a/devel/hs-atomic-primops/distinfo
+++ b/devel/hs-atomic-primops/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/atomic-primops-0.8.tar.gz) = c0e19e8005bb7320a0a9f6eaa5b464adb14aa88308e9922249305eeaa42f6471
-SIZE (cabal/atomic-primops-0.8.tar.gz) = 33588
+TIMESTAMP = 1499450732
+SHA256 (cabal/atomic-primops-0.8.0.4.tar.gz) = 47e1e393848c0538aa1733a90a63bd08a00915ec7499d90014aaecc792db9864
+SIZE (cabal/atomic-primops-0.8.0.4.tar.gz) = 34075
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
index b0219c06daa2..24f47698f60a 100644
--- a/devel/hs-auto-update/Makefile
+++ b/devel/hs-auto-update/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	auto-update
-PORTVERSION=	0.1.2.2
+PORTVERSION=	0.1.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-auto-update/distinfo b/devel/hs-auto-update/distinfo
index 5e0526850464..fd55b6f10ab1 100644
--- a/devel/hs-auto-update/distinfo
+++ b/devel/hs-auto-update/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/auto-update-0.1.2.2.tar.gz) = 7b3000c330055d4059fe8d9ab044c29e3a57b4dc31b88ea386a75a886b6144db
-SIZE (cabal/auto-update-0.1.2.2.tar.gz) = 6651
+TIMESTAMP = 1499627821
+SHA256 (cabal/auto-update-0.1.4.tar.gz) = 5e96c151024e8bcaf4eaa932e16995872b2017f46124b967e155744d9580b425
+SIZE (cabal/auto-update-0.1.4.tar.gz) = 8607
diff --git a/devel/hs-base-compat/Makefile b/devel/hs-base-compat/Makefile
new file mode 100644
index 000000000000..346c9e181b13
--- /dev/null
+++ b/devel/hs-base-compat/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	base-compat
+PORTVERSION=	0.9.3
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Provides functions available in later versions of base to a wider range of compilers
+
+LICENSE=	MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-base-compat/distinfo b/devel/hs-base-compat/distinfo
new file mode 100644
index 000000000000..30eaf35ba24b
--- /dev/null
+++ b/devel/hs-base-compat/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499541026
+SHA256 (cabal/base-compat-0.9.3.tar.gz) = 7d602b0f0543fadbd598a090c738e9ce9b07a1896673dc27f1503ae3bea1a210
+SIZE (cabal/base-compat-0.9.3.tar.gz) = 27632
diff --git a/devel/hs-base-compat/pkg-descr b/devel/hs-base-compat/pkg-descr
new file mode 100644
index 000000000000..8070cfe9be6b
--- /dev/null
+++ b/devel/hs-base-compat/pkg-descr
@@ -0,0 +1,11 @@
+Provides functions available in later versions of base to a wider range of
+compilers, without requiring you to use CPP pragmas in your code. See the README
+for what is covered. Also see the changelog for recent changes.
+
+Note that base-compat does not add any orphan instances. There is a separate
+package, base-orphans, for that.
+
+In addition, base-compat does not backport any data types or type classes.
+See this section of the README for more info.
+
+WWW: https://github.com/haskell-compat/base-compat
diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile
index 4bda66211d93..bdd0752ad466 100644
--- a/devel/hs-base-orphans/Makefile
+++ b/devel/hs-base-orphans/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	base-orphans
-PORTVERSION=	0.4.4
+PORTVERSION=	0.6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-base-orphans/distinfo b/devel/hs-base-orphans/distinfo
index 96924c04e284..914152611128 100644
--- a/devel/hs-base-orphans/distinfo
+++ b/devel/hs-base-orphans/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/base-orphans-0.4.4.tar.gz) = f4323cc2ae2b25ce228d7291ff65ac5e6c583070b53eaf21dd509ebe25bf0f42
-SIZE (cabal/base-orphans-0.4.4.tar.gz) = 13068
+TIMESTAMP = 1499444442
+SHA256 (cabal/base-orphans-0.6.tar.gz) = c7282aa7516652e6e4a78ccdfb654a99c9da683875748ad5898a3f200be7ad0e
+SIZE (cabal/base-orphans-0.6.tar.gz) = 18087
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 66fed67ce046..71fdcef917b5 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	base-unicode-symbols
 PORTVERSION=	0.2.2.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/distinfo b/devel/hs-base-unicode-symbols/distinfo
index 2b45526e5bfa..b22606d29201 100644
--- a/devel/hs-base-unicode-symbols/distinfo
+++ b/devel/hs-base-unicode-symbols/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
 SHA256 (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = a2f841430fec32edba778b74bde83bf0170ada7c5e2e59d7187c8f06d92dcca9
 SIZE (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = 5562
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 781e32c8fd37..435a182d81bd 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	base16-bytestring
 PORTVERSION=	0.1.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/distinfo b/devel/hs-base16-bytestring/distinfo
index 650a4c79ede3..037937ec0505 100644
--- a/devel/hs-base16-bytestring/distinfo
+++ b/devel/hs-base16-bytestring/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
 SHA256 (cabal/base16-bytestring-0.1.1.6.tar.gz) = 5afe65a152c5418f5f4e3579a5e0d5ca19c279dc9bf31c1a371ccbe84705c449
 SIZE (cabal/base16-bytestring-0.1.1.6.tar.gz) = 3694
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 3e577f7abf26..b767736a43b9 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	base64-bytestring
 PORTVERSION=	1.0.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/distinfo b/devel/hs-base64-bytestring/distinfo
index 7e8b3be0249d..9f919349a61c 100644
--- a/devel/hs-base64-bytestring/distinfo
+++ b/devel/hs-base64-bytestring/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
 SHA256 (cabal/base64-bytestring-1.0.0.1.tar.gz) = ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50
 SIZE (cabal/base64-bytestring-1.0.0.1.tar.gz) = 9080
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index ac37d873a539..3c586f1c15cc 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	basic-prelude
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.1.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index a1e555b06399..4ed645814eec 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/basic-prelude-0.5.0.tar.gz) = d1f562338ed9934a02b4fadc9f9a33f467d10105dbe03f527b47d4ae536210d1
-SIZE (cabal/basic-prelude-0.5.0.tar.gz) = 5743
+TIMESTAMP = 1499627821
+SHA256 (cabal/basic-prelude-0.6.1.1.tar.gz) = f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7
+SIZE (cabal/basic-prelude-0.6.1.1.tar.gz) = 6009
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 95a22f469d72..2730176b02e7 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bifunctors
-PORTVERSION=	5
+PORTVERSION=	5.4.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Bifunctors
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	semigroups>=0.8.3.1 tagged>=0.7.3
+USE_CABAL=	base-orphans comonad semigroups>=0.8.3.1 tagged>=0.7.3
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index 29f009f021b8..8dce950a9667 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/bifunctors-5.tar.gz) = 41df923a03f15ba2d00335aea2409ebf48ee7585f0a1101f1ec282fe5a07298d
-SIZE (cabal/bifunctors-5.tar.gz) = 10562
+TIMESTAMP = 1499542053
+SHA256 (cabal/bifunctors-5.4.2.tar.gz) = 38620267824abbf834f708f1b7cf10307c1d2719b1a0f8ae49330a1002dfdc8d
+SIZE (cabal/bifunctors-5.4.2.tar.gz) = 39535
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 6d852cd3c6b3..a63cce50300b 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bits-atomic
 PORTVERSION=	0.1.3
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bits-atomic/distinfo b/devel/hs-bits-atomic/distinfo
index 52e579d6dd8e..e34ba4fe9445 100644
--- a/devel/hs-bits-atomic/distinfo
+++ b/devel/hs-bits-atomic/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/bits-atomic-0.1.3.tar.gz) = e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d
 SIZE (cabal/bits-atomic-0.1.3.tar.gz) = 7982
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 5681e08b1689..b65216b742e0 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	blaze-builder-enumerator
 PORTVERSION=	0.2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,8 +10,7 @@ COMMENT=	Enumeratees for the incremental conversion of builders to bytestrings
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	blaze-builder>=0.2.1.4 enumerator>=0.4.3.1 \
-		streaming-commons>=0.1.10
+USE_CABAL=	blaze-builder enumerator streaming-commons
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-blaze-builder-enumerator/distinfo b/devel/hs-blaze-builder-enumerator/distinfo
index 03c891974651..34ad87e35b46 100644
--- a/devel/hs-blaze-builder-enumerator/distinfo
+++ b/devel/hs-blaze-builder-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 50f52918a130e81971d01782ead343cdc9bfbf7270ec1e5630943e6b5d23bf96
 SIZE (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 4248
diff --git a/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
index 2cc38b10c15a..4605b668925e 100644
--- a/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
+++ b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
@@ -1,6 +1,13 @@
 --- blaze-builder-enumerator.cabal.orig	2015-04-01 17:10:57 UTC
 +++ blaze-builder-enumerator.cabal
-@@ -49,8 +49,7 @@ Library
+@@ -43,14 +43,13 @@ Library
+     , bytestring    >= 0.9     && < 0.11
+     , enumerator    >= 0.4.3.1 && < 0.5
+     , streaming-commons >= 0.1.10 && < 0.2
+-    , transformers  >= 0.2     && < 0.5
++    , transformers  >= 0.2 
+   Exposed-modules:
+     Blaze.ByteString.Builder.Enumerator
  
    if flag(newbuilder)
        Build-depends:
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index d09ea0698f14..7a5c4d641b2f 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	blaze-builder
-PORTVERSION=	0.4.0.1
+PORTVERSION=	0.4.0.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index 2f75f60ae439..30274144b35e 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/blaze-builder-0.4.0.1.tar.gz) = c136ec877bb8d1558409e87b77174977ae01f8dff5bddb472df8b8d4c7e0a3c5
-SIZE (cabal/blaze-builder-0.4.0.1.tar.gz) = 57113
+TIMESTAMP = 1499546087
+SHA256 (cabal/blaze-builder-0.4.0.2.tar.gz) = 9ad3e4661bf5556d650fb9aa56a3ad6e6eec7575e87d472e8ab6d15eaef163d4
+SIZE (cabal/blaze-builder-0.4.0.2.tar.gz) = 58681
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index e34329a2fa7a..7710fbf01630 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	blaze-textual
 PORTVERSION=	0.2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-blaze-textual/distinfo b/devel/hs-blaze-textual/distinfo
index 08620f567b48..bbcc1722f430 100644
--- a/devel/hs-blaze-textual/distinfo
+++ b/devel/hs-blaze-textual/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/blaze-textual-0.2.1.0.tar.gz) = 1042795ab0bab891c034c24a51bafecbb89870ccd28af39534ab3d9ae7f46c2d
 SIZE (cabal/blaze-textual-0.2.1.0.tar.gz) = 6914
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index 99228152485a..dbf244ba7dc3 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bloomfilter
 PORTVERSION=	2.0.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/distinfo b/devel/hs-bloomfilter/distinfo
index 85c94c7fff64..4849664c4a67 100644
--- a/devel/hs-bloomfilter/distinfo
+++ b/devel/hs-bloomfilter/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/bloomfilter-2.0.1.0.tar.gz) = 6c5e0d357d5d39efe97ae2776e8fb533fa50c1c05397c7b85020b0f098ad790f
 SIZE (cabal/bloomfilter-2.0.1.0.tar.gz) = 22100
diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile
index e77118f2047d..216e15214dc1 100644
--- a/devel/hs-boxes/Makefile
+++ b/devel/hs-boxes/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	boxes
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo
index e6d863864160..19bce67a016a 100644
--- a/devel/hs-boxes/distinfo
+++ b/devel/hs-boxes/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/boxes-0.1.4.tar.gz) = 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8
 SIZE (cabal/boxes-0.1.4.tar.gz) = 6481
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index e9240b6062b2..92a42042c4be 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bsd-sysctl
 PORTVERSION=	1.0.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/distinfo b/devel/hs-bsd-sysctl/distinfo
index d2c54e2b94cb..eff026fbdfe9 100644
--- a/devel/hs-bsd-sysctl/distinfo
+++ b/devel/hs-bsd-sysctl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/bsd-sysctl-1.0.7.tar.gz) = de8c9e2b6d0fa64f7e33885392a05b450e30da35d80de10f37c918ac8d2e1aa3
 SIZE (cabal/bsd-sysctl-1.0.7.tar.gz) = 6183
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
index 543bb55fcf8a..b3499275238c 100644
--- a/devel/hs-byteable/Makefile
+++ b/devel/hs-byteable/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	byteable
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-byteable/distinfo b/devel/hs-byteable/distinfo
index 11d3c1e2095b..0097dff3c870 100644
--- a/devel/hs-byteable/distinfo
+++ b/devel/hs-byteable/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/byteable-0.1.1.tar.gz) = 243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2
 SIZE (cabal/byteable-0.1.1.tar.gz) = 2400
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 0c6670728d26..a29c64c76a77 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	byteorder
 PORTVERSION=	1.0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/distinfo b/devel/hs-byteorder/distinfo
index a1c0b78b4b22..3a4873c29cab 100644
--- a/devel/hs-byteorder/distinfo
+++ b/devel/hs-byteorder/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919
 SIZE (cabal/byteorder-1.0.4.tar.gz) = 2030
diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile
index adf7ab389d06..5dcb321986c3 100644
--- a/devel/hs-bytestring-lexing/Makefile
+++ b/devel/hs-bytestring-lexing/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bytestring-lexing
 PORTVERSION=	0.5.0.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-lexing/distinfo b/devel/hs-bytestring-lexing/distinfo
index 5ad031818cf3..035e04bee31b 100644
--- a/devel/hs-bytestring-lexing/distinfo
+++ b/devel/hs-bytestring-lexing/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 01f9add3f25067a89c5ae9ab1f2fd8ab75ec9f386987ee0d83f73ec855b43f73
 SIZE (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 13859
diff --git a/devel/hs-bytestring-mmap/Makefile b/devel/hs-bytestring-mmap/Makefile
index c23b2e740858..2381a20e1a80 100644
--- a/devel/hs-bytestring-mmap/Makefile
+++ b/devel/hs-bytestring-mmap/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bytestring-mmap
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-mmap/distinfo b/devel/hs-bytestring-mmap/distinfo
index 93a825b438ce..668ccd42740c 100644
--- a/devel/hs-bytestring-mmap/distinfo
+++ b/devel/hs-bytestring-mmap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
 SHA256 (cabal/bytestring-mmap-0.2.2.tar.gz) = 7bbcaeeccec5cf448ba59c9ed4de95bcc47b11ae2b9bcddb6201decb88eb69af
 SIZE (cabal/bytestring-mmap-0.2.2.tar.gz) = 7188
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index 0cb43c1f2689..a022ded4130e 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bytestring-nums
 PORTVERSION=	0.3.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/distinfo b/devel/hs-bytestring-nums/distinfo
index a1d9cc088072..0a4d5c2d5993 100644
--- a/devel/hs-bytestring-nums/distinfo
+++ b/devel/hs-bytestring-nums/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627823
 SHA256 (cabal/bytestring-nums-0.3.6.tar.gz) = bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd
 SIZE (cabal/bytestring-nums-0.3.6.tar.gz) = 3770
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index ebb40e415b60..d6ed55e071d4 100644
--- a/devel/hs-bytestring-show/Makefile
+++ b/devel/hs-bytestring-show/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bytestring-show
 PORTVERSION=	0.3.5.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/distinfo b/devel/hs-bytestring-show/distinfo
index 82c5cb792baf..7876a0176d41 100644
--- a/devel/hs-bytestring-show/distinfo
+++ b/devel/hs-bytestring-show/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627823
 SHA256 (cabal/bytestring-show-0.3.5.6.tar.gz) = 29242efd16951ebba888218c469a99ff25b19ab74ee1e0d7b4db09b8800a0812
 SIZE (cabal/bytestring-show-0.3.5.6.tar.gz) = 8145
diff --git a/devel/hs-bytestring-show/files/patch-bytestring-show.cabal b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
new file mode 100644
index 000000000000..fa60616d91cd
--- /dev/null
+++ b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
@@ -0,0 +1,11 @@
+--- bytestring-show.cabal.orig	2017-07-08 18:54:46 UTC
++++ bytestring-show.cabal
+@@ -16,7 +16,7 @@ flag integer-simple
+         description: use with integer-simple build of GHC
+ 
+ library
+-    build-depends: base < 5, binary < 0.8, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6
++    build-depends: base < 5, binary < 0.9, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6
+ 
+     exposed-modules:
+         Text.Show.ByteString
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index ce0fe1ebeecd..671000d9b919 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	c2hs
-PORTVERSION=	0.28.1
+PORTVERSION=	0.28.2
 PORTREVISION=	1
 CATEGORIES=	devel haskell
 
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index 2c6b94f46cad..54b7479f6378 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486993392
-SHA256 (cabal/c2hs-0.28.1.tar.gz) = 95b04ef42cf43a1078e9c8a4bf9264dd26e8653b441b3fb7f2296c8b3a0752bb
-SIZE (cabal/c2hs-0.28.1.tar.gz) = 205622
+TIMESTAMP = 1499627824
+SHA256 (cabal/c2hs-0.28.2.tar.gz) = f4171478cafe9f4906735763c2e0bc1ca0a9f56b50e9d59aac07520434920f9e
+SIZE (cabal/c2hs-0.28.2.tar.gz) = 205916
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 4b181195025b..3d9a58654b59 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cabal-install
-PORTVERSION=	1.22.6.0
+PORTVERSION=	1.24.0.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,8 +9,9 @@ COMMENT=	Command-line interface for Cabal and Hackage
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	HTTP>=4000.2.5 mtl>=2.0 network>=2.6 network-uri>=2.6 \
-		random>=1 stm>=2.0 zlib>=0.5.3
+USE_CABAL=	async base16-bytestring cryptohash-sha256 hackage-security \
+		hashable HTTP mtl network network-uri old-time random stm \
+		tar zlib
 
 STANDALONE=	yes
 EXECUTABLE=	cabal
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index 3194cae126ee..e357bb419c56 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cabal-install-1.22.6.0.tar.gz) = 9d239e385696a7faa49f068aea451882baec6a7df26fbddbd08271c9053cb0b4
-SIZE (cabal/cabal-install-1.22.6.0.tar.gz) = 302564
+TIMESTAMP = 1499540276
+SHA256 (cabal/cabal-install-1.24.0.2.tar.gz) = 2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0
+SIZE (cabal/cabal-install-1.24.0.2.tar.gz) = 499937
diff --git a/devel/hs-call-stack/Makefile b/devel/hs-call-stack/Makefile
new file mode 100644
index 000000000000..f956def523ed
--- /dev/null
+++ b/devel/hs-call-stack/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	call-stack
+PORTVERSION=	0.1.0
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	The call-stack package
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-call-stack/distinfo b/devel/hs-call-stack/distinfo
new file mode 100644
index 000000000000..59b4d0446cca
--- /dev/null
+++ b/devel/hs-call-stack/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499547219
+SHA256 (cabal/call-stack-0.1.0.tar.gz) = f25f5e0992a39371079cc25c2a14b5abb872fa7d868a32753aac3a258b83b1e2
+SIZE (cabal/call-stack-0.1.0.tar.gz) = 2473
diff --git a/devel/hs-call-stack/pkg-descr b/devel/hs-call-stack/pkg-descr
new file mode 100644
index 000000000000..e0499cd7eb67
--- /dev/null
+++ b/devel/hs-call-stack/pkg-descr
@@ -0,0 +1,3 @@
+Use GHC call-stacks in a backward compatible way.
+
+WWW: https://hackage.haskell.org/package/call-stack
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 891578352351..676a373ad875 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cereal
-PORTVERSION=	0.4.1.1
+PORTVERSION=	0.5.4.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo
index 2853ab1df6d8..f99ee80b5cec 100644
--- a/devel/hs-cereal/distinfo
+++ b/devel/hs-cereal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cereal-0.4.1.1.tar.gz) = df047216179ba3817134e32c73ef9e3b5dddbd4efff604f50ca0ca0c93753097
-SIZE (cabal/cereal-0.4.1.1.tar.gz) = 22656
+TIMESTAMP = 1499627824
+SHA256 (cabal/cereal-0.5.4.0.tar.gz) = daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7
+SIZE (cabal/cereal-0.5.4.0.tar.gz) = 19504
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 76af9e653c12..b5191c210f56 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	checkers
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.7
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-checkers/distinfo b/devel/hs-checkers/distinfo
index 8f64068af05c..beb5d19fb724 100644
--- a/devel/hs-checkers/distinfo
+++ b/devel/hs-checkers/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/checkers-0.4.3.tar.gz) = c0589321485225b7f37f108d232eb4caa42ba52afe0d28dccbe932185862c567
-SIZE (cabal/checkers-0.4.3.tar.gz) = 15022
+TIMESTAMP = 1499538835
+SHA256 (cabal/checkers-0.4.7.tar.gz) = f9d9cb2fcd613d0cfe440aae024e27e9ccb5c8f925046e4f71f6360d8f4c2b97
+SIZE (cabal/checkers-0.4.7.tar.gz) = 15026
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
index e320c81b7e40..d475008a8118 100644
--- a/devel/hs-chunked-data/Makefile
+++ b/devel/hs-chunked-data/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	chunked-data
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-chunked-data/distinfo b/devel/hs-chunked-data/distinfo
index 3f032bab4c10..08ac2c815ca5 100644
--- a/devel/hs-chunked-data/distinfo
+++ b/devel/hs-chunked-data/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/chunked-data-0.2.0.tar.gz) = 9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272
-SIZE (cabal/chunked-data-0.2.0.tar.gz) = 4923
+TIMESTAMP = 1499627825
+SHA256 (cabal/chunked-data-0.3.0.tar.gz) = e1be9da64c3682fd907aa9f1a118e8bfba7964d509fddf54bd245b199dc15f2f
+SIZE (cabal/chunked-data-0.3.0.tar.gz) = 4349
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 116e25f33b28..4a9901889680 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	classy-prelude-conduit
-PORTVERSION=	0.12.0.1
+PORTVERSION=	1.2.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index 02e71d9dca36..f6816aa3392e 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7
-SIZE (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = 1598
+TIMESTAMP = 1499627826
+SHA256 (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f
+SIZE (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 1735
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index 5f910e7e2fbf..f0cd3722a972 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	classy-prelude
-PORTVERSION=	0.12.1.1
+PORTVERSION=	1.2.0.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,11 +9,12 @@ COMMENT=	Typeclass-based Prelude
 
 LICENSE=	MIT
 
-USE_CABAL=	basic-prelude>=0.4 bifunctors chunked-data dlist>=0.7 \
-		enclosed-exceptions exceptions>=0.5 hashable lifted-base>=0.2 \
-		mono-traversable>=0.9.1 mtl mutable-containers>=0.3 primitive \
-		semigroups stm text time-locale-compat unordered-containers \
-		vector vector-instances
+USE_CABAL=	async basic-prelude bifunctors chunked-data dlist \
+		exceptions hashable lifted-async lifted-base monad-unlift \
+		mono-traversable mono-traversable-instances mtl \
+		mutable-containers primitive safe-exceptions say semigroups \
+		stm stm-chans text time-locale-compat transformers-base \
+		unordered-containers vector vector-instances
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index 166c94d5dd36..e72567fe62a0 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/classy-prelude-0.12.1.1.tar.gz) = 670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13
-SIZE (cabal/classy-prelude-0.12.1.1.tar.gz) = 10273
+TIMESTAMP = 1499627825
+SHA256 (cabal/classy-prelude-1.2.0.1.tar.gz) = a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34
+SIZE (cabal/classy-prelude-1.2.0.1.tar.gz) = 12017
diff --git a/devel/hs-clock/Makefile b/devel/hs-clock/Makefile
new file mode 100644
index 000000000000..02325b2071f1
--- /dev/null
+++ b/devel/hs-clock/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	clock
+PORTVERSION=	0.7.2
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	A package for convenient access to high-resolution clock and timer functions
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-clock/distinfo b/devel/hs-clock/distinfo
new file mode 100644
index 000000000000..6c3e33220931
--- /dev/null
+++ b/devel/hs-clock/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499692787
+SHA256 (cabal/clock-0.7.2.tar.gz) = 886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f
+SIZE (cabal/clock-0.7.2.tar.gz) = 7465
diff --git a/devel/hs-clock/pkg-descr b/devel/hs-clock/pkg-descr
new file mode 100644
index 000000000000..37748a5a5bd3
--- /dev/null
+++ b/devel/hs-clock/pkg-descr
@@ -0,0 +1,4 @@
+A package for convenient access to high-resolution clock and timer functions of
+different operating systems via a unified API.
+
+WWW: http://hackage.haskell.org/package/clock
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 901c6e0a425c..ac7b2abe82e8 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmdargs
-PORTVERSION=	0.10.13
+PORTVERSION=	0.10.17
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index 13b88cc1930f..8509d2ff8fcf 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cmdargs-0.10.13.tar.gz) = 66117c1fadaa2a79be07998287ca7cee334c249615b0fab9b91467ad813bbf6e
-SIZE (cabal/cmdargs-0.10.13.tar.gz) = 64008
+TIMESTAMP = 1499596679
+SHA256 (cabal/cmdargs-0.10.17.tar.gz) = 3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da
+SIZE (cabal/cmdargs-0.10.17.tar.gz) = 64440
diff --git a/devel/hs-code-page/Makefile b/devel/hs-code-page/Makefile
new file mode 100644
index 000000000000..0e23bf06a190
--- /dev/null
+++ b/devel/hs-code-page/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	code-page
+PORTVERSION=	0.1.3
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	A cross-platform module that exports functions which adjust code pages on Windows
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-code-page/distinfo b/devel/hs-code-page/distinfo
new file mode 100644
index 000000000000..96e1d94bf360
--- /dev/null
+++ b/devel/hs-code-page/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499790338
+SHA256 (cabal/code-page-0.1.3.tar.gz) = e65c86600e06d85f2e2c2a9df4b3d68e2dbd3adb2df9e922a4cd744966762191
+SIZE (cabal/code-page-0.1.3.tar.gz) = 4718
diff --git a/devel/hs-code-page/pkg-descr b/devel/hs-code-page/pkg-descr
new file mode 100644
index 000000000000..b2fb523749a7
--- /dev/null
+++ b/devel/hs-code-page/pkg-descr
@@ -0,0 +1,10 @@
+This library provides two modules:
+
+ * System.IO.CodePage: a cross-platform module that exports functions which
+   adjust code pages on Windows, and do nothing on other operating systems.
+
+ * System.Win32.CodePage: On Windows, this exports functions for getting,
+   setting, and analyzing code pages. On other operating systems, this module
+   exports nothing.
+
+WWW: https://hackage.haskell.org/package/code-page
diff --git a/devel/hs-colour/Makefile b/devel/hs-colour/Makefile
new file mode 100644
index 000000000000..d655d0b8b7fa
--- /dev/null
+++ b/devel/hs-colour/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	colour
+PORTVERSION=	2.3.3
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	This package provides a data type for colours and transparency
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-colour/distinfo b/devel/hs-colour/distinfo
new file mode 100644
index 000000000000..db94588f4d62
--- /dev/null
+++ b/devel/hs-colour/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499547650
+SHA256 (cabal/colour-2.3.3.tar.gz) = 8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2
+SIZE (cabal/colour-2.3.3.tar.gz) = 20392
diff --git a/devel/hs-colour/pkg-descr b/devel/hs-colour/pkg-descr
new file mode 100644
index 000000000000..3876a3997a17
--- /dev/null
+++ b/devel/hs-colour/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a data type for colours and transparency.
+Colours can be blended and composed. Various colour spaces are
+supported. A module of colour names (Data.Colour.Names) is provided.
+
+WWW: http://hackage.haskell.org/package/colour
diff --git a/devel/hs-concurrent-output/Makefile b/devel/hs-concurrent-output/Makefile
new file mode 100644
index 000000000000..d04077288657
--- /dev/null
+++ b/devel/hs-concurrent-output/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	concurrent-output
+PORTVERSION=	1.10.0
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Ungarble output from several threads or commands
+
+LICENSE=	BSD2CLAUSE
+
+USE_CABAL=	text async stm exceptions ansi-terminal terminal-size
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-concurrent-output/distinfo b/devel/hs-concurrent-output/distinfo
new file mode 100644
index 000000000000..f3d0b41e12c9
--- /dev/null
+++ b/devel/hs-concurrent-output/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501333173
+SHA256 (cabal/concurrent-output-1.10.0.tar.gz) = 29716759e088f2a59b4aef2c9cb5e4931d7990f1a6393adcb551781ed1af58b2
+SIZE (cabal/concurrent-output-1.10.0.tar.gz) = 21764
diff --git a/devel/hs-concurrent-output/files/patch-concurrent-output.cabal b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
new file mode 100644
index 000000000000..a517c388b924
--- /dev/null
+++ b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
@@ -0,0 +1,11 @@
+--- concurrent-output.cabal.orig	2017-05-19 15:55:09 UTC
++++ concurrent-output.cabal
+@@ -34,7 +34,7 @@ Library
+     , text (>= 0.11.0 && < 1.3.0)
+     , async (>= 2.0 && < 2.2)
+     , stm (>= 2.0 && < 2.5)
+-    , process (>= 1.6.0 && < 1.7.0)
++    , process
+     , directory (>= 1.2.0 && < 1.4.0)
+     , transformers (>= 0.3.0 && < 0.6.0)
+     , exceptions (>= 0.6.0 && < 0.9.0)
diff --git a/devel/hs-concurrent-output/pkg-descr b/devel/hs-concurrent-output/pkg-descr
new file mode 100644
index 000000000000..ed809c2db02d
--- /dev/null
+++ b/devel/hs-concurrent-output/pkg-descr
@@ -0,0 +1,9 @@
+Lets multiple threads and external processes concurrently output to the
+console, without it getting all garbled up.
+
+Built on top of that is a way of defining multiple output regions, which are
+automatically laid out on the screen and can be individually updated by
+concurrent threads. Can be used for progress displays etc. 
+
+WWW: http://hackage.haskell.org/package/concurrent-output
+
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
index c5f79cb56198..0572e6866c44 100644
--- a/devel/hs-conduit-combinators/Makefile
+++ b/devel/hs-conduit-combinators/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	conduit-combinators
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-conduit-combinators/distinfo b/devel/hs-conduit-combinators/distinfo
index b8915bbc4208..28904c912a66 100644
--- a/devel/hs-conduit-combinators/distinfo
+++ b/devel/hs-conduit-combinators/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-combinators-1.0.3.tar.gz) = 29c1f3dd854d11212474692c6c3a4158ed2929e8443ff2878eee5ea1ed6700bf
-SIZE (cabal/conduit-combinators-1.0.3.tar.gz) = 38172
+TIMESTAMP = 1499627827
+SHA256 (cabal/conduit-combinators-1.1.1.tar.gz) = a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918
+SIZE (cabal/conduit-combinators-1.1.1.tar.gz) = 38380
diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile
index 12683b586da5..65b6e826afe3 100644
--- a/devel/hs-conduit-extra/Makefile
+++ b/devel/hs-conduit-extra/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	conduit-extra
-PORTVERSION=	1.1.9.1
+PORTVERSION=	1.1.16
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-conduit-extra/distinfo b/devel/hs-conduit-extra/distinfo
index 50bdc241aee9..bb3c610cd933 100644
--- a/devel/hs-conduit-extra/distinfo
+++ b/devel/hs-conduit-extra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-extra-1.1.9.1.tar.gz) = 3f1be15bef32652caa9a98e175c95614c0f6d04ca29c35d30ddbc940a90fa0a3
-SIZE (cabal/conduit-extra-1.1.9.1.tar.gz) = 29571
+TIMESTAMP = 1499627827
+SHA256 (cabal/conduit-extra-1.1.16.tar.gz) = bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5
+SIZE (cabal/conduit-extra-1.1.16.tar.gz) = 34402
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index b3376359f2ab..8a4d095c9e73 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	conduit
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.11
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index dcde7641cbdc..0ede71efa0c2 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-1.2.5.tar.gz) = b100cdb428731923205372dded60b6529d33728f69a0eb951a01f53c182c2a46
-SIZE (cabal/conduit-1.2.5.tar.gz) = 46805
+TIMESTAMP = 1499543753
+SHA256 (cabal/conduit-1.2.11.tar.gz) = 0b66423f04d991262b800174064d0c6046fba0009eddcca616f9afaf84dca8f7
+SIZE (cabal/conduit-1.2.11.tar.gz) = 50240
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index e121c375bb34..fb879d793858 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	configurator
 PORTVERSION=	0.3.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-configurator/distinfo b/devel/hs-configurator/distinfo
index 1ffcc4ec4af8..fa149af9b6c2 100644
--- a/devel/hs-configurator/distinfo
+++ b/devel/hs-configurator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627827
 SHA256 (cabal/configurator-0.3.0.0.tar.gz) = 6eb9996b672e9f7112ca23482c42fa533553312c3c13f38a8a06476e67c031b4
 SIZE (cabal/configurator-0.3.0.0.tar.gz) = 15232
diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile
index aa95bda4cf6d..8d517c0f9e19 100644
--- a/devel/hs-constraints/Makefile
+++ b/devel/hs-constraints/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	constraints
-PORTVERSION=	0.4.1.3
+PORTVERSION=	0.9.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Constraint manipulation
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	newtype>=0.2
+USE_CABAL=	hashable mtl transformers-compat
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo
index 1bb8e26226ee..33ab50904526 100644
--- a/devel/hs-constraints/distinfo
+++ b/devel/hs-constraints/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/constraints-0.4.1.3.tar.gz) = dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0
-SIZE (cabal/constraints-0.4.1.3.tar.gz) = 7311
+TIMESTAMP = 1499444670
+SHA256 (cabal/constraints-0.9.1.tar.gz) = 276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785
+SIZE (cabal/constraints-0.9.1.tar.gz) = 18503
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 737bdfbc5b9c..64b0529283a0 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	convertible
 PORTVERSION=	1.1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-convertible/distinfo b/devel/hs-convertible/distinfo
index 76a4901de85a..aa551f69bf81 100644
--- a/devel/hs-convertible/distinfo
+++ b/devel/hs-convertible/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627827
 SHA256 (cabal/convertible-1.1.1.0.tar.gz) = e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c
 SIZE (cabal/convertible-1.1.1.0.tar.gz) = 14354
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index c27affa50ef0..855ca369d6f3 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpphs
-PORTVERSION=	1.19
+PORTVERSION=	1.20.8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index e79d6bde247c..d2925493b20e 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cpphs-1.19.tar.gz) = e05c97be645eafeed5c7475f84a02016ad56eaf67ad0a725b8ebff7fbcc73e3a
-SIZE (cabal/cpphs-1.19.tar.gz) = 44056
+TIMESTAMP = 1499627828
+SHA256 (cabal/cpphs-1.20.8.tar.gz) = e56d64a7d8058e0fb63f0669397c1c861efb20a0376e0e74d86942ac151105ae
+SIZE (cabal/cpphs-1.20.8.tar.gz) = 45108
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 54cd8d9fa7eb..b828d3b42acb 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	darcs
-PORTVERSION=	2.10.1
+PORTVERSION=	2.12.5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,12 +10,12 @@ COMMENT=	Distributed, interactive, smart revision control system
 
 LICENSE=	GPLv2
 
-USE_CABAL=	attoparsec>=0.11 base16-bytestring>=0.1 cryptohash>=0.4 \
-		data-ordlist>=0.4 dataenc>=0.11 hashable>=1.0 html \
-		mmap>=0.5 mtl>=2.1 parsec>=3.1 random>=1.0 \
-		regex-applicative>=0.2 regex-compat-tdfa>=0.95.1 tar>=0.4 \
-		text>=0.11.2.0 transformers-compat>=0.4 unix-compat>=0.1.2 \
-		utf8-string>=0.3.6 vector>=0.7 zip-archive>=0.2.3 zlib>=0.5.3.0
+USE_CABAL=	async attoparsec base16-bytestring cryptohash \
+		data-ordlist dataenc fgl graphviz hashable html HTTP \
+		mmap mtl parsec random \
+		regex-applicative regex-compat-tdfa sandi tar \
+		text transformers-compat unix-compat \
+		utf8-string vector zip-archive zlib
 
 EXECUTABLE=	darcs
 
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 674b3132fd28..b1637f2cebd2 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/darcs-2.10.1.tar.gz) = f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94
-SIZE (cabal/darcs-2.10.1.tar.gz) = 1509208
+TIMESTAMP = 1499538866
+SHA256 (cabal/darcs-2.12.5.tar.gz) = 355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553
+SIZE (cabal/darcs-2.12.5.tar.gz) = 1460698
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index c93b12126848..e37898d12a64 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,6 +1,6 @@
---- ./Setup.lhs.orig	2013-02-06 07:07:21.000000000 +0100
-+++ ./Setup.lhs	2014-07-13 22:44:31.000000000 +0200
-@@ -26,7 +26,7 @@
+--- Setup.lhs.orig	2017-01-11 20:07:29 UTC
++++ Setup.lhs
+@@ -26,7 +26,7 @@ import Distribution.Version
  import Data.Version( showVersion )
  import Distribution.Simple.LocalBuildInfo
           ( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
@@ -9,7 +9,7 @@
  import Distribution.Simple.PackageIndex ( topologicalOrder )
  import Distribution.Simple.Program ( gccProgram, rawSystemProgramStdoutConf )
  import Distribution.Simple.Setup
-@@ -200,7 +200,7 @@
+@@ -217,7 +217,7 @@ installManpage :: PackageDescription -> LocalBuildInfo
                    -> Verbosity -> CopyDest -> IO ()
  installManpage pkg lbi verbosity copy =
      copyFiles verbosity
@@ -17,4 +17,4 @@
 +              (prefix (absoluteInstallDirs pkg lbi copy) </> "man" </> "man1")
                [(buildDir lbi </> "darcs", "darcs.1")]
  
- determineVersion :: Verbosity -> PackageDescription -> IO (String, String)
+ -- ---------------------------------------------------------------------
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
new file mode 100644
index 000000000000..18095e40a87a
--- /dev/null
+++ b/devel/hs-darcs/files/patch-darcs.cabal
@@ -0,0 +1,11 @@
+--- darcs.cabal.orig	2017-07-11 16:28:16 UTC
++++ darcs.cabal
+@@ -400,7 +400,7 @@ Library
+                      transformers-compat >= 0.4 && < 0.6,
+                      parsec       >= 3.1 && < 3.2,
+                      fgl          >= 5.5.0.1 && < 5.6,
+-                     graphviz     >= 2999.17.0.1 && < 2999.19,
++                     graphviz     >= 2999.17.0.1 && < 2999.20,
+                      html         >= 1.0.1.2 && < 1.1,
+                      filepath     >= 1.3.0.1 && < 1.5.0.0,
+                      haskeline    >= 0.6.3 && < 0.8,
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index ff032871af21..9a0ca9723fa4 100644
--- a/devel/hs-data-default-class/Makefile
+++ b/devel/hs-data-default-class/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	data-default-class
-PORTVERSION=	0.0.1
-PORTREVISION=	7
+PORTVERSION=	0.1.2.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-default-class/distinfo b/devel/hs-data-default-class/distinfo
index 31fd528a0f3d..464fd1fafb02 100644
--- a/devel/hs-data-default-class/distinfo
+++ b/devel/hs-data-default-class/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-class-0.0.1.tar.gz) = adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31
-SIZE (cabal/data-default-class-0.0.1.tar.gz) = 1461
+TIMESTAMP = 1499627829
+SHA256 (cabal/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
+SIZE (cabal/data-default-class-0.1.2.0.tar.gz) = 2522
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
index bec4750fbc4a..8f046f7753fb 100644
--- a/devel/hs-data-default-instances-base/Makefile
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	data-default-instances-base
-PORTVERSION=	0.0.1
-PORTREVISION=	7
+PORTVERSION=	0.1.0.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-base/distinfo b/devel/hs-data-default-instances-base/distinfo
index ac501b02ff33..92eddcf0b843 100644
--- a/devel/hs-data-default-instances-base/distinfo
+++ b/devel/hs-data-default-instances-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-instances-base-0.0.1.tar.gz) = eb12ff0174ae1fe2613058b87d0752f94e64df9a9bf971780c2e24bf0cb662a0
-SIZE (cabal/data-default-instances-base-0.0.1.tar.gz) = 1930
+TIMESTAMP = 1499627830
+SHA256 (cabal/data-default-instances-base-0.1.0.1.tar.gz) = 844fe453f674b6b0998da804465914abce8936c5e640d8bb8bff37ad07d7a17a
+SIZE (cabal/data-default-instances-base-0.1.0.1.tar.gz) = 1554
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
index 70d45256768c..3294b52f7c02 100644
--- a/devel/hs-data-default-instances-containers/Makefile
+++ b/devel/hs-data-default-instances-containers/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-instances-containers
 PORTVERSION=	0.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-containers/distinfo b/devel/hs-data-default-instances-containers/distinfo
index 67aacc61da1d..6576bb357d2a 100644
--- a/devel/hs-data-default-instances-containers/distinfo
+++ b/devel/hs-data-default-instances-containers/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
 SHA256 (cabal/data-default-instances-containers-0.0.1.tar.gz) = a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a
 SIZE (cabal/data-default-instances-containers-0.0.1.tar.gz) = 1659
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
index f86cd4604227..76628997145a 100644
--- a/devel/hs-data-default-instances-dlist/Makefile
+++ b/devel/hs-data-default-instances-dlist/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-instances-dlist
 PORTVERSION=	0.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-dlist/distinfo b/devel/hs-data-default-instances-dlist/distinfo
index f62a64d50b1e..fa9fd22b9699 100644
--- a/devel/hs-data-default-instances-dlist/distinfo
+++ b/devel/hs-data-default-instances-dlist/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
 SHA256 (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959
 SIZE (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 1503
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
index 9da6291cfec6..a9fb775eaf74 100644
--- a/devel/hs-data-default-instances-old-locale/Makefile
+++ b/devel/hs-data-default-instances-old-locale/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-instances-old-locale
 PORTVERSION=	0.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-old-locale/distinfo b/devel/hs-data-default-instances-old-locale/distinfo
index 475d09844e98..16f3c50a4a6d 100644
--- a/devel/hs-data-default-instances-old-locale/distinfo
+++ b/devel/hs-data-default-instances-old-locale/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
 SHA256 (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802
 SIZE (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 5266420f2c68..5ee16ba88fdc 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	data-default
-PORTVERSION=	0.5.3
-PORTREVISION=	7
+PORTVERSION=	0.7.1.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-default/distinfo b/devel/hs-data-default/distinfo
index 46c14a4b1a21..dce4860a7ea1 100644
--- a/devel/hs-data-default/distinfo
+++ b/devel/hs-data-default/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-0.5.3.tar.gz) = ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034
-SIZE (cabal/data-default-0.5.3.tar.gz) = 1623
+TIMESTAMP = 1499627829
+SHA256 (cabal/data-default-0.7.1.1.tar.gz) = b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511
+SIZE (cabal/data-default-0.7.1.1.tar.gz) = 1627
diff --git a/devel/hs-data-endian/Makefile b/devel/hs-data-endian/Makefile
new file mode 100644
index 000000000000..d1481a6d3f71
--- /dev/null
+++ b/devel/hs-data-endian/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	data-endian
+PORTVERSION=	0.1.1
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Endian-sensitive data
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-endian/distinfo b/devel/hs-data-endian/distinfo
new file mode 100644
index 000000000000..b983e0971148
--- /dev/null
+++ b/devel/hs-data-endian/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501335045
+SHA256 (cabal/data-endian-0.1.1.tar.gz) = 8c1d4f30374f8331d31f4d7c6b39284331b6b9436e7b50f86547417bd05f2ac0
+SIZE (cabal/data-endian-0.1.1.tar.gz) = 2788
diff --git a/devel/hs-data-endian/pkg-descr b/devel/hs-data-endian/pkg-descr
new file mode 100644
index 000000000000..8e9be44da194
--- /dev/null
+++ b/devel/hs-data-endian/pkg-descr
@@ -0,0 +1,3 @@
+This package provides helpers for converting endian-sensitive data.
+
+WWW: https://github.com/mvv/data-endian 
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
index 7ebe7dedcbe2..079a44a215b0 100644
--- a/devel/hs-data-hash/Makefile
+++ b/devel/hs-data-hash/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	data-hash
 PORTVERSION=	0.2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/distinfo b/devel/hs-data-hash/distinfo
index 9f44700516fb..8e75d5aff7b2 100644
--- a/devel/hs-data-hash/distinfo
+++ b/devel/hs-data-hash/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
 SHA256 (cabal/data-hash-0.2.0.1.tar.gz) = 9117dd49013ca28ff188fc71c3595ac3af23d56d301c1f39bac93d44d8c60bbe
 SIZE (cabal/data-hash-0.2.0.1.tar.gz) = 8504
diff --git a/devel/hs-data-ordlist/Makefile b/devel/hs-data-ordlist/Makefile
index 3d7e5e71c198..723703f4aac0 100644
--- a/devel/hs-data-ordlist/Makefile
+++ b/devel/hs-data-ordlist/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	data-ordlist
 PORTVERSION=	0.4.7.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-data-ordlist/distinfo b/devel/hs-data-ordlist/distinfo
index 84fbd37ceec0..bb7c22be6541 100644
--- a/devel/hs-data-ordlist/distinfo
+++ b/devel/hs-data-ordlist/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
 SHA256 (cabal/data-ordlist-0.4.7.0.tar.gz) = 6f6c1e7a9a9155ad78ca78cb9abd6f7e2e1c78b3e549b179dc0874e6428f490d
 SIZE (cabal/data-ordlist-0.4.7.0.tar.gz) = 8906
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index 5935bd598519..bc9aea80728e 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	data-pprint
-PORTVERSION=	0.2.4
+PORTVERSION=	0.2.4.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Prettyprint and compare Data values
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	mtl>=2.0 parallel>=3.1
+USE_CABAL=	mtl parallel
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-data-pprint/distinfo b/devel/hs-data-pprint/distinfo
index cc583500b7e0..eff54157f627 100644
--- a/devel/hs-data-pprint/distinfo
+++ b/devel/hs-data-pprint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-pprint-0.2.4.tar.gz) = 659bf5b10d5c177982bed9f6676a656387c70e9223ea0b1060afbe446f499864
-SIZE (cabal/data-pprint-0.2.4.tar.gz) = 10112
+TIMESTAMP = 1499448153
+SHA256 (cabal/data-pprint-0.2.4.1.tar.gz) = 0c06aae83e1e41883927fbaa008964acd7d6b005a0f7e44c95fa5062943e0f83
+SIZE (cabal/data-pprint-0.2.4.1.tar.gz) = 10117
diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal
new file mode 100644
index 000000000000..a63eb3a49419
--- /dev/null
+++ b/devel/hs-data-pprint/files/patch-data-pprint.cabal
@@ -0,0 +1,10 @@
+--- data-pprint.cabal.orig	2017-07-10 15:51:41 UTC
++++ data-pprint.cabal
+@@ -72,6 +72,6 @@ library
+     pretty >= 1.0 && < 1.2,
+     mtl >= 2.0 && < 2.3,
+     deepseq >= 1.1 && < 1.5,
+-    time >= 1.2 && < 1.6,
++    time >= 1.2 && < 1.7,
+     parallel >= 3.1 && < 3.3
+ 
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index 1dda19d3ff04..1cb954ca3af3 100644
--- a/devel/hs-date-cache/Makefile
+++ b/devel/hs-date-cache/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	date-cache
 PORTVERSION=	0.3.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-date-cache/distinfo b/devel/hs-date-cache/distinfo
index 5bf3401bd783..0a4b730b040f 100644
--- a/devel/hs-date-cache/distinfo
+++ b/devel/hs-date-cache/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627831
 SHA256 (cabal/date-cache-0.3.0.tar.gz) = abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f
 SIZE (cabal/date-cache-0.3.0.tar.gz) = 2126
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 583939a50a2d..c3bfc1c8cabe 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	datetime
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-datetime/distinfo b/devel/hs-datetime/distinfo
index 67c44c65626e..f1b398b13494 100644
--- a/devel/hs-datetime/distinfo
+++ b/devel/hs-datetime/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627831
 SHA256 (cabal/datetime-0.3.1.tar.gz) = 333c7577c5051eb23d172568b9d4fe186f8b5bc750ba1d09822c275d76edbd4a
 SIZE (cabal/datetime-0.3.1.tar.gz) = 15071
diff --git a/devel/hs-dbus/Makefile b/devel/hs-dbus/Makefile
new file mode 100644
index 000000000000..bd04b57d9d51
--- /dev/null
+++ b/devel/hs-dbus/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	dbus
+PORTVERSION=	0.10.13
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	A client library for the D-Bus IPC system
+
+LICENSE=	GPLv3
+
+USE_CABAL=	cereal libxml-sax network parsec random text vector xml-types
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-dbus/distinfo b/devel/hs-dbus/distinfo
new file mode 100644
index 000000000000..14245bed4930
--- /dev/null
+++ b/devel/hs-dbus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501342515
+SHA256 (cabal/dbus-0.10.13.tar.gz) = aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca
+SIZE (cabal/dbus-0.10.13.tar.gz) = 75603
diff --git a/devel/hs-dbus/pkg-descr b/devel/hs-dbus/pkg-descr
new file mode 100644
index 000000000000..4b968c71b5b2
--- /dev/null
+++ b/devel/hs-dbus/pkg-descr
@@ -0,0 +1,13 @@
+D-Bus is a simple, message-based protocol for inter-process communication,
+which allows applications to interact with other parts of the machine and the
+user's session using remote procedure calls.
+
+D-Bus is a essential part of the modern Linux desktop, where it replaces
+earlier protocols such as CORBA and DCOP.
+
+This library is an implementation of the D-Bus protocol in Haskell.  It can be
+used to add D-Bus support to Haskell applications, without the awkward
+interfaces common to foreign bindings.
+
+WWW: https://github.com/rblaze/haskell-dbus#readme
+
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
index c7ef01f26245..8b9dac1701f1 100644
--- a/devel/hs-deepseq-generics/Makefile
+++ b/devel/hs-deepseq-generics/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	deepseq-generics
-PORTVERSION=	0.1.1.2
+PORTVERSION=	0.2.0.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/distinfo b/devel/hs-deepseq-generics/distinfo
index 5359067853f9..f344190f38b7 100644
--- a/devel/hs-deepseq-generics/distinfo
+++ b/devel/hs-deepseq-generics/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/deepseq-generics-0.1.1.2.tar.gz) = 839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06
-SIZE (cabal/deepseq-generics-0.1.1.2.tar.gz) = 5304
+TIMESTAMP = 1499444756
+SHA256 (cabal/deepseq-generics-0.2.0.0.tar.gz) = b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d
+SIZE (cabal/deepseq-generics-0.2.0.0.tar.gz) = 5192
diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
deleted file mode 100644
index 0245d5386535..000000000000
--- a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- deepseq-generics.cabal.orig	2014-12-17 12:16:47 UTC
-+++ deepseq-generics.cabal
-@@ -42,7 +42,7 @@ source-repository head
- library
-     default-language:    Haskell2010
-     exposed-modules:     Control.DeepSeq.Generics
--    build-depends:       base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.4, deepseq >= 1.2.0.1 && < 1.5
-+    build-depends:       base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.5, deepseq >= 1.2.0.1 && < 1.5
-     other-extensions:    BangPatterns, FlexibleContexts, TypeOperators
-     ghc-options:         -Wall
- 
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index e9d095a13975..c5b152b8bb86 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	directory-tree
-PORTVERSION=	0.12.0
-PORTREVISION=	2
+PORTVERSION=	0.12.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-directory-tree/distinfo b/devel/hs-directory-tree/distinfo
index 27ecf8e3d60c..b736767ddc50 100644
--- a/devel/hs-directory-tree/distinfo
+++ b/devel/hs-directory-tree/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/directory-tree-0.12.0.tar.gz) = ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5
-SIZE (cabal/directory-tree-0.12.0.tar.gz) = 12024
+TIMESTAMP = 1499627831
+SHA256 (cabal/directory-tree-0.12.1.tar.gz) = e2084495b3a226cf54d949635c86fc14e89daa09d86cce39e3c3cf898ae6e517
+SIZE (cabal/directory-tree-0.12.1.tar.gz) = 12261
diff --git a/devel/hs-directory/distinfo b/devel/hs-directory/distinfo
deleted file mode 100644
index 68dd5f329300..000000000000
--- a/devel/hs-directory/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486844627
-SHA256 (cabal/directory-1.3.0.1.tar.gz) = b2b444aea7faac750efa23c994d9a16f207f12b2009cf38ba39fc7334f373f3c
-SIZE (cabal/directory-1.3.0.1.tar.gz) = 69401
diff --git a/devel/hs-directory/pkg-descr b/devel/hs-directory/pkg-descr
deleted file mode 100644
index 734cb0047d97..000000000000
--- a/devel/hs-directory/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This library provides a basic set of operations for manipulating files 
-and directories in a portable way.
-
-WWW: https://github.com/haskell/directory
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
index fd05f71049e9..9458168704d2 100644
--- a/devel/hs-dlist-instances/Makefile
+++ b/devel/hs-dlist-instances/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dlist-instances
-PORTVERSION=	0.1
-PORTREVISION=	2
+PORTVERSION=	0.1.1.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-dlist-instances/distinfo b/devel/hs-dlist-instances/distinfo
index 315dc4394517..7d69d5afb950 100644
--- a/devel/hs-dlist-instances/distinfo
+++ b/devel/hs-dlist-instances/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dlist-instances-0.1.tar.gz) = 2598aae775532829923d2a8f99dcaaa20e49efec31314e8460a761ee653b3264
-SIZE (cabal/dlist-instances-0.1.tar.gz) = 1676
+TIMESTAMP = 1499459956
+SHA256 (cabal/dlist-instances-0.1.1.1.tar.gz) = d14a10c06f52fb412b2c1066d729f5534aa43204221e7ba7d81d935c44ce4f5b
+SIZE (cabal/dlist-instances-0.1.1.1.tar.gz) = 1749
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 6288b3521685..fff9b0a721ea 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dlist
-PORTVERSION=	0.7.1.1
+PORTVERSION=	0.8.0.3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index a41378fd3338..c6c49fd409be 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dlist-0.7.1.1.tar.gz) = 08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd
-SIZE (cabal/dlist-0.7.1.1.tar.gz) = 6161
+TIMESTAMP = 1499627832
+SHA256 (cabal/dlist-0.8.0.3.tar.gz) = 876782c96957ff480863effb33878f48dd55de7fa64d036e12bf1fbd49542f2f
+SIZE (cabal/dlist-0.8.0.3.tar.gz) = 8596
diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile
index 1c0a16c6afc2..b9415c7970a1 100644
--- a/devel/hs-easy-file/Makefile
+++ b/devel/hs-easy-file/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	easy-file
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-easy-file/distinfo b/devel/hs-easy-file/distinfo
index 442be3eb075b..2cd4b787e652 100644
--- a/devel/hs-easy-file/distinfo
+++ b/devel/hs-easy-file/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
 SHA256 (cabal/easy-file-0.2.1.tar.gz) = ff86e1b29284499bea5f1d0ff539b3ed64fa6d1a06c2243ca61f93be0202e56c
 SIZE (cabal/easy-file-0.2.1.tar.gz) = 12610
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index e383af325ba3..e63ee6759f9a 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	edit-distance
 PORTVERSION=	0.2.2.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/distinfo b/devel/hs-edit-distance/distinfo
index 85c64552e7f2..f42daab8bbd8 100644
--- a/devel/hs-edit-distance/distinfo
+++ b/devel/hs-edit-distance/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
 SHA256 (cabal/edit-distance-0.2.2.1.tar.gz) = 3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a
 SIZE (cabal/edit-distance-0.2.2.1.tar.gz) = 13228
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index 95f7c319a0bd..02b6daea9eb2 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	either
-PORTVERSION=	4.4.1
+PORTVERSION=	4.4.1.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT=	Either monad transformer
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	exceptions>=0.5 free>=4.9 mmorph>=1.0.0 monad-control>=0.3.2 \
-		MonadRandom>=0.1 mtl>=2.0 profunctors>=4 semigroupoids>=4 \
-		semigroups>=0.8.3.1 transformers-base>=0.4
+USE_CABAL=	bifunctors exceptions free mmorph monad-control \
+		MonadRandom mtl profunctors semigroupoids semigroups \
+		transformers-base
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index 84bef2727732..69815b6ae8a3 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/either-4.4.1.tar.gz) = 91e57debc09bcaa7d4b884902ea6d3201ca3fec77625a059edd84bcaeb5909cb
-SIZE (cabal/either-4.4.1.tar.gz) = 9243
+TIMESTAMP = 1499627832
+SHA256 (cabal/either-4.4.1.1.tar.gz) = b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3
+SIZE (cabal/either-4.4.1.1.tar.gz) = 9376
diff --git a/devel/hs-either/files/patch-either.cabal b/devel/hs-either/files/patch-either.cabal
new file mode 100644
index 000000000000..ab50ef682130
--- /dev/null
+++ b/devel/hs-either/files/patch-either.cabal
@@ -0,0 +1,14 @@
+--- either.cabal.orig	2017-07-10 15:15:32 UTC
++++ either.cabal
+@@ -32,9 +32,9 @@ library
+     exceptions        >= 0.5     && < 0.9,
+     free              >= 4.9     && < 5,
+     monad-control     >= 0.3.2   && < 1.1,
+-    MonadRandom       >= 0.1     && < 0.5,
++    MonadRandom       >= 0.1     && < 0.6,
+     mtl               >= 2.0     && < 2.3,
+-    mmorph            >= 1.0.0   && < 1.1,
++    mmorph            >= 1.0.0   && < 1.2,
+     profunctors       >= 4       && < 6,
+     semigroups        >= 0.8.3.1 && < 1,
+     semigroupoids     >= 4       && < 6,
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
index d2306d4a23e7..64c65d434316 100644
--- a/devel/hs-enclosed-exceptions/Makefile
+++ b/devel/hs-enclosed-exceptions/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	enclosed-exceptions
-PORTVERSION=	1.0.1.1
+PORTVERSION=	1.0.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-enclosed-exceptions/distinfo b/devel/hs-enclosed-exceptions/distinfo
index bd569bcf8f0c..a459aca75509 100644
--- a/devel/hs-enclosed-exceptions/distinfo
+++ b/devel/hs-enclosed-exceptions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = e5236133ba5a2395fbac9f8436eb8765ede4a0a8b36341ccbb8a4cddf00c5d99
-SIZE (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = 4566
+TIMESTAMP = 1499627832
+SHA256 (cabal/enclosed-exceptions-1.0.2.tar.gz) = 7b9beab82d219c0dd879dfdef70fb74a4a7595b4dbd0baf7adb12cdbbe8189f1
+SIZE (cabal/enclosed-exceptions-1.0.2.tar.gz) = 5266
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index 78876b4978e5..c50501fad3ca 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	enumerator
 PORTVERSION=	0.4.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-enumerator/distinfo b/devel/hs-enumerator/distinfo
index c1f9e82e96b9..11f76a64f017 100644
--- a/devel/hs-enumerator/distinfo
+++ b/devel/hs-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
 SHA256 (cabal/enumerator-0.4.20.tar.gz) = 33e21054352bb579e8db8697256ff3c61b3dc862c567f9e0fc2509f95e2b4709
 SIZE (cabal/enumerator-0.4.20.tar.gz) = 53986
diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile
index eaa20d8e958a..f8816a8caa53 100644
--- a/devel/hs-equivalence/Makefile
+++ b/devel/hs-equivalence/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	equivalence
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-equivalence/distinfo b/devel/hs-equivalence/distinfo
index 9349edba452b..0851897e619b 100644
--- a/devel/hs-equivalence/distinfo
+++ b/devel/hs-equivalence/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/equivalence-0.3.1.tar.gz) = 7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e
-SIZE (cabal/equivalence-0.3.1.tar.gz) = 8350
+TIMESTAMP = 1499627833
+SHA256 (cabal/equivalence-0.3.2.tar.gz) = 7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529
+SIZE (cabal/equivalence-0.3.2.tar.gz) = 8378
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index a5029c309957..98059612584a 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	errors
-PORTVERSION=	2.0.0
+PORTVERSION=	2.2.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Simplified error-handling
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	safe>=0.3.3
+USE_CABAL=	exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio text
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo
index f846ddacfef6..0a965efdc044 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/errors-2.0.0.tar.gz) = 4527db37c2560b9b3a96eab58c632bf1fbb5e2d530b378eb9043ecedb0de4703
-SIZE (cabal/errors-2.0.0.tar.gz) = 8051
+TIMESTAMP = 1499451104
+SHA256 (cabal/errors-2.2.1.tar.gz) = 4197eb87910bf32d81b92247c2f8fbeee1650217532374ecb63a09d12255f531
+SIZE (cabal/errors-2.2.1.tar.gz) = 8821
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index 383bf7f826b3..04af10620e39 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	exceptions
-PORTVERSION=	0.8.0.2
+PORTVERSION=	0.8.3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Extensible optionally-pure exceptions
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	mtl>=2.0 stm>=2.2 transformers-compat>=0.3
+USE_CABAL=	mtl stm transformers-compat
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo
index 7e311699bb69..da74124de563 100644
--- a/devel/hs-exceptions/distinfo
+++ b/devel/hs-exceptions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/exceptions-0.8.0.2.tar.gz) = 070a3e0d1495243770fb3a629d5187ce898f069cb3621c5f7c610ae264982bf4
-SIZE (cabal/exceptions-0.8.0.2.tar.gz) = 12241
+TIMESTAMP = 1499444351
+SHA256 (cabal/exceptions-0.8.3.tar.gz) = 4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be
+SIZE (cabal/exceptions-0.8.3.tar.gz) = 12986
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 43687062a78c..8d8ba3046664 100644
--- a/devel/hs-extensible-exceptions/Makefile
+++ b/devel/hs-extensible-exceptions/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	extensible-exceptions
 PORTVERSION=	0.1.1.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-extensible-exceptions/distinfo b/devel/hs-extensible-exceptions/distinfo
index ff89f15c5a1f..e3594b520253 100644
--- a/devel/hs-extensible-exceptions/distinfo
+++ b/devel/hs-extensible-exceptions/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627833
 SHA256 (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388
 SIZE (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 8531
diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile
index 848f063aec9e..87b00eb94a88 100644
--- a/devel/hs-extra/Makefile
+++ b/devel/hs-extra/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	extra
-PORTVERSION=	1.4.1
+PORTVERSION=	1.6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT=	Extra functions
 
 LICENSE=	BSD3CLAUSE
 
+USE_CABAL=	clock
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-extra/distinfo b/devel/hs-extra/distinfo
index 10c9ac0cd146..a58102038407 100644
--- a/devel/hs-extra/distinfo
+++ b/devel/hs-extra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/extra-1.4.1.tar.gz) = e02ca751533eb44b221a8e6250c70a125627be8fc1c9711092dc3d2668f2d001
-SIZE (cabal/extra-1.4.1.tar.gz) = 31235
+TIMESTAMP = 1499627833
+SHA256 (cabal/extra-1.6.tar.gz) = 0766e656fad80cfff4fc4c0370d2fe1712077549a5f8a57c38d2c1b5da7b14df
+SIZE (cabal/extra-1.6.tar.gz) = 36369
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 41139b293b1e..936d5e68ed8a 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fast-logger
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Fast logging system
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	auto-update>=0.1.2 text
+USE_CABAL=	auto-update easy-file old-locale text unix-time
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-fast-logger/distinfo b/devel/hs-fast-logger/distinfo
index 1e2a7ada305f..c05e4df04faa 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/fast-logger-2.4.1.tar.gz) = e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e
-SIZE (cabal/fast-logger-2.4.1.tar.gz) = 6211
+TIMESTAMP = 1499627834
+SHA256 (cabal/fast-logger-2.4.10.tar.gz) = dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d
+SIZE (cabal/fast-logger-2.4.10.tar.gz) = 9537
diff --git a/devel/hs-fast-logger/files/patch-fast-logger.cabal b/devel/hs-fast-logger/files/patch-fast-logger.cabal
deleted file mode 100644
index 3f9ce7c18d0b..000000000000
--- a/devel/hs-fast-logger/files/patch-fast-logger.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- fast-logger.cabal.orig	2015-07-06 02:52:26 UTC
-+++ fast-logger.cabal
-@@ -23,7 +23,6 @@ Library
-                       , array
-                       , auto-update >= 0.1.2
-                       , bytestring
--                      , bytestring-builder
-                       , directory
-                       , filepath
-                       , text
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 937cd5b6a9cc..16b615ea6277 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fgl
-PORTVERSION=	5.5.2.1
+PORTVERSION=	5.5.3.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index 42f437b83f82..917f6f6c0665 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/fgl-5.5.2.1.tar.gz) = 0c2e745b7c2532f67b87a1c97ef016dca7444113d3901722c48c3193e71bd5d9
-SIZE (cabal/fgl-5.5.2.1.tar.gz) = 51963
+TIMESTAMP = 1499541554
+SHA256 (cabal/fgl-5.5.3.1.tar.gz) = dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c
+SIZE (cabal/fgl-5.5.3.1.tar.gz) = 54868
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index ccc2968879e8..d8525e5c22a7 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	file-embed
-PORTVERSION=	0.0.9
+PORTVERSION=	0.0.10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index 1f6cd82e6aca..d3031a0c3178 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/file-embed-0.0.9.tar.gz) = 58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005
-SIZE (cabal/file-embed-0.0.9.tar.gz) = 5624
+TIMESTAMP = 1499627834
+SHA256 (cabal/file-embed-0.0.10.tar.gz) = f751925cec5773a4fad5a48ca0a86a21091ee5f1efccf618a64a89fa2cf5f711
+SIZE (cabal/file-embed-0.0.10.tar.gz) = 6247
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 5b1dd783e572..96596b5cf345 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	filemanip
 PORTVERSION=	0.3.6.3
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/distinfo b/devel/hs-filemanip/distinfo
index 6ea50035080f..ab907943273d 100644
--- a/devel/hs-filemanip/distinfo
+++ b/devel/hs-filemanip/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627834
 SHA256 (cabal/filemanip-0.3.6.3.tar.gz) = 8836da17baaaf02ca080c9990ece4e0b0c8d6a128f458f8b64fd07b225ca9846
 SIZE (cabal/filemanip-0.3.6.3.tar.gz) = 10369
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index 6fcbe68cd90c..0ccba25d07b0 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	filestore
-PORTVERSION=	0.6.1
+PORTVERSION=	0.6.3.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index df9d1c96775d..6088cc20a8d7 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/filestore-0.6.1.tar.gz) = 0009c97f00044d2902209050d3b85a32dbad656ad0bb6276e811d7b0aca5d455
-SIZE (cabal/filestore-0.6.1.tar.gz) = 31837
+TIMESTAMP = 1499627835
+SHA256 (cabal/filestore-0.6.3.1.tar.gz) = 816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de
+SIZE (cabal/filestore-0.6.3.1.tar.gz) = 31776
diff --git a/devel/hs-fmlist/Makefile b/devel/hs-fmlist/Makefile
new file mode 100644
index 000000000000..8e2edd4e1090
--- /dev/null
+++ b/devel/hs-fmlist/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	fmlist
+PORTVERSION=	0.9
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	FoldMap lists are lists represented by their foldMap function
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-fmlist/distinfo b/devel/hs-fmlist/distinfo
new file mode 100644
index 000000000000..dea77335835d
--- /dev/null
+++ b/devel/hs-fmlist/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719989
+SHA256 (cabal/fmlist-0.9.tar.gz) = 581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf
+SIZE (cabal/fmlist-0.9.tar.gz) = 4256
diff --git a/devel/hs-fmlist/pkg-descr b/devel/hs-fmlist/pkg-descr
new file mode 100644
index 000000000000..6ba34e535217
--- /dev/null
+++ b/devel/hs-fmlist/pkg-descr
@@ -0,0 +1,6 @@
+FoldMap lists are lists represented by their foldMap function. FoldMap lists
+have O(1) cons, snoc and append, just like DLists, but other operations might
+have favorable performance characteristics as well. These wild claims are
+still completely unverified though.
+
+WWW: http://hackage.haskell.org/package/fmlist
diff --git a/devel/hs-foundation/Makefile b/devel/hs-foundation/Makefile
new file mode 100644
index 000000000000..d0672ee1950f
--- /dev/null
+++ b/devel/hs-foundation/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	foundation
+PORTVERSION=	0.0.13
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	A custom prelude with no dependencies apart from base
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-foundation/distinfo b/devel/hs-foundation/distinfo
new file mode 100644
index 000000000000..59ee0c7dfef8
--- /dev/null
+++ b/devel/hs-foundation/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499627835
+SHA256 (cabal/foundation-0.0.13.tar.gz) = 106a85cbbf936591df44b46ee04d39f29c15752f6eca438341f2b735e9c0755f
+SIZE (cabal/foundation-0.0.13.tar.gz) = 221540
diff --git a/devel/hs-foundation/pkg-descr b/devel/hs-foundation/pkg-descr
new file mode 100644
index 000000000000..38f7cc1da12d
--- /dev/null
+++ b/devel/hs-foundation/pkg-descr
@@ -0,0 +1,12 @@
+This package has the following goals:
+  * provide a base like sets of modules that provide a consistent set of 
+    features and bugfixes across multiple versions of GHC (unlike base).
+  * provide a better and more efficient prelude than base's prelude.
+  * be self-sufficient: no external dependencies apart from base.
+  * provide better data-types: packed unicode string by default, arrays.
+  * Better numerical classes that better represent mathematical thing 
+    (No more all-in-one Num).
+  * Better I/O system with less Lazy IO
+  * Usual partial functions distinguished through type system 
+
+WWW: https://hackage.haskell.org/package/foundation
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
index 86194dcc6b5b..f31e8aa1f1f8 100644
--- a/devel/hs-free/Makefile
+++ b/devel/hs-free/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	free
-PORTVERSION=	4.12.1
+PORTVERSION=	4.12.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo
index e523078645db..c6c9e393deaf 100644
--- a/devel/hs-free/distinfo
+++ b/devel/hs-free/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/free-4.12.1.tar.gz) = 376559042204e56bcd1152f04bf01079118c6ccba5e0cf8344de929537bc286b
-SIZE (cabal/free-4.12.1.tar.gz) = 49736
+TIMESTAMP = 1499627836
+SHA256 (cabal/free-4.12.4.tar.gz) = c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784
+SIZE (cabal/free-4.12.4.tar.gz) = 50601
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 72bad04d3bd3..f22d1147ab6f 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	fsnotify
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 1dc69d4078a9..728dfcc0bee5 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627836
 SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b
 SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 365f10509d37..b6c423b1eb77 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gconf
-PORTVERSION=	0.13.0.2
+PORTVERSION=	0.13.1.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-gconf/distinfo b/devel/hs-gconf/distinfo
index bccf100b122d..df39899b5024 100644
--- a/devel/hs-gconf/distinfo
+++ b/devel/hs-gconf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gconf-0.13.0.2.tar.gz) = 930ac96d4e46d6fc8f5fb9c5a19ff79695f8d01fa3a110da25f1ba95828add77
-SIZE (cabal/gconf-0.13.0.2.tar.gz) = 35926
+TIMESTAMP = 1499627837
+SHA256 (cabal/gconf-0.13.1.0.tar.gz) = 57cfa606ef4dcd377e0d77d59b880439382ad05604b3e3d439fd64af64a21dad
+SIZE (cabal/gconf-0.13.1.0.tar.gz) = 26625
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 380256201b95..3b887cf735f7 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	generic-deriving
-PORTVERSION=	1.8.0
+PORTVERSION=	1.11.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index 4cfb6fb27f08..f17dac442933 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/generic-deriving-1.8.0.tar.gz) = 26b3d927c1341e372118c976d4d8b33a7c4a42ec657734ef9b4653ab1aa486cd
-SIZE (cabal/generic-deriving-1.8.0.tar.gz) = 29935
+TIMESTAMP = 1499450572
+SHA256 (cabal/generic-deriving-1.11.2.tar.gz) = 29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9
+SIZE (cabal/generic-deriving-1.11.2.tar.gz) = 66546
diff --git a/devel/hs-geniplate-mirror/Makefile b/devel/hs-geniplate-mirror/Makefile
index 4ff286881e57..814151f860a4 100644
--- a/devel/hs-geniplate-mirror/Makefile
+++ b/devel/hs-geniplate-mirror/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	geniplate-mirror
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-geniplate-mirror/distinfo b/devel/hs-geniplate-mirror/distinfo
index 4cf96ad95c03..4559e257c665 100644
--- a/devel/hs-geniplate-mirror/distinfo
+++ b/devel/hs-geniplate-mirror/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/geniplate-mirror-0.7.1.tar.gz) = 60d4b0a0d01a93ee9188eb52d39803d9c2c814d321f95acfb0fdb8c7c075e773
-SIZE (cabal/geniplate-mirror-0.7.1.tar.gz) = 9259
+TIMESTAMP = 1499447732
+SHA256 (cabal/geniplate-mirror-0.7.5.tar.gz) = 519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f
+SIZE (cabal/geniplate-mirror-0.7.5.tar.gz) = 9297
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index e3bc987a88bd..89d9af661f0b 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc-events
-PORTVERSION=	0.4.4.0
+PORTVERSION=	0.6.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index 49f97900fc31..d5b8b4ab4904 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ghc-events-0.4.4.0.tar.gz) = ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d
-SIZE (cabal/ghc-events-0.4.4.0.tar.gz) = 102944
+TIMESTAMP = 1499451126
+SHA256 (cabal/ghc-events-0.6.0.tar.gz) = 277da9dcd9a1910e530c76b2ad8875868f5e2d8acff44091623dc97255ce0769
+SIZE (cabal/ghc-events-0.6.0.tar.gz) = 153517
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 826d267f8f6f..f0e411ca3b3c 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ghc-mtl
 PORTVERSION=	1.2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ghc-mtl/distinfo b/devel/hs-ghc-mtl/distinfo
index 9c319377b28e..61739ae5260f 100644
--- a/devel/hs-ghc-mtl/distinfo
+++ b/devel/hs-ghc-mtl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627837
 SHA256 (cabal/ghc-mtl-1.2.1.0.tar.gz) = 934e36c03ae0cbf59d6eb6d626983a3e520c6101417284b0a652db74e333d940
 SIZE (cabal/ghc-mtl-1.2.1.0.tar.gz) = 2963
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 0bcd5f8de789..8ee5773961d1 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ghc-paths
 PORTVERSION=	0.1.0.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/distinfo b/devel/hs-ghc-paths/distinfo
index fd8cca66f7c9..46b995f709f4 100644
--- a/devel/hs-ghc-paths/distinfo
+++ b/devel/hs-ghc-paths/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627837
 SHA256 (cabal/ghc-paths-0.1.0.9.tar.gz) = afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945
 SIZE (cabal/ghc-paths-0.1.0.9.tar.gz) = 2402
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 5c4930c27273..c3c3acd505fc 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gio
-PORTVERSION=	0.13.1.0
+PORTVERSION=	0.13.3.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-gio/distinfo b/devel/hs-gio/distinfo
index 67620fc1577e..ab8dd7804ffd 100644
--- a/devel/hs-gio/distinfo
+++ b/devel/hs-gio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gio-0.13.1.0.tar.gz) = b274b121b7814d25e0125f3129287a2407c83f458731040297a6fc6ebf6cabe3
-SIZE (cabal/gio-0.13.1.0.tar.gz) = 79367
+TIMESTAMP = 1499627838
+SHA256 (cabal/gio-0.13.3.1.tar.gz) = ac63f42321800731b9dc1f753f27ee877c04fdf7bcbcab0e2c57348a4739d827
+SIZE (cabal/gio-0.13.3.1.tar.gz) = 70058
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 95ef2c76d532..b43f5b8b0c8d 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git-annex
-PORTVERSION=	5.20150727
-PORTREVISION=	1
+PORTVERSION=	6.20170520
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,17 +10,52 @@ COMMENT=	Manage files with git, without checking their contents into git
 
 LICENSE=	GPLv3
 
-USE_CABAL=	optparse-applicative>=0.10 cryptohash>=0.11.0 exceptions>=0.6 \
-		QuickCheck>=2.1 stm>=2.3 mtl>=2 data-default case-insensitive \
-		uuid random dlist unix-compat SafeSemaphore async IfElse \
-		MissingH hslogger monad-logger utf8-string text sandi json \
-		monad-control bloomfilter edit-distance resourcet aws>=0.9.2 \
-		http-conduit http-types network>=2.6 network-uri>=2.6
+USE_CABAL=	hslogger split IfElse QuickCheck SafeSemaphore bloomfilter \
+		concurrent-output disk-free-space edit-distance esqueleto \
+		feed magic network persistent-sqlite regex-tdfa sandi \
+		torrent uuid
 
 USES=		gmake perl5
 USE_PERL5=	build
 
-MAN1PAGES=	git-annex.1 git-annex-shell.1
+MAN1PAGES=	git-annex-add.1 git-annex-expire.1 git-annex-lookupkey.1 \
+		git-annex-remotedaemon.1 git-annex-ungroup.1 \
+		git-annex-addunused.1 git-annex-find.1 git-annex-map.1 \
+		git-annex-repair.1 git-annex-uninit.1 git-annex-addurl.1 \
+		git-annex-findref.1 git-annex-matchexpression.1 \
+		git-annex-required.1 git-annex-unlock.1 git-annex-adjust.1 \
+		git-annex-fix.1 git-annex-matching-options.1 \
+		git-annex-resolvemerge.1 git-annex-untrust.1 \
+		git-annex-assistant.1 git-annex-forget.1 git-annex-merge.1 \
+		git-annex-rmurl.1 git-annex-unused.1 git-annex-calckey.1 \
+		git-annex-fromkey.1 git-annex-metadata.1 git-annex-schedule.1 \
+		git-annex-upgrade.1 git-annex-checkpresentkey.1 \
+		git-annex-fsck.1 git-annex-migrate.1 git-annex-semitrust.1 \
+		git-annex-vadd.1 git-annex-contentlocation.1 \
+		git-annex-fuzztest.1 git-annex-mirror.1 git-annex-setkey.1 \
+		git-annex-vcycle.1 git-annex-copy.1 git-annex-get.1 \
+		git-annex-move.1 git-annex-setpresentkey.1 \
+		git-annex-version.1 git-annex-dead.1 git-annex-group.1 \
+		git-annex-multicast.1 git-annex-shell.1 git-annex-vfilter.1 \
+		git-annex-describe.1 git-annex-groupwanted.1 \
+		git-annex-numcopies.1 git-annex-smudge.1 git-annex-vicfg.1 \
+		git-annex-diffdriver.1 git-annex-import.1 git-annex-p2p.1 \
+		git-annex-status.1 git-annex-view.1 git-annex-direct.1 \
+		git-annex-importfeed.1 git-annex-pre-commit.1 \
+		git-annex-sync.1 git-annex-vpop.1 git-annex-drop.1 \
+		git-annex-indirect.1 git-annex-preferred-content.1 \
+		git-annex-test.1 git-annex-wanted.1 git-annex-dropkey.1 \
+		git-annex-info.1 git-annex-proxy.1 git-annex-testremote.1 \
+		git-annex-watch.1 git-annex-dropunused.1 git-annex-init.1 \
+		git-annex-readpresentkey.1 git-annex-transferkey.1 \
+		git-annex-webapp.1 git-annex-edit.1 git-annex-initremote.1 \
+		git-annex-registerurl.1 git-annex-transferkeys.1 \
+		git-annex-whereis.1 git-annex-enable-tor.1 git-annex-list.1 \
+		git-annex-reinit.1 git-annex-trust.1 git-annex.1 \
+		git-annex-enableremote.1 git-annex-lock.1 \
+		git-annex-reinject.1 git-annex-unannex.1 \
+		git-remote-tor-annex.1 git-annex-examinekey.1 git-annex-log.1 \
+		git-annex-rekey.1 git-annex-undo.1
 
 BUILD_DEPENDS+=	rsync:net/rsync \
 		git:devel/git \
@@ -31,92 +65,45 @@ RUN_DEPENDS+=	rsync:net/rsync \
 		git:devel/git \
 		gsha256sum:sysutils/coreutils
 
-EXECUTABLE=	git-annex git-annex-shell
+EXECUTABLE=	git-annex git-annex-shell git-remote-tor-annex
 STANDALONE=	yes
 
-FLAGS_DEFINE=	S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
-		XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DESKTOPNOTIFY \
-		TORRENTPARSER EKG DATABASE
-FLAGS_DEFAULT=	S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
-		XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DATABASE
+FLAGS_DEFINE=	S3 ASSISTANT WEBDAV WEBAPP PAIRING PRODUCTION DBUS
+FLAGS_DEFAULT=	S3 ASSISTANT WEBDAV WEBAPP PAIRING PRODUCTION
 
 S3_DESC=		S3 support
 S3_FLAG_ENABLE=		S3
-S3_FLAG_CABAL=		hS3
+S3_FLAG_CABAL=		conduit conduit-extra aws
+
+WEBDAV_DESC=		WebDAV support
+WEBDAV_FLAG_ENABLE=	WebDAV
+WEBDAV_FLAG_CABAL=	DAV
 
 ASSISTANT_DESC=		'assistant' and 'watch' commands
 ASSISTANT_FLAG_ENABLE=	Assistant
-
-INOTIFY_DESC=		File system notifications support
-INOTIFY_FLAG_ENABLE=	Inotify
-INOTIFY_FLAG_CABAL=	hinotify
+ASSISTANT_FLAG_CABAL=	dns mountpoints hinotify 
 
 WEBAPP_DESC=		Web application (requires assistant)
 WEBAPP_FLAG_DEPENDS=	ASSISTANT
 WEBAPP_FLAG_ENABLE=	Webapp
-WEBAPP_FLAG_CABAL=	yesod>=1.2.6 yesod-static>=1.2.4 yesod-form>=1.3.15 \
-			yesod-core>=1.2.19 path-pieces>=0.1.4 warp>=3.0.05 \
-			warp-tls wai wai-extra blaze-builder crypto-api \
-			clientsession aeson shakespeare>=2.0.0
-
-WEBAPP_SECURE_DESC=		Secure webapp (requires webbapp)
-WEBAPP_SECURE_FLAG_DEPENDS=	WEBAPP
-WEBAPP_SECURE_FLAG_ENABLE=	Webapp-secure
-WEBAPP_SECURE_FLAG_CABAL=	warp-tls>=1.4 securemem byteable
+WEBAPP_FLAG_CABAL=	yesod yesod-static yesod-form yesod-core path-pieces \
+			warp warp-tls wai wai-extra blaze-builder \
+			clientsession shakespeare
 
 PAIRING_DESC=		Enable pairing (requires web application)
 PAIRING_FLAG_DEPENDS=	WEBAPP
 PAIRING_FLAG_ENABLE=	Pairing
 PAIRING_FLAG_CABAL=	network-multicast network-info
 
-XMPP_DESC=		Enable notifications using XMPP (requires assistant)
-XMPP_FLAG_DEPENDS=	ASSISTANT
-XMPP_FLAG_ENABLE=	XMPP
-XMPP_FLAG_CABAL=	gnutls>=0.1.4 network-protocol-xmpp xml-types
-
-DNS_DESC=		Use the DNS library for lookups (requires XMPP)
-DNS_FLAG_DEPENDS=	ASSISTANT XMPP
-DNS_FLAG_ENABLE=	DNS
-DNS_FLAG_CABAL=		dns
-
 PRODUCTION_DESC=	Production build
 PRODUCTION_FLAG_ENABLE=	Production
 
-TDFA_DESC=		Use regex-tdfa for wildcards
-TDFA_FLAG_ENABLE=	TDFA
-TDFA_FLAG_CABAL=	regex-tdfa
-
-WEBDAV_DESC=		WebDAV support
-WEBDAV_FLAG_ENABLE=	WebDAV
-WEBDAV_FLAG_CABAL=	DAV>=0.3 http-conduit xml-conduit http-types
-
-FEED_DESC=		Podcast feed support
-FEED_FLAG_ENABLE=	Feed
-FEED_FLAG_CABAL=	feed
-
-QUVI_DESC=		quvi to download videos
-QUVI_FLAG_ENABLE=	Quvi
-QUVI_FLAG_CABAL=	aeson
-
-TAHOE_DESC=		Tahoe special remote
-TAHOE_FLAG_ENABLE=	Tahoe
-TAHOE_FLAG_CABAL=	aeson
-
-DESKTOPNOTIFY_DESC=		Desktop environment notifications
-DESKTOPNOTIFY_FLAG_ENABLE=	DesktopNotify
-
-TORRENTPARSER_DESC=		Use haskell torrent library to parse torrent files
-TORRENTPARSER_FLAG_ENABLE=	TorrentParser
-TORRENTPARSER_FLAG_CABAL=	torrent>=10000.0.0
-
-EKG_DESC=		EKG for run-time monitoring
-EKG_FLAG_ENABLE=	EKG
-EKG_FLAG_CABAL=		ekg
+DBUS_DESC=		Dbus support
+DBUS_FLAG_ENABLE=	Dbus
+DBUS_FLAG_CABAL=	dbus fdo-notify
 
-DATABASE_DESC=		Build with persistent for database use
-DATABASE_FLAG_ENABLE=	Database
-DATABASE_FLAG_CABAL=	esqueleto persistent-sqlite persistent \
-			persistent-template
+FLAGS_ENABLE=		ConcurrentOutput TorrentParser MagicMime
+FLAGS_DISABLE=		Benchmark TestSuite Android AndroidSplice
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-git-annex/distinfo b/devel/hs-git-annex/distinfo
index 1cc0fbc15a2b..001933951e4b 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/git-annex-5.20150727.tar.gz) = 9826836bd0eb4e35be8664862405afbf2ff4dff9a643b2f8ec61c295bd16099f
-SIZE (cabal/git-annex-5.20150727.tar.gz) = 5095110
+TIMESTAMP = 1499627839
+SHA256 (cabal/git-annex-6.20170520.tar.gz) = f8cf9b44172ce1914c8be8134795c4197d02960b81a2ba596712cbd35e002717
+SIZE (cabal/git-annex-6.20170520.tar.gz) = 1124314
diff --git a/devel/hs-git-annex/files/patch-Build__Configure.hs b/devel/hs-git-annex/files/patch-Build__Configure.hs
index ea06e561b749..4a60a71ad332 100644
--- a/devel/hs-git-annex/files/patch-Build__Configure.hs
+++ b/devel/hs-git-annex/files/patch-Build__Configure.hs
@@ -1,6 +1,6 @@
---- ./Build/Configure.hs.orig	2014-07-09 22:09:05.000000000 +0200
-+++ ./Build/Configure.hs	2014-07-13 15:15:00.000000000 +0200
-@@ -68,7 +68,7 @@
+--- Build/Configure.hs.orig	2017-06-12 17:56:05 UTC
++++ Build/Configure.hs
+@@ -75,7 +75,7 @@ shaTestCases l = map make l
  				else search cmds
  	
  	shacmds n = concatMap (\x -> [x, 'g':x]) $
diff --git a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
index 5a5352bc2d4a..8290342bfff3 100644
--- a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
+++ b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
@@ -1,14 +1,14 @@
---- ./Build/DesktopFile.hs.orig	2014-07-09 22:09:05.000000000 +0200
-+++ ./Build/DesktopFile.hs	2014-07-13 01:40:51.000000000 +0200
-@@ -25,6 +25,7 @@
+--- Build/DesktopFile.hs.orig	2017-06-12 17:56:05 UTC
++++ Build/DesktopFile.hs
+@@ -25,6 +25,7 @@ import System.Environment
  #ifndef mingw32_HOST_OS
  import System.Posix.User
  #endif
 +import System.FilePath.Posix
  import Data.Maybe
- 
- systemwideInstall :: IO Bool
-@@ -48,12 +49,17 @@
+ import Control.Applicative
+ import Prelude
+@@ -50,12 +51,17 @@ writeFDODesktop :: FilePath -> IO ()
  writeFDODesktop command = do
  	systemwide <- systemwideInstall
  
diff --git a/devel/hs-git-annex/files/patch-Setup.hs b/devel/hs-git-annex/files/patch-Setup.hs
index 9691658ad45f..1a01309521fa 100644
--- a/devel/hs-git-annex/files/patch-Setup.hs
+++ b/devel/hs-git-annex/files/patch-Setup.hs
@@ -1,45 +1,11 @@
---- Setup.hs.orig	2015-07-27 16:25:52 UTC
+--- Setup.hs.orig	2017-06-12 17:56:05 UTC
 +++ Setup.hs
-@@ -23,6 +23,7 @@ main = defaultMainWithHooks simpleUserHo
- 		Configure.run Configure.tests
- 		return (Nothing, [])	
- 	, postInst = myPostInst
-+	, postCopy = myPostCopy
- 	}
- 
- myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-@@ -34,6 +35,15 @@ myPostInst _ (InstallFlags { installVerb
- 	dest      = NoCopyDest
- 	verbosity = fromFlag installVerbosity
- 
-+myPostCopy :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-+myPostCopy _ (CopyFlags { copyVerbosity, copyDest }) pkg lbi = do
-+	installGitAnnexShell dest verbosity pkg lbi
-+	installManpages      dest verbosity pkg lbi
-+	installDesktopFile   dest verbosity pkg lbi
-+  where
-+	dest      = fromFlag copyDest
-+	verbosity = fromFlag copyVerbosity
-+
- installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
- installGitAnnexShell copyDest verbosity pkg lbi =
- 	rawSystemExit verbosity "ln"
-@@ -50,14 +60,14 @@ installManpages :: CopyDest -> Verbosity
+@@ -54,7 +54,7 @@ installManpages :: CopyDest -> Verbosity -> PackageDes
  installManpages copyDest verbosity pkg lbi =
  	installOrdinaryFiles verbosity dstManDir =<< srcManpages
    where
 -	dstManDir   = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1"
 +	dstManDir   = prefix (absoluteInstallDirs pkg lbi copyDest) </> "man" </> "man1"
- 	srcManpages = zip (repeat srcManDir)
--		<$> filterM doesFileExist manpages
--	srcManDir   = ""
-+		<$> filterM (doesFileExist . (srcManDir </>)) manpages
-+	srcManDir   = "man"
- 	manpages    = ["git-annex.1", "git-annex-shell.1"]
- 
- installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
- installDesktopFile copyDest _verbosity pkg lbi =
- 	DesktopFile.install $ dstBinDir </> "git-annex"
-   where
--	dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest
-+	dstBinDir = bindir $ absoluteInstallDirs pkg lbi NoCopyDest
+ 	-- If mdwn2man fails, perhaps because perl is not available,
+ 	-- we just skip installing man pages.
+ 	srcManpages = zip (repeat "man") . map takeFileName . catMaybes
diff --git a/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs b/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs
new file mode 100644
index 000000000000..28ecb91890cb
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs
@@ -0,0 +1,12 @@
+--- Utility/QuickCheck.hs.orig	2017-06-12 17:56:05 UTC
++++ Utility/QuickCheck.hs
+@@ -35,9 +35,6 @@ instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) w
+ instance Arbitrary POSIXTime where
+ 	arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+ 
+-instance Arbitrary EpochTime where
+-	arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+-
+ {- Pids are never negative, or 0. -}
+ instance Arbitrary ProcessID where
+ 	arbitrary = arbitrarySizedBoundedIntegral `suchThat` (> 0)
diff --git a/devel/hs-git-annex/files/patch-git-annex.cabal b/devel/hs-git-annex/files/patch-git-annex.cabal
index fb102a057ff0..55604acd49d5 100644
--- a/devel/hs-git-annex/files/patch-git-annex.cabal
+++ b/devel/hs-git-annex/files/patch-git-annex.cabal
@@ -1,10 +1,7 @@
---- git-annex.cabal.orig	2015-07-27 16:25:52 UTC
+--- git-annex.cabal.orig	2017-06-12 17:56:05 UTC
 +++ git-annex.cabal
-@@ -218,9 +218,9 @@ Executable git-annex
-     CPP-Options: -DANDROID_SPLICES
- 
+@@ -446,7 +446,6 @@ Executable git-annex
    if flag(Webapp)
-+    extensions: TemplateHaskell
      Build-Depends:
       yesod (>= 1.2.6), 
 -     yesod-default (>= 1.2.0),
diff --git a/devel/hs-git-annex/pkg-plist b/devel/hs-git-annex/pkg-plist
deleted file mode 100644
index 02dfba5c4c0e..000000000000
--- a/devel/hs-git-annex/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/xdg/autostart/git-annex.desktop
-share/applications/git-annex.desktop
-share/icons/hicolor/16x16/apps/git-annex.png
-share/icons/hicolor/scalable/apps/git-annex.svg
diff --git a/devel/hs-gitrev/Makefile b/devel/hs-gitrev/Makefile
new file mode 100644
index 000000000000..1e1198b7d33a
--- /dev/null
+++ b/devel/hs-gitrev/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	gitrev
+PORTVERSION=	1.3.1
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Compile git revision info into Haskell projects
+
+LICENSE=	BSD3CLAUSE
+
+USE_CABAL=	base-compat
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-gitrev/distinfo b/devel/hs-gitrev/distinfo
new file mode 100644
index 000000000000..a663b88ab8f5
--- /dev/null
+++ b/devel/hs-gitrev/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996936
+SHA256 (cabal/gitrev-1.3.1.tar.gz) = a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332
+SIZE (cabal/gitrev-1.3.1.tar.gz) = 3756
diff --git a/devel/hs-gitrev/pkg-descr b/devel/hs-gitrev/pkg-descr
new file mode 100644
index 000000000000..bb27b0d5b2a0
--- /dev/null
+++ b/devel/hs-gitrev/pkg-descr
@@ -0,0 +1,6 @@
+Some handy Template Haskell splices for including the current git hash and
+branch in the code of your project.  Useful for including in panic messages,
+--version output, or diagnostic info for more informative bug reports.
+
+WWW: https://github.com/acfoltzer/gitrev
+
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index ee5031ec1322..33a1d38367a3 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	glib
-PORTVERSION=	0.13.1.1
+PORTVERSION=	0.13.4.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 6d08348ce0c0..6012de34c7a7 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/glib-0.13.1.1.tar.gz) = e494b416ee7b80743af586edf5f7f497b4ce5eae6c070ec12b0e9ec5b99b43f1
-SIZE (cabal/glib-0.13.1.1.tar.gz) = 48228
+TIMESTAMP = 1499537811
+SHA256 (cabal/glib-0.13.4.1.tar.gz) = f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630
+SIZE (cabal/glib-0.13.4.1.tar.gz) = 39441
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 92e5cc4f557d..50c90a6be8ea 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gtk2hs-buildtools
-PORTVERSION=	0.13.0.4
-PORTREVISION=	1
+PORTVERSION=	0.13.2.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -16,7 +15,5 @@ USE_HAPPY=	yes
 
 EXECUTABLE=	gtk2hsC2hs gtk2hsHookGenerator gtk2hsTypeGen
 
-STANDALONE=	yes
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 02392bc17433..8f7d36f1bde7 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 2a24c2d4124ec046800326922807ab457e2beaf0ffb320162687e1475dbe3510
-SIZE (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 169272
+TIMESTAMP = 1499539633
+SHA256 (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b
+SIZE (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = 178124
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
index f0400f06d69c..03e1bd95991a 100644
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
@@ -1,4 +1,4 @@
---- c2hs/c/CAST.hs.orig	2017-03-21 18:15:30 UTC
+--- c2hs/c/CAST.hs.orig	2017-01-14 09:17:54 UTC
 +++ c2hs/c/CAST.hs
 @@ -1125,6 +1125,9 @@ instance Binary CStorageSpec where
      put_ bh (CTypedef ae) = do
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
index b06fe7616609..9c1fbee08541 100644
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
@@ -5,18 +5,9 @@ c2hs: C header contains errors:
   The symbol `long' does not fit here.
 *** Error code 1
 
---- c2hs/toplevel/C2HSConfig.hs.orig	2017-03-21 18:17:37 UTC
+--- c2hs/toplevel/C2HSConfig.hs.orig	2017-01-14 09:17:54 UTC
 +++ c2hs/toplevel/C2HSConfig.hs
-@@ -64,14 +64,17 @@ cpp  = case os of
- -- * `-x c' forces CPP to regard the input as C code; this option seems to be
- --   understood at least on Linux, FreeBSD, and Solaris and seems to make a
- --   difference over the default language setting on FreeBSD
-+--
-+-- * Pass -std=c99 as c2hs get's confused by the c11 parts in the FreeBSD
-+--   system headers.
- --
- -- * `-P' would suppress `#line' directives
- --
+@@ -70,8 +70,8 @@ cpp  = case os of
  cppopts :: [String]
  cppopts  = case (os,cpp) of
    ("openbsd","cpp") -> ["-xc", "-w"]
@@ -25,5 +16,5 @@ c2hs: C header contains errors:
 +  (_,"cpp")         -> ["-x", "c", "-w", "-std=c99"]
 +  (_,"gcc")         -> ["-E", "-x", "c", "-w", "-std=c99"]
    _                 -> []
-
+ 
  -- C preprocessor option for including only definitions (EXPORTED)
diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile
index 2ec7d93b2459..9eb4dbe64326 100644
--- a/devel/hs-haddock-api/Makefile
+++ b/devel/hs-haddock-api/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock-api
-PORTVERSION=	2.16.1
+PORTVERSION=	2.17.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo
index 1d7a4bb3e6f2..0dbdea95c108 100644
--- a/devel/hs-haddock-api/distinfo
+++ b/devel/hs-haddock-api/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-api-2.16.1.tar.gz) = e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea
-SIZE (cabal/haddock-api-2.16.1.tar.gz) = 125372
+TIMESTAMP = 1499452541
+SHA256 (cabal/haddock-api-2.17.4.tar.gz) = 5a97114f567bb7384d07dfc77a7c2f6c35017193e63411b85ab2a3f7fe35d601
+SIZE (cabal/haddock-api-2.17.4.tar.gz) = 145712
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
index 49e1f3adf54d..91fcfde88b77 100644
--- a/devel/hs-haddock-library/Makefile
+++ b/devel/hs-haddock-library/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock-library
-PORTVERSION=	1.2.1
+PORTVERSION=	1.4.3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
index 63fd398d1116..2723301ae1e4 100644
--- a/devel/hs-haddock-library/distinfo
+++ b/devel/hs-haddock-library/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-library-1.2.1.tar.gz) = 0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056
-SIZE (cabal/haddock-library-1.2.1.tar.gz) = 38606
+TIMESTAMP = 1499448291
+SHA256 (cabal/haddock-library-1.4.3.tar.gz) = f764763f8004715431a184a981493781b8380e13fd89ca0075ac426edc5d445b
+SIZE (cabal/haddock-library-1.4.3.tar.gz) = 38863
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 97836694bc0b..17f2e5ce28a7 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	2.16.1
+PORTVERSION=	2.17.5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 340a26fb4bb1..3191273deadb 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-2.16.1.tar.gz) = 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6
-SIZE (cabal/haddock-2.16.1.tar.gz) = 216323
+TIMESTAMP = 1499538938
+SHA256 (cabal/haddock-2.17.5.tar.gz) = 1493012ed12ca8cad901380fece150e4b342a8bacd9ba319bff8be7ebb37bee3
+SIZE (cabal/haddock-2.17.5.tar.gz) = 244683
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
index f8193e05dd97..85fc89b4d9c7 100644
--- a/devel/hs-haddock/pkg-plist
+++ b/devel/hs-haddock/pkg-plist
@@ -1,2 +1,2 @@
-@exec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
-@unexec /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%%
+@postexec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
+@postunexec [ -f %%GHC_HADDOCK_CMD%% ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%% || rm -f %%HADDOCK%%
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 06a878c83f08..d18aebe2fe45 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	happy
 PORTVERSION=	1.19.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index aa017607273a..03e89dcd0154 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
 SHA256 (cabal/happy-1.19.5.tar.gz) = 62f03ac11d7b4b9913f212f5aa2eee1087f3b46dc07d799d41e1854ff02843da
 SIZE (cabal/happy-1.19.5.tar.gz) = 159280
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 8748ce486135..d95e7842426f 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hashable
-PORTVERSION=	1.2.3.3
+PORTVERSION=	1.2.6.1
 PORTEPOCH=	1
 CATEGORIES=	devel haskell
 
@@ -10,7 +10,7 @@ COMMENT=	Class for types that can be converted to a hash value
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	text>=0.11.0.5
+USE_CABAL=	text>=0.11.0.5 vector
 
 FLAGS_DEFINE=			INTEGER_GMP SSE2 SSE41
 FLAGS_DEFAULT=			INTEGER_GMP SSE2
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 4afe612aab92..6ac7cd366364 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hashable-1.2.3.3.tar.gz) = fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e
-SIZE (cabal/hashable-1.2.3.3.tar.gz) = 23944
+TIMESTAMP = 1499444230
+SHA256 (cabal/hashable-1.2.6.1.tar.gz) = 94ca8789e13bc05c1582c46b709f3b0f5aeec2092be634b8606dbd9c5915bb7a
+SIZE (cabal/hashable-1.2.6.1.tar.gz) = 30305
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index 2613f4cd336d..c1f82213e716 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hashed-storage
 PORTVERSION=	0.5.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hashed-storage/distinfo b/devel/hs-hashed-storage/distinfo
index 80c49d2722dd..da799e91cea0 100644
--- a/devel/hs-hashed-storage/distinfo
+++ b/devel/hs-hashed-storage/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
 SHA256 (cabal/hashed-storage-0.5.11.tar.gz) = 734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569
 SIZE (cabal/hashed-storage-0.5.11.tar.gz) = 57315
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index 2a0461743df2..8b05dcc5b5c6 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hashtables
-PORTVERSION=	1.2.0.2
+PORTVERSION=	1.2.1.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo
index cb3331d3b895..5b17209d1054 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hashtables-1.2.0.2.tar.gz) = 012be9fa5e91118b9301ca58138fbf45222119a284d5561ca6f7e3f9b42e1837
-SIZE (cabal/hashtables-1.2.0.2.tar.gz) = 54283
+TIMESTAMP = 1499459894
+SHA256 (cabal/hashtables-1.2.1.1.tar.gz) = 227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951
+SIZE (cabal/hashtables-1.2.1.1.tar.gz) = 53674
diff --git a/devel/hs-haskell-lexer/Makefile b/devel/hs-haskell-lexer/Makefile
new file mode 100644
index 000000000000..70bc5d3ea37e
--- /dev/null
+++ b/devel/hs-haskell-lexer/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	haskell-lexer
+PORTVERSION=	1.0.1
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	A fully compliant Haskell 98 lexer
+
+LICENSE=	BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-haskell-lexer/distinfo b/devel/hs-haskell-lexer/distinfo
new file mode 100644
index 000000000000..12a4838366d0
--- /dev/null
+++ b/devel/hs-haskell-lexer/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720420
+SHA256 (cabal/haskell-lexer-1.0.1.tar.gz) = d7d42ab3c4bc2f0232ede8b005fb9de57f862ee4c1c83aa61e1022346fc84366
+SIZE (cabal/haskell-lexer-1.0.1.tar.gz) = 12380
diff --git a/devel/hs-haskell-lexer/pkg-descr b/devel/hs-haskell-lexer/pkg-descr
new file mode 100644
index 000000000000..69b5920898aa
--- /dev/null
+++ b/devel/hs-haskell-lexer/pkg-descr
@@ -0,0 +1,3 @@
+A fully compliant Haskell 98 lexer.
+
+WWW: http://hackage.haskell.org/package/haskell-lexer
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index a92a23dbeb77..14886b6229a5 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haskell-src-exts
-PORTVERSION=	1.16.0.1
+PORTVERSION=	1.19.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Manipulating Haskell source
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	cpphs>=1.3
+USE_CABAL=	cpphs
 USE_HAPPY=	yes
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index e2d628abb831..6be8325d27cb 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 3f3bd41ad3a346a78e80195eca83de529d3ece63fa7edcd4df3b8bf40a970fc1
-SIZE (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 1410081
+TIMESTAMP = 1501416565
+SHA256 (cabal/haskell-src-exts-1.19.1.tar.gz) = f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971
+SIZE (cabal/haskell-src-exts-1.19.1.tar.gz) = 1296952
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 92047cb04bc3..f6e0e665e442 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	haskell-src
 PORTVERSION=	1.0.2.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo
index 2ed2cd3688ad..90bac848ea19 100644
--- a/devel/hs-haskell-src/distinfo
+++ b/devel/hs-haskell-src/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
 SHA256 (cabal/haskell-src-1.0.2.0.tar.gz) = 2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6
 SIZE (cabal/haskell-src-1.0.2.0.tar.gz) = 53636
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index b05ca0f007a5..72eef06077fd 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hasktags
-PORTVERSION=	0.69.1
+PORTVERSION=	0.69.3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo
index 193a3cc0a9b4..358d9a444b55 100644
--- a/devel/hs-hasktags/distinfo
+++ b/devel/hs-hasktags/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hasktags-0.69.1.tar.gz) = 243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6
-SIZE (cabal/hasktags-0.69.1.tar.gz) = 55906
+TIMESTAMP = 1499452576
+SHA256 (cabal/hasktags-0.69.3.tar.gz) = 4e069aa63c2a7d762332d1acbc12a3d705abdc5e24c06d55129e1a3fd66e5afa
+SIZE (cabal/hasktags-0.69.3.tar.gz) = 62888
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index f9e004babaf4..18a58a2d3d50 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hastache
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 35d7df616e3e..41407ad2d527 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
 SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464
 SIZE (cabal/hastache-0.6.1.tar.gz) = 16452
diff --git a/devel/hs-hastache/files/patch-hastache.cabal b/devel/hs-hastache/files/patch-hastache.cabal
new file mode 100644
index 000000000000..cd911a4513d7
--- /dev/null
+++ b/devel/hs-hastache/files/patch-hastache.cabal
@@ -0,0 +1,29 @@
+--- hastache.cabal.orig	2014-12-23 10:40:08 UTC
++++ hastache.cabal
+@@ -27,7 +27,7 @@ extra-source-files:
+ executable mkReadme
+   main-is: mkReadme.hs
+   build-depends: hastache, process,
+-    base >=4 && <4.9
++    base >=4.4 && <4.10
+     ,bytestring
+     ,mtl
+     ,transformers
+@@ -46,7 +46,7 @@ library
+     Text.Hastache.Context
+ 
+   build-depends:
+-    base >=4 && <4.9
++    base >=4.4 && <4.10
+     ,bytestring
+     ,mtl
+     ,transformers
+@@ -69,7 +69,7 @@ test-suite test-hastache
+ 
+   build-depends:
+     hastache
+-   ,base >=4 && <4.9
++   ,base >=4.4 && <4.10
+    ,directory
+    ,mtl
+    ,HUnit
diff --git a/devel/hs-hex/Makefile b/devel/hs-hex/Makefile
index 501e1fffe875..d20e9b9c0411 100644
--- a/devel/hs-hex/Makefile
+++ b/devel/hs-hex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hex
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hex/distinfo b/devel/hs-hex/distinfo
index 028bd5b9ff27..865934a937ce 100644
--- a/devel/hs-hex/distinfo
+++ b/devel/hs-hex/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
 SHA256 (cabal/hex-0.1.2.tar.gz) = 12ee1243edd80570a486521565fb0c9b5e39374f21a12f050636e71d55ec61ec
 SIZE (cabal/hex-0.1.2.tar.gz) = 1956
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 3b55f6aed5a7..6a8f9b020ced 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hinotify
-PORTVERSION=	0.3.8.1
+PORTVERSION=	0.3.9
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,5 +11,7 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
+USE_CABAL=	async
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
index 0786180a0527..4c22b16eb385 100644
--- a/devel/hs-hinotify/distinfo
+++ b/devel/hs-hinotify/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hinotify-0.3.8.1.tar.gz) = 37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d
-SIZE (cabal/hinotify-0.3.8.1.tar.gz) = 8344
+TIMESTAMP = 1499627841
+SHA256 (cabal/hinotify-0.3.9.tar.gz) = f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99
+SIZE (cabal/hinotify-0.3.9.tar.gz) = 9021
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 21f719d7e506..105492453361 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hint
-PORTVERSION=	0.4.2.3
+PORTVERSION=	0.7.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -13,13 +13,5 @@ LICENSE=	BSD3CLAUSE
 USE_CABAL=	exceptions extensible-exceptions ghc-mtl>=1.2.1 ghc-paths \
 		mtl random utf8-string
 
-INSTALL_PORTEXAMPLES=	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-
-INSTALL_PORTDATA=	${INSTALL_DATA} \
-			    ${WRKSRC}/AUTHORS \
-			    ${WRKSRC}/README \
-			    ${WRKSRC}/CHANGELOG.markdown \
-			    ${STAGEDIR}${DATADIR}
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 0705311b2690..a86f3e935bad 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hint-0.4.2.3.tar.gz) = cf2b3f98ba6929e2e79dfc373e101ee6ae1711a5706e718cf0152733da4a40b7
-SIZE (cabal/hint-0.4.2.3.tar.gz) = 30117
+TIMESTAMP = 1499544799
+SHA256 (cabal/hint-0.7.0.tar.gz) = 299a735848bd6b2e0bdeeee4b47d9d52f865198fbb9403df3f6571801b3e8155
+SIZE (cabal/hint-0.7.0.tar.gz) = 28138
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 5a103a4c373c..9876c9bbbd88 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hlibev
 PORTVERSION=	0.4.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hlibev/distinfo b/devel/hs-hlibev/distinfo
index 7c1d484f3cbe..6d33daf25c98 100644
--- a/devel/hs-hlibev/distinfo
+++ b/devel/hs-hlibev/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
 SHA256 (cabal/hlibev-0.4.0.tar.gz) = dc37dafa42fad03228f353eaa0cda8d57eaf2f8c2558c3de29d2425526e02610
 SIZE (cabal/hlibev-0.4.0.tar.gz) = 6366
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index c1d1ecd22b44..51e589260859 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hlint
-PORTVERSION=	1.9.21
+PORTVERSION=	2.0.9
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +10,7 @@ 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 uniplate>=1.5
+		haskell-src-exts>=1.16 hscolour>=1.21 refact uniplate>=1.5 yaml
 
 EXECUTABLE=	hlint
 
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index 797190e14399..87c73ce3021c 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hlint-1.9.21.tar.gz) = 8694a193e0f55b9a74ddd4fb44a242872f91e36ea59dd96ab489562a65cb6393
-SIZE (cabal/hlint-1.9.21.tar.gz) = 88802
+TIMESTAMP = 1499627842
+SHA256 (cabal/hlint-2.0.9.tar.gz) = 252993e74def5caae29a546f39ce37ce2cf2b6bcafa6cc5c867fb5d07fb4a5ad
+SIZE (cabal/hlint-2.0.9.tar.gz) = 102835
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index b4e7d34b2842..b7f6d15da9de 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hoogle
-PORTVERSION=	4.2.41
+PORTVERSION=	5.0.12
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,11 +10,11 @@ COMMENT=	Haskell API Search
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	aeson>=0.6.1 blaze-builder>=0.2 case-insensitive>=0.2 \
-		cmdargs>=0.7 conduit>=0.2 haskell-src-exts>=1.16 \
-		http-types>=0.7 parsec>=2.1 QuickCheck random resourcet \
-		safe shake>=0.14 tagsoup>=0.11 text>=0.11 uniplate>=1.6 \
-		vector>=0.9 vector-algorithms>=0.6 wai>=1.1 warp>=2.1
+USE_CABAL=	aeson cmdargs conduit conduit-extra connection extra \
+		haskell-src-exts http-conduit http-types js-flot js-jquery \
+		mmap network network-uri old-locale process-extras QuickCheck \
+		resourcet tar text uniplate utf8-string vector wai wai-logger \
+		warp warp-tls zlib
 
 EXECUTABLE=	hoogle
 
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index ad1f0b7d7521..dfbeb4d4eadb 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hoogle-4.2.41.tar.gz) = a6b80301849314399f622d8c68c3b46cb0ae85a65f625f47817f23d40ed7a1be
-SIZE (cabal/hoogle-4.2.41.tar.gz) = 135709
+TIMESTAMP = 1499627842
+SHA256 (cabal/hoogle-5.0.12.tar.gz) = 1d37f1e96b699fe71ea3661ac2a9424cfd178cba5cc26b0a7ee5505e6fb49308
+SIZE (cabal/hoogle-5.0.12.tar.gz) = 85464
diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile
index d262dac03a4c..9da5e9077d41 100644
--- a/devel/hs-hourglass/Makefile
+++ b/devel/hs-hourglass/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hourglass
-PORTVERSION=	0.2.9
+PORTVERSION=	0.2.10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hourglass/distinfo b/devel/hs-hourglass/distinfo
index 84a2f947bcd7..004beeb32729 100644
--- a/devel/hs-hourglass/distinfo
+++ b/devel/hs-hourglass/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hourglass-0.2.9.tar.gz) = 9b54f163a1ecad98fbd14cb9737c28001b2648106d98cbd68fb2f5cfed090af6
-SIZE (cabal/hourglass-0.2.9.tar.gz) = 24919
+TIMESTAMP = 1499627843
+SHA256 (cabal/hourglass-0.2.10.tar.gz) = d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80
+SIZE (cabal/hourglass-0.2.10.tar.gz) = 26417
diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile
index 62692b468a38..d40d66e52677 100644
--- a/devel/hs-hsb2hs/Makefile
+++ b/devel/hs-hsb2hs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hsb2hs
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hsb2hs/distinfo b/devel/hs-hsb2hs/distinfo
index dfc1480a3782..7678c1dbee86 100644
--- a/devel/hs-hsb2hs/distinfo
+++ b/devel/hs-hsb2hs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627843
 SHA256 (cabal/hsb2hs-0.3.1.tar.gz) = 8ad800820554f273ada083dfce2f463d920fb1ceb053255023a4c883b090f9d8
 SIZE (cabal/hsb2hs-0.3.1.tar.gz) = 2387
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index fba6efa57025..b1d396c346fb 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hslogger
-PORTVERSION=	1.2.9
+PORTVERSION=	1.2.10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index a3c3b8cfa6d5..ca3967e131eb 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hslogger-1.2.9.tar.gz) = be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476
-SIZE (cabal/hslogger-1.2.9.tar.gz) = 35576
+TIMESTAMP = 1499627844
+SHA256 (cabal/hslogger-1.2.10.tar.gz) = d7ca6e94a4aacb47a8dc30e3960ab8deff482d2ec9dca9a87b225e03e97e452b
+SIZE (cabal/hslogger-1.2.10.tar.gz) = 35889
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
index 226fa652639a..4713ee9658ca 100644
--- a/devel/hs-hslua/Makefile
+++ b/devel/hs-hslua/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hslua
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo
index 2bd503366a26..c2f863c5136c 100644
--- a/devel/hs-hslua/distinfo
+++ b/devel/hs-hslua/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hslua-0.4.0.tar.gz) = 77a865a3258656c2536c154d18ac38873a371685fde6ba03a3436f65f7bda050
-SIZE (cabal/hslua-0.4.0.tar.gz) = 129883
+TIMESTAMP = 1499627844
+SHA256 (cabal/hslua-0.5.0.tar.gz) = 6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b
+SIZE (cabal/hslua-0.5.0.tar.gz) = 132155
diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile
index f295c7b4e74f..891cd2575c2a 100644
--- a/devel/hs-hspec-core/Makefile
+++ b/devel/hs-hspec-core/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hspec-core
-PORTVERSION=	2.1.10
+PORTVERSION=	2.4.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hspec-core/distinfo b/devel/hs-hspec-core/distinfo
index b61d2cfa9735..4ed332246055 100644
--- a/devel/hs-hspec-core/distinfo
+++ b/devel/hs-hspec-core/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-core-2.1.10.tar.gz) = 682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0
-SIZE (cabal/hspec-core-2.1.10.tar.gz) = 31124
+TIMESTAMP = 1499627845
+SHA256 (cabal/hspec-core-2.4.4.tar.gz) = 601d321cdf7f2685880ee80c31154763884cb90dc512906005c4a485e8c8bfdf
+SIZE (cabal/hspec-core-2.4.4.tar.gz) = 40871
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
index 93d2f36a834d..6f236fac8001 100644
--- a/devel/hs-hspec-discover/Makefile
+++ b/devel/hs-hspec-discover/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hspec-discover
-PORTVERSION=	2.1.10
+PORTVERSION=	2.4.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo
index d7e8b0958085..a21ccef98240 100644
--- a/devel/hs-hspec-discover/distinfo
+++ b/devel/hs-hspec-discover/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-discover-2.1.10.tar.gz) = efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b
-SIZE (cabal/hspec-discover-2.1.10.tar.gz) = 5646
+TIMESTAMP = 1499627846
+SHA256 (cabal/hspec-discover-2.4.4.tar.gz) = 76423bc72f3ed0a80ccefb26fbf3fb16c3d74a69d69b4ce0bc88db54984d5d47
+SIZE (cabal/hspec-discover-2.4.4.tar.gz) = 5942
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index 51fff1e33223..fc40aa304791 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hspec-expectations
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT=	Catchy combinators for HUnit
 
 LICENSE=	MIT
 
-USE_CABAL=	HUnit
+USE_CABAL=	call-stack HUnit
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
index 8a324976d0a2..a652ea8cc82f 100644
--- a/devel/hs-hspec-expectations/distinfo
+++ b/devel/hs-hspec-expectations/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-expectations-0.7.1.tar.gz) = afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258
-SIZE (cabal/hspec-expectations-0.7.1.tar.gz) = 4005
+TIMESTAMP = 1499544608
+SHA256 (cabal/hspec-expectations-0.8.2.tar.gz) = 819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef
+SIZE (cabal/hspec-expectations-0.8.2.tar.gz) = 5492
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index e59cfd8da701..ceec95ce63f5 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hspec
-PORTVERSION=	2.1.10
+PORTVERSION=	2.4.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index f5e185fd06c4..4bf6e7e7d4ac 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-2.1.10.tar.gz) = f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154
-SIZE (cabal/hspec-2.1.10.tar.gz) = 5382
+TIMESTAMP = 1499627845
+SHA256 (cabal/hspec-2.4.4.tar.gz) = b01a3245da9c597608befddc4fc3cae35e5bc753235877076f11ae8e0647cf21
+SIZE (cabal/hspec-2.4.4.tar.gz) = 10634
diff --git a/devel/hs-io-streams-haproxy/Makefile b/devel/hs-io-streams-haproxy/Makefile
new file mode 100644
index 000000000000..cb937d615984
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	io-streams-haproxy
+PORTVERSION=	1.0.0.1
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	HAProxy protocol version 1.5 support for I/O using streams
+
+LICENSE=	BSD3CLAUSE
+
+USE_CABAL=	attoparsec io-streams network
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-io-streams-haproxy/distinfo b/devel/hs-io-streams-haproxy/distinfo
new file mode 100644
index 000000000000..5753d01dfff3
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499716472
+SHA256 (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f
+SIZE (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = 9892
diff --git a/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
new file mode 100644
index 000000000000..bd2556d4f862
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
@@ -0,0 +1,11 @@
+--- io-streams-haproxy.cabal.orig	2017-07-10 20:00:53 UTC
++++ io-streams-haproxy.cabal
+@@ -38,7 +38,7 @@ library
+   build-depends:     base              >= 4.5 && < 4.10,
+                      attoparsec        >= 0.7 && < 0.14,
+                      bytestring        >= 0.9 && < 0.11,
+-                     io-streams        >= 1.3 && < 1.4,
++                     io-streams        >= 1.3 && < 1.5,
+                      network           >= 2.3 && < 2.7,
+                      transformers      >= 0.3 && < 0.6
+   default-language:  Haskell2010
diff --git a/devel/hs-io-streams-haproxy/pkg-descr b/devel/hs-io-streams-haproxy/pkg-descr
new file mode 100644
index 000000000000..bc3a1c898726
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/pkg-descr
@@ -0,0 +1,7 @@
+HAProxy protocol version 1.5 support
+(see http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt) for
+applications using io-streams. The proxy protocol allows information about a
+networked peer (like remote address and port) to be propagated through a
+forwarding proxy that is configured to speak this protocol.
+
+WWW: http://hackage.haskell.org/package/io-streams-haproxy
diff --git a/devel/hs-io-streams/Makefile b/devel/hs-io-streams/Makefile
new file mode 100644
index 000000000000..bb088ca8e65e
--- /dev/null
+++ b/devel/hs-io-streams/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	io-streams
+PORTVERSION=	1.4.0.0
+CATEGORIES=	devel haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Simple and easy-to-use primitives for I/O using streams
+
+LICENSE=	BSD3CLAUSE
+
+USE_CABAL=	attoparsec network primitive text vector zlib-bindings
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-io-streams/distinfo b/devel/hs-io-streams/distinfo
new file mode 100644
index 000000000000..8f375908cf33
--- /dev/null
+++ b/devel/hs-io-streams/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499694762
+SHA256 (cabal/io-streams-1.4.0.0.tar.gz) = 6d393da60cbbbb31ca3cfe6e25beea6a1fd426ed1348723b357c6358f538930e
+SIZE (cabal/io-streams-1.4.0.0.tar.gz) = 62422
diff --git a/devel/hs-io-streams/files/patch-io-streams.cabal b/devel/hs-io-streams/files/patch-io-streams.cabal
new file mode 100644
index 000000000000..41a7921eb24d
--- /dev/null
+++ b/devel/hs-io-streams/files/patch-io-streams.cabal
@@ -0,0 +1,18 @@
+--- io-streams.cabal.orig	2017-07-10 15:08:37 UTC
++++ io-streams.cabal
+@@ -122,7 +122,6 @@ Library
+   Build-depends:     base               >= 4     && <5,
+                      attoparsec         >= 0.10  && <0.14,
+                      bytestring         >= 0.9   && <0.11,
+-                     bytestring-builder >= 0.10  && <0.11,
+                      network            >= 2.3   && <2.7,
+                      primitive          >= 0.2   && <0.7,
+                      process            >= 1.1   && <1.7,
+@@ -205,7 +204,6 @@ Test-suite testsuite
+   Build-depends:     base               >= 4     && <5,
+                      attoparsec         >= 0.10  && <0.14,
+                      bytestring         >= 0.9   && <0.11,
+-                     bytestring-builder >= 0.10  && <0.11,
+                      deepseq            >= 1.2   && <1.5,
+                      directory          >= 1.1   && <2,
+                      filepath           >= 1.2   && <2,
diff --git a/devel/hs-io-streams/pkg-descr b/devel/hs-io-streams/pkg-descr
new file mode 100644
index 000000000000..03d9f4a68b2b
--- /dev/null
+++ b/devel/hs-io-streams/pkg-descr
@@ -0,0 +1,4 @@
+The io-streams library contains simple and easy-to-use primitives for I/O using
+streams.
+
+WWW: http://hackage.haskell.org/package/io-streams
diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile
index afe5f5cb4837..06e2c83cf22b 100644
--- a/devel/hs-js-flot/Makefile
+++ b/devel/hs-js-flot/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	js-flot
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-js-flot/distinfo b/devel/hs-js-flot/distinfo
index 187227743469..d902e5d7ee79 100644
--- a/devel/hs-js-flot/distinfo
+++ b/devel/hs-js-flot/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627846
 SHA256 (cabal/js-flot-0.8.3.tar.gz) = 1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a
 SIZE (cabal/js-flot-0.8.3.tar.gz) = 662691
diff --git a/devel/hs-js-jquery/Makefile b/devel/hs-js-jquery/Makefile
index 02093d645f42..b1a083f622ae 100644
--- a/devel/hs-js-jquery/Makefile
+++ b/devel/hs-js-jquery/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	js-jquery
-PORTVERSION=	1.11.3
+PORTVERSION=	3.2.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-js-jquery/distinfo b/devel/hs-js-jquery/distinfo
index acae74b0abc9..ee23890482a0 100644
--- a/devel/hs-js-jquery/distinfo
+++ b/devel/hs-js-jquery/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/js-jquery-1.11.3.tar.gz) = 3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257
-SIZE (cabal/js-jquery-1.11.3.tar.gz) = 120919
+TIMESTAMP = 1499618157
+SHA256 (cabal/js-jquery-3.2.1.tar.gz) = 60503d82d0a601291cf0aa495edecbdb749dcf8982502bf18b9a886979ac1e0f
+SIZE (cabal/js-jquery-3.2.1.tar.gz) = 112319
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
index f221c3257287..74775fcbac8b 100644
--- a/devel/hs-keys/Makefile
+++ b/devel/hs-keys/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	keys
-PORTVERSION=	3.10.2
+PORTVERSION=	3.11
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
index 4cf4edfc81f5..214b50411120 100644
--- a/devel/hs-keys/distinfo
+++ b/devel/hs-keys/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/keys-3.10.2.tar.gz) = 425f1ee508efd371220d2eae4d81be1423797968af2387a2a83b937fb186bef6
-SIZE (cabal/keys-3.10.2.tar.gz) = 8635
+TIMESTAMP = 1499627846
+SHA256 (cabal/keys-3.11.tar.gz) = 0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2
+SIZE (cabal/keys-3.11.tar.gz) = 8674
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index fd95a5523483..1ac7c6876fc5 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kqueue
-PORTVERSION=	0.1.2.6
-PORTREVISION=	2
+PORTVERSION=	0.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-kqueue/distinfo b/devel/hs-kqueue/distinfo
index 716fbaf364f4..2655994756cf 100644
--- a/devel/hs-kqueue/distinfo
+++ b/devel/hs-kqueue/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/kqueue-0.1.2.6.tar.gz) = e851243826ecadda865809289d6f6921483ab5fed54f9d12453277dd355445e0
-SIZE (cabal/kqueue-0.1.2.6.tar.gz) = 7398
+TIMESTAMP = 1499627846
+SHA256 (cabal/kqueue-0.2.tar.gz) = 700c6daf8a3f6ff1dbbc7f8ef10f3acb2ffddb4ccc65a68fa533907802f67369
+SIZE (cabal/kqueue-0.2.tar.gz) = 7505
diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal
deleted file mode 100644
index a6145d68df98..000000000000
--- a/devel/hs-kqueue/files/patch-kqueue.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
---- kqueue.cabal.orig	2014-05-08 16:35:57 UTC
-+++ kqueue.cabal
-@@ -21,11 +21,11 @@ Library
-   Hs-Source-Dirs:      src
-   Exposed-modules:     System.KQueue
-                        System.KQueue.HighLevel
--  Build-depends:       base >= 4.0 && < 4.8
-+  Build-depends:       base >= 4.0 && < 4.9
-                      , directory >= 1.0 && < 1.4
--                     , filepath >= 1.1 && < 1.4
-+                     , filepath >= 1.1 && < 1.5
-                      , mtl >= 1.1 && < 2.3
--                     , time >= 1.1 && < 1.5
-+                     , time >= 1.1 && < 1.6
-                      , unix >= 2.3 && < 2.8
-   Build-tools:         c2hs
-   GHC-Options:         -Wall
diff --git a/devel/hs-kqueue/files/patch-src__System__KQueue.chs b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
index f5a9586bc0dd..294fed64b0b5 100644
--- a/devel/hs-kqueue/files/patch-src__System__KQueue.chs
+++ b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
@@ -1,14 +1,22 @@
---- ./src/System/KQueue.chs.orig	2012-01-03 14:00:32.000000000 +0100
-+++ ./src/System/KQueue.chs	2012-01-27 07:17:17.000000000 +0100
-@@ -21,6 +21,7 @@
+--- src/System/KQueue.chs.orig	2016-05-30 14:31:11 UTC
++++ src/System/KQueue.chs
+@@ -21,6 +21,7 @@ module System.KQueue
  
  #include <sys/time.h>
  #include <sys/event.h>
 +#include "MachDeps.h"
  
+ #if __GLASGOW_HASKELL__ <= 708
  import Control.Applicative ( (<$>), (<*>) )
- import Control.Exception   ( Exception, throwIO )
-@@ -62,11 +63,19 @@
+@@ -57,6 +58,7 @@ import Foreign.C           ( CInt )
+ import Foreign.C           ( CLong
+                            , CTime
+                            , CULong
++                           , CUInt
+                            )
+ 
+ -- | A kernel event queue.
+@@ -68,11 +70,19 @@ kqueue = KQueue <$> {#call kqueue as kqueue_ #}
  
  -- | A kernel event.
  data KEvent = KEvent
@@ -28,13 +36,13 @@
    , udata    :: Ptr ()  -- ^ User-defined data, passed through unchanged.
    } deriving (Show, Eq)
  
-@@ -122,8 +131,10 @@
+@@ -128,8 +138,10 @@ enum FFlag
    , NoteExit   = NOTE_EXIT
    , NoteFork   = NOTE_FORK
    , NoteExec   = NOTE_EXEC
 +#ifndef __FreeBSD__
    , NoteSignal = NOTE_SIGNAL
-   , NoteReap   = NOTE_REAP
+ //  , NoteReap   = NOTE_REAP
 +#endif
    };
  #endc
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 65bc346da2b6..19f3bfef1a93 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	language-c
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index 0f68692100b0..f3bf44a232b6 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486993392
-SHA256 (cabal/language-c-0.5.0.tar.gz) = 86d58bc017a7bba157fc4d5d0ab9e3a3d3f3a2f98bfe46b5b0d5d72a0f5d2222
-SIZE (cabal/language-c-0.5.0.tar.gz) = 170403
+TIMESTAMP = 1499627847
+SHA256 (cabal/language-c-0.6.1.tar.gz) = 23cadc9d04e46490ec57f56b79ecdc2a709ebf57571345905e6e30db29fa37e8
+SIZE (cabal/language-c-0.6.1.tar.gz) = 179625
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 0f8a5f55f391..b55dd42617cf 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile