For ports with USES=cabal install a wrapper shell script instead of a real

executable into /bin/, that sets some environment variables to workaround
https://github.com/haskell/cabal/issues/5997

While there, update bunch of Haskell ports, install their data files.

PR:		237878
Reviewed by:	tcberner
Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D20556

26 files changed, 240 insertions, 96 deletions

diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index ec76043cd64e..11710ca0317f 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ShellCheck
 DISTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	pizzamig@FreeBSD.org
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 7198b9fcfd65..f85c85a6ba7f 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	alex
 PORTVERSION=	3.2.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index bad525ff5a78..341c1cd3ac73 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=	15
+PORTREVISION=	16
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 3ccc412ebca6..a80cba658fc2 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	c2hs
 PORTVERSION=	0.28.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index 044da4a5bba0..0a81464aa8a8 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cpphs
 PORTVERSION=	1.20.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 37adb5cfc333..56e2c95183e8 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	darcs
 PORTVERSION=	2.14.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index 4d4c76a2f7fc..2a606a950358 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc-events
-PORTVERSION=	0.8.0.1
-PORTREVISION=	2
+PORTVERSION=	0.9.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index 35a964857a62..f921cc0af8ab 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1550306545
-SHA256 (cabal/ghc-events-0.8.0.1.tar.gz) = 29c5f07f1f0fbf64f8f74b806a5ce3b3ad39bbd443bb7241451e91ad48a6a898
-SIZE (cabal/ghc-events-0.8.0.1.tar.gz) = 1441899
+TIMESTAMP = 1559892080
+SHA256 (cabal/ghc-events-0.9.0.tar.gz) = 20d4e10bcbe8d1dadbd5d1e6bb786d621a25c1117f57d954bd14780cb1748d00
+SIZE (cabal/ghc-events-0.9.0.tar.gz) = 1450026
 SHA256 (cabal/primitive-0.6.4.0/primitive-0.6.4.0.tar.gz) = 4cbeaf7924dd79221f327ea101a29bf35c4976dc3319df157ff46ea68e6a0c64
 SIZE (cabal/primitive-0.6.4.0/primitive-0.6.4.0.tar.gz) = 45937
 SHA256 (cabal/primitive-0.6.4.0/revision/1.cabal) = 5b6a2c3cc70a35aabd4565fcb9bb1dd78fe2814a36e62428a9a1aae8c32441a1
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index fc54fb62b145..2ccd6d1d5320 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	git-annex
 PORTVERSION=	7.20190129
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -123,55 +124,58 @@ CABAL_FLAGS=		torrentparser magicmime \
 			-benchmark -debuglocks
 
 EXECUTABLES=	git-annex
-#EXECUTABLES=	git-annex git-annex-shell git-remote-tor-annex
-
-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
-
-PLIST_FILES=	bin/git-annex-shell bin/git-remote-tor-annex
 
