3 files changed, 84 insertions, 10 deletions

diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index df1d440f23d3..7be5948b56d0 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -2,16 +2,27 @@
 
 PORTNAME=	yaml
 PORTVERSION=	0.11.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Support for parsing and rendering YAML documents
+COMMENT=	Utilities for converting YAML and JSON documents back and forth
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \
-		libyaml resourcet>=0.3 scientific unordered-containers vector
+USES=		cabal
+
+USE_CABAL=	aeson-1.4.2.0_1 attoparsec-0.13.2.2 base-compat-0.10.5 \
+		conduit-1.3.1 dlist-0.8.0.5 exceptions-0.10.0_2 \
+		hashable-1.2.7.0_1 integer-logarithms-1.0.2.2 libyaml-0.1.1.0 \
+		mono-traversable-1.0.11.0 primitive-0.6.4.0_1 random-1.1_1 \
+		resourcet-1.2.2 scientific-0.3.6.2 split-0.2.3.3_1 tagged-0.8.6 \
+		th-abstraction-0.2.10.0 time-locale-compat-0.1.1.5 \
+		transformers-compat-0.6.2 unliftio-core-0.1.2.0_1 \
+		unordered-containers-0.2.10.0 uuid-types-1.0.3_1 vector-0.12.0.2 \
+		vector-algorithms-0.8.0.1
+
+EXECUTABLES=	json2yaml yaml2json
+CABAL_FLAGS=	-no-exe
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 012d0e2e042a..e324d1fe7ae5 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,3 +1,67 @@
-TIMESTAMP = 1546184008
+TIMESTAMP = 1553429262
 SHA256 (cabal/yaml-0.11.0.0.tar.gz) = e66466cd29a4d256c3dd4dd4ab366033dbc5fa1fb67fdc6f7ac7aa3f161527bf
 SIZE (cabal/yaml-0.11.0.0.tar.gz) = 26529
+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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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
diff --git a/textproc/hs-yaml/pkg-descr b/textproc/hs-yaml/pkg-descr
index fab41530ef2b..7031811b188a 100644
--- a/textproc/hs-yaml/pkg-descr
+++ b/textproc/hs-yaml/pkg-descr
@@ -1,6 +1,5 @@
-Provides support for parsing and emitting Yaml documents.  This package
-includes the full libyaml C library version 0.1.2 by Kirill Simonov in
-the package so you don't need to worry about any non-Haskell
-dependencies.
+Provides command line utilities for converting Yaml documents to JSON and other
+way around. This package includes the full libyaml C library version 0.1.2 by
+Kirill Simonov in the package.
 
 WWW: https://github.com/snoyberg/yaml/