aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile10
-rw-r--r--textproc/hs-Diff/Makefile2
-rw-r--r--textproc/hs-Diff/distinfo5
-rw-r--r--textproc/hs-HStringTemplate/Makefile2
-rw-r--r--textproc/hs-HStringTemplate/distinfo5
-rw-r--r--textproc/hs-HaXml/Makefile2
-rw-r--r--textproc/hs-HaXml/distinfo5
-rw-r--r--textproc/hs-appar/Makefile2
-rw-r--r--textproc/hs-appar/distinfo1
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile1
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo1
-rw-r--r--textproc/hs-attoparsec-iso8601/Makefile15
-rw-r--r--textproc/hs-attoparsec-iso8601/distinfo3
-rw-r--r--textproc/hs-attoparsec-iso8601/pkg-descr3
-rw-r--r--textproc/hs-attoparsec/Makefile4
-rw-r--r--textproc/hs-attoparsec/distinfo5
-rw-r--r--textproc/hs-bencode/Makefile1
-rw-r--r--textproc/hs-bencode/distinfo1
-rw-r--r--textproc/hs-blaze-html/Makefile2
-rw-r--r--textproc/hs-blaze-html/distinfo5
-rw-r--r--textproc/hs-blaze-markup/Makefile2
-rw-r--r--textproc/hs-blaze-markup/distinfo5
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-bytestring-csv/distinfo1
-rw-r--r--textproc/hs-case-insensitive/Makefile2
-rw-r--r--textproc/hs-case-insensitive/distinfo5
-rw-r--r--textproc/hs-cassava/Makefile4
-rw-r--r--textproc/hs-cassava/distinfo5
-rw-r--r--textproc/hs-citeproc-hs/Makefile38
-rw-r--r--textproc/hs-citeproc-hs/distinfo2
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs8
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs8
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs10
-rw-r--r--textproc/hs-citeproc-hs/pkg-descr7
-rw-r--r--textproc/hs-cmark/Makefile2
-rw-r--r--textproc/hs-cmark/distinfo5
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-csv/distinfo1
-rw-r--r--textproc/hs-doctemplates/Makefile16
-rw-r--r--textproc/hs-doctemplates/distinfo3
-rw-r--r--textproc/hs-doctemplates/pkg-descr3
-rw-r--r--textproc/hs-double-conversion/Makefile2
-rw-r--r--textproc/hs-double-conversion/distinfo5
-rw-r--r--textproc/hs-feed/Makefile2
-rw-r--r--textproc/hs-feed/distinfo5
-rw-r--r--textproc/hs-hexpat/Makefile4
-rw-r--r--textproc/hs-hexpat/distinfo5
-rw-r--r--textproc/hs-highlighting-kate/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/distinfo5
-rw-r--r--textproc/hs-hs-bibutils/Makefile1
-rw-r--r--textproc/hs-hs-bibutils/distinfo1
-rw-r--r--textproc/hs-html-conduit/Makefile2
-rw-r--r--textproc/hs-html-conduit/distinfo5
-rw-r--r--textproc/hs-html-conduit/files/patch-html-conduit.cabal11
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-html/distinfo1
-rw-r--r--textproc/hs-hxt-charproperties/Makefile1
-rw-r--r--textproc/hs-hxt-charproperties/distinfo1
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile2
-rw-r--r--textproc/hs-hxt-regex-xmlschema/distinfo5
-rw-r--r--textproc/hs-hxt-unicode/Makefile1
-rw-r--r--textproc/hs-hxt-unicode/distinfo1
-rw-r--r--textproc/hs-hxt/Makefile2
-rw-r--r--textproc/hs-hxt/distinfo5
-rw-r--r--textproc/hs-lhs2tex/Makefile1
-rw-r--r--textproc/hs-lhs2tex/distinfo1
-rw-r--r--textproc/hs-libxml-sax/Makefile2
-rw-r--r--textproc/hs-libxml-sax/distinfo1
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-libxml/distinfo1
-rw-r--r--textproc/hs-magic/Makefile13
-rw-r--r--textproc/hs-magic/distinfo3
-rw-r--r--textproc/hs-magic/pkg-descr5
-rw-r--r--textproc/hs-pandoc-citeproc/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/distinfo5
-rw-r--r--textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal38
-rw-r--r--textproc/hs-pandoc-types/Makefile4
-rw-r--r--textproc/hs-pandoc-types/distinfo5
-rw-r--r--textproc/hs-pandoc-types/files/patch-pandoc-types.cabal24
-rw-r--r--textproc/hs-pandoc/Makefile23
-rw-r--r--textproc/hs-pandoc/distinfo5
-rw-r--r--textproc/hs-pandoc/files/patch-pandoc.cabal83
-rw-r--r--textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs14
-rw-r--r--textproc/hs-parsec/Makefile2
-rw-r--r--textproc/hs-parsec/distinfo5
-rw-r--r--textproc/hs-polyparse/Makefile2
-rw-r--r--textproc/hs-polyparse/distinfo5
-rw-r--r--textproc/hs-pretty-show/Makefile16
-rw-r--r--textproc/hs-pretty-show/distinfo3
-rw-r--r--textproc/hs-pretty-show/pkg-descr8
-rw-r--r--textproc/hs-regex-applicative/Makefile2
-rw-r--r--textproc/hs-regex-applicative/distinfo5
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-base/distinfo1
-rw-r--r--textproc/hs-regex-compat-tdfa/Makefile1
-rw-r--r--textproc/hs-regex-compat-tdfa/distinfo1
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-compat/distinfo1
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/distinfo1
-rw-r--r--textproc/hs-regex-pcre/Makefile17
-rw-r--r--textproc/hs-regex-pcre/distinfo3
-rw-r--r--textproc/hs-regex-pcre/pkg-descr3
-rw-r--r--textproc/hs-regex-posix/Makefile2
-rw-r--r--textproc/hs-regex-posix/distinfo1
-rw-r--r--textproc/hs-regex-tdfa/Makefile3
-rw-r--r--textproc/hs-regex-tdfa/distinfo5
-rw-r--r--textproc/hs-rfc5051/Makefile1
-rw-r--r--textproc/hs-rfc5051/distinfo1
-rw-r--r--textproc/hs-scanner/Makefile13
-rw-r--r--textproc/hs-scanner/distinfo3
-rw-r--r--textproc/hs-scanner/pkg-descr3
-rw-r--r--textproc/hs-skylighting/Makefile16
-rw-r--r--textproc/hs-skylighting/distinfo3
-rw-r--r--textproc/hs-skylighting/pkg-descr7
-rw-r--r--textproc/hs-stringsearch/Makefile1
-rw-r--r--textproc/hs-stringsearch/distinfo1
-rw-r--r--textproc/hs-tagsoup/Makefile2
-rw-r--r--textproc/hs-tagsoup/distinfo5
-rw-r--r--textproc/hs-tagstream-conduit/Makefile1
-rw-r--r--textproc/hs-tagstream-conduit/distinfo1
-rw-r--r--textproc/hs-texmath/Makefile6
-rw-r--r--textproc/hs-texmath/distinfo5
-rw-r--r--textproc/hs-texmath/files/patch-texmath.cabal20
-rw-r--r--textproc/hs-uri-bytestring-aeson/Makefile15
-rw-r--r--textproc/hs-uri-bytestring-aeson/distinfo3
-rw-r--r--textproc/hs-uri-bytestring-aeson/pkg-descr4
-rw-r--r--textproc/hs-uri-bytestring/Makefile15
-rw-r--r--textproc/hs-uri-bytestring/distinfo3
-rw-r--r--textproc/hs-uri-bytestring/pkg-descr4
-rw-r--r--textproc/hs-uri/Makefile2
-rw-r--r--textproc/hs-uri/distinfo5
-rw-r--r--textproc/hs-xml-conduit/Makefile2
-rw-r--r--textproc/hs-xml-conduit/distinfo5
-rw-r--r--textproc/hs-xml-hamlet/Makefile2
-rw-r--r--textproc/hs-xml-hamlet/distinfo5
-rw-r--r--textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal11
-rw-r--r--textproc/hs-xml-types/Makefile1
-rw-r--r--textproc/hs-xml-types/distinfo1
-rw-r--r--textproc/hs-xml/Makefile1
-rw-r--r--textproc/hs-xml/distinfo1
-rw-r--r--textproc/hs-xmlhtml/Makefile6
-rw-r--r--textproc/hs-xmlhtml/distinfo5
-rw-r--r--textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs30
-rw-r--r--textproc/hs-xmlhtml/files/patch-xmlhtml.cabal14
-rw-r--r--textproc/hs-yaml/Makefile2
-rw-r--r--textproc/hs-yaml/distinfo5
147 files changed, 633 insertions, 200 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index d4c169c92e6e..421cf6731b95 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -250,15 +250,16 @@
SUBDIR += hs-appar
SUBDIR += hs-attoparsec
SUBDIR += hs-attoparsec-enumerator
+ SUBDIR += hs-attoparsec-iso8601
SUBDIR += hs-bencode
SUBDIR += hs-blaze-html
SUBDIR += hs-blaze-markup
SUBDIR += hs-bytestring-csv
SUBDIR += hs-case-insensitive
SUBDIR += hs-cassava
- SUBDIR += hs-citeproc-hs
SUBDIR += hs-cmark
SUBDIR += hs-csv
+ SUBDIR += hs-doctemplates
SUBDIR += hs-double-conversion
SUBDIR += hs-feed
SUBDIR += hs-hexpat
@@ -273,24 +274,31 @@
SUBDIR += hs-lhs2tex
SUBDIR += hs-libxml
SUBDIR += hs-libxml-sax
+ SUBDIR += hs-magic
SUBDIR += hs-pandoc
SUBDIR += hs-pandoc-citeproc
SUBDIR += hs-pandoc-types
SUBDIR += hs-parsec
SUBDIR += hs-polyparse
+ SUBDIR += hs-pretty-show
SUBDIR += hs-regex-applicative
SUBDIR += hs-regex-base
SUBDIR += hs-regex-compat
SUBDIR += hs-regex-compat-tdfa
+ SUBDIR += hs-regex-pcre
SUBDIR += hs-regex-pcre-builtin
SUBDIR += hs-regex-posix
SUBDIR += hs-regex-tdfa
SUBDIR += hs-rfc5051
+ SUBDIR += hs-scanner
+ SUBDIR += hs-skylighting
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
SUBDIR += hs-texmath
SUBDIR += hs-uri
+ SUBDIR += hs-uri-bytestring
+ SUBDIR += hs-uri-bytestring-aeson
SUBDIR += hs-xml
SUBDIR += hs-xml-conduit
SUBDIR += hs-xml-hamlet
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index ba7b555983e4..6425649b5e60 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Diff
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 2ccdc931f36c..55cc518b159f 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Diff-0.3.2.tar.gz) = 7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e
-SIZE (cabal/Diff-0.3.2.tar.gz) = 5024
+TIMESTAMP = 1499624823
+SHA256 (cabal/Diff-0.3.4.tar.gz) = 77b7daec5a79ade779706748f11b4d9b8f805e57a68e7406c3b5a1dee16e0c2f
+SIZE (cabal/Diff-0.3.4.tar.gz) = 7979
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index ace511b41381..db3f1117acbe 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.8.3
+PORTVERSION= 0.8.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 0eb54aa720b0..a37a85f96014 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HStringTemplate-0.8.3.tar.gz) = 63d6b1c993f5612ef370b92bb8fab05323657ec34a0f35110b967eb853239d18
-SIZE (cabal/HStringTemplate-0.8.3.tar.gz) = 16023
+TIMESTAMP = 1499538746
+SHA256 (cabal/HStringTemplate-0.8.6.tar.gz) = 7022cb9c1e1c223cfb8adf5ca6994b9f4709399ae197cb7541247c0b5d0255cd
+SIZE (cabal/HStringTemplate-0.8.6.tar.gz) = 16034
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 045d81955a2a..3268dd6bfd26 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.25.3
+PORTVERSION= 1.25.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index 73216a1045e9..99859277fa2a 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HaXml-1.25.3.tar.gz) = 6448a7ee1c26159c6c10db93757ed9248f647b1c0c431e7aead6aadd6d2307c7
-SIZE (cabal/HaXml-1.25.3.tar.gz) = 144189
+TIMESTAMP = 1499624824
+SHA256 (cabal/HaXml-1.25.4.tar.gz) = d77467b8c855ba85d900b5d1a9b771aa498c80d570f9ac60a9f10803cfc01db5
+SIZE (cabal/HaXml-1.25.4.tar.gz) = 144571
diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile
index 8d381913032b..1458759bb48f 100644
--- a/textproc/hs-appar/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= appar
PORTVERSION= 0.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-appar/distinfo b/textproc/hs-appar/distinfo
index 4515d2ce6a34..4b91247aed0f 100644
--- a/textproc/hs-appar/distinfo
+++ b/textproc/hs-appar/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624824
SHA256 (cabal/appar-0.1.4.tar.gz) = 58ea66abe4dd502d2fc01eecdb0828d5e214704a3c1b33b1f8b33974644c4b26
SIZE (cabal/appar-0.1.4.tar.gz) = 3904
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 611794d1f7a7..11f1f0a3b7cf 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= attoparsec-enumerator
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index 6708037d8d0a..b8ad5e0d6529 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624824
SHA256 (cabal/attoparsec-enumerator-0.3.4.tar.gz) = be95a763ebbec5529f486e62e49ce6709f14e688138fc36cff5590613690f588
SIZE (cabal/attoparsec-enumerator-0.3.4.tar.gz) = 2485
diff --git a/textproc/hs-attoparsec-iso8601/Makefile b/textproc/hs-attoparsec-iso8601/Makefile
new file mode 100644
index 000000000000..bc6035096808
--- /dev/null
+++ b/textproc/hs-attoparsec-iso8601/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= attoparsec-iso8601
+PORTVERSION= 1.0.0.0
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Parsing of ISO 8601 dates
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec base-compat text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-iso8601/distinfo b/textproc/hs-attoparsec-iso8601/distinfo
new file mode 100644
index 000000000000..7dc90ee0fb6d
--- /dev/null
+++ b/textproc/hs-attoparsec-iso8601/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499622155
+SHA256 (cabal/attoparsec-iso8601-1.0.0.0.tar.gz) = aa6c6d87587383e386cb85e7ffcc4a6317aa8dafb8ba9a104ecac365ce2a858a
+SIZE (cabal/attoparsec-iso8601-1.0.0.0.tar.gz) = 4188
diff --git a/textproc/hs-attoparsec-iso8601/pkg-descr b/textproc/hs-attoparsec-iso8601/pkg-descr
new file mode 100644
index 000000000000..ea00a4a91ce5
--- /dev/null
+++ b/textproc/hs-attoparsec-iso8601/pkg-descr
@@ -0,0 +1,3 @@
+Parsing of ISO 8601 dates, originally from aeson.
+
+WWW: http://hackage.haskell.org/package/attoparsec-iso8601
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index bbe0cf042670..fefabec1c924 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec
-PORTVERSION= 0.12.1.6
+PORTVERSION= 0.13.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Fast combinator parsing for bytestrings and text
LICENSE= BSD3CLAUSE
-USE_CABAL= scientific>=0.3.1 text>=1.1.1.3
+USE_CABAL= scientific text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index 6ea728661333..d3dbac0e2561 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/attoparsec-0.12.1.6.tar.gz) = ce0bb68c3a232dc981412b44211395ee04b0c18075777c30493d4e0f1edc06a8
-SIZE (cabal/attoparsec-0.12.1.6.tar.gz) = 65300
+TIMESTAMP = 1499537691
+SHA256 (cabal/attoparsec-0.13.1.0.tar.gz) = 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64
+SIZE (cabal/attoparsec-0.13.1.0.tar.gz) = 159512
diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile
index d38d920cfa7c..17c1d61cec4f 100644
--- a/textproc/hs-bencode/Makefile
+++ b/textproc/hs-bencode/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bencode
PORTVERSION= 0.6.0.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-bencode/distinfo b/textproc/hs-bencode/distinfo
index 0b636d3c28f7..9825098b75e4 100644
--- a/textproc/hs-bencode/distinfo
+++ b/textproc/hs-bencode/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624824
SHA256 (cabal/bencode-0.6.0.0.tar.gz) = 3b8efdfecee9bc486d9bcdbb633b7128ca235360f102478a7e0f8c895281f68a
SIZE (cabal/bencode-0.6.0.0.tar.gz) = 4622
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index a351c303092d..7375bdb9b91b 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.8.1.0
+PORTVERSION= 0.9.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 167b0baad58a..2e0b57124cef 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/blaze-html-0.8.1.0.tar.gz) = fb6dc0755b578928538e867ba441525d7169fcfeaabbfc4663f06bc91b6fed31
-SIZE (cabal/blaze-html-0.8.1.0.tar.gz) = 76151
+TIMESTAMP = 1499624824
+SHA256 (cabal/blaze-html-0.9.0.1.tar.gz) = aeceaab3fbccbf7f01a241819e6c16c0a1cf19dccecb795c5de5407bc8660a64
+SIZE (cabal/blaze-html-0.9.0.1.tar.gz) = 78133
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index c7d3d623b67f..4d95ed195dae 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.7.0.2
+PORTVERSION= 0.8.0.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index cf064dba4ecc..916db7997dbb 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/blaze-markup-0.7.0.2.tar.gz) = e4068a284834d8fe68df5ec63a037b92b7c956a82c0c72d7beca8d670fd5725c
-SIZE (cabal/blaze-markup-0.7.0.2.tar.gz) = 13440
+TIMESTAMP = 1499624825
+SHA256 (cabal/blaze-markup-0.8.0.0.tar.gz) = 19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f
+SIZE (cabal/blaze-markup-0.8.0.0.tar.gz) = 14054
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 924cf6cd8d10..07233d25239c 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-bytestring-csv/distinfo b/textproc/hs-bytestring-csv/distinfo
index 08fe78053e97..e248f9880483 100644
--- a/textproc/hs-bytestring-csv/distinfo
+++ b/textproc/hs-bytestring-csv/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624825
SHA256 (cabal/bytestring-csv-0.1.2.tar.gz) = 19480f2f60c474b18ef507a657daa63b18a40f97a3171883cf9d4b33169df874
SIZE (cabal/bytestring-csv-0.1.2.tar.gz) = 76022
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index d27d846d5fd0..42ac06507fc0 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.2.0.4
+PORTVERSION= 1.2.0.10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index d86563098002..98fbd8a51042 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/case-insensitive-1.2.0.4.tar.gz) = 63830d4b6b8cd51f4e40e492c17b5eaa11ebab5ef28eeb344e57709f3220d51e
-SIZE (cabal/case-insensitive-1.2.0.4.tar.gz) = 53377
+TIMESTAMP = 1499445486
+SHA256 (cabal/case-insensitive-1.2.0.10.tar.gz) = 66321c40fffb35f3a3188ba508753b74aada53fb51c822a9752614b03765306c
+SIZE (cabal/case-insensitive-1.2.0.10.tar.gz) = 53630
diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile
index 5a7f25e28925..1a1f4926e83c 100644
--- a/textproc/hs-cassava/Makefile
+++ b/textproc/hs-cassava/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cassava
-PORTVERSION= 0.4.3.1
+PORTVERSION= 0.5.0.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= CSV parsing and encoding library
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.2 blaze-builder hashable text \
+USE_CABAL= attoparsec blaze-builder hashable Only text text-short \
unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-cassava/distinfo b/textproc/hs-cassava/distinfo
index e8bf358a4254..52788632d2dc 100644
--- a/textproc/hs-cassava/distinfo
+++ b/textproc/hs-cassava/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cassava-0.4.3.1.tar.gz) = e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac
-SIZE (cabal/cassava-0.4.3.1.tar.gz) = 31922
+TIMESTAMP = 1499538420
+SHA256 (cabal/cassava-0.5.0.0.tar.gz) = 847e4b09860e9721c1436ae48a9db89fff119c7b43c696997c18592ca86fbeb9
+SIZE (cabal/cassava-0.5.0.0.tar.gz) = 33476
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
deleted file mode 100644
index 4aea96d09ef7..000000000000
--- a/textproc/hs-citeproc-hs/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= citeproc-hs
-PORTVERSION= 0.3.10
-CATEGORIES= textproc haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Citation Style Language implementation in Haskell
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-
-FLAGS_DEFINE= BIBUTILS EMBED_DATA HEXPAT NETWORK UNICODE_COLLATION
-FLAGS_DEFAULT= BIBUTILS HEXPAT NETWORK
-
-BIBUTILS_DESC= Use Chris Putnam's Bibutils
-BIBUTILS_FLAG_ENABLE= bibutils
-BIBUTILS_FLAG_CABAL= hs-bibutils>=0.3
-
-EMBED_DATA_DESC= Embed locale files into the library
-EMBED_DATA_FLAG_ENABLE= embed_data_files
-EMBED_DATA_FLAG_CABAL= file-embed
-
-HEXPAT_DESC= Use hexpat to parse XML
-HEXPAT_FLAG_ENABLE= hexpat
-HEXPAT_FLAG_CABAL= hexpat>=0.20.2
-
-NETWORK_DESC= Use network and HTTP to retrieve CSL file
-NETWORK_FLAG_ENABLE= network
-NETWORK_FLAG_CABAL= HTTP>=4000.0.9 network>=2.6 network-uri>=2.6
-
-UNICODE_COLLATION_DESC= Use bindings to the ICU libraries
-UNICODE_COLLATION_FLAG_ENABLE= unicode_collation
-UNICODE_COLLATION_FLAG_CABAL= text text-icu
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
deleted file mode 100644
index 3af462d1c746..000000000000
--- a/textproc/hs-citeproc-hs/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/citeproc-hs-0.3.10.tar.gz) = 1928db4f4c00f6722281f25171fc58412ec74c5e42adfc901a33a20dd10e65b9
-SIZE (cabal/citeproc-hs-0.3.10.tar.gz) = 115588
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs
deleted file mode 100644
index dc6be7f658d1..000000000000
--- a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/Text/CSL/Eval.hs.orig 2015-03-17 10:32:38 UTC
-+++ src/Text/CSL/Eval.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Text.CSL.Eval
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs
deleted file mode 100644
index 750e9767af0c..000000000000
--- a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/Text/CSL/Eval/Names.hs.orig 2015-03-17 10:32:38 UTC
-+++ src/Text/CSL/Eval/Names.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Text.CSL.Eval.Names
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs
deleted file mode 100644
index 16eb7ba2cbb2..000000000000
--- a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Text/CSL/Test.hs.orig 2015-03-17 10:32:38 UTC
-+++ src/Text/CSL/Test.hs
-@@ -29,7 +29,6 @@ import Data.List
- import Data.Maybe (isJust)
- import Data.Time
- import System.Directory
--import System.Locale
-
- import Text.ParserCombinators.Parsec
-
diff --git a/textproc/hs-citeproc-hs/pkg-descr b/textproc/hs-citeproc-hs/pkg-descr
deleted file mode 100644
index dbdad31bf085..000000000000
--- a/textproc/hs-citeproc-hs/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-citeproc-hs is a library for rendering bibliographic reference citations
-into a variety of styles using a macro language called Citation Style
-Language (CSL) [1].
-
-[1] http://xbiblio.sourceforge.net/
-
-WWW: http://istitutocolli.org/repos/citeproc-hs/
diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile
index 63c40dbb29ff..101c4a05f700 100644
--- a/textproc/hs-cmark/Makefile
+++ b/textproc/hs-cmark/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cmark
-PORTVERSION= 0.4.0.1
+PORTVERSION= 0.5.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-cmark/distinfo b/textproc/hs-cmark/distinfo
index c9f34b62d3ab..0315db4a3824 100644
--- a/textproc/hs-cmark/distinfo
+++ b/textproc/hs-cmark/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cmark-0.4.0.1.tar.gz) = 638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce
-SIZE (cabal/cmark-0.4.0.1.tar.gz) = 175936
+TIMESTAMP = 1499448212
+SHA256 (cabal/cmark-0.5.5.1.tar.gz) = 62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d
+SIZE (cabal/cmark-0.5.5.1.tar.gz) = 169811
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 673e8b5faa6e..2c58ad659877 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-csv/distinfo b/textproc/hs-csv/distinfo
index 17dfba59eaeb..b8c499c11b12 100644
--- a/textproc/hs-csv/distinfo
+++ b/textproc/hs-csv/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624827
SHA256 (cabal/csv-0.1.2.tar.gz) = 8cf43442325faa1368f9b55ad952beccf677d9980cdffa3d70a7f204a23ae600
SIZE (cabal/csv-0.1.2.tar.gz) = 2923
diff --git a/textproc/hs-doctemplates/Makefile b/textproc/hs-doctemplates/Makefile
new file mode 100644
index 000000000000..4b931d33a871
--- /dev/null
+++ b/textproc/hs-doctemplates/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= doctemplates
+PORTVERSION= 0.1.0.2
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The doctemplates package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson blaze-html blaze-markup parsec scientific text \
+ unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-doctemplates/distinfo b/textproc/hs-doctemplates/distinfo
new file mode 100644
index 000000000000..887a63e2ac97
--- /dev/null
+++ b/textproc/hs-doctemplates/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720884
+SHA256 (cabal/doctemplates-0.1.0.2.tar.gz) = b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b
+SIZE (cabal/doctemplates-0.1.0.2.tar.gz) = 5924
diff --git a/textproc/hs-doctemplates/pkg-descr b/textproc/hs-doctemplates/pkg-descr
new file mode 100644
index 000000000000..391688f9983a
--- /dev/null
+++ b/textproc/hs-doctemplates/pkg-descr
@@ -0,0 +1,3 @@
+The doctemplates package
+
+WWW: http://hackage.haskell.org/package/doctemplates
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 2628827a08a8..340ea7d57e5e 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= double-conversion
-PORTVERSION= 2.0.1.0
+PORTVERSION= 2.0.2.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/distinfo b/textproc/hs-double-conversion/distinfo
index c50f94df7cc0..d7bfcd4661c2 100644
--- a/textproc/hs-double-conversion/distinfo
+++ b/textproc/hs-double-conversion/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/double-conversion-2.0.1.0.tar.gz) = 0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c
-SIZE (cabal/double-conversion-2.0.1.0.tar.gz) = 7023237
+TIMESTAMP = 1499624828
+SHA256 (cabal/double-conversion-2.0.2.0.tar.gz) = 44cde172395401169e844d6791b6eb0ef2c2e55a08de8dda96551cfe029ba26b
+SIZE (cabal/double-conversion-2.0.2.0.tar.gz) = 7023616
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index ea53f0323e50..fcf099403bc6 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 0.3.10.0
+PORTVERSION= 0.3.12.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 97525cfe27bc..2925abf966f1 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/feed-0.3.10.0.tar.gz) = 74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094
-SIZE (cabal/feed-0.3.10.0.tar.gz) = 76124
+TIMESTAMP = 1499538656
+SHA256 (cabal/feed-0.3.12.0.tar.gz) = cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942
+SIZE (cabal/feed-0.3.12.0.tar.gz) = 102415
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index ff2dd465db08..98fa3c1bff6a 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hexpat
-PORTVERSION= 0.20.9
+PORTVERSION= 0.20.13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,6 +9,8 @@ COMMENT= XML parser/formatter based on expat
LICENSE= BSD3CLAUSE
+LIB_DEPENDS= libexpat.so:textproc/expat2
+
USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hexpat/distinfo b/textproc/hs-hexpat/distinfo
index 1104bb363362..2acbde20242d 100644
--- a/textproc/hs-hexpat/distinfo
+++ b/textproc/hs-hexpat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hexpat-0.20.9.tar.gz) = 5d1c075f1ae00be2e80c0018b522a351b2f4ef73b9baca1113ee80e554449d9d
-SIZE (cabal/hexpat-0.20.9.tar.gz) = 132649
+TIMESTAMP = 1499624829
+SHA256 (cabal/hexpat-0.20.13.tar.gz) = 46e1a0e651c1603c1f064c6ca8d4c66cb27e7a66974bfb45ecaa8f9ccc753fd1
+SIZE (cabal/hexpat-0.20.13.tar.gz) = 143733
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 85b83af1af32..baf3691af49a 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.6
+PORTVERSION= 0.6.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index 35cc42038df2..868fbb78a72c 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/highlighting-kate-0.6.tar.gz) = b39dc194386eb7613a5e9935023b1173010800c3a9b0b7fe09c0601f97236398
-SIZE (cabal/highlighting-kate-0.6.tar.gz) = 922847
+TIMESTAMP = 1499624830
+SHA256 (cabal/highlighting-kate-0.6.4.tar.gz) = d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf
+SIZE (cabal/highlighting-kate-0.6.4.tar.gz) = 913575
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 0cab1e280959..eb7a0b3e1c92 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hs-bibutils
PORTVERSION= 5.5
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index c9101693408d..99260edc6f99 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624830
SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d
SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index aca81c22294f..d8d75c798a21 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= html-conduit
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index eb8e07c6f26c..de9512724c3b 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/html-conduit-1.2.0.tar.gz) = 751096080f961a44ac3c2d93274dfa5fd4e047d215af33734dd325158e16404a
-SIZE (cabal/html-conduit-1.2.0.tar.gz) = 3905
+TIMESTAMP = 1499624831
+SHA256 (cabal/html-conduit-1.2.1.1.tar.gz) = 98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8
+SIZE (cabal/html-conduit-1.2.1.1.tar.gz) = 4125
diff --git a/textproc/hs-html-conduit/files/patch-html-conduit.cabal b/textproc/hs-html-conduit/files/patch-html-conduit.cabal
new file mode 100644
index 000000000000..ae600cca1aca
--- /dev/null
+++ b/textproc/hs-html-conduit/files/patch-html-conduit.cabal
@@ -0,0 +1,11 @@
+--- html-conduit.cabal.orig 2017-07-10 15:41:23 UTC
++++ html-conduit.cabal
+@@ -22,7 +22,7 @@ Library
+ , resourcet >= 0.3 && < 1.2
+ , conduit >= 1.0 && < 1.3
+ , conduit-extra >= 1.1.1
+- , xml-conduit >= 1.3 && < 1.5
++ , xml-conduit >= 1.3 && < 1.6
+ , tagstream-conduit >= 0.5.5.3 && < 0.6
+ , xml-types >= 0.3 && < 0.4
+
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 6d21a027c4bb..00b46aa3ab10 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-html/distinfo b/textproc/hs-html/distinfo
index 88edbd8ed597..63111f5c8833 100644
--- a/textproc/hs-html/distinfo
+++ b/textproc/hs-html/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624830
SHA256 (cabal/html-1.0.1.2.tar.gz) = 0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061
SIZE (cabal/html-1.0.1.2.tar.gz) = 11021
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index dc4788c86400..dcfbedadbe10 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hxt-charproperties
PORTVERSION= 9.2.0.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/distinfo b/textproc/hs-hxt-charproperties/distinfo
index a5398a66046b..bf192261e80c 100644
--- a/textproc/hs-hxt-charproperties/distinfo
+++ b/textproc/hs-hxt-charproperties/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624832
SHA256 (cabal/hxt-charproperties-9.2.0.1.tar.gz) = e46614d6bf0390b2a6a1aeeb0771e6d366944da40fb21c12c2f8a94d1f47b4d6
SIZE (cabal/hxt-charproperties-9.2.0.1.tar.gz) = 270767
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 1f968d45464a..bacca8556649 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-regex-xmlschema
-PORTVERSION= 9.2.0.2
+PORTVERSION= 9.2.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/distinfo b/textproc/hs-hxt-regex-xmlschema/distinfo
index d67f45004f30..4d26a802b048 100644
--- a/textproc/hs-hxt-regex-xmlschema/distinfo
+++ b/textproc/hs-hxt-regex-xmlschema/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 4744676dde2b29c4bb75a579345145225a1f1b7ba15d46b7f868c37c6e696cc2
-SIZE (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 35896
+TIMESTAMP = 1499624833
+SHA256 (cabal/hxt-regex-xmlschema-9.2.0.3.tar.gz) = f4743ba65498d6001cdfcf5cbc3317d4bc43941be5c7030b60beb83408c892b0
+SIZE (cabal/hxt-regex-xmlschema-9.2.0.3.tar.gz) = 35781
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 48f3806a5f11..3791ff828f3b 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/distinfo b/textproc/hs-hxt-unicode/distinfo
index ae28ab31dd61..c670ff7d707c 100644
--- a/textproc/hs-hxt-unicode/distinfo
+++ b/textproc/hs-hxt-unicode/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624833
SHA256 (cabal/hxt-unicode-9.0.2.4.tar.gz) = 7b5823f3bd94b57022d9d84ab3555303653c5121eaaef2ee1fd4918f3c434466
SIZE (cabal/hxt-unicode-9.0.2.4.tar.gz) = 14010
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index d69aaf0ba9de..196abf0e195b 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hxt
-PORTVERSION= 9.3.1.15
+PORTVERSION= 9.3.1.16
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo
index 1b79cee1a4a5..5504031e5c18 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hxt-9.3.1.15.tar.gz) = 723e7b3c22f58771087e7763d11702b3ae3aa910158a2beee70e973722966560
-SIZE (cabal/hxt-9.3.1.15.tar.gz) = 235096
+TIMESTAMP = 1499624832
+SHA256 (cabal/hxt-9.3.1.16.tar.gz) = 0d55e35cc718891d0987b7c8e6c43499efa727c68bc92e88e8b99461dff403e3
+SIZE (cabal/hxt-9.3.1.16.tar.gz) = 223814
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 1272528ce52d..04f28bd4e9b7 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.19
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index e5145cace428..a9984180aefe 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624833
SHA256 (cabal/lhs2tex-1.19.tar.gz) = 24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e
SIZE (cabal/lhs2tex-1.19.tar.gz) = 658353
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
index 3f787ea2cb5c..663962e6866f 100644
--- a/textproc/hs-libxml-sax/Makefile
+++ b/textproc/hs-libxml-sax/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml-sax
PORTVERSION= 0.7.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml-sax/distinfo b/textproc/hs-libxml-sax/distinfo
index 3b51b84ab854..2cc7158149e0 100644
--- a/textproc/hs-libxml-sax/distinfo
+++ b/textproc/hs-libxml-sax/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624834
SHA256 (cabal/libxml-sax-0.7.5.tar.gz) = 99141784cc0d6c5749f0df618b2d46922391eede09f4f9ccfc36fb58a9c16d51
SIZE (cabal/libxml-sax-0.7.5.tar.gz) = 8916
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index e92cd1af4179..87d20c26c1c5 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml/distinfo b/textproc/hs-libxml/distinfo
index 6cac89f65758..ecaedf942aae 100644
--- a/textproc/hs-libxml/distinfo
+++ b/textproc/hs-libxml/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624834
SHA256 (cabal/libxml-0.1.1.tar.gz) = d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07
SIZE (cabal/libxml-0.1.1.tar.gz) = 3959
diff --git a/textproc/hs-magic/Makefile b/textproc/hs-magic/Makefile
new file mode 100644
index 000000000000..6bce86ce7b18
--- /dev/null
+++ b/textproc/hs-magic/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= magic
+PORTVERSION= 1.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Interface to C file/magic library
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-magic/distinfo b/textproc/hs-magic/distinfo
new file mode 100644
index 000000000000..0bf125a6066c
--- /dev/null
+++ b/textproc/hs-magic/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501338939
+SHA256 (cabal/magic-1.1.tar.gz) = b21c3b69f57b64199c1d7be0ac8ea1d02d698be59943058f6a2d642ea57ce082
+SIZE (cabal/magic-1.1.tar.gz) = 4318
diff --git a/textproc/hs-magic/pkg-descr b/textproc/hs-magic/pkg-descr
new file mode 100644
index 000000000000..649a5ccb2bca
--- /dev/null
+++ b/textproc/hs-magic/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a Haskell interface to the C libmagic library. With it,
+you can determine the type of a file by examining its contents rather than its
+name. The Haskell interface provides a full-featured binding.
+
+WWW: http://hackage.haskell.org/package/magic
diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile
index 9e6530049fa5..6b08a9b70e6f 100644
--- a/textproc/hs-pandoc-citeproc/Makefile
+++ b/textproc/hs-pandoc-citeproc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-citeproc
-PORTVERSION= 0.7.3.1
+PORTVERSION= 0.10.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo
index e6a2590db074..83916a3d8e09 100644
--- a/textproc/hs-pandoc-citeproc/distinfo
+++ b/textproc/hs-pandoc-citeproc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = b2e9b814603dbb60b845fa14d767a154e43a2115a9a81b218a173e9bc1a319f5
-SIZE (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = 298737
+TIMESTAMP = 1499624836
+SHA256 (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 49038b80ad802098169852b0bc7fc7c9878a85a9091eee4c32211844fecda783
+SIZE (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 262993
diff --git a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal b/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal
new file mode 100644
index 000000000000..26a28052b0e3
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal
@@ -0,0 +1,38 @@
+--- pandoc-citeproc.cabal.orig 2017-06-04 18:38:13 UTC
++++ pandoc-citeproc.cabal
+@@ -99,7 +99,7 @@ library
+ ghc-prof-options: -fprof-auto-exported
+ build-depends: containers, directory, mtl,
+ bytestring, filepath,
+- pandoc-types >= 1.16 && < 1.18,
++ pandoc-types >= 1.16 && < 1.20,
+ pandoc >= 1.16 && < 2.1,
+ tagsoup,
+ aeson >= 0.7 && < 1.3,
+@@ -146,7 +146,7 @@ executable pandoc-citeproc
+ ghc-options: -funbox-strict-fields -Wall
+ ghc-prof-options: -fprof-auto-exported -rtsopts
+ build-depends: base >= 4, pandoc-citeproc,
+- pandoc-types >= 1.16 && < 1.18,
++ pandoc-types >= 1.16 && < 1.20,
+ pandoc >= 1.16 && < 2.1,
+ aeson,
+ aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text,
+@@ -169,7 +169,7 @@ executable test-citeproc
+ else
+ Buildable: False
+ build-depends: base >= 4, aeson, directory, text, mtl,
+- pandoc-types >= 1.16 && < 1.18,
++ pandoc-types >= 1.16 && < 1.20,
+ pandoc >= 1.16 && < 2.1,
+ filepath,
+ bytestring, pandoc-citeproc, process, temporary >= 1.1,
+@@ -185,7 +185,7 @@ test-suite test-pandoc-citeproc
+ Prelude
+ Hs-Source-Dirs: tests, prelude, compat
+ build-depends: base >= 4, aeson, directory, text,
+- pandoc-types >= 1.16 && < 1.18, mtl,
++ pandoc-types >= 1.16 && < 1.20, mtl,
+ pandoc >= 1.16 && < 2.1, filepath,
+ bytestring, pandoc-citeproc, process, temporary >= 1.1,
+ yaml >= 0.8.8.7
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index fd7fc328b7af..1f0f08cfd785 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.12.4.5
+PORTVERSION= 1.19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Types for representing a structured document
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 syb>=0.1
+USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 QuickCheck syb>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 98ee34051a69..76620ce18f88 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pandoc-types-1.12.4.5.tar.gz) = 87a1db206be3eccd2e66518363340e90e7592d8e82e2a5f006620cd3e1ac877b
-SIZE (cabal/pandoc-types-1.12.4.5.tar.gz) = 13341
+TIMESTAMP = 1499543994
+SHA256 (cabal/pandoc-types-1.19.tar.gz) = 2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf
+SIZE (cabal/pandoc-types-1.19.tar.gz) = 21942
diff --git a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal b/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal
new file mode 100644
index 000000000000..e8741ae401d4
--- /dev/null
+++ b/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal
@@ -0,0 +1,24 @@
+--- pandoc-types.cabal.orig 2017-01-22 09:26:57 UTC
++++ pandoc-types.cabal
+@@ -48,10 +48,10 @@ Library
+ Other-modules: Paths_pandoc_types
+ Build-depends: base >= 4 && < 5,
+ containers >= 0.3,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ ghc-prim >= 0.2,
+ bytestring >= 0.9 && < 0.11,
+- aeson >= 0.6.2 && < 1.2,
++ aeson >= 0.6.2 && < 1.3,
+ QuickCheck >= 2
+ if impl(ghc < 7.10)
+ Build-depends: deepseq-generics >= 0.1 && < 0.2
+@@ -65,7 +65,7 @@ test-suite test-pandoc-types
+ build-depends: base,
+ pandoc-types,
+ syb,
+- aeson >= 0.6.2 && < 1.2,
++ aeson >= 0.6.2 && < 1.3,
+ containers >= 0.3,
+ bytestring >= 0.9 && < 0.11,
+ test-framework >= 0.3 && < 0.9,
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index b9ba79d552d2..c70f46edcd98 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.15.0.6
-PORTREVISION= 1
+PORTVERSION= 1.19.2.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,16 +10,16 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= aeson>=0.7.0.5 base64-bytestring>=0.1 blaze-html>=0.5 \
- blaze-markup>=0.5.1 cmark>=0.4.0.1 data-default>=0.4 \
- deepseq-generics>=0.1 extensible-exceptions>=0.1 \
- filemanip>=0.3 haddock-library>=1.1 highlighting-kate>=0.6 \
- hslua>=0.3 HTTP>=4000.0.5 JuicyPixels>=3.1.6.1 mtl>=1.1 \
- network>=2.6 network-uri>=2.6 pandoc-types>=1.12.4 parsec>=3.1 \
- random>=1 scientific>=0.2 SHA>=1.6 syb>=0.1 tagsoup>=0.13.1 \
- temporary>=1.1 texmath>=0.8.1 text>=0.11 \
- unordered-containers>=0.2 vector>=0.10 xml>=1.3.12 \
- yaml>=0.8.8.2 zip-archive>=0.2.3.4 zlib>=0.5
+USE_CABAL= aeson base64-bytestring blaze-html \
+ blaze-markup cmark data-default \
+ deepseq-generics doctemplates extensible-exceptions \
+ filemanip haddock-library highlighting-kate \
+ hslua HTTP JuicyPixels mtl \
+ network network-uri pandoc-types parsec \
+ random scientific SHA skylighting syb tagsoup\
+ temporary texmath text \
+ unordered-containers vector xml \
+ yaml zip-archive zlib
USE_ALEX= yes
USE_HAPPY= yes
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index d7c721bc1184..5f38ab8379a5 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pandoc-1.15.0.6.tar.gz) = d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46
-SIZE (cabal/pandoc-1.15.0.6.tar.gz) = 2049870
+TIMESTAMP = 1499624835
+SHA256 (cabal/pandoc-1.19.2.1.tar.gz) = 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801
+SIZE (cabal/pandoc-1.19.2.1.tar.gz) = 2755101
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
new file mode 100644
index 000000000000..07d92a10932a
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-pandoc.cabal
@@ -0,0 +1,83 @@
+--- pandoc.cabal.orig 2017-01-31 15:02:20 UTC
++++ pandoc.cabal
+@@ -253,7 +253,7 @@ Flag old-locale
+
+ Library
+ Build-Depends: base >= 4.7 && <5,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ containers >= 0.1 && < 0.6,
+ unordered-containers >= 0.2 && < 0.3,
+ array >= 0.3 && < 0.6,
+@@ -270,12 +270,12 @@ Library
+ xml >= 1.3.12 && < 1.4,
+ random >= 1 && < 1.2,
+ extensible-exceptions >= 0.1 && < 0.2,
+- pandoc-types >= 1.17 && < 1.18,
+- aeson >= 0.7 && < 1.2,
++ pandoc-types >= 1.17 && < 1.20,
++ aeson >= 0.7 && < 1.3,
+ tagsoup >= 0.13.7 && < 0.15,
+ base64-bytestring >= 0.1 && < 1.1,
+ zlib >= 0.5 && < 0.7,
+- skylighting >= 0.1.1.4 && < 0.2,
++ skylighting >= 0.1.1.4 && < 0.4,
+ data-default >= 0.4 && < 0.8,
+ temporary >= 1.1 && < 1.3,
+ blaze-html >= 0.5 && < 0.10,
+@@ -283,7 +283,7 @@ Library
+ yaml >= 0.8.8.2 && < 0.9,
+ scientific >= 0.2 && < 0.4,
+ vector >= 0.10 && < 0.13,
+- hslua >= 0.3 && < 0.5,
++ hslua >= 0.3 && < 0.6,
+ binary >= 0.5 && < 0.9,
+ SHA >= 1.6 && < 1.7,
+ haddock-library >= 1.1 && < 1.5,
+@@ -424,15 +424,15 @@ Library
+
+ Executable pandoc
+ Build-Depends: pandoc,
+- pandoc-types >= 1.17 && < 1.18,
++ pandoc-types >= 1.17 && < 1.20,
+ base >= 4.2 && <5,
+ directory >= 1.2 && < 1.4,
+ filepath >= 1.1 && < 1.5,
+ text >= 0.11 && < 1.3,
+ bytestring >= 0.9 && < 0.11,
+ extensible-exceptions >= 0.1 && < 0.2,
+- skylighting >= 0.1.1.3 && < 0.2,
+- aeson >= 0.7.0.5 && < 1.2,
++ skylighting >= 0.1.1.3 && < 0.4,
++ aeson >= 0.7.0.5 && < 1.3,
+ yaml >= 0.8.8.2 && < 0.9,
+ containers >= 0.1 && < 0.6,
+ HTTP >= 4000.0.5 && < 4000.4
+@@ -498,15 +498,15 @@ Test-Suite test-pandoc
+ Hs-Source-Dirs: prelude
+ Other-Modules: Prelude
+ Build-Depends: base >= 4.2 && < 5,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ pandoc,
+- pandoc-types >= 1.17 && < 1.18,
++ pandoc-types >= 1.17 && < 1.20,
+ bytestring >= 0.9 && < 0.11,
+ text >= 0.11 && < 1.3,
+ directory >= 1 && < 1.4,
+ filepath >= 1.1 && < 1.5,
+ process >= 1 && < 1.5,
+- skylighting >= 0.1.1.3 && < 0.2,
++ skylighting >= 0.1.1.3 && < 0.4,
+ Diff >= 0.2 && < 0.4,
+ test-framework >= 0.3 && < 0.9,
+ test-framework-hunit >= 0.2 && < 0.4,
+@@ -553,7 +553,7 @@ benchmark benchmark-pandoc
+ Other-Modules: Prelude
+ Build-Depends: pandoc,
+ base >= 4.2 && < 5,
+- syb >= 0.1 && < 0.7,
++ syb >= 0.1 && < 0.8,
+ criterion >= 1.0 && < 1.2
+ Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
+ Default-Language: Haskell98
diff --git a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
new file mode 100644
index 000000000000..648d7ffa890d
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
@@ -0,0 +1,14 @@
+--- src/Text/Pandoc/Writers/Custom.hs.orig 2017-01-25 16:07:43 UTC
++++ src/Text/Pandoc/Writers/Custom.hs
+@@ -183,7 +183,11 @@ writeCustom luaFile opts doc@(Pandoc meta _) = do
+ setForeignEncoding utf8
+ lua <- Lua.newstate
+ Lua.openlibs lua
++#if MIN_VERSION_hslua(0,5,0)
++ status <- Lua.loadstring lua luaScript
++#else
+ status <- Lua.loadstring lua luaScript luaFile
++#endif
+ -- check for error in lua script (later we'll change the return type
+ -- to handle this more gracefully):
+ when (status /= 0) $
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index 34c98c03e1c9..1738037d7104 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= parsec
-PORTVERSION= 3.1.9
+PORTVERSION= 3.1.11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index baf11e9f3f50..53ec58aa1cb3 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/parsec-3.1.9.tar.gz) = 71f711d24c89581a43b8bc2d3ed56a1a802bbf1cd0b083bc34636c232b0342c9
-SIZE (cabal/parsec-3.1.9.tar.gz) = 29668
+TIMESTAMP = 1499618976
+SHA256 (cabal/parsec-3.1.11.tar.gz) = 6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e
+SIZE (cabal/parsec-3.1.11.tar.gz) = 32412
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 00f428004892..6137b288c30c 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= polyparse
-PORTVERSION= 1.11
+PORTVERSION= 1.12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index 11bf8d704d76..e088304f8c8d 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/polyparse-1.11.tar.gz) = 30ef045a25bd7de0f3507ed1161aab35b5711120d315b15f23558205903b81fc
-SIZE (cabal/polyparse-1.11.tar.gz) = 22978
+TIMESTAMP = 1499543355
+SHA256 (cabal/polyparse-1.12.tar.gz) = f54c63584ace968381de4a06bd7328b6adc3e1a74fd336e18449e0dd7650be15
+SIZE (cabal/polyparse-1.12.tar.gz) = 32625
diff --git a/textproc/hs-pretty-show/Makefile b/textproc/hs-pretty-show/Makefile
new file mode 100644
index 000000000000..8e877c5a7a41
--- /dev/null
+++ b/textproc/hs-pretty-show/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= pretty-show
+PORTVERSION= 1.6.13
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Library and an executable for working with derived Show instances
+
+LICENSE= BSD3CLAUSE
+
+EXECUTABLE= ppsh
+USE_CABAL= happy haskell-lexer
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-pretty-show/distinfo b/textproc/hs-pretty-show/distinfo
new file mode 100644
index 000000000000..2dc39c2a8127
--- /dev/null
+++ b/textproc/hs-pretty-show/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720300
+SHA256 (cabal/pretty-show-1.6.13.tar.gz) = 55ba43cb043e15738adcba3e9a5a5dd3e341026f5334fd0b9c80dfbcbc387dcd
+SIZE (cabal/pretty-show-1.6.13.tar.gz) = 140057
diff --git a/textproc/hs-pretty-show/pkg-descr b/textproc/hs-pretty-show/pkg-descr
new file mode 100644
index 000000000000..93778b2fd703
--- /dev/null
+++ b/textproc/hs-pretty-show/pkg-descr
@@ -0,0 +1,8 @@
+We provide a library and an executable for working with derived Show instances.
+By using the library, we can parse derived Show instances into a generic data
+structure. The ppsh tool uses the library to produce human-readable versions
+of Show instances, which can be quite handy for debugging Haskell programs.
+We can also render complex generic values into an interactive Html page, for
+easier examination.
+
+WWW: http://hackage.haskell.org/package/pretty-show
diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile
index 4389083f0f9f..a24ea567442e 100644
--- a/textproc/hs-regex-applicative/Makefile
+++ b/textproc/hs-regex-applicative/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= regex-applicative
-PORTVERSION= 0.3.2.1
+PORTVERSION= 0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-applicative/distinfo b/textproc/hs-regex-applicative/distinfo
index cb736c1f7bad..ca56876d0a63 100644
--- a/textproc/hs-regex-applicative/distinfo
+++ b/textproc/hs-regex-applicative/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/regex-applicative-0.3.2.1.tar.gz) = bf4ab2dc765d8083ac08a72b2221712a942a734b90e4ce433baf4b5c8db35ca7
-SIZE (cabal/regex-applicative-0.3.2.1.tar.gz) = 13531
+TIMESTAMP = 1499624837
+SHA256 (cabal/regex-applicative-0.3.3.tar.gz) = 6659a2cc1c8137d77ef57f75027723b075d473354d935233d98b1ae1b03c3be6
+SIZE (cabal/regex-applicative-0.3.3.tar.gz) = 13834
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index ffadc671e937..c32dab9846d7 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/distinfo b/textproc/hs-regex-base/distinfo
index ceb964b610d7..9f7f328d1810 100644
--- a/textproc/hs-regex-base/distinfo
+++ b/textproc/hs-regex-base/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624837
SHA256 (cabal/regex-base-0.93.2.tar.gz) = 20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278
SIZE (cabal/regex-base-0.93.2.tar.gz) = 9156
diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile
index 8b500fad2728..b86c99243851 100644
--- a/textproc/hs-regex-compat-tdfa/Makefile
+++ b/textproc/hs-regex-compat-tdfa/Makefile
@@ -2,6 +2,7 @@
PORTNAME= regex-compat-tdfa
PORTVERSION= 0.95.1.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat-tdfa/distinfo b/textproc/hs-regex-compat-tdfa/distinfo
index 99cbafe9490d..6619679b7a86 100644
--- a/textproc/hs-regex-compat-tdfa/distinfo
+++ b/textproc/hs-regex-compat-tdfa/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624837
SHA256 (cabal/regex-compat-tdfa-0.95.1.4.tar.gz) = 4fa38ed24ae390eeffe6eef04bbe632d7ecd02b9123729e976e7420f927520dd
SIZE (cabal/regex-compat-tdfa-0.95.1.4.tar.gz) = 4146
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 4c3e09b9969e..41adb030b8f1 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat/distinfo b/textproc/hs-regex-compat/distinfo
index e8ec88fa9595..8ef98aa8233d 100644
--- a/textproc/hs-regex-compat/distinfo
+++ b/textproc/hs-regex-compat/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624837
SHA256 (cabal/regex-compat-0.95.1.tar.gz) = d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b
SIZE (cabal/regex-compat-0.95.1.tar.gz) = 3968
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 97976c6f36ce..316d18603094 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-pcre-builtin
PORTVERSION= 0.94.4.8.8.35
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/distinfo b/textproc/hs-regex-pcre-builtin/distinfo
index 55054846dcae..2630851b004d 100644
--- a/textproc/hs-regex-pcre-builtin/distinfo
+++ b/textproc/hs-regex-pcre-builtin/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/regex-pcre-builtin-0.94.4.8.8.35.tar.gz) = 0bd1b695de953ba4b6e6e0de007021c346cb2a6c8e09356fbcd34f8a79d2ea78
SIZE (cabal/regex-pcre-builtin-0.94.4.8.8.35.tar.gz) = 311974
diff --git a/textproc/hs-regex-pcre/Makefile b/textproc/hs-regex-pcre/Makefile
new file mode 100644
index 000000000000..7e1c9c3e2901
--- /dev/null
+++ b/textproc/hs-regex-pcre/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= regex-pcre
+PORTVERSION= 0.94.4
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The PCRE backend to accompany regex-base
+
+LICENSE= BSD3CLAUSE
+
+LIB_DEPENDS= libpcre.so:devel/pcre
+
+USE_CABAL= regex-base
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-pcre/distinfo b/textproc/hs-regex-pcre/distinfo
new file mode 100644
index 000000000000..fd1ae7f9bd6a
--- /dev/null
+++ b/textproc/hs-regex-pcre/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720826
+SHA256 (cabal/regex-pcre-0.94.4.tar.gz) = 8eaa7d4ac6c0a4ba35aa59fc3f6b8f8e252bb25a47e136791446a74752e226c0
+SIZE (cabal/regex-pcre-0.94.4.tar.gz) = 10814
diff --git a/textproc/hs-regex-pcre/pkg-descr b/textproc/hs-regex-pcre/pkg-descr
new file mode 100644
index 000000000000..ef17ff4156db
--- /dev/null
+++ b/textproc/hs-regex-pcre/pkg-descr
@@ -0,0 +1,3 @@
+The PCRE backend to accompany regex-base, see www.pcre.org
+
+WWW: http://hackage.haskell.org/package/regex-pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 964f3b73eb3e..2865f1487090 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-posix/distinfo b/textproc/hs-regex-posix/distinfo
index 682ee5aeb002..7a7ca5732819 100644
--- a/textproc/hs-regex-posix/distinfo
+++ b/textproc/hs-regex-posix/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/regex-posix-0.95.2.tar.gz) = 56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e
SIZE (cabal/regex-posix-0.95.2.tar.gz) = 42916
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index c277e50c74e3..be5db6ca4458 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= regex-tdfa
-PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTVERSION= 1.2.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
index 7a01b8d1a802..7d1d6321a459 100644
--- a/textproc/hs-regex-tdfa/distinfo
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/regex-tdfa-1.2.0.tar.gz) = fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401
-SIZE (cabal/regex-tdfa-1.2.0.tar.gz) = 66039
+TIMESTAMP = 1499624838
+SHA256 (cabal/regex-tdfa-1.2.2.tar.gz) = cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39
+SIZE (cabal/regex-tdfa-1.2.2.tar.gz) = 65969
diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile
index 20b580f4e146..05ac6c340086 100644
--- a/textproc/hs-rfc5051/Makefile
+++ b/textproc/hs-rfc5051/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rfc5051
PORTVERSION= 0.1.0.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-rfc5051/distinfo b/textproc/hs-rfc5051/distinfo
index 938c8e05af87..306f3d784f9f 100644
--- a/textproc/hs-rfc5051/distinfo
+++ b/textproc/hs-rfc5051/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/rfc5051-0.1.0.3.tar.gz) = e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b
SIZE (cabal/rfc5051-0.1.0.3.tar.gz) = 217935
diff --git a/textproc/hs-scanner/Makefile b/textproc/hs-scanner/Makefile
new file mode 100644
index 000000000000..ec417600e82d
--- /dev/null
+++ b/textproc/hs-scanner/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= scanner
+PORTVERSION= 0.2
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Parser combinator library designed to be fast
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-scanner/distinfo b/textproc/hs-scanner/distinfo
new file mode 100644
index 000000000000..70ef56e0020a
--- /dev/null
+++ b/textproc/hs-scanner/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499620390
+SHA256 (cabal/scanner-0.2.tar.gz) = 3a020d68a0372a5211c72e55eeb299738ea608d17184bc68f74d31ebe667a5e9
+SIZE (cabal/scanner-0.2.tar.gz) = 38735
diff --git a/textproc/hs-scanner/pkg-descr b/textproc/hs-scanner/pkg-descr
new file mode 100644
index 000000000000..21807ac1f61d
--- /dev/null
+++ b/textproc/hs-scanner/pkg-descr
@@ -0,0 +1,3 @@
+Parser combinator library designed to be fast. It doesn't support backtracking.
+
+WWW: https://hackage.haskell.org/package/scanner
diff --git a/textproc/hs-skylighting/Makefile b/textproc/hs-skylighting/Makefile
new file mode 100644
index 000000000000..2b5436f29295
--- /dev/null
+++ b/textproc/hs-skylighting/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= skylighting
+PORTVERSION= 0.3.3.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Syntax highlighting library with support for over one hundred languages
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson attoparsec blaze-html case-insensitive hxt mtl \
+ pretty-show regex-pcre regex-pcre-builtin safe text utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-skylighting/distinfo b/textproc/hs-skylighting/distinfo
new file mode 100644
index 000000000000..59a31d6dcf35
--- /dev/null
+++ b/textproc/hs-skylighting/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499717353
+SHA256 (cabal/skylighting-0.3.3.1.tar.gz) = f3e1f910a4d0e13afff2abdc54ad836ff968fcc8f4083b33c0153367393c5d57
+SIZE (cabal/skylighting-0.3.3.1.tar.gz) = 1014631
diff --git a/textproc/hs-skylighting/pkg-descr b/textproc/hs-skylighting/pkg-descr
new file mode 100644
index 000000000000..1af3090ca07f
--- /dev/null
+++ b/textproc/hs-skylighting/pkg-descr
@@ -0,0 +1,7 @@
+Skylighting is a syntax highlighting library with support for over one hundred
+languages. It derives its tokenizers from XML syntax definitions used by KDE's
+KSyntaxHighlighting framework, so any syntax supported by that framework can be
+added. An optional command-line program is provided. Skylighting is intended to
+be the successor to highlighting-kate.
+
+WWW: http://hackage.haskell.org/package/skylighting
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 28d487c75f5a..e0aa11a22726 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stringsearch
PORTVERSION= 0.3.6.6
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index 6bf8d5b2a604..ca07c62d3bdf 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624838
SHA256 (cabal/stringsearch-0.3.6.6.tar.gz) = 295f1971920bc52263d8275d7054ad223a7e1aefe75533f9887735c9644ffe4a
SIZE (cabal/stringsearch-0.3.6.6.tar.gz) = 39679
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index fee650e24b58..92e2adc9bdca 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tagsoup
-PORTVERSION= 0.13.3
+PORTVERSION= 0.14.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 8a4c501af16d..653cf16d5021 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/tagsoup-0.13.3.tar.gz) = 32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d
-SIZE (cabal/tagsoup-0.13.3.tar.gz) = 42279
+TIMESTAMP = 1499624839
+SHA256 (cabal/tagsoup-0.14.1.tar.gz) = 028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb
+SIZE (cabal/tagsoup-0.14.1.tar.gz) = 44031
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 0e3d7a58f096..92116b096b90 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tagstream-conduit
PORTVERSION= 0.5.5.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index 8f1a799e4a18..5f332dbf6428 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624839
SHA256 (cabal/tagstream-conduit-0.5.5.3.tar.gz) = b296e8f0ba18ae951b5bb3fc2d9d964954666df61ea9363d667f251af17134ab
SIZE (cabal/tagstream-conduit-0.5.5.3.tar.gz) = 9813
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 4ff2f905816e..3ff44c527cb4 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.8.3
+PORTVERSION= 0.9.4.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,8 @@ COMMENT= Conversion between formats used to represent mathematics
LICENSE= GPLv2
-USE_CABAL= aeson mtl network>=2.6 network-uri>=2.6 \
- pandoc-types>=1.12.3.3 parsec>=3 syb text xml
+USE_CABAL= aeson mtl network network-uri pandoc-types parsec split \
+ syb text xml
FLAGS_ENABLE= network-uri
FLAGS_DISABLE= executable
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 34e754c60b68..d300fd4ee54b 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/texmath-0.8.3.tar.gz) = 553d4e8785caf97370aa8d1b626c0e310fe0a1dec15abf2b146dc2ee219e1d34
-SIZE (cabal/texmath-0.8.3.tar.gz) = 1599129
+TIMESTAMP = 1499624840
+SHA256 (cabal/texmath-0.9.4.1.tar.gz) = 302202b2c896403963aefe63044ca65ca277482d0e661607010ca3bf8d9a9d04
+SIZE (cabal/texmath-0.9.4.1.tar.gz) = 1705730
diff --git a/textproc/hs-texmath/files/patch-texmath.cabal b/textproc/hs-texmath/files/patch-texmath.cabal
new file mode 100644
index 000000000000..f1f846076b26
--- /dev/null
+++ b/textproc/hs-texmath/files/patch-texmath.cabal
@@ -0,0 +1,20 @@
+--- texmath.cabal.orig 2017-07-10 15:55:23 UTC
++++ texmath.cabal
+@@ -87,7 +87,7 @@ Flag network-uri
+
+ Library
+ Build-depends: xml, parsec >= 3, containers,
+- pandoc-types >= 1.12.3.3 && < 1.18, mtl
++ pandoc-types >= 1.12.3.3 , mtl
+ if impl(ghc >= 6.10)
+ Build-depends: base >= 4.5 && < 5, syb
+ else
+@@ -141,7 +141,7 @@ Executable texmath
+ if flag(executable)
+ Buildable: True
+ Build-Depends: base >= 4.5 && < 5, texmath, xml,
+- pandoc-types >= 1.12.3.3 && < 1.18,
++ pandoc-types >= 1.12.3.3 ,
+ split, aeson, bytestring, text
+ else
+ Buildable: False
diff --git a/textproc/hs-uri-bytestring-aeson/Makefile b/textproc/hs-uri-bytestring-aeson/Makefile
new file mode 100644
index 000000000000..ce3c41b1e6de
--- /dev/null
+++ b/textproc/hs-uri-bytestring-aeson/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uri-bytestring-aeson
+PORTVERSION= 0.1.0.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The uri-bytestring-aeson package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson text uri-bytestring
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-uri-bytestring-aeson/distinfo b/textproc/hs-uri-bytestring-aeson/distinfo
new file mode 100644
index 000000000000..43e2944dbb99
--- /dev/null
+++ b/textproc/hs-uri-bytestring-aeson/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499703625
+SHA256 (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = ef42c3b276a061e3c262de0aea6237aa1aa38ec71038f71d75bb4a3d059525fe
+SIZE (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = 1987
diff --git a/textproc/hs-uri-bytestring-aeson/pkg-descr b/textproc/hs-uri-bytestring-aeson/pkg-descr
new file mode 100644
index 000000000000..85839085fcf3
--- /dev/null
+++ b/textproc/hs-uri-bytestring-aeson/pkg-descr
@@ -0,0 +1,4 @@
+uri-bytestring aims to be an RFC3986 compliant URI parser that uses
+efficient ByteStrings for parsing and representing the URI data.
+
+WWW: http://hackage.haskell.org/package/uri-bytestring
diff --git a/textproc/hs-uri-bytestring/Makefile b/textproc/hs-uri-bytestring/Makefile
new file mode 100644
index 000000000000..cf7a4638c367
--- /dev/null
+++ b/textproc/hs-uri-bytestring/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uri-bytestring
+PORTVERSION= 0.2.3.3
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell URI parsing as ByteStrings
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec blaze-builder th-lift th-lift-instances
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-uri-bytestring/distinfo b/textproc/hs-uri-bytestring/distinfo
new file mode 100644
index 000000000000..71f3e2baf1f5
--- /dev/null
+++ b/textproc/hs-uri-bytestring/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499621831
+SHA256 (cabal/uri-bytestring-0.2.3.3.tar.gz) = 3d838bf247e95a66885d2d603c1594ef01d4dade728aa50b6c2224a65d8d0b14
+SIZE (cabal/uri-bytestring-0.2.3.3.tar.gz) = 22514
diff --git a/textproc/hs-uri-bytestring/pkg-descr b/textproc/hs-uri-bytestring/pkg-descr
new file mode 100644
index 000000000000..85839085fcf3
--- /dev/null
+++ b/textproc/hs-uri-bytestring/pkg-descr
@@ -0,0 +1,4 @@
+uri-bytestring aims to be an RFC3986 compliant URI parser that uses
+efficient ByteStrings for parsing and representing the URI data.
+
+WWW: http://hackage.haskell.org/package/uri-bytestring
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
index c2120ab0400e..018041900b6d 100644
--- a/textproc/hs-uri/Makefile
+++ b/textproc/hs-uri/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uri
-PORTVERSION= 0.1.6.3
+PORTVERSION= 0.1.6.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-uri/distinfo b/textproc/hs-uri/distinfo
index 1fabe2295498..9d2b1a5fbfa3 100644
--- a/textproc/hs-uri/distinfo
+++ b/textproc/hs-uri/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uri-0.1.6.3.tar.gz) = 321165b9897aaab108170ee3b6073ec718150ebf650a3f76042a0e5c89cd15b6
-SIZE (cabal/uri-0.1.6.3.tar.gz) = 5331
+TIMESTAMP = 1499624841
+SHA256 (cabal/uri-0.1.6.4.tar.gz) = a90cd3d3ca1d33740dc732f14773266a7707901a872747a6e543129cab4ee409
+SIZE (cabal/uri-0.1.6.4.tar.gz) = 5343
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index d6c975ed9cc3..2c5d459f9884 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.3.1
+PORTVERSION= 1.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index c8f65e35aa18..0474c080371d 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xml-conduit-1.3.1.tar.gz) = 19e65bb1753f99c8a9f2011f2088639db3b8c06f72d29fea1464f623879b8f24
-SIZE (cabal/xml-conduit-1.3.1.tar.gz) = 33304
+TIMESTAMP = 1499546442
+SHA256 (cabal/xml-conduit-1.5.1.tar.gz) = 7afe26fa3e3160552b7a15af4a063f10678400cac54785a06ce9b70a5a5a9734
+SIZE (cabal/xml-conduit-1.5.1.tar.gz) = 37603
diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile
index 74212580fecb..8aa76fec598c 100644
--- a/textproc/hs-xml-hamlet/Makefile
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xml-hamlet
-PORTVERSION= 0.4.0.11
+PORTVERSION= 0.4.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo
index 9d6e0383184a..6d415afdc903 100644
--- a/textproc/hs-xml-hamlet/distinfo
+++ b/textproc/hs-xml-hamlet/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xml-hamlet-0.4.0.11.tar.gz) = 3d598ad387e310e76a07f213afe35db06662611840d1bce3bcdf202668bc1e89
-SIZE (cabal/xml-hamlet-0.4.0.11.tar.gz) = 6080
+TIMESTAMP = 1499624842
+SHA256 (cabal/xml-hamlet-0.4.1.tar.gz) = 7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb
+SIZE (cabal/xml-hamlet-0.4.1.tar.gz) = 9149
diff --git a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal b/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal
new file mode 100644
index 000000000000..019f91570df9
--- /dev/null
+++ b/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal
@@ -0,0 +1,11 @@
+--- xml-hamlet.cabal.orig 2017-07-10 13:36:43 UTC
++++ xml-hamlet.cabal
+@@ -19,7 +19,7 @@ Library
+
+ Build-depends: base >= 4 && < 5
+ , shakespeare >= 1.0 && < 2.2
+- , xml-conduit >= 1.0 && < 1.5
++ , xml-conduit >= 1.0 && < 1.6
+ , text >= 0.10
+ , template-haskell
+ , parsec >= 2.0 && < 3.2
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index b05032d9f66f..248f2c411b73 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xml-types
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index 1a24c3c65033..2c7ccd8c94fa 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624842
SHA256 (cabal/xml-types-0.3.6.tar.gz) = 9937d440072552c03c6d8ad79f61e61467dc28dcd5adeaad81038b9b94eef8c9
SIZE (cabal/xml-types-0.3.6.tar.gz) = 4020
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index b47de97846e9..20ae5f0cdd50 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xml
PORTVERSION= 1.3.14
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml/distinfo b/textproc/hs-xml/distinfo
index c1622a7f273e..4b7af438fd97 100644
--- a/textproc/hs-xml/distinfo
+++ b/textproc/hs-xml/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499624842
SHA256 (cabal/xml-1.3.14.tar.gz) = 32d1a1a9f21a59176d84697f96ae3a13a0198420e3e4f1c48abbab7d2425013d
SIZE (cabal/xml-1.3.14.tar.gz) = 12048
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 72bf23d3eb49..8e11ddcb660e 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.3.4
+PORTVERSION= 0.2.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= XML parser and renderer with HTML 5 quirks mode
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5 \
- parsec>=3.1.2 text>=0.11 unordered-containers>=0.1.4
+USE_CABAL= blaze-builder blaze-html blaze-markup parsec text \
+ unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index 51880d55b4b6..b04f611d4d0b 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xmlhtml-0.2.3.4.tar.gz) = d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533
-SIZE (cabal/xmlhtml-0.2.3.4.tar.gz) = 124760
+TIMESTAMP = 1499624843
+SHA256 (cabal/xmlhtml-0.2.4.tar.gz) = 80100374fe10802e3c1435d22c9281b35421db72f716d90451adc277dfe4539c
+SIZE (cabal/xmlhtml-0.2.4.tar.gz) = 121541
diff --git a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs b/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs
new file mode 100644
index 000000000000..cd84fb74b6a7
--- /dev/null
+++ b/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs
@@ -0,0 +1,30 @@
+--- src/Text/Blaze/Renderer/XmlHtml.hs.orig 2017-05-19 10:38:07 UTC
++++ src/Text/Blaze/Renderer/XmlHtml.hs
+@@ -58,22 +58,20 @@ renderNodes = go []
+ (Element (getText tag) attrs (go [] content []) :)
+ go attrs (CustomParent tag content) =
+ (Element (fromChoiceStringText tag) attrs (go [] content []) :)
+- go attrs (Leaf tag _ _) =
++ go attrs (Leaf tag _ _ _) =
+ (Element (getText tag) attrs [] :)
+- go attrs (CustomLeaf tag _) =
++ go attrs (CustomLeaf tag _ _) =
+ (Element (fromChoiceStringText tag) attrs [] :)
+ go attrs (AddAttribute key _ value content) =
+ go ((getText key, fromChoiceStringText value) : attrs) content
+ go attrs (AddCustomAttribute key value content) =
+ go ((fromChoiceStringText key, fromChoiceStringText value) : attrs)
+ content
+- go _ (Content content) = fromChoiceString content
+-#if MIN_VERSION_blaze_markup(0,6,3)
+- go _ (TBI.Comment comment) =
++ go _ (Content content _) = fromChoiceString content
++ go _ (TBI.Comment comment _) =
+ (X.Comment (fromChoiceStringText comment) :)
+-#endif
+ go attrs (Append h1 h2) = go attrs h1 . go attrs h2
+- go _ Empty = id
++ go _ (Empty _) = id
+ {-# NOINLINE go #-}
+ {-# INLINE renderNodes #-}
+
diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
index af6d22559c75..4a675479e68e 100644
--- a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
+++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
@@ -1,15 +1,15 @@
---- xmlhtml.cabal.orig 2014-12-24 20:41:19 UTC
+--- xmlhtml.cabal.orig 2017-05-19 10:38:07 UTC
+++ xmlhtml.cabal
@@ -820,9 +820,9 @@ Library
Text.XmlHtml.HTML.Render
Build-depends: base >= 4 && < 5,
-- blaze-builder >= 0.2 && < 0.4,
-- blaze-html >= 0.5 && < 0.8,
-- blaze-markup >= 0.5 && < 0.7,
-+ blaze-builder >= 0.2 && < 0.5,
-+ blaze-html >= 0.5 && < 0.9,
-+ blaze-markup >= 0.5 && < 0.8,
+- blaze-builder >= 0.2 && < 0.5,
+- blaze-html >= 0.5 && < 0.9,
+- blaze-markup >= 0.5 && < 0.8,
++ blaze-builder >= 0.2 ,
++ blaze-html >= 0.5 ,
++ blaze-markup >= 0.5 ,
bytestring >= 0.9 && < 0.11,
containers >= 0.3 && < 0.6,
parsec >= 3.1.2 && < 3.2,
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index e2d386d32a82..09534078ec65 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.13
+PORTVERSION= 0.8.23.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 2cb796dc3985..d4b4133c7d1b 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/yaml-0.8.13.tar.gz) = f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a
-SIZE (cabal/yaml-0.8.13.tar.gz) = 74369
+TIMESTAMP = 1499546173
+SHA256 (cabal/yaml-0.8.23.1.tar.gz) = 4a9bc0b540b25db0edafea58e1c7fe5f00770bd599c9c94f16b92210bf0f606b
+SIZE (cabal/yaml-0.8.23.1.tar.gz) = 81569