-post-stage:
-	${LN} -sf ${PREFIX}/bin/git-annex ${STAGEDIR}${PREFIX}/bin/git-annex-shell
-	${LN} -sf ${PREFIX}/bin/git-annex ${STAGEDIR}${PREFIX}/bin/git-remote-tor-annex
+MAN1PAGES=	git-annex-add git-annex-expire git-annex-lookupkey \
+		git-annex-remotedaemon git-annex-ungroup \
+		git-annex-addunused git-annex-find git-annex-map \
+		git-annex-repair git-annex-uninit git-annex-addurl \
+		git-annex-findref git-annex-matchexpression \
+		git-annex-required git-annex-unlock git-annex-adjust \
+		git-annex-fix git-annex-matching-options \
+		git-annex-resolvemerge git-annex-untrust \
+		git-annex-assistant git-annex-forget git-annex-merge \
+		git-annex-rmurl git-annex-unused git-annex-calckey \
+		git-annex-fromkey git-annex-metadata git-annex-schedule \
+		git-annex-upgrade git-annex-checkpresentkey \
+		git-annex-fsck git-annex-migrate git-annex-semitrust \
+		git-annex-vadd git-annex-contentlocation \
+		git-annex-fuzztest git-annex-mirror git-annex-setkey \
+		git-annex-vcycle git-annex-copy git-annex-get \
+		git-annex-move git-annex-setpresentkey \
+		git-annex-version git-annex-dead git-annex-group \
+		git-annex-multicast git-annex-shell git-annex-vfilter \
+		git-annex-describe git-annex-groupwanted \
+		git-annex-numcopies git-annex-smudge git-annex-vicfg \
+		git-annex-diffdriver git-annex-import git-annex-p2p \
+		git-annex-status git-annex-view git-annex-direct \
+		git-annex-importfeed git-annex-pre-commit \
+		git-annex-sync git-annex-vpop git-annex-drop \
+		git-annex-indirect git-annex-preferred-content \
+		git-annex-test git-annex-wanted git-annex-dropkey \
+		git-annex-info git-annex-proxy git-annex-testremote \
+		git-annex-watch git-annex-dropunused git-annex-init \
+		git-annex-readpresentkey git-annex-transferkey \
+		git-annex-webapp git-annex-edit git-annex-initremote \
+		git-annex-registerurl git-annex-transferkeys \
+		git-annex-whereis git-annex-enable-tor git-annex-list \
+		git-annex-reinit git-annex-trust git-annex \
+		git-annex-enableremote git-annex-lock \
+		git-annex-reinject git-annex-unannex \
+		git-remote-tor-annex git-annex-examinekey git-annex-log \
+		git-annex-rekey git-annex-undo
+
+post-build:
+.for man in ${MAN1PAGES}
+	${WRKSRC}/Build/mdwn2man ${man} 1 ${WRKSRC}/doc/${man}.mdwn > ${WRKSRC}/doc/${man}.1
+.endfor
+
+post-install:
+.for man in ${MAN1PAGES}
+	${INSTALL_MAN} ${WRKSRC}/doc/${man}.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+.endfor
 
-# .for man in ${MAN1PAGES}
-# 	${INSTALL_MAN} ${WRKSRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man1/
-# .endfor
+post-stage:
+	${LN} -sf git-annex ${STAGEDIR}${PREFIX}/bin/git-annex-shell
+	${LN} -sf git-annex ${STAGEDIR}${PREFIX}/bin/git-remote-tor-annex
 
 .include <bsd.port.mk>
