3 files changed, 293 insertions, 18 deletions

diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index b318964b9596..07d00e3cc09a 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	yesod-bin
 PORTVERSION=	1.6.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,20 +11,41 @@ COMMENT=	Yesod helper executable
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_CABAL=	async attoparsec>=0.10 base64-bytestring \
-		blaze-builder>=0.2.1.4 conduit>=1.2 conduit-extra \
-		data-default-class file-embed fsnotify>=0.0 ghc-paths>=0.1 \
-		http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \
-		http-types>=0.7 lifted-base network \
-		optparse-applicative>=0.11 \
-		project-template>=0.1.1 resourcet>=0.3 safe-exceptions say shakespeare>=2.0 \
-		split>=0.2 streaming-commons tar>=0.4 \
-		transformers-compat typed-process unix-compat>=0.2 unordered-containers \
-		wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \
-		zlib>=0.5
+USES=		cabal
 
-EXECUTABLE=	yesod
-STANDALONE=	yes
+USE_CABAL=	aeson-1.4.2.0_1 ansi-terminal-0.9 ansi-wl-pprint-0.6.8.2_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 \
+		base64-bytestring-1.0.0.2 base-compat-0.10.5 basement-0.0.10_1 \
+		blaze-builder-0.4.1.0 blaze-html-0.9.1.1 blaze-markup-0.8.2.2 \
+		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 colour-2.3.4 conduit-1.3.1 conduit-extra-1.3.0 \
+		connection-0.2.8 cookie-0.4.4 cryptonite-0.25 \
+		data-default-class-0.1.2.0 dlist-0.8.0.5 easy-file-0.2.2 \
+		exceptions-0.10.0_2 fast-logger-2.4.13 file-embed-0.0.11 \
+		fsnotify-0.3.0.1_1 hsc2hs-0.68.4_1 hashable-1.2.7.0_1 \
+		hourglass-0.2.12 http-client-0.6.1 http-client-tls-0.3.5.3 \
+		http-date-0.0.8 http-reverse-proxy-0.6.0 http-types-0.12.2 \
+		http2-1.6.4 integer-logarithms-1.0.2.2 iproute-1.7.7 \
+		libyaml-0.1.1.0 memory-0.14.18_1 mime-types-0.1.0.9 \
+		mono-traversable-1.0.11.0 network-2.7.0.2_2 network-byte-order-0.0.0.0 \
+		network-uri-2.6.1.0_1 old-locale-1.0.0.7_2 old-time-1.1.0.3_2 \
+		optparse-applicative-0.14.3.0 pem-0.2.4 primitive-0.6.4.0_1 \
+		project-template-0.2.0.1 psqueues-0.2.7.1 random-1.1_1 \
+		resourcet-1.2.2 say-0.1.0.1 scientific-0.3.6.2 semigroups-0.18.5 \
+		shakespeare-2.0.20 simple-sendfile-0.2.28 socks-0.5.6_1 \
+		split-0.2.3.3_1 streaming-commons-0.2.1.0 tar-0.5.1.0_1 tagged-0.8.6 \
+		th-abstraction-0.2.10.0 time-locale-compat-0.1.1.5 tls-1.4.1 \
+		tls-session-manager-0.0.0.2 transformers-compat-0.6.2 \
+		typed-process-0.2.4.0 unix-compat-0.5.1 unix-time-0.4.5 \
+		unliftio-0.2.10 unliftio-core-0.1.2.0_1 \
+		unordered-containers-0.2.10.0 uuid-types-1.0.3_1 vault-0.3.1.2 \
+		vector-0.12.0.2 vector-algorithms-0.8.0.1 void-0.7.2 wai-3.2.2 \
+		wai-extra-3.0.25 wai-logger-2.3.4 warp-3.2.26 warp-tls-3.2.4.3 \
+		word8-0.1.3 x509-1.7.5 x509-store-1.6.7 x509-system-1.6.6 \
+		x509-validation-1.6.11 yaml-0.11.0.0 zlib-0.6.2
+
+EXECUTABLES=	yesod
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-yesod-bin/distinfo b/www/hs-yesod-bin/distinfo
index 3ad59b0e8f99..9540b887f12f 100644
--- a/www/hs-yesod-bin/distinfo
+++ b/www/hs-yesod-bin/distinfo
@@ -1,3 +1,247 @@
-TIMESTAMP = 1531832614
+TIMESTAMP = 1553697364
 SHA256 (cabal/yesod-bin-1.6.0.3.tar.gz) = e4db295b4c651c205a1730df38501c217d9b600f3dbc1eea21d5fa47e832aedc
 SIZE (cabal/yesod-bin-1.6.0.3.tar.gz) = 22319