diff --git a/devel/hs-git-annex/pkg-plist b/devel/hs-git-annex/pkg-plist
new file mode 100644
index 000000000000..5fe344fbeada
--- /dev/null
+++ b/devel/hs-git-annex/pkg-plist
@@ -0,0 +1,101 @@
+bin/git-annex-shell
+bin/git-remote-tor-annex
+man/man1/git-annex-add.1.gz
+man/man1/git-annex-addunused.1.gz
+man/man1/git-annex-addurl.1.gz
+man/man1/git-annex-adjust.1.gz
+man/man1/git-annex-assistant.1.gz
+man/man1/git-annex-calckey.1.gz
+man/man1/git-annex-checkpresentkey.1.gz
+man/man1/git-annex-contentlocation.1.gz
+man/man1/git-annex-copy.1.gz
+man/man1/git-annex-dead.1.gz
+man/man1/git-annex-describe.1.gz
+man/man1/git-annex-diffdriver.1.gz
+man/man1/git-annex-direct.1.gz
+man/man1/git-annex-drop.1.gz
+man/man1/git-annex-dropkey.1.gz
+man/man1/git-annex-dropunused.1.gz
+man/man1/git-annex-edit.1.gz
+man/man1/git-annex-enable-tor.1.gz
+man/man1/git-annex-enableremote.1.gz
+man/man1/git-annex-examinekey.1.gz
+man/man1/git-annex-expire.1.gz
+man/man1/git-annex-find.1.gz
+man/man1/git-annex-findref.1.gz
+man/man1/git-annex-fix.1.gz
+man/man1/git-annex-forget.1.gz
+man/man1/git-annex-fromkey.1.gz
+man/man1/git-annex-fsck.1.gz
+man/man1/git-annex-fuzztest.1.gz
+man/man1/git-annex-get.1.gz
+man/man1/git-annex-group.1.gz
+man/man1/git-annex-groupwanted.1.gz
+man/man1/git-annex-import.1.gz
+man/man1/git-annex-importfeed.1.gz
+man/man1/git-annex-indirect.1.gz
+man/man1/git-annex-info.1.gz
+man/man1/git-annex-init.1.gz
+man/man1/git-annex-initremote.1.gz
+man/man1/git-annex-list.1.gz
+man/man1/git-annex-lock.1.gz
+man/man1/git-annex-log.1.gz
+man/man1/git-annex-lookupkey.1.gz
+man/man1/git-annex-map.1.gz
+man/man1/git-annex-matchexpression.1.gz
+man/man1/git-annex-matching-options.1.gz
+man/man1/git-annex-merge.1.gz
+man/man1/git-annex-metadata.1.gz
+man/man1/git-annex-migrate.1.gz
+man/man1/git-annex-mirror.1.gz
+man/man1/git-annex-move.1.gz
+man/man1/git-annex-multicast.1.gz
+man/man1/git-annex-numcopies.1.gz
+man/man1/git-annex-p2p.1.gz
+man/man1/git-annex-pre-commit.1.gz
+man/man1/git-annex-preferred-content.1.gz
+man/man1/git-annex-proxy.1.gz
+man/man1/git-annex-readpresentkey.1.gz
+man/man1/git-annex-registerurl.1.gz
+man/man1/git-annex-reinit.1.gz
+man/man1/git-annex-reinject.1.gz
+man/man1/git-annex-rekey.1.gz
+man/man1/git-annex-remotedaemon.1.gz
+man/man1/git-annex-repair.1.gz
+man/man1/git-annex-required.1.gz
+man/man1/git-annex-resolvemerge.1.gz
+man/man1/git-annex-rmurl.1.gz
+man/man1/git-annex-schedule.1.gz
+man/man1/git-annex-semitrust.1.gz
+man/man1/git-annex-setkey.1.gz
+man/man1/git-annex-setpresentkey.1.gz
+man/man1/git-annex-shell.1.gz
+man/man1/git-annex-smudge.1.gz
+man/man1/git-annex-status.1.gz
+man/man1/git-annex-sync.1.gz
+man/man1/git-annex-test.1.gz
+man/man1/git-annex-testremote.1.gz
+man/man1/git-annex-transferkey.1.gz
+man/man1/git-annex-transferkeys.1.gz
+man/man1/git-annex-trust.1.gz
+man/man1/git-annex-unannex.1.gz
+man/man1/git-annex-undo.1.gz
+man/man1/git-annex-ungroup.1.gz
+man/man1/git-annex-uninit.1.gz
+man/man1/git-annex-unlock.1.gz
+man/man1/git-annex-untrust.1.gz
+man/man1/git-annex-unused.1.gz
+man/man1/git-annex-upgrade.1.gz
+man/man1/git-annex-vadd.1.gz
+man/man1/git-annex-vcycle.1.gz
+man/man1/git-annex-version.1.gz
+man/man1/git-annex-vfilter.1.gz
+man/man1/git-annex-vicfg.1.gz
+man/man1/git-annex-view.1.gz
+man/man1/git-annex-vpop.1.gz
+man/man1/git-annex-wanted.1.gz
+man/man1/git-annex-watch.1.gz
+man/man1/git-annex-webapp.1.gz
+man/man1/git-annex-whereis.1.gz
+man/man1/git-annex.1.gz
+man/man1/git-remote-tor-annex.1.gz
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 6648726980ff..930c8b23634b 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	2.21.0
-PORTREVISION=	3
+PORTVERSION=	2.22.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -13,6 +12,11 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cabal
 
-USE_CABAL=	ghc-paths-0.1.0.9_4 haddock-api-2.21.0 haddock-library-1.7.0
+USE_CABAL=	ghc-paths-0.1.0.9_4 haddock-api-${PORTVERSION} haddock-library-1.7.0
+
+haddock_DATADIR_VARS=	haddock-api
+
+post-install:
+	cd ${WRKSRC}/haddock-api-${PORTVERSION}/resources/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 5d8960e992ab..33bfa255aa9b 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1550307107
-SHA256 (cabal/haddock-2.21.0.tar.gz) = 0863cea77db75032ea8eb3b31e363300cf59ce347c56bd0d3aa64b0b298378b6
-SIZE (cabal/haddock-2.21.0.tar.gz) = 264884
+TIMESTAMP = 1559901036
+SHA256 (cabal/haddock-2.22.0.tar.gz) = 66c556e9b5cf5666acda3d0cb03637d72addc563495dc446a2199402bff882cc
+SIZE (cabal/haddock-2.22.0.tar.gz) = 266319
 SHA256 (cabal/ghc-paths-0.1.0.9/ghc-paths-0.1.0.9.tar.gz) = afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945
 SIZE (cabal/ghc-paths-0.1.0.9/ghc-paths-0.1.0.9.tar.gz) = 2402
 SHA256 (cabal/ghc-paths-0.1.0.9/revision/4.cabal) = ed18df7b53699446dabd66f6e019e5b156820f0301d8dec0d6385f13b797e0ba
 SIZE (cabal/ghc-paths-0.1.0.9/revision/4.cabal) = 656
-SHA256 (cabal/haddock-api-2.21.0/haddock-api-2.21.0.tar.gz) = dcaeb11b9fa22544b932492198b373abf598c87fedc3ea05ae125a6230ecd148
-SIZE (cabal/haddock-api-2.21.0/haddock-api-2.21.0.tar.gz) = 177939
+SHA256 (cabal/haddock-api-2.22.0/haddock-api-2.22.0.tar.gz) = 24804f7e9da006a97712822da8afd7b24b00a9135638457266fc54e2e8273891
+SIZE (cabal/haddock-api-2.22.0/haddock-api-2.22.0.tar.gz) = 186601
 SHA256 (cabal/haddock-library-1.7.0/haddock-library-1.7.0.tar.gz) = e7c2794a7eb352824f098cafa07bc0506f2c3633808bfbf4c64aef0ba664d011
 SIZE (cabal/haddock-library-1.7.0/haddock-library-1.7.0.tar.gz) = 26315
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
index 85fc89b4d9c7..6099c2f5b330 100644
--- a/devel/hs-haddock/pkg-plist
+++ b/devel/hs-haddock/pkg-plist
@@ -1,2 +1,15 @@
-@postexec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
-@postunexec [ -f %%GHC_HADDOCK_CMD%% ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%% || rm -f %%HADDOCK%%
+%%DATADIR%%/html/Classic.theme/haskell_icon.gif
+%%DATADIR%%/html/Classic.theme/minus.gif
+%%DATADIR%%/html/Classic.theme/plus.gif
+%%DATADIR%%/html/Classic.theme/xhaddock.css
+%%DATADIR%%/html/Ocean.std-theme/hslogo-16.png
+%%DATADIR%%/html/Ocean.std-theme/minus.gif
+%%DATADIR%%/html/Ocean.std-theme/ocean.css
+%%DATADIR%%/html/Ocean.std-theme/plus.gif
+%%DATADIR%%/html/Ocean.std-theme/synopsis.png
+%%DATADIR%%/html/haddock-bundle.min.js
+%%DATADIR%%/html/highlight.js
+%%DATADIR%%/html/quick-jump.css
+%%DATADIR%%/html/quick-jump.min.js
+%%DATADIR%%/html/solarized.css
+%%DATADIR%%/latex/haddock.sty
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 9e09c9b0541e..a2cff9c27b45 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	happy
 PORTVERSION=	1.19.10
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -20,4 +21,8 @@ post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} $$(find ${WRKSRC} -name 'HappyTemplate*') ${STAGEDIR}${DATADIR}
+
 .include <bsd.port.mk>
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
new file mode 100644
index 000000000000..92d73f60fd2d
--- /dev/null
+++ b/devel/hs-happy/pkg-plist
@@ -0,0 +1,9 @@
+%%DATADIR%%/HappyTemplate
+%%DATADIR%%/HappyTemplate-arrays
+%%DATADIR%%/HappyTemplate-arrays-coerce
+%%DATADIR%%/HappyTemplate-arrays-coerce-debug
+%%DATADIR%%/HappyTemplate-arrays-debug
+%%DATADIR%%/HappyTemplate-arrays-ghc
+%%DATADIR%%/HappyTemplate-arrays-ghc-debug
+%%DATADIR%%/HappyTemplate-coerce
+%%DATADIR%%/HappyTemplate-ghc
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index 825d71093894..1136be98b3f6 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hasktags
 PORTVERSION=	0.71.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index 1bada91afe43..001516fed5c4 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hlint
 PORTVERSION=	2.1.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 4b737bf596a5..7a70ba6420e0 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hoogle