+SHA256 (cabal/aeson-1.4.2.0/aeson-1.4.2.0.tar.gz) = 75ce71814a33d5e5568208e6806a8847e7ba47fea74d30f6a8b1b56ecb318bd0
+SIZE (cabal/aeson-1.4.2.0/aeson-1.4.2.0.tar.gz) = 268052
+SHA256 (cabal/aeson-1.4.2.0/revision/1.cabal) = 8166752a9669597db375343df19805069595fed9c613f98504e418849f40fe18
+SIZE (cabal/aeson-1.4.2.0/revision/1.cabal) = 7007
+SHA256 (cabal/ansi-terminal-0.9/ansi-terminal-0.9.tar.gz) = d755c2c0f2819cd7fe198a6aa58e60a88ae532cd69467e1111c8839b83c0ac03
+SIZE (cabal/ansi-terminal-0.9/ansi-terminal-0.9.tar.gz) = 34424
+SHA256 (cabal/ansi-wl-pprint-0.6.8.2/ansi-wl-pprint-0.6.8.2.tar.gz) = a630721bd57678c3bfeb6c703f8249e434cbf85f40daceec4660fb8c6725cb3e
+SIZE (cabal/ansi-wl-pprint-0.6.8.2/ansi-wl-pprint-0.6.8.2.tar.gz) = 16491
+SHA256 (cabal/ansi-wl-pprint-0.6.8.2/revision/1.cabal) = 08d938b6b1a61690063b12dad47f899ce3f8d8f179480948b98af8e733016701
+SIZE (cabal/ansi-wl-pprint-0.6.8.2/revision/1.cabal) = 2178
+SHA256 (cabal/appar-0.1.7/appar-0.1.7.tar.gz) = f6de4f1d1332d665057a9fd1af6b805f66cf04299b03f53696f3c9db4f7ff21f
+SIZE (cabal/appar-0.1.7/appar-0.1.7.tar.gz) = 3997
+SHA256 (cabal/asn1-encoding-0.9.5/asn1-encoding-0.9.5.tar.gz) = 1e863bfd363f6c3760cc80f2c0d422e17845a9f79fe006030db202ecab5aaf29
+SIZE (cabal/asn1-encoding-0.9.5/asn1-encoding-0.9.5.tar.gz) = 16114
+SHA256 (cabal/asn1-parse-0.9.4/asn1-parse-0.9.4.tar.gz) = c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708
+SIZE (cabal/asn1-parse-0.9.4/asn1-parse-0.9.4.tar.gz) = 2860
+SHA256 (cabal/asn1-types-0.3.2/asn1-types-0.3.2.tar.gz) = 0c571fff4a10559c6a630d4851ba3cdf1d558185ce3dcfca1136f9883d647217
+SIZE (cabal/asn1-types-0.3.2/asn1-types-0.3.2.tar.gz) = 6424
+SHA256 (cabal/async-2.2.1/async-2.2.1.tar.gz) = 8f0b86022a1319d3c1c68655790da4b7f98017982e27ec3f3dbfe01029d39027
+SIZE (cabal/async-2.2.1/async-2.2.1.tar.gz) = 12775
+SHA256 (cabal/async-2.2.1/revision/1.cabal) = 61789382f449a02f827e70a029ba8f24a223b9c6b3792bb094fbd41ee360e851
+SIZE (cabal/async-2.2.1/revision/1.cabal) = 2983
+SHA256 (cabal/attoparsec-0.13.2.2/attoparsec-0.13.2.2.tar.gz) = dd93471eb969172cc4408222a3842d867adda3dd7fb39ad8a4df1b121a67d848
+SIZE (cabal/attoparsec-0.13.2.2/attoparsec-0.13.2.2.tar.gz) = 159729
+SHA256 (cabal/auto-update-0.1.4/auto-update-0.1.4.tar.gz) = 5e96c151024e8bcaf4eaa932e16995872b2017f46124b967e155744d9580b425
+SIZE (cabal/auto-update-0.1.4/auto-update-0.1.4.tar.gz) = 8607
+SHA256 (cabal/base-compat-0.10.5/base-compat-0.10.5.tar.gz) = 990aea21568956d44ab018c5dbfbaea014b9a0d5295d29ca7550149419a6fb41
+SIZE (cabal/base-compat-0.10.5/base-compat-0.10.5.tar.gz) = 33158
+SHA256 (cabal/base64-bytestring-1.0.0.2/base64-bytestring-1.0.0.2.tar.gz) = 193654ed9bd9e7f20163c9b70bab32d33010be50a5e1e8e2258229faf32a608c
+SIZE (cabal/base64-bytestring-1.0.0.2/base64-bytestring-1.0.0.2.tar.gz) = 9830
+SHA256 (cabal/basement-0.0.10/basement-0.0.10.tar.gz) = e3471b037187da02814fa710c4d59a804c5446a3617122aca63f32d4f8c4f505
+SIZE (cabal/basement-0.0.10/basement-0.0.10.tar.gz) = 133928
+SHA256 (cabal/basement-0.0.10/revision/1.cabal) = 11b1a13d16c81a7a9706fadfc52ecad60523abd745efd27206e6f43f12d8bcd8
+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/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
+SIZE (cabal/byteable-0.1.1/byteable-0.1.1.tar.gz) = 2400
+SHA256 (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919
+SIZE (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = 2030
+SHA256 (cabal/cabal-doctest-1.0.6/cabal-doctest-1.0.6.tar.gz) = decaaa5a73eaabaf3c4f8c644bd7f6e3f428b6244e935c0cf105f75f9b24ed2d
+SIZE (cabal/cabal-doctest-1.0.6/cabal-doctest-1.0.6.tar.gz) = 10007
+SHA256 (cabal/cabal-doctest-1.0.6/revision/2.cabal) = c0b4a5b1ff38d2867e7003b4be59f3bd7e8e204ab8c988d96d3a77472ae671cd
+SIZE (cabal/cabal-doctest-1.0.6/revision/2.cabal) = 1408
+SHA256 (cabal/case-insensitive-1.2.0.11/case-insensitive-1.2.0.11.tar.gz) = a7ce6d17e50caaa0f19ad8e67361499022860554c521b1e57993759da3eb37e3
+SIZE (cabal/case-insensitive-1.2.0.11/case-insensitive-1.2.0.11.tar.gz) = 53581
+SHA256 (cabal/cereal-0.5.8.0/cereal-0.5.8.0.tar.gz) = 37d3668aba37babc83321aa1538841da041476b5423722e6f5210c4e5e014282
+SIZE (cabal/cereal-0.5.8.0/cereal-0.5.8.0.tar.gz) = 20083
+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/colour-2.3.4/colour-2.3.4.tar.gz) = 0f439f00b322ce3d551f28a4dd1520aa2c91d699de4cdc6d485b9b04be0dc5eb
+SIZE (cabal/colour-2.3.4/colour-2.3.4.tar.gz) = 20418
+SHA256 (cabal/conduit-1.3.1/conduit-1.3.1.tar.gz) = ae129b66ada785c43a693d3b260f0e7b2f01d79fbf04ae43f7341405455320d6
+SIZE (cabal/conduit-1.3.1/conduit-1.3.1.tar.gz) = 87476
+SHA256 (cabal/conduit-extra-1.3.0/conduit-extra-1.3.0.tar.gz) = 2c41c925fc53d9ba2e640c7cdca72c492b28c0d45f1a82e94baef8dfa65922ae
+SIZE (cabal/conduit-extra-1.3.0/conduit-extra-1.3.0.tar.gz) = 32716
+SHA256 (cabal/connection-0.2.8/connection-0.2.8.tar.gz) = 70b1f44e8786320c18b26fc5d4ec115fc8ac016ba1f852fa8137f55d785a93eb
+SIZE (cabal/connection-0.2.8/connection-0.2.8.tar.gz) = 8695
+SHA256 (cabal/cookie-0.4.4/cookie-0.4.4.tar.gz) = 3245ed04ae933cf7becede816d1f76043b851472700abf558ae90b28414cc0e3
+SIZE (cabal/cookie-0.4.4/cookie-0.4.4.tar.gz) = 5996
+SHA256 (cabal/cryptonite-0.25/cryptonite-0.25.tar.gz) = 89be1a18af8730a7bfe4d718d7d5f6ce858e9df93a411566d15bf992db5a3c8c
+SIZE (cabal/cryptonite-0.25/cryptonite-0.25.tar.gz) = 552967
+SHA256 (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
+SIZE (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 2522
+SHA256 (cabal/dlist-0.8.0.5/dlist-0.8.0.5.tar.gz) = 98a88aa839b40d4aee8b08880030d282d627b63de311f5414dca6e831a951b43
+SIZE (cabal/dlist-0.8.0.5/dlist-0.8.0.5.tar.gz) = 8987
+SHA256 (cabal/easy-file-0.2.2/easy-file-0.2.2.tar.gz) = 52f52e72ba48d60935932401c233a72bf45c582871238aecc5a18021ce67b47e
+SIZE (cabal/easy-file-0.2.2/easy-file-0.2.2.tar.gz) = 12667
+SHA256 (cabal/exceptions-0.10.0/exceptions-0.10.0.tar.gz) = 1edd912e5ea5cbda37941b06738597d35214dc247d332b1bfffc82adadfa49d7
+SIZE (cabal/exceptions-0.10.0/exceptions-0.10.0.tar.gz) = 19460
+SHA256 (cabal/exceptions-0.10.0/revision/2.cabal) = ef6066c13de2dfd191dc810f9dfa9a474318abc9bb458413ffbdd2ece482312a
+SIZE (cabal/exceptions-0.10.0/revision/2.cabal) = 2149
+SHA256 (cabal/fast-logger-2.4.13/fast-logger-2.4.13.tar.gz) = 4bd4ef406f661e603320a34c353c29c5160644e3c4a446dd47efb279088a32b2
+SIZE (cabal/fast-logger-2.4.13/fast-logger-2.4.13.tar.gz) = 10998
+SHA256 (cabal/file-embed-0.0.11/file-embed-0.0.11.tar.gz) = eea5d00973808e440f346972b7477c8d8c2194a7036cc532eafeffc5189fcd50
+SIZE (cabal/file-embed-0.0.11/file-embed-0.0.11.tar.gz) = 6469
+SHA256 (cabal/fsnotify-0.3.0.1/fsnotify-0.3.0.1.tar.gz) = ded2165f72a2b4971f941cb83ef7f58b200e3e04159be78da55ba6c5d35f6da5
+SIZE (cabal/fsnotify-0.3.0.1/fsnotify-0.3.0.1.tar.gz) = 20638
+SHA256 (cabal/fsnotify-0.3.0.1/revision/1.cabal) = 58bb530d7acf93eb4ed69473e32a1485581815f04f69dfc8a278523781ba49dd
+SIZE (cabal/fsnotify-0.3.0.1/revision/1.cabal) = 2988
+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/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 44335b5c402e80c60f1db6a74462be4ea29d1a9043aa994334ffee1164f1ca4a
+SIZE (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 25797
+SHA256 (cabal/hsc2hs-0.68.4/hsc2hs-0.68.4.tar.gz) = e69f4ff4a839df3e2b6d7dbb78bbba637456ea8ebb18dd74cefd992343f61f1f
+SIZE (cabal/hsc2hs-0.68.4/hsc2hs-0.68.4.tar.gz) = 28109
+SHA256 (cabal/hsc2hs-0.68.4/revision/1.cabal) = 713092fccf64712b510ef1228695b14e1bf7ef0d1b2ce069776e0dcf894d4bf1
+SIZE (cabal/hsc2hs-0.68.4/revision/1.cabal) = 2437
+SHA256 (cabal/http-client-0.6.1/http-client-0.6.1.tar.gz) = d4e7d809b6068148e15b15a9ea9da8379b5219562a45799260849c93952bd267
+SIZE (cabal/http-client-0.6.1/http-client-0.6.1.tar.gz) = 88984
+SHA256 (cabal/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz) = 471abf8f29a909f40b21eab26a410c0e120ae12ce337512a61dae9f52ebb4362
+SIZE (cabal/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz) = 7679
+SHA256 (cabal/http-date-0.0.8/http-date-0.0.8.tar.gz) = 0f4c6348487abe4f9d58e43d3c23bdefc7fd1fd5672effd3c7d84aaff05f5427
+SIZE (cabal/http-date-0.0.8/http-date-0.0.8.tar.gz) = 5322
+SHA256 (cabal/http-reverse-proxy-0.6.0/http-reverse-proxy-0.6.0.tar.gz) = fb1c913111478384c4f23647810b8c3c01c79e9276a08a1ea46215e4a42dd1a8
+SIZE (cabal/http-reverse-proxy-0.6.0/http-reverse-proxy-0.6.0.tar.gz) = 10538
+SHA256 (cabal/http-types-0.12.2/http-types-0.12.2.tar.gz) = 523102d7ba8923e1b399cfd2a1c821e858146ecd934fc147c3acd0fd2b2f9305
+SIZE (cabal/http-types-0.12.2/http-types-0.12.2.tar.gz) = 13552
+SHA256 (cabal/http2-1.6.4/http2-1.6.4.tar.gz) = 2fcadd614cb8fa031e23a0fae096be76b08af7bbd525dc67096bd575cc3f1e66
+SIZE (cabal/http2-1.6.4/http2-1.6.4.tar.gz) = 5192632
+SHA256 (cabal/integer-logarithms-1.0.2.2/integer-logarithms-1.0.2.2.tar.gz) = ba86628d5c14f31fddccea86eeec122ed992af28d5b7ad964b2f5487605e7fc3
+SIZE (cabal/integer-logarithms-1.0.2.2/integer-logarithms-1.0.2.2.tar.gz) = 8855
+SHA256 (cabal/iproute-1.7.7/iproute-1.7.7.tar.gz) = e6a3fe4a6f2a78fcee0f98255f97232d8b6b9b1fa48faee3bef96f0b462a4b3d
+SIZE (cabal/iproute-1.7.7/iproute-1.7.7.tar.gz) = 13253
+SHA256 (cabal/libyaml-0.1.1.0/libyaml-0.1.1.0.tar.gz) = 6a034047f45c2f5d3acb8a5b0852075bd4b4f7d6a222a992f45afac152b55f5f
+SIZE (cabal/libyaml-0.1.1.0/libyaml-0.1.1.0.tar.gz) = 63160
+SHA256 (cabal/memory-0.14.18/memory-0.14.18.tar.gz) = f5458d170a291788ac8da896bb44b0cc84021c99dd596c52adf2f7a7f6c03507
+SIZE (cabal/memory-0.14.18/memory-0.14.18.tar.gz) = 42266
+SHA256 (cabal/memory-0.14.18/revision/1.cabal) = f55301417e1c5a43b055d1f0d3e88abe895d15a3e9d49889af634fb4b7028d40
+SIZE (cabal/memory-0.14.18/revision/1.cabal) = 5087
+SHA256 (cabal/mime-types-0.1.0.9/mime-types-0.1.0.9.tar.gz) = 0a32435169ef4ba59f4a4b8addfd0c04479410854d1b8d69a1e38fb389ba71d2
+SIZE (cabal/mime-types-0.1.0.9/mime-types-0.1.0.9.tar.gz) = 11384
+SHA256 (cabal/mono-traversable-1.0.11.0/mono-traversable-1.0.11.0.tar.gz) = c1a0d727a06131174bf6da3733084c284ec70e4f6aa398981e8ba5d4289137d2
+SIZE (cabal/mono-traversable-1.0.11.0/mono-traversable-1.0.11.0.tar.gz) = 39701
+SHA256 (cabal/network-2.7.0.2/network-2.7.0.2.tar.gz) = 6e0b1d86a3377512d8169865ad0a66e8092691fa460993ed7fe1057e3e674dbb
+SIZE (cabal/network-2.7.0.2/network-2.7.0.2.tar.gz) = 124420
+SHA256 (cabal/network-2.7.0.2/revision/2.cabal) = 7cb8d7bc2080be946cf87890c807b12dae9c59314fa030b2687999100ce60512
+SIZE (cabal/network-2.7.0.2/revision/2.cabal) = 2845
+SHA256 (cabal/network-byte-order-0.0.0.0/network-byte-order-0.0.0.0.tar.gz) = 3bb6f1110d9ac16a18f0c2d5921af584044e667e46fcfbdebd7a1e74e329de71
+SIZE (cabal/network-byte-order-0.0.0.0/network-byte-order-0.0.0.0.tar.gz) = 3188
+SHA256 (cabal/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz) = 423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0
+SIZE (cabal/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz) = 27262
+SHA256 (cabal/network-uri-2.6.1.0/revision/1.cabal) = 62cc45c66023e37ef921d5fb546aca56a9c786615e05925fb193a70bf0913690
+SIZE (cabal/network-uri-2.6.1.0/revision/1.cabal) = 2310
+SHA256 (cabal/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz) = dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50
+SIZE (cabal/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz) = 3384
+SHA256 (cabal/old-locale-1.0.0.7/revision/2.cabal) = fa998be2c7e00cd26a6e9075bea790caaf3932caa3e9497ad69bc20380dd6911
+SIZE (cabal/old-locale-1.0.0.7/revision/2.cabal) = 1071
+SHA256 (cabal/old-time-1.1.0.3/old-time-1.1.0.3.tar.gz) = 1ccb158b0f7851715d36b757c523b026ca1541e2030d02239802ba39b4112bc1
+SIZE (cabal/old-time-1.1.0.3/old-time-1.1.0.3.tar.gz) = 74219
+SHA256 (cabal/old-time-1.1.0.3/revision/2.cabal) = c91fbb3ee73d20ccd015842b30f1f29a304893ebe0ae3128b7bbc13d5bb0d4c8
+SIZE (cabal/old-time-1.1.0.3/revision/2.cabal) = 1328
+SHA256 (cabal/optparse-applicative-0.14.3.0/optparse-applicative-0.14.3.0.tar.gz) = 72476302fe555a508917b2d7d6121c7b58ea5434cdc08aeb5d4b652e8f0e7663
+SIZE (cabal/optparse-applicative-0.14.3.0/optparse-applicative-0.14.3.0.tar.gz) = 53480
+SHA256 (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 770c4c1b9cd24b3db7f511f8a48404a0d098999e28573c3743a8a296bb96f8d4
+SIZE (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 4717
+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
+SIZE (cabal/primitive-0.6.4.0/revision/1.cabal) = 2079
+SHA256 (cabal/project-template-0.2.0.1/project-template-0.2.0.1.tar.gz) = eb52496fa7448f5fed445525c05327b31a45282fc1d0a772c7022a9809e7c9dc
+SIZE (cabal/project-template-0.2.0.1/project-template-0.2.0.1.tar.gz) = 8321
+SHA256 (cabal/psqueues-0.2.7.1/psqueues-0.2.7.1.tar.gz) = 047e42ecd50d09fef99d1db9f8b1e511b64ea4b41afc435ad5fdd373d2ea8ec1
+SIZE (cabal/psqueues-0.2.7.1/psqueues-0.2.7.1.tar.gz) = 27384
+SHA256 (cabal/random-1.1/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
+SIZE (cabal/random-1.1/random-1.1.tar.gz) = 10870
+SHA256 (cabal/random-1.1/revision/1.cabal) = 7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df
+SIZE (cabal/random-1.1/revision/1.cabal) = 1777
+SHA256 (cabal/resourcet-1.2.2/resourcet-1.2.2.tar.gz) = 1323425aba3827479eb3588efaf7608b12a083327d64ec814f02863c3673cbe5
+SIZE (cabal/resourcet-1.2.2/resourcet-1.2.2.tar.gz) = 16541
+SHA256 (cabal/say-0.1.0.1/say-0.1.0.1.tar.gz) = f639656fc21925c45f3f55769b9fb7a90699e943376a725e215a5deea473b3e4
+SIZE (cabal/say-0.1.0.1/say-0.1.0.1.tar.gz) = 5931
+SHA256 (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 278d0afc87450254f8a76eab21b5583af63954efc9b74844a17a21a68013140f
+SIZE (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 23510
+SHA256 (cabal/semigroups-0.18.5/semigroups-0.18.5.tar.gz) = ab2a96af6e81e31b909c37ba65f436f1493dbf387cfe0de10b6586270c4ce29d
+SIZE (cabal/semigroups-0.18.5/semigroups-0.18.5.tar.gz) = 20162
+SHA256 (cabal/shakespeare-2.0.20/shakespeare-2.0.20.tar.gz) = f50ebff8e585851a1e3af36885d6a6d1218b19dcde1d7459f02272d6925d9e03
+SIZE (cabal/shakespeare-2.0.20/shakespeare-2.0.20.tar.gz) = 65695
+SHA256 (cabal/simple-sendfile-0.2.28/simple-sendfile-0.2.28.tar.gz) = a9800b79d41c3896181c93b3805135440bca31b5524a33303b7e32aa1bb29870
+SIZE (cabal/simple-sendfile-0.2.28/simple-sendfile-0.2.28.tar.gz) = 343120
+SHA256 (cabal/socks-0.5.6/socks-0.5.6.tar.gz) = fa63cd838025e18864c59755750c0cfc4ea76e140a542f07a5c682488ec78438
+SIZE (cabal/socks-0.5.6/socks-0.5.6.tar.gz) = 10239
+SHA256 (cabal/socks-0.5.6/revision/1.cabal) = 765b6ba4996fda7bbf561a2bb7ad2a37087dfe0691a31fe2077caf4ed5f7c6a5
+SIZE (cabal/socks-0.5.6/revision/1.cabal) = 1254
+SHA256 (cabal/split-0.2.3.3/split-0.2.3.3.tar.gz) = 1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413
+SIZE (cabal/split-0.2.3.3/split-0.2.3.3.tar.gz) = 15681
+SHA256 (cabal/split-0.2.3.3/revision/1.cabal) = f1c7b12865e38d1e241ceef74c85eb81d82301022fea1a5012d8d9803af5e26f
+SIZE (cabal/split-0.2.3.3/revision/1.cabal) = 2614
+SHA256 (cabal/streaming-commons-0.2.1.0/streaming-commons-0.2.1.0.tar.gz) = d8d1fe588924479ea7eefce8c6af77dfb373ee6bde7f4691bdfcbd782b36d68d
+SIZE (cabal/streaming-commons-0.2.1.0/streaming-commons-0.2.1.0.tar.gz) = 86525
+SHA256 (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = ad16def0884cf6f05ae1ae8e90192cf9d8d9673fa264b249499bd9e4fac791dd
+SIZE (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = 11759
+SHA256 (cabal/tar-0.5.1.0/tar-0.5.1.0.tar.gz) = c89d697b6472b739db50e61201251fcaf8a8f5b595b1d9a488d395d7d5ce4b68
+SIZE (cabal/tar-0.5.1.0/tar-0.5.1.0.tar.gz) = 39271
+SHA256 (cabal/tar-0.5.1.0/revision/1.cabal) = 9d18d14f4121a9f13806b06efe1c5bbf967cfa3a4006f3c056c23156355fcdd3
+SIZE (cabal/tar-0.5.1.0/revision/1.cabal) = 4733
+SHA256 (cabal/th-abstraction-0.2.10.0/th-abstraction-0.2.10.0.tar.gz) = c9dbffcaa4ed04f257427e61da135797190b572d4e37662f7821844cbd2114af
+SIZE (cabal/th-abstraction-0.2.10.0/th-abstraction-0.2.10.0.tar.gz) = 29620
+SHA256 (cabal/time-locale-compat-0.1.1.5/time-locale-compat-0.1.1.5.tar.gz) = 07ff1566de7d851423a843b2de385442319348c621d4f779b3d365ce91ac502c
+SIZE (cabal/time-locale-compat-0.1.1.5/time-locale-compat-0.1.1.5.tar.gz) = 1956
+SHA256 (cabal/tls-1.4.1/tls-1.4.1.tar.gz) = bbead1afc0b808bd5cff7bddaeae84ade37f18bbe72bd78d45a2fa4ac41908f8
+SIZE (cabal/tls-1.4.1/tls-1.4.1.tar.gz) = 92647
+SHA256 (cabal/tls-session-manager-0.0.0.2/tls-session-manager-0.0.0.2.tar.gz) = c586ccfd8da578ed2174352bea1952f55fe38023e476f851d7f0ed428aa57567
+SIZE (cabal/tls-session-manager-0.0.0.2/tls-session-manager-0.0.0.2.tar.gz) = 3183
+SHA256 (cabal/transformers-compat-0.6.2/transformers-compat-0.6.2.tar.gz) = dc06228b7b8a546f9d257b4fe2b369fc2cb279240bbe4312aa8f47bb2752e4be
+SIZE (cabal/transformers-compat-0.6.2/transformers-compat-0.6.2.tar.gz) = 39711
+SHA256 (cabal/typed-process-0.2.4.0/typed-process-0.2.4.0.tar.gz) = 997ff5a892c6f2834736a25cbc9e8936138a4a2f36093bebc292774db0f2bb0b
+SIZE (cabal/typed-process-0.2.4.0/typed-process-0.2.4.0.tar.gz) = 15567
+SHA256 (cabal/unix-compat-0.5.1/unix-compat-0.5.1.tar.gz) = a39d0c79dd906763770b80ba5b6c5cb710e954f894350e9917de0d73f3a19c52
+SIZE (cabal/unix-compat-0.5.1/unix-compat-0.5.1.tar.gz) = 13218
+SHA256 (cabal/unix-time-0.4.5/unix-time-0.4.5.tar.gz) = fe7805c62ad682589567afeee265e6e230170c3941cdce479a2318d1c5088faf
+SIZE (cabal/unix-time-0.4.5/unix-time-0.4.5.tar.gz) = 51731
+SHA256 (cabal/unliftio-0.2.10/unliftio-0.2.10.tar.gz) = 141d6e858f3c340c881d9853a38076ca09306e45a02fffc36885b9ee11cf1b5c
+SIZE (cabal/unliftio-0.2.10/unliftio-0.2.10.tar.gz) = 42075
+SHA256 (cabal/unliftio-core-0.1.2.0/unliftio-core-0.1.2.0.tar.gz) = 24c38b3d610ca2642ed496d1de3d7b6b398ce0410aa0a15f3c7ce636ba8f7a78
+SIZE (cabal/unliftio-core-0.1.2.0/unliftio-core-0.1.2.0.tar.gz) = 3631
+SHA256 (cabal/unliftio-core-0.1.2.0/revision/1.cabal) = 49d43dc863d14d89d91a676a968cea8d9f0030ad6ac95768747a44d0d273dd68
+SIZE (cabal/unliftio-core-0.1.2.0/revision/1.cabal) = 1081
+SHA256 (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 65f117bdbdea9efc75fb9fd539873de7687e005d8898bb21821020a4b383c573
+SIZE (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 44733
+SHA256 (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd
+SIZE (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 11999
+SHA256 (cabal/uuid-types-1.0.3/revision/1.cabal) = 01887ed945e74c3c361b00700bd9aeead37d1124d39c0d4f190f89fb0e909c47
+SIZE (cabal/uuid-types-1.0.3/revision/1.cabal) = 2473
+SHA256 (cabal/vault-0.3.1.2/vault-0.3.1.2.tar.gz) = 9e00e52ec0b054cfb9b1e44d8ce2eefb499cc1dcd4bcdd0d434b370d635e551c
+SIZE (cabal/vault-0.3.1.2/vault-0.3.1.2.tar.gz) = 5307
+SHA256 (cabal/vector-0.12.0.2/vector-0.12.0.2.tar.gz) = 52e89dacaff10bedb8653181963cae928f9674a099bb706713dae83994bbc0f3
+SIZE (cabal/vector-0.12.0.2/vector-0.12.0.2.tar.gz) = 124743
+SHA256 (cabal/vector-algorithms-0.8.0.1/vector-algorithms-0.8.0.1.tar.gz) = 15bcde786dcf03861946885e030d3dbe3b683e1a6fc12d7317e115084f4637fe
+SIZE (cabal/vector-algorithms-0.8.0.1/vector-algorithms-0.8.0.1.tar.gz) = 26071
+SHA256 (cabal/void-0.7.2/void-0.7.2.tar.gz) = d3fffe66a03e4b53db1e459edf75ad8402385a817cae415d857ec0b03ce0cf2b
+SIZE (cabal/void-0.7.2/void-0.7.2.tar.gz) = 5563
+SHA256 (cabal/wai-3.2.2/wai-3.2.2.tar.gz) = 2a64d54901d7bcc3c59dd94dcc99b5dcbbb95b4ec9176e677877888526c17fe1
+SIZE (cabal/wai-3.2.2/wai-3.2.2.tar.gz) = 10176
+SHA256 (cabal/wai-extra-3.0.25/wai-extra-3.0.25.tar.gz) = def0216fdad1da6015fc076c1405a65ffae6fc8a673fd79e79587acb630d5f31
+SIZE (cabal/wai-extra-3.0.25/wai-extra-3.0.25.tar.gz) = 62734
+SHA256 (cabal/wai-logger-2.3.4/wai-logger-2.3.4.tar.gz) = 93fe191310c4054ccf5ad8c431e9075646b0d2b7405faf697640461c72789600
+SIZE (cabal/wai-logger-2.3.4/wai-logger-2.3.4.tar.gz) = 5771
+SHA256 (cabal/warp-3.2.26/warp-3.2.26.tar.gz) = 4ca338568a3b867e36d6f01255bf562429f25d8f1373e79122881bcd461803e9
+SIZE (cabal/warp-3.2.26/warp-3.2.26.tar.gz) = 78477
+SHA256 (cabal/warp-tls-3.2.4.3/warp-tls-3.2.4.3.tar.gz) = 84cd511e32019ba5bef07b0e8a3550b2da06d534bf3df1673d14a5ec4a12f29d
+SIZE (cabal/warp-tls-3.2.4.3/warp-tls-3.2.4.3.tar.gz) = 7366
+SHA256 (cabal/word8-0.1.3/word8-0.1.3.tar.gz) = 2630934c75728bfbf390c1f0206b225507b354f68d4047b06c018a36823b5d8a
+SIZE (cabal/word8-0.1.3/word8-0.1.3.tar.gz) = 6271
+SHA256 (cabal/x509-1.7.5/x509-1.7.5.tar.gz) = b1b0fcbb4aa0d749ed2b54710c2ebd6d900cb932108ad14f97640cf4ca60c7c8
+SIZE (cabal/x509-1.7.5/x509-1.7.5.tar.gz) = 21457
+SHA256 (cabal/x509-store-1.6.7/x509-store-1.6.7.tar.gz) = 9786356c8bfdf631ea018c3244d0854c6db2cb24e583891ea553961443f61ef9
+SIZE (cabal/x509-store-1.6.7/x509-store-1.6.7.tar.gz) = 12689
+SHA256 (cabal/x509-system-1.6.6/x509-system-1.6.6.tar.gz) = 40dcdaae3ec67f38c08d96d4365b901eb8ac0c590bd7972eb429d37d58aa4419
+SIZE (cabal/x509-system-1.6.6/x509-system-1.6.6.tar.gz) = 3419
+SHA256 (cabal/x509-validation-1.6.11/x509-validation-1.6.11.tar.gz) = f94321cbcc4a534adf5889ae6950f3673e38b62b89b6970b477f502ce987d19b
+SIZE (cabal/x509-validation-1.6.11/x509-validation-1.6.11.tar.gz) = 19752
+SHA256 (cabal/yaml-0.11.0.0/yaml-0.11.0.0.tar.gz) = e66466cd29a4d256c3dd4dd4ab366033dbc5fa1fb67fdc6f7ac7aa3f161527bf
+SIZE (cabal/yaml-0.11.0.0/yaml-0.11.0.0.tar.gz) = 26529
+SHA256 (cabal/zlib-0.6.2/zlib-0.6.2.tar.gz) = 0dcc7d925769bdbeb323f83b66884101084167501f11d74d21eb9bc515707fed
+SIZE (cabal/zlib-0.6.2/zlib-0.6.2.tar.gz) = 142677
diff --git a/www/hs-yesod-bin/files/patch-yesod-bin.cabal b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
index 013dc826119b..c96db4007b05 100644
--- a/www/hs-yesod-bin/files/patch-yesod-bin.cabal
+++ b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
@@ -1,11 +1,21 @@
 --- yesod-bin.cabal.orig	2018-05-13 12:13:32 UTC
 +++ yesod-bin.cabal
-@@ -43,7 +43,7 @@ executable             yesod
+@@ -1,5 +1,6 @@
+ name:            yesod-bin
+ version:         1.6.0.3
++x-revision: 4
+ license:         MIT
+ license-file:    LICENSE
+ author:          Michael Snoyman <michael@snoyman.com>
+@@ -43,9 +44,9 @@ executable             yesod
                       , zlib               >= 0.5
                       , tar                >= 0.4          && < 0.6
                       , unordered-containers
 -                     , yaml               >= 0.8          && < 0.9
 +                     , yaml               >= 0.8          && < 0.12
                       , optparse-applicative >= 0.11
-                      , fsnotify           >= 0.0          && < 0.3
+-                     , fsnotify           >= 0.0          && < 0.3
++                     , fsnotify           >= 0.0          && < 0.4
                       , split              >= 0.2          && < 0.3
+                      , file-embed
+                      , conduit            >= 1.3