-PORTVERSION=	5.0.17.4
-PORTREVISION=	2
+PORTVERSION=	5.0.17.9
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -12,14 +11,15 @@ COMMENT=	Haskell API Search
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	happy:devel/hs-happy
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cabal
 
 USE_CABAL=	ListLike-4.6_2 QuickCheck-2.12.6.1_1 aeson-1.4.2.0_1 appar-0.1.7 \
 		asn1-encoding-0.9.5 asn1-parse-0.9.4 asn1-types-0.3.2 async-2.2.1_1 \
 		attoparsec-0.13.2.2 auto-update-0.1.4 base-compat-0.10.5 \
-		base-orphans-0.8 basement-0.0.10_1 blaze-builder-0.4.1.0 \
-		bsb-http-chunked-0.0.0.4 byteable-0.1.1 byteorder-1.0.4 \
+		base-orphans-0.8 basement-0.0.10_1 blaze-builder-0.4.1.0 blaze-html-0.9.1.1 \
+		blaze-markup-0.8.2.2_1 bsb-http-chunked-0.0.0.4 byteable-0.1.1 byteorder-1.0.4 \
 		cabal-doctest-1.0.6_2 case-insensitive-1.2.0.11 cereal-0.5.8.0 \
 		clock-0.7.2 cmdargs-0.10.20 conduit-1.3.1 conduit-extra-1.3.0 \
 		connection-0.2.8 cookie-0.4.4 cryptonite-0.25 \
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index e42e88dc224d..94e69512b275 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1553675419
-SHA256 (cabal/hoogle-5.0.17.4.tar.gz) = 499b2b7a77806ed486d7ed8daad29c3827cec38a32dbd02769b72fba87f62d15
-SIZE (cabal/hoogle-5.0.17.4.tar.gz) = 93902
+TIMESTAMP = 1559909386
+SHA256 (cabal/hoogle-5.0.17.9.tar.gz) = df207e0cc1214ba3eb83240907d9f3c15b34e2c9a384ef01a37278ada3409768
+SIZE (cabal/hoogle-5.0.17.9.tar.gz) = 96318
 SHA256 (cabal/ListLike-4.6/ListLike-4.6.tar.gz) = c1cdec79a5f585a5839eea26a2afe6a37aab5ed2f402a16e7d59fe9a4e925a9a
 SIZE (cabal/ListLike-4.6/ListLike-4.6.tar.gz) = 30544
 SHA256 (cabal/ListLike-4.6/revision/2.cabal) = 0fc4f9b6d6da1eab7102310f37379c4fc751ec94ac4c36096cd87ef948168ad5
@@ -39,6 +39,12 @@ SHA256 (cabal/basement-0.0.10/revision/1.cabal) = 11b1a13d16c81a7a9706fadfc52eca
 SIZE (cabal/basement-0.0.10/revision/1.cabal) = 5595
 SHA256 (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814
 SIZE (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 61365
+SHA256 (cabal/blaze-html-0.9.1.1/blaze-html-0.9.1.1.tar.gz) = ea0e944298dbbd692b41af4f15dbd1a1574aec7b8f91f38391d25106b143bb1b
+SIZE (cabal/blaze-html-0.9.1.1/blaze-html-0.9.1.1.tar.gz) = 81502
+SHA256 (cabal/blaze-markup-0.8.2.2/blaze-markup-0.8.2.2.tar.gz) = c6f0cf8fd707ba8c0b700e0c5ad6a1212c8b57d46a9cbdfb904d8bf585ad82e1
+SIZE (cabal/blaze-markup-0.8.2.2/blaze-markup-0.8.2.2.tar.gz) = 14458
+SHA256 (cabal/blaze-markup-0.8.2.2/revision/1.cabal) = fda3582c37167b7b26a3e973f8501e0889041de01416add83c592cf03bbb7a47
+SIZE (cabal/blaze-markup-0.8.2.2/revision/1.cabal) = 2231
 SHA256 (cabal/bsb-http-chunked-0.0.0.4/bsb-http-chunked-0.0.0.4.tar.gz) = 148309e23eb8b261c1de374712372d62d8c8dc8ee504c392809c7ec33c0a0e7c
 SIZE (cabal/bsb-http-chunked-0.0.0.4/bsb-http-chunked-0.0.0.4.tar.gz) = 6630
 SHA256 (cabal/byteable-0.1.1/byteable-0.1.1.tar.gz) = 243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
index 0c6992af8d9c..7114e003ab23 100644
--- a/devel/hs-hspec-discover/Makefile
+++ b/devel/hs-hspec-discover/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hspec-discover
-PORTVERSION=	2.6.1
+PORTVERSION=	2.7.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo
index ed8526f19323..31d195f5b991 100644
--- a/devel/hs-hspec-discover/distinfo
+++ b/devel/hs-hspec-discover/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550317272
-SHA256 (cabal/hspec-discover-2.6.1.tar.gz) = 9d569a9587d2034272d287442855490a06266192eba1da871cae7d971b922fa1
-SIZE (cabal/hspec-discover-2.6.1.tar.gz) = 6719
+TIMESTAMP = 1559911407
+SHA256 (cabal/hspec-discover-2.7.1.tar.gz) = 0b31c29b37d7d446d44b3559f794cd62b09ee5fc3f30862eccd8284e52758764
+SIZE (cabal/hspec-discover-2.7.1.tar.gz) = 6755
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 986e88fbdbcb..b5491f77a71b 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mueval
 PORTVERSION=	0.9.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
index 1dcddadb5a69..e708f76b23a2 100644
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	shake
-PORTVERSION=	0.17.5
+PORTVERSION=	0.18.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,8 +11,9 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cabal
 
-USE_CABAL=	clock-0.7.2 extra-1.6.14 hashable-1.2.7.0_1 js-flot-0.8.3 \
-		js-jquery-3.3.1 primitive-0.6.4.0_1 random-1.1_1 \
-		unordered-containers-0.2.10.0 utf8-string-1.0.1.1_3
+USE_CABAL=	clock-0.7.2 extra-1.6.14 filepattern-0.1.1 hashable-1.2.7.0_1 \
+		heaps-0.3.6.1 js-dgtable-0.5.2 js-flot-0.8.3 js-jquery-3.3.1 \
+		primitive-0.6.4.0_1 random-1.1_1 unordered-containers-0.2.10.0 \
+		utf8-string-1.0.1.1_3
 
 .include <bsd.port.mk>
diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo
index cff640dcb0cc..343b62880b29 100644
--- a/devel/hs-shake/distinfo
+++ b/devel/hs-shake/distinfo
@@ -1,14 +1,20 @@
-TIMESTAMP = 1553452122
-SHA256 (cabal/shake-0.17.5.tar.gz) = dff71cf56f7ef75045419b3084f9ef2481023df2ba3541a6f4e84e50dea42a20
-SIZE (cabal/shake-0.17.5.tar.gz) = 562751
+TIMESTAMP = 1559912465
+SHA256 (cabal/shake-0.18.2.tar.gz) = 28fecc26cb8a994d35482a673cee4dbe02c8e20d49a875ebd009037935673fb7
+SIZE (cabal/shake-0.18.2.tar.gz) = 257358
 SHA256 (cabal/clock-0.7.2/clock-0.7.2.tar.gz) = 886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f
 SIZE (cabal/clock-0.7.2/clock-0.7.2.tar.gz) = 7465
 SHA256 (cabal/extra-1.6.14/extra-1.6.14.tar.gz) = a60641530d96653ecc365aa042f4061892154995915d91f432ea5a2e3aaf129c
 SIZE (cabal/extra-1.6.14/extra-1.6.14.tar.gz) = 41074
+SHA256 (cabal/filepattern-0.1.1/filepattern-0.1.1.tar.gz) = f7fc5bdcfef0d43a793a3c64e7c0fd3b1d35eea97a37f0e69d6612ab255c9b4b
+SIZE (cabal/filepattern-0.1.1/filepattern-0.1.1.tar.gz) = 14868
 SHA256 (cabal/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz) = ecb5efc0586023f5a0dc861100621c1dbb4cbb2f0516829a16ebac39f0432abf
 SIZE (cabal/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz) = 30182
 SHA256 (cabal/hashable-1.2.7.0/revision/1.cabal) = 03b6836ca9cd3ad0e5a2f3cce989b001dd0e05f306a873db3196037adb30e0a4
 SIZE (cabal/hashable-1.2.7.0/revision/1.cabal) = 5215
+SHA256 (cabal/heaps-0.3.6.1/heaps-0.3.6.1.tar.gz) = 91d552f3c8992f745607de39239b950db78295b533eda43d083699872a4ee36d
+SIZE (cabal/heaps-0.3.6.1/heaps-0.3.6.1.tar.gz) = 12440
+SHA256 (cabal/js-dgtable-0.5.2/js-dgtable-0.5.2.tar.gz) = e28dd65bee8083b17210134e22e01c6349dc33c3b7bd17705973cd014e9f20ac
+SIZE (cabal/js-dgtable-0.5.2/js-dgtable-0.5.2.tar.gz) = 49085
 SHA256 (cabal/js-flot-0.8.3/js-flot-0.8.3.tar.gz) = 1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a
 SIZE (cabal/js-flot-0.8.3/js-flot-0.8.3.tar.gz) = 662691
 SHA256 (cabal/js-jquery-3.3.1/js-jquery-3.3.1.tar.gz) = e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index dbfd70dc432b..f66f4680fa51 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	threadscope
 PORTVERSION=	0.2.11.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index 10bf32da22e2..95fa3e730fa0 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -1,16 +1,9 @@
 # Created by: Tobias Kortkamp <t@tobik.me>
 # $FreeBSD$
 
-# To update this port first go to
-# https://github.com/arrowd/stack-dependencies, change the
-# version in the Makefile there, regenerate the stack-dependencies
-# tarball, commit Makefile changes, create a new tag (release)
-# matching the new stack version, and upload the tarball.  Finally
-# bump the version here.
-
 PORTNAME=	stack
 PORTVERSION=	1.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org