aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile7
-rw-r--r--textproc/hs-Diff/Makefile5
-rw-r--r--textproc/hs-Diff/distinfo4
-rw-r--r--textproc/hs-Diff/pkg-descr3
-rw-r--r--textproc/hs-HStringTemplate/Makefile5
-rw-r--r--textproc/hs-HStringTemplate/distinfo4
-rw-r--r--textproc/hs-HaXml/Makefile5
-rw-r--r--textproc/hs-HaXml/distinfo4
-rw-r--r--textproc/hs-HaXml/pkg-descr2
-rw-r--r--textproc/hs-appar/Makefile2
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile3
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo4
-rw-r--r--textproc/hs-attoparsec/Makefile7
-rw-r--r--textproc/hs-attoparsec/distinfo4
-rw-r--r--textproc/hs-bencode/Makefile15
-rw-r--r--textproc/hs-bencode/distinfo2
-rw-r--r--textproc/hs-bencode/pkg-descr5
-rw-r--r--textproc/hs-blaze-html/Makefile5
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-markup/Makefile5
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile3
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-cassava/Makefile16
-rw-r--r--textproc/hs-cassava/distinfo2
-rw-r--r--textproc/hs-cassava/pkg-descr4
-rw-r--r--textproc/hs-citeproc-hs/Makefile11
-rw-r--r--textproc/hs-citeproc-hs/distinfo4
-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-descr2
-rw-r--r--textproc/hs-cmark/Makefile15
-rw-r--r--textproc/hs-cmark/distinfo2
-rw-r--r--textproc/hs-cmark/pkg-descr6
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-double-conversion/Makefile10
-rw-r--r--textproc/hs-double-conversion/distinfo4
-rw-r--r--textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal12
-rw-r--r--textproc/hs-feed/Makefile6
-rw-r--r--textproc/hs-feed/distinfo4
-rw-r--r--textproc/hs-feed/pkg-descr2
-rw-r--r--textproc/hs-hexpat/Makefile5
-rw-r--r--textproc/hs-hexpat/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/Makefile8
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/pkg-descr4
-rw-r--r--textproc/hs-hs-bibutils/Makefile3
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/pkg-descr2
-rw-r--r--textproc/hs-html-conduit/Makefile7
-rw-r--r--textproc/hs-html-conduit/distinfo4
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-hxt-charproperties/Makefile3
-rw-r--r--textproc/hs-hxt-charproperties/distinfo4
-rw-r--r--textproc/hs-hxt-charproperties/pkg-descr4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile5
-rw-r--r--textproc/hs-hxt-regex-xmlschema/distinfo4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/pkg-descr17
-rw-r--r--textproc/hs-hxt-unicode/Makefile5
-rw-r--r--textproc/hs-hxt-unicode/distinfo4
-rw-r--r--textproc/hs-hxt-unicode/pkg-descr2
-rw-r--r--textproc/hs-hxt/Makefile8
-rw-r--r--textproc/hs-hxt/distinfo4
-rw-r--r--textproc/hs-hxt/pkg-descr9
-rw-r--r--textproc/hs-lhs2tex/Makefile3
-rw-r--r--textproc/hs-lhs2tex/distinfo4
-rw-r--r--textproc/hs-libxml-sax/Makefile2
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/Makefile36
-rw-r--r--textproc/hs-pandoc-citeproc/distinfo2
-rw-r--r--textproc/hs-pandoc-citeproc/pkg-descr6
-rw-r--r--textproc/hs-pandoc-types/Makefile5
-rw-r--r--textproc/hs-pandoc-types/distinfo4
-rw-r--r--textproc/hs-pandoc/Makefile34
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/pkg-descr30
-rw-r--r--textproc/hs-parsec/Makefile3
-rw-r--r--textproc/hs-parsec/distinfo4
-rw-r--r--textproc/hs-parsec/pkg-descr2
-rw-r--r--textproc/hs-polyparse/Makefile3
-rw-r--r--textproc/hs-polyparse/distinfo4
-rw-r--r--textproc/hs-regex-applicative/Makefile13
-rw-r--r--textproc/hs-regex-applicative/distinfo2
-rw-r--r--textproc/hs-regex-applicative/pkg-descr4
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-compat-tdfa/Makefile15
-rw-r--r--textproc/hs-regex-compat-tdfa/distinfo2
-rw-r--r--textproc/hs-regex-compat-tdfa/pkg-descr4
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-posix/Makefile2
-rw-r--r--textproc/hs-regex-tdfa/Makefile2
-rw-r--r--textproc/hs-rfc5051/Makefile13
-rw-r--r--textproc/hs-rfc5051/distinfo2
-rw-r--r--textproc/hs-rfc5051/pkg-descr7
-rw-r--r--textproc/hs-stringsearch/Makefile3
-rw-r--r--textproc/hs-stringsearch/distinfo4
-rw-r--r--textproc/hs-tagsoup/Makefile8
-rw-r--r--textproc/hs-tagsoup/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/Makefile7
-rw-r--r--textproc/hs-tagstream-conduit/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal11
-rw-r--r--textproc/hs-texmath/Makefile8
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-uri/Makefile3
-rw-r--r--textproc/hs-uri/distinfo4
-rw-r--r--textproc/hs-xml-conduit/Makefile9
-rw-r--r--textproc/hs-xml-conduit/distinfo4
-rw-r--r--textproc/hs-xml-conduit/files/patch-xml-conduit.cabal11
-rw-r--r--textproc/hs-xml-hamlet/Makefile3
-rw-r--r--textproc/hs-xml-hamlet/distinfo4
-rw-r--r--textproc/hs-xml-types/Makefile3
-rw-r--r--textproc/hs-xml-types/distinfo4
-rw-r--r--textproc/hs-xml/Makefile3
-rw-r--r--textproc/hs-xml/distinfo4
-rw-r--r--textproc/hs-xmlhtml/Makefile3
-rw-r--r--textproc/hs-xmlhtml/distinfo4
-rw-r--r--textproc/hs-xmlhtml/files/patch-xmlhtml.cabal15
-rw-r--r--textproc/hs-yaml/Makefile9
-rw-r--r--textproc/hs-yaml/distinfo4
122 files changed, 457 insertions, 255 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index 7ec90ec49a9e..de0de9b81854 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -242,11 +242,14 @@
SUBDIR += hs-appar
SUBDIR += hs-attoparsec
SUBDIR += hs-attoparsec-enumerator
+ 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-double-conversion
SUBDIR += hs-feed
@@ -263,14 +266,18 @@
SUBDIR += hs-libxml
SUBDIR += hs-libxml-sax
SUBDIR += hs-pandoc
+ SUBDIR += hs-pandoc-citeproc
SUBDIR += hs-pandoc-types
SUBDIR += hs-parsec
SUBDIR += hs-polyparse
+ SUBDIR += hs-regex-applicative
SUBDIR += hs-regex-base
SUBDIR += hs-regex-compat
+ SUBDIR += hs-regex-compat-tdfa
SUBDIR += hs-regex-pcre-builtin
SUBDIR += hs-regex-posix
SUBDIR += hs-regex-tdfa
+ SUBDIR += hs-rfc5051
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 02b20b7bbaa5..ba7b555983e4 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= Diff
-PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTVERSION= 0.3.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= O(ND) diff algorithm in haskell
+COMMENT= O(ND) diff algorithm in Haskell
LICENSE= BSD3CLAUSE
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 55cb6d8570ea..2ccdc931f36c 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Diff-0.3.0.tar.gz) = 28f96d7f4bb0f88a13fa0b59e89cc8b93fa901c6cbe6ca82e84540cb2291ee4c
-SIZE (cabal/Diff-0.3.0.tar.gz) = 4128
+SHA256 (cabal/Diff-0.3.2.tar.gz) = 7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e
+SIZE (cabal/Diff-0.3.2.tar.gz) = 5024
diff --git a/textproc/hs-Diff/pkg-descr b/textproc/hs-Diff/pkg-descr
index 07b3f5bce739..b96554a88736 100644
--- a/textproc/hs-Diff/pkg-descr
+++ b/textproc/hs-Diff/pkg-descr
@@ -1,3 +1,4 @@
-Basic implementation of the standard diff algorithm in Haskell.
+Implementation of the standard diff algorithm, and utilities for pretty
+printing.
WWW: http://hackage.haskell.org/package/Diff
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 52e29f95f13c..ace511b41381 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTVERSION= 0.8.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder mtl parsec syb text utf8-string void
+USE_CABAL= blaze-builder mtl old-locale parsec syb text void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 78d260f490e7..0eb54aa720b0 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.7.3.tar.gz) = 883fbfd35c14ab46cd1545a8643da700094297f0cb74462f460781694dd884bf
-SIZE (cabal/HStringTemplate-0.7.3.tar.gz) = 15961
+SHA256 (cabal/HStringTemplate-0.8.3.tar.gz) = 63d6b1c993f5612ef370b92bb8fab05323657ec34a0f35110b967eb853239d18
+SIZE (cabal/HStringTemplate-0.8.3.tar.gz) = 16023
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 72a4d354ad81..045d81955a2a 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.24.1
-PORTREVISION= 1
+PORTVERSION= 1.25.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Utilities for manipulating XML documents
LICENSE= LGPL21
-USE_CABAL= polyparse>=1.9 random
+USE_CABAL= polyparse>=1.10 random
EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \
MkOneOf Validate XsdToHaskell Xtract
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index 31395f642092..73216a1045e9 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HaXml-1.24.1.tar.gz) = 5f258c7c6291ad54bb9a65280dd30efcbca3fc79a499d5b6575a753d3f7b78df
-SIZE (cabal/HaXml-1.24.1.tar.gz) = 142739
+SHA256 (cabal/HaXml-1.25.3.tar.gz) = 6448a7ee1c26159c6c10db93757ed9248f647b1c0c431e7aead6aadd6d2307c7
+SIZE (cabal/HaXml-1.25.3.tar.gz) = 144189
diff --git a/textproc/hs-HaXml/pkg-descr b/textproc/hs-HaXml/pkg-descr
index 35a25ac6d1d5..3eebed9d8158 100644
--- a/textproc/hs-HaXml/pkg-descr
+++ b/textproc/hs-HaXml/pkg-descr
@@ -1,4 +1,4 @@
Haskell utilities for parsing, filtering, transforming and generating XML
documents.
-WWW: http://www.cs.york.ac.uk/fp/HaXml/
+WWW: http://projects.haskell.org/HaXml/
diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile
index c02b37d1c5c1..8d381913032b 100644
--- a/textproc/hs-appar/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= appar
PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 4faf4a6641b6..611794d1f7a7 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec-enumerator
-PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTVERSION= 0.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index 98dde5c6df30..6708037d8d0a 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 3cf105cdc29120a5c21487708783155a35fd9d4df29f72e56c22ed93f85aa77c
-SIZE (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 2484
+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/Makefile b/textproc/hs-attoparsec/Makefile
index 12dc7a78174b..bbe0cf042670 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= attoparsec
-PORTVERSION= 0.10.4.0
-PORTREVISION= 7
+PORTVERSION= 0.12.1.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Fast combinator parsing for bytestrings
+COMMENT= Fast combinator parsing for bytestrings and text
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.11.1.5
+USE_CABAL= scientific>=0.3.1 text>=1.1.1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index f7172f960663..6ea728661333 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-0.10.4.0.tar.gz) = b6b84e0dbd1c3beec1dedea578ac2f4d62afbe66b383582b7b3349406866d346
-SIZE (cabal/attoparsec-0.10.4.0.tar.gz) = 36268
+SHA256 (cabal/attoparsec-0.12.1.6.tar.gz) = ce0bb68c3a232dc981412b44211395ee04b0c18075777c30493d4e0f1edc06a8
+SIZE (cabal/attoparsec-0.12.1.6.tar.gz) = 65300
diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile
new file mode 100644
index 000000000000..d38d920cfa7c
--- /dev/null
+++ b/textproc/hs-bencode/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= bencode
+PORTVERSION= 0.6.0.0
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Parser and printer for bencoded data
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-bencode/distinfo b/textproc/hs-bencode/distinfo
new file mode 100644
index 000000000000..0b636d3c28f7
--- /dev/null
+++ b/textproc/hs-bencode/distinfo
@@ -0,0 +1,2 @@
+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-bencode/pkg-descr b/textproc/hs-bencode/pkg-descr
new file mode 100644
index 000000000000..70beec501f1f
--- /dev/null
+++ b/textproc/hs-bencode/pkg-descr
@@ -0,0 +1,5 @@
+Parser and printer for bencoded data. Bencode (pronounced like B encode)
+is the encoding used by the peer-to-peer file sharing system BitTorrent
+for storing and transmitting loosely structured data.
+
+WWW: http://hackage.haskell.org/package/bencode
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 015ac125c8f5..a351c303092d 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.7.0.2
-PORTREVISION= 1
+PORTVERSION= 0.8.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Blazingly fast HTML combinator library for Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.6 text>=0.10
+USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index f6d39a3e6ea6..167b0baad58a 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.7.0.2.tar.gz) = 5b74f65b9201b1ac81b58f6c7350a2ab493e7777eb429c3ec5a0fb9c6da90f7b
-SIZE (cabal/blaze-html-0.7.0.2.tar.gz) = 75815
+SHA256 (cabal/blaze-html-0.8.1.0.tar.gz) = fb6dc0755b578928538e867ba441525d7169fcfeaabbfc4663f06bc91b6fed31
+SIZE (cabal/blaze-html-0.8.1.0.tar.gz) = 76151
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 01a227aa1367..c7d3d623b67f 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.6.1.0
-PORTREVISION= 1
+PORTVERSION= 0.7.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Blazingly fast markup combinator library
+COMMENT= Blazingly fast markup combinator library for Haskell
LICENSE= BSD3CLAUSE
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index d3f24c05fe72..cf064dba4ecc 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.6.1.0.tar.gz) = f45c0a5f3c9d9d91af3b4d0ea6d88293c036d000a71a8e63d37a21193c19b379
-SIZE (cabal/blaze-markup-0.6.1.0.tar.gz) = 12738
+SHA256 (cabal/blaze-markup-0.7.0.2.tar.gz) = e4068a284834d8fe68df5ec63a037b92b7c956a82c0c72d7beca8d670fd5725c
+SIZE (cabal/blaze-markup-0.7.0.2.tar.gz) = 13440
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 162fceaaf4cc..79a46ae849eb 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= 17
+PORTREVISION= 18
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 475a49355bc7..d27d846d5fd0 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.2.0.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index cc78d76b060c..d86563098002 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-1.1.0.3.tar.gz) = 7b255fe63155d53ab84b248ab5ba9306fd4bec47a6198e3275cf9cb41c4d263b
-SIZE (cabal/case-insensitive-1.1.0.3.tar.gz) = 5188
+SHA256 (cabal/case-insensitive-1.2.0.4.tar.gz) = 63830d4b6b8cd51f4e40e492c17b5eaa11ebab5ef28eeb344e57709f3220d51e
+SIZE (cabal/case-insensitive-1.2.0.4.tar.gz) = 53377
diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile
new file mode 100644
index 000000000000..5a7f25e28925
--- /dev/null
+++ b/textproc/hs-cassava/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= cassava
+PORTVERSION= 0.4.3.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= CSV parsing and encoding library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec>=0.10.2 blaze-builder hashable text \
+ unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-cassava/distinfo b/textproc/hs-cassava/distinfo
new file mode 100644
index 000000000000..e8bf358a4254
--- /dev/null
+++ b/textproc/hs-cassava/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cassava-0.4.3.1.tar.gz) = e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac
+SIZE (cabal/cassava-0.4.3.1.tar.gz) = 31922
diff --git a/textproc/hs-cassava/pkg-descr b/textproc/hs-cassava/pkg-descr
new file mode 100644
index 000000000000..25f63440cea6
--- /dev/null
+++ b/textproc/hs-cassava/pkg-descr
@@ -0,0 +1,4 @@
+A CSV parsing and encoding library optimized for ease of use and high
+performance.
+
+WWW: https://github.com/tibbe/cassava
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index efd7d125af46..4aea96d09ef7 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTVERSION= 0.3.10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,20 +11,24 @@ LICENSE= BSD3CLAUSE
USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-FLAGS_DEFINE= BIBUTILS HEXPAT NETWORK UNICODE_COLLATION
+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
+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
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
index 47a3e039ec5a..3af462d1c746 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.9.tar.gz) = 4f6b7db9b731789f25e4faebce8ec2ea4a19a920aaad6951a5e8b23cd4187438
-SIZE (cabal/citeproc-hs-0.3.9.tar.gz) = 114621
+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
new file mode 100644
index 000000000000..dc6be7f658d1
--- /dev/null
+++ b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs
@@ -0,0 +1,8 @@
+--- 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
new file mode 100644
index 000000000000..750e9767af0c
--- /dev/null
+++ b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs
@@ -0,0 +1,8 @@
+--- 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
new file mode 100644
index 000000000000..16eb7ba2cbb2
--- /dev/null
+++ b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs
@@ -0,0 +1,10 @@
+--- 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
index f55261280c22..dbdad31bf085 100644
--- a/textproc/hs-citeproc-hs/pkg-descr
+++ b/textproc/hs-citeproc-hs/pkg-descr
@@ -4,4 +4,4 @@ Language (CSL) [1].
[1] http://xbiblio.sourceforge.net/
-WWW: http://gorgias.mine.nu/repos/citeproc-hs/
+WWW: http://istitutocolli.org/repos/citeproc-hs/
diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile
new file mode 100644
index 000000000000..63c40dbb29ff
--- /dev/null
+++ b/textproc/hs-cmark/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cmark
+PORTVERSION= 0.4.0.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fast, accurate CommonMark (Markdown) parser and renderer
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text>=1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-cmark/distinfo b/textproc/hs-cmark/distinfo
new file mode 100644
index 000000000000..c9f34b62d3ab
--- /dev/null
+++ b/textproc/hs-cmark/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cmark-0.4.0.1.tar.gz) = 638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce
+SIZE (cabal/cmark-0.4.0.1.tar.gz) = 175936
diff --git a/textproc/hs-cmark/pkg-descr b/textproc/hs-cmark/pkg-descr
new file mode 100644
index 000000000000..f7575ea8cd6e
--- /dev/null
+++ b/textproc/hs-cmark/pkg-descr
@@ -0,0 +1,6 @@
+This package provides Haskell bindings for libcmark, the reference
+parser for CommonMark, a fully specified variant of Markdown. It
+includes sources for libcmark (0.21.0) and does not require prior
+installation of the C library.
+
+WWW: https://github.com/jgm/commonmark-hs
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 9f55a0534a53..673e8b5faa6e 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 6ee619777cbe..d9f7b3a4c0be 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= double-conversion
-PORTVERSION= 0.2.0.6
-PORTREVISION= 7
+PORTVERSION= 2.0.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,4 +12,11 @@ LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.11.0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+
+.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-double-conversion.cabal
+LIB_DEPENDS+= libcxxrt.so:${PORTSDIR}/devel/libcxxrt
+.endif
+
.include <bsd.port.mk>
+
diff --git a/textproc/hs-double-conversion/distinfo b/textproc/hs-double-conversion/distinfo
index e8d08bcbf0a7..c50f94df7cc0 100644
--- a/textproc/hs-double-conversion/distinfo
+++ b/textproc/hs-double-conversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/double-conversion-0.2.0.6.tar.gz) = 57428dc3896628d9e5b6aef48104af112a90d992bddd06b723c4e1061ff0d0b0
-SIZE (cabal/double-conversion-0.2.0.6.tar.gz) = 7016270
+SHA256 (cabal/double-conversion-2.0.1.0.tar.gz) = 0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c
+SIZE (cabal/double-conversion-2.0.1.0.tar.gz) = 7023237
diff --git a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal b/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal
new file mode 100644
index 000000000000..f194f16d456b
--- /dev/null
+++ b/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal
@@ -0,0 +1,12 @@
+--- double-conversion.cabal.orig 2014-08-13 18:38:48 UTC
++++ double-conversion.cabal
+@@ -71,7 +71,8 @@ library
+ double-conversion/src/fixed-dtoa.cc
+ double-conversion/src/strtod.cc
+
+- extra-libraries: stdc++
++ cc-options: -std=c++11 -stdlib=libc++
++ extra-libraries: cxxrt gcc_s
+
+ include-dirs:
+ double-conversion/src
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index 775fefeec65f..ea53f0323e50 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 0.3.9.2
-PORTREVISION= 1
+PORTVERSION= 0.3.10.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,8 @@ COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
LICENSE= BSD3CLAUSE
-USE_CABAL= utf8-string xml>=1.2.6
+USE_CABAL= old-locale>=1.0 old-time>=1 time-locale-compat>=0.1 \
+ utf8-string xml>=1.2.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 41fb6a479ed8..97525cfe27bc 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/feed-0.3.9.2.tar.gz) = ef1d23d130b766186a0bacd6e4807279cab681712b0fb09d1ed1ee1b3c154f17
-SIZE (cabal/feed-0.3.9.2.tar.gz) = 73353
+SHA256 (cabal/feed-0.3.10.0.tar.gz) = 74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094
+SIZE (cabal/feed-0.3.10.0.tar.gz) = 76124
diff --git a/textproc/hs-feed/pkg-descr b/textproc/hs-feed/pkg-descr
index 281194338b87..5d4dcc4a7cef 100644
--- a/textproc/hs-feed/pkg-descr
+++ b/textproc/hs-feed/pkg-descr
@@ -1,3 +1,3 @@
Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell.
-WWW: https://github.com/sof/feed
+WWW: https://github.com/bergmark/feed
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 326768a02e70..ff2dd465db08 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hexpat
-PORTVERSION= 0.20.6
-PORTREVISION= 1
+PORTVERSION= 0.20.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= XML parser/formatter based on expat
LICENSE= BSD3CLAUSE
-USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string
+USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hexpat/distinfo b/textproc/hs-hexpat/distinfo
index 2334a5732270..1104bb363362 100644
--- a/textproc/hs-hexpat/distinfo
+++ b/textproc/hs-hexpat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hexpat-0.20.6.tar.gz) = 0b98fb2726e0be4c98102edd68025b7731b0dc8aeb9029719e601a091935ba0a
-SIZE (cabal/hexpat-0.20.6.tar.gz) = 133394
+SHA256 (cabal/hexpat-0.20.9.tar.gz) = 5d1c075f1ae00be2e80c0018b522a351b2f4ef73b9baca1113ee80e554449d9d
+SIZE (cabal/hexpat-0.20.9.tar.gz) = 132649
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 72cb8a6df025..85b83af1af32 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.11.1
+PORTVERSION= 0.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,9 +14,11 @@ USE_CABAL= blaze-html>=0.4.2 mtl parsec \
FLAGS_DEFINE= EXECUTABLE
-EXECUTABLE_DESC= Build the Highlight executable
+EXECUTABLE_DESC= Build the executable
EXECUTABLE_FLAG_ENABLE= executable
-EXECUTABLE_FLAG_EXECUTABLE= Highlight
+EXECUTABLE_FLAG_EXECUTABLE= highlighting-kate
+
+FLAGS_DISABLE= pcre-light
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index 90cabdc38a5c..35cc42038df2 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.11.1.tar.gz) = 7b5af011fb86b0358c186245840c95c4c43ada3d98f7b9060d9ce2a0c2e5c2fc
-SIZE (cabal/highlighting-kate-0.5.11.1.tar.gz) = 862965
+SHA256 (cabal/highlighting-kate-0.6.tar.gz) = b39dc194386eb7613a5e9935023b1173010800c3a9b0b7fe09c0601f97236398
+SIZE (cabal/highlighting-kate-0.6.tar.gz) = 922847
diff --git a/textproc/hs-highlighting-kate/pkg-descr b/textproc/hs-highlighting-kate/pkg-descr
index 0cf8ce4c11f6..f09ab3860c9a 100644
--- a/textproc/hs-highlighting-kate/pkg-descr
+++ b/textproc/hs-highlighting-kate/pkg-descr
@@ -1,9 +1,7 @@
The highlighting-kate is a syntax highlighting library with support for
nearly one hundred languages. The syntax parsers are automatically
generated from Kate syntax descriptions [1], so any syntax supported by
-Kate can be added. An (optional) command-line program is provided,
-along with a utility for generating new parsers from Kate XML syntax
-descriptions.
+Kate can be added.
[1] http://kate-editor.org/
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index f41f103233e3..0cab1e280959 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 5.0
-PORTREVISION= 6
+PORTVERSION= 5.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 5ee776de4369..c9101693408d 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-5.0.tar.gz) = 54403646b4530649e9a48b01f0d23818566d62691c651ba4ff9889278c85eca1
-SIZE (cabal/hs-bibutils-5.0.tar.gz) = 428490
+SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d
+SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546
diff --git a/textproc/hs-hs-bibutils/pkg-descr b/textproc/hs-hs-bibutils/pkg-descr
index 1cfc23fb94f2..ea63fc0f484a 100644
--- a/textproc/hs-hs-bibutils/pkg-descr
+++ b/textproc/hs-hs-bibutils/pkg-descr
@@ -2,4 +2,4 @@ Haskell bindings to Chris Putnam's bibutils, a library that
interconverts between various bibliography formats using a common
MODS-format XML intermediate.
-WWW: http://gorgias.mine.ru/repos/hs-bibutils/
+WWW: http://istitutocolli.org/repos/hs-bibutils/
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index 7c0728889ff6..aca81c22294f 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= html-conduit
-PORTVERSION= 1.1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Parse HTML documents using xml-conduit datatypes
LICENSE= MIT
-USE_CABAL= conduit>=1.0 conduit-extra resourcet>=0.3 system-filepath>=0.4 \
- tagstream-conduit>=0.4 text xml-conduit>=1.1 xml-types>=0.3
+USE_CABAL= conduit>=1.0 conduit-extra>=1.1.1 resourcet>=0.3 \
+ tagstream-conduit>=0.5.5.3 text xml-conduit>=1.3 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index 2282ea35be75..eb8e07c6f26c 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-1.1.0.5.tar.gz) = 560bac7c5601554c8958099cc7a0035af270e1c8f93b2d76d40ea4476754bbfb
-SIZE (cabal/html-conduit-1.1.0.5.tar.gz) = 4048
+SHA256 (cabal/html-conduit-1.2.0.tar.gz) = 751096080f961a44ac3c2d93274dfa5fd4e047d215af33734dd325158e16404a
+SIZE (cabal/html-conduit-1.2.0.tar.gz) = 3905
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 894b06bc95ca..6d21a027c4bb 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 86b817a0cafe..dc4788c86400 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-charproperties
-PORTVERSION= 9.1.1.1
-PORTREVISION= 1
+PORTVERSION= 9.2.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/distinfo b/textproc/hs-hxt-charproperties/distinfo
index c7ee18a4db6f..a5398a66046b 100644
--- a/textproc/hs-hxt-charproperties/distinfo
+++ b/textproc/hs-hxt-charproperties/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-charproperties-9.1.1.1.tar.gz) = e800393a12f3469e37d76cd5449ab22b5eccca565fdf65f075a0698fb9ae0ca9
-SIZE (cabal/hxt-charproperties-9.1.1.1.tar.gz) = 225230
+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-charproperties/pkg-descr b/textproc/hs-hxt-charproperties/pkg-descr
index 4f77104deca8..06efe20169de 100644
--- a/textproc/hs-hxt-charproperties/pkg-descr
+++ b/textproc/hs-hxt-charproperties/pkg-descr
@@ -1,5 +1,5 @@
Character proprties defined by XML and Unicode standards. These modules contain
predicates for Unicode blocks and char proprties and character predicates
-defined by XML. Supported Unicode version is 5.2.0.
+defined by XML. Supported Unicode version is 7.0.0.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: https://github.com/UweSchmidt/hxt
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 2c5573acae40..1f968d45464a 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-regex-xmlschema
-PORTVERSION= 9.1.0
-PORTREVISION= 7
+PORTVERSION= 9.2.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Regular expression library for W3C XML Schema regular expressions
LICENSE= MIT
-USE_CABAL= hxt-charproperties>=9 parsec>=2.1
+USE_CABAL= hxt-charproperties>=9.0 parsec>=2.1 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-regex-xmlschema/distinfo b/textproc/hs-hxt-regex-xmlschema/distinfo
index 8e7f39a485fa..d67f45004f30 100644
--- a/textproc/hs-hxt-regex-xmlschema/distinfo
+++ b/textproc/hs-hxt-regex-xmlschema/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 99bf7f8c7e2b0d930c84ce699861549e02408716902f1e5febf51abaf3cc2751
-SIZE (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 26675
+SHA256 (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 4744676dde2b29c4bb75a579345145225a1f1b7ba15d46b7f868c37c6e696cc2
+SIZE (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 35896
diff --git a/textproc/hs-hxt-regex-xmlschema/pkg-descr b/textproc/hs-hxt-regex-xmlschema/pkg-descr
index 3c11bcf67594..2c7f91c9a5d2 100644
--- a/textproc/hs-hxt-regex-xmlschema/pkg-descr
+++ b/textproc/hs-hxt-regex-xmlschema/pkg-descr
@@ -1,11 +1,10 @@
-This library supports full W3C XML Schema regular expressions inclusive all
-Unicode character sets and blocks. The complete grammar can be found under
-<http://www.w3.org/TR/xmlschema11-2/#regexs>. It is implemented by the
-technique of derivations of regular expressions. The W3C syntax is extended
-to support not only union of regular sets, but also intersection, set
-difference, exor. Matching of subexpressions is also supported.
-The library can be used for constricting lightweight scanners and tokenizers.
-It is a standalone library, no external regex libraries are used.
-This package is a substitute for the old regex-xmlschema package.
+This library supports full W3C XML Schema regular expressions inclusive
+all Unicode character sets and blocks. It is implemented by the
+technique of derivations of regular expressions. The W3C syntax is
+extended to support not only union of regular sets, but also
+intersection, set difference, exor. Matching of subexpressions is also
+supported. The library can be used for constricting lightweight
+scanners and tokenizers. It is a standalone library, no external regex
+libraries are used.
WWW: http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 841052e9648d..48f3806a5f11 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-unicode
-PORTVERSION= 9.0.2.2
-PORTREVISION= 1
+PORTVERSION= 9.0.2.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Unicode en-/decoding functions for utf8, iso-latin-* and other encoding
LICENSE= MIT
-USE_CABAL= hxt-charproperties>=9
+USE_CABAL= hxt-charproperties>=9.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-unicode/distinfo b/textproc/hs-hxt-unicode/distinfo
index 69cb83e062bb..ae28ab31dd61 100644
--- a/textproc/hs-hxt-unicode/distinfo
+++ b/textproc/hs-hxt-unicode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-unicode-9.0.2.2.tar.gz) = 193dbe7bb829ef3c9b8d2f5ad71bd603990310dfe02e910a9d9cb4e3ce5c92c6
-SIZE (cabal/hxt-unicode-9.0.2.2.tar.gz) = 13978
+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-unicode/pkg-descr b/textproc/hs-hxt-unicode/pkg-descr
index 4fb7a2f39976..11ba79dc8dcb 100644
--- a/textproc/hs-hxt-unicode/pkg-descr
+++ b/textproc/hs-hxt-unicode/pkg-descr
@@ -3,4 +3,4 @@ encodings, used in the Haskell XML Toolbox. ISO Latin 1 - 16, utf8, utf16,
ASCII are supported. Decoding is done with lasy functions, errors may be
detected or ignored.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: https://github.com/UweSchmidt/hxt
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index 3911d2eba3cb..d69aaf0ba9de 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt
-PORTVERSION= 9.3.1.4
-PORTREVISION= 1
+PORTVERSION= 9.3.1.15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Collection of tools for processing XML with Haskell
LICENSE= MIT
-USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9 \
- hxt-unicode>=9.0.1 mtl>=2 network>=2.4 parsec>=2.1
+USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9.2 \
+ hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 \
+ parsec>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo
index c44d75431976..1b79cee1a4a5 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-9.3.1.4.tar.gz) = 2e07afe8b81f01f04c586f85c44e1f13710c2565df7e5123bfb0e5822d7b964e
-SIZE (cabal/hxt-9.3.1.4.tar.gz) = 233730
+SHA256 (cabal/hxt-9.3.1.15.tar.gz) = 723e7b3c22f58771087e7763d11702b3ae3aa910158a2beee70e973722966560
+SIZE (cabal/hxt-9.3.1.15.tar.gz) = 235096
diff --git a/textproc/hs-hxt/pkg-descr b/textproc/hs-hxt/pkg-descr
index 780e0f33b4a9..4ad5e8c0c1c1 100644
--- a/textproc/hs-hxt/pkg-descr
+++ b/textproc/hs-hxt/pkg-descr
@@ -1,12 +1,11 @@
The Haskell XML Toolbox bases on the ideas of HaXml and HXML, but
-introduces a more general approach for processing XML with Haskell. The
+introduces a more general approach for processing XML with Haskell. The
Haskell XML Toolbox uses a generic data model for representing XML
documents, including the DTD subset and the document subset, in Haskell.
It contains a validating XML parser, a HTML parser, namespace support,
an XPath expression evaluator, an XSLT library, a RelaxNG schema
validator and funtions for serialization and deserialization of user
-defined data. The library make extensive use of the arrow approach for
-processing XML. Since version 8.5 XPath and XSLT have been moved to
-separate packages hxt-xpath and hxt-xslt.
+defined data. The library makes extensive use of the arrow approach for
+processing XML.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: https://github.com/UweSchmidt/hxt
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index e5e42f8be090..1272528ce52d 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lhs2tex
-PORTVERSION= 1.18.1
-PORTREVISION= 8
+PORTVERSION= 1.19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index d894389f8582..e5145cace428 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lhs2tex-1.18.1.tar.gz) = dccae22231a1db64cddc38b6f7ac98ac4d5677f03df2f548b2efe9a5e63e9648
-SIZE (cabal/lhs2tex-1.18.1.tar.gz) = 661053
+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 b18b9059e0fd..575a585c77e5 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= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 8889b3b9d806..e92cd1af4179 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile
new file mode 100644
index 000000000000..9e6530049fa5
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+PORTNAME= pandoc-citeproc
+PORTVERSION= 0.7.3.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Supports using pandoc with citeproc
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson>=0.7 aeson-pretty attoparsec data-default \
+ mtl pandoc>=1.13 pandoc-types>=1.12.3 parsec rfc5051 \
+ setenv>=0.1 split syb tagsoup text vector xml-conduit>=1.2 \
+ yaml>=0.8.8.7
+
+EXECUTABLE= pandoc-citeproc
+
+FLAGS_DEFINE= BIBUTILS EMBED_DATA UNICODE_COLLATION
+FLAGS_DEFAULT= BIBUTILS
+
+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
+
+UNICODE_COLLATION_DESC= Use bindings to the Internationl Components for Unicode libraries
+UNICODE_COLLATION_FLAG_ENABLE= unicode_collation
+UNICODE_COLLATION_FLAG_CABAL= text-icu
+
+FLAGS_DISABLE= test_citeproc debug
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo
new file mode 100644
index 000000000000..e6a2590db074
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = b2e9b814603dbb60b845fa14d767a154e43a2115a9a81b218a173e9bc1a319f5
+SIZE (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = 298737
diff --git a/textproc/hs-pandoc-citeproc/pkg-descr b/textproc/hs-pandoc-citeproc/pkg-descr
new file mode 100644
index 000000000000..90a03d670202
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/pkg-descr
@@ -0,0 +1,6 @@
+The pandoc-citeproc library exports functions for using the citeproc
+system with pandoc. It relies on citeproc-hs, a library for rendering
+bibliographic reference citations into a variety of styles using a macro
+language called Citation Style Language (CSL).
+
+WWW: http://hackage.haskell.org/package/pandoc-citeproc
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 7c389ac305d8..fd7fc328b7af 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.12.4.1
-PORTREVISION= 1
+PORTVERSION= 1.12.4.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Types for representing a structured document
-LICENSE= GPLv2
+LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 syb>=0.1
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 1a40430a7e1f..98ee34051a69 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-types-1.12.4.1.tar.gz) = 187bda4b12746b9cc460ae98b39d0964adace2bcca2fd0e343b1ea4234a86ff1
-SIZE (cabal/pandoc-types-1.12.4.1.tar.gz) = 18909
+SHA256 (cabal/pandoc-types-1.12.4.5.tar.gz) = 87a1db206be3eccd2e66518363340e90e7592d8e82e2a5f006620cd3e1ac877b
+SIZE (cabal/pandoc-types-1.12.4.5.tar.gz) = 13341
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index fc8e455ba018..2f8d347bd1b9 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.13.2
+PORTVERSION= 1.15.0.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,16 +10,16 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= aeson>=0.7 base64-bytestring>=0.1 blaze-html>=0.5 \
- blaze-markup>=0.5.1 data-default>=0.4 deepseq-generics>=0.1 \
- extensible-exceptions>=0.1 haddock-library>=1.1 \
- highlighting-kate>=0.5.11.1 hslua>=0.3 HTTP>=4000.0.5 \
- JuicyPixels>=3.1.6.1 mtl>=1.1 network>=2 \
- 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.0.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>=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_ALEX= yes
USE_HAPPY= yes
@@ -29,16 +29,15 @@ EXECUTABLE= pandoc
# For PDF generation
USE_TEX= texmf:run
-MAN1SRC= man/man1
-MAN5SRC= man/man5
+MAN1SRC= man
MAN1PAGES= pandoc.1
-MAN5PAGES= pandoc_markdown.5
-FLAGS_DEFINE= EMBED_DATA_FILES HTTPS TRYPANDOC
+FLAGS_DEFINE= EMBED_DATA HTTPS TRYPANDOC
FLAGS_DEFAULT= HTTPS
-EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
-EMBED_DATA_FILES_FLAG_ENABLE= embed_data_files
+EMBED_DATA_DESC= Embed data files in binary for relocatable executable
+EMBED_DATA_FLAG_ENABLE= embed_data_files
+EMBED_DATA_FLAG_CABAL= hsb2hs>=0.3.1
HTTPS_DESC= Enable downloading of resources over HTTPS
HTTPS_FLAG_ENABLE= https
@@ -50,6 +49,7 @@ TRYPANDOC_FLAG_CABAL= aeson highlighting-kate text wai-extra wai>=0.3 \
http-types
TRYPANDOC_FLAG_EXECUTABLE= trypandoc
+FLAGS_ENABLE= network-uri
FLAGS_DISABLE= make-pandoc-man-pages
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index f52429c82d0e..d7c721bc1184 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.13.2.tar.gz) = e65c445f4454e9efcf1bc8c28754260d7108803bd8979bc2ff3c34705e386d8a
-SIZE (cabal/pandoc-1.13.2.tar.gz) = 1980729
+SHA256 (cabal/pandoc-1.15.0.6.tar.gz) = d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46
+SIZE (cabal/pandoc-1.15.0.6.tar.gz) = 2049870
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index d532d32887bf..5cfd90d5ec62 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,15 +1,23 @@
Pandoc is a Haskell library for converting from one markup format to
another, and a command-line tool that uses this library. It can read
markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
-MediaWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and
-Textile, and it can write markdown, reStructuredText, HTML, LaTeX,
-ConTeXt, Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki,
-DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode,
-AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML,
-and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
-DZSlides, reveal.js). Pandoc extends standard markdown syntax with
-footnotes, embedded LaTeX, definition lists, tables, and other features.
-A compatibility mode is provided for those who need a drop-in
-replacement for Markdown.pl.
+MediaWiki markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode,
+txt2tags and Textile, and it can write markdown, reStructuredText,
+XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT, Word
+docx, RTF, MediaWiki, DokuWiki, Textile, groff man pages, plain text,
+Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
+FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide
+shows (S5, Slidy, Slideous, DZSlides, reveal.js).
-WWW: http://johnmacfarlane.net/pandoc
+Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
+definition lists, tables, and other features. A compatibility mode is
+provided for those who need a drop-in replacement for Markdown.pl.
+
+In contrast to existing tools for converting markdown to HTML, which use
+regex substitutions, pandoc has a modular design: it consists of a set
+of readers, which parse text in a given format and produce a native
+representation of the document, and a set of writers, which convert this
+native representation into a target format. Thus, adding an input or
+output format requires only adding a reader or writer.
+
+WWW: http://pandoc.org
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index 628f0e095f39..34c98c03e1c9 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= parsec
-PORTVERSION= 3.1.5
-PORTREVISION= 1
+PORTVERSION= 3.1.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index 9661ca9c9bce..baf11e9f3f50 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parsec-3.1.5.tar.gz) = c572245d72bc3aff3491ce4f89215fcaa1e01c5e7b280d4c105a87db31793cb8
-SIZE (cabal/parsec-3.1.5.tar.gz) = 27894
+SHA256 (cabal/parsec-3.1.9.tar.gz) = 71f711d24c89581a43b8bc2d3ed56a1a802bbf1cd0b083bc34636c232b0342c9
+SIZE (cabal/parsec-3.1.9.tar.gz) = 29668
diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr
index 03d2fd02ff90..cb0f23454412 100644
--- a/textproc/hs-parsec/pkg-descr
+++ b/textproc/hs-parsec/pkg-descr
@@ -4,4 +4,4 @@ has extensive libraries and good error messages, and is also fast. It
is defined as a monad transformer that can be stacked on arbitrary
monads, and it is also parametric in the input stream type.
-WWW: http://www.cs.uu.nl/~daan/parsec.html
+WWW: https://github.com/aslatter/parsec
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 0cf66d548061..00f428004892 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= polyparse
-PORTVERSION= 1.9
-PORTREVISION= 6
+PORTVERSION= 1.11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index b4c0d24ffbb4..11bf8d704d76 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/polyparse-1.9.tar.gz) = 9f12d6821594166af881941d6c346a6ad617eae18a0ee8659044ef163694708a
-SIZE (cabal/polyparse-1.9.tar.gz) = 22256
+SHA256 (cabal/polyparse-1.11.tar.gz) = 30ef045a25bd7de0f3507ed1161aab35b5711120d315b15f23558205903b81fc
+SIZE (cabal/polyparse-1.11.tar.gz) = 22978
diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile
new file mode 100644
index 000000000000..4389083f0f9f
--- /dev/null
+++ b/textproc/hs-regex-applicative/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= regex-applicative
+PORTVERSION= 0.3.2.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Regex-based parsing with applicative interface
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-applicative/distinfo b/textproc/hs-regex-applicative/distinfo
new file mode 100644
index 000000000000..cb736c1f7bad
--- /dev/null
+++ b/textproc/hs-regex-applicative/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/regex-applicative-0.3.2.1.tar.gz) = bf4ab2dc765d8083ac08a72b2221712a942a734b90e4ce433baf4b5c8db35ca7
+SIZE (cabal/regex-applicative-0.3.2.1.tar.gz) = 13531
diff --git a/textproc/hs-regex-applicative/pkg-descr b/textproc/hs-regex-applicative/pkg-descr
new file mode 100644
index 000000000000..0d953ae7d9fa
--- /dev/null
+++ b/textproc/hs-regex-applicative/pkg-descr
@@ -0,0 +1,4 @@
+Regex-applicative is a Haskell library for parsing using regular expressions.
+Parsers can be built using Applicative interface.
+
+WWW: https://github.com/feuerbach/regex-applicative
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index 7ab814a448c1..ffadc671e937 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= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile
new file mode 100644
index 000000000000..8b500fad2728
--- /dev/null
+++ b/textproc/hs-regex-compat-tdfa/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= regex-compat-tdfa
+PORTVERSION= 0.95.1.4
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Unicode Support version of Text.Regex, using regex-tdfa
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= regex-base>=0.93 regex-tdfa>=1.1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-compat-tdfa/distinfo b/textproc/hs-regex-compat-tdfa/distinfo
new file mode 100644
index 000000000000..99cbafe9490d
--- /dev/null
+++ b/textproc/hs-regex-compat-tdfa/distinfo
@@ -0,0 +1,2 @@
+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-tdfa/pkg-descr b/textproc/hs-regex-compat-tdfa/pkg-descr
new file mode 100644
index 000000000000..e6dae28abea0
--- /dev/null
+++ b/textproc/hs-regex-compat-tdfa/pkg-descr
@@ -0,0 +1,4 @@
+One module layer over regex-tdfa to replace Text.Regex. regex-compat
+can't use Unicode characters correctly because of using regex-posix.
+
+WWW: http://hub.darcs.net/shelarcy/regex-compat-tdfa
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 3308c7d06d00..4c3e09b9969e 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= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 765baa62c9a2..fd47ea0cc381 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= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index e2b20f30ce2f..964f3b73eb3e 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= 8
+PORTREVISION= 9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index b8f691fcf1f1..c277e50c74e3 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-tdfa
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile
new file mode 100644
index 000000000000..20b580f4e146
--- /dev/null
+++ b/textproc/hs-rfc5051/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= rfc5051
+PORTVERSION= 0.1.0.3
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple unicode collation as per RFC5051
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-rfc5051/distinfo b/textproc/hs-rfc5051/distinfo
new file mode 100644
index 000000000000..938c8e05af87
--- /dev/null
+++ b/textproc/hs-rfc5051/distinfo
@@ -0,0 +1,2 @@
+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-rfc5051/pkg-descr b/textproc/hs-rfc5051/pkg-descr
new file mode 100644
index 000000000000..32cf6d3e03be
--- /dev/null
+++ b/textproc/hs-rfc5051/pkg-descr
@@ -0,0 +1,7 @@
+This library implements i;unicode-casemap, the simple, non
+locale-sensitive unicode collation algorithm described in RFC 5051.
+Proper unicode collation can be done using text-icu, but that is a big
+dependency that depends on a large C library, and rfc5051 might be
+better for some purposes.
+
+WWW: http://hackage.haskell.org/package/rfc5051
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 489abf1106e9..28d487c75f5a 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= stringsearch
-PORTVERSION= 0.3.6.5
-PORTREVISION= 1
+PORTVERSION= 0.3.6.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index f6e76a9eb1bc..6bf8d5b2a604 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stringsearch-0.3.6.5.tar.gz) = 58d3409a551f71ccc55ded74be3f6f43b23614d74e12bc71d97d3a9271585bd6
-SIZE (cabal/stringsearch-0.3.6.5.tar.gz) = 38994
+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 526ceef689aa..fee650e24b58 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tagsoup
-PORTVERSION= 0.13.1
-PORTREVISION= 1
+PORTVERSION= 0.13.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,12 +12,13 @@ LICENSE= BSD3CLAUSE
USE_CABAL= text
-INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/tagsoup.htm ${STAGEDIR}${DATADIR}
-
FLAGS_DEFINE= DOWNLOAD
DOWNLOAD_DESC= Build with Download module
DOWNLOAD_FLAG_ENABLE= download
+DOWNLOAD_FLAG_CABAL= network
+
+FLAGS_DISABLE= testprog
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 0b6a6d8008b9..8a4c501af16d 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagsoup-0.13.1.tar.gz) = 1314020e877b8208f42866f4683db40403099595edcd50e556772f31a5e7355c
-SIZE (cabal/tagsoup-0.13.1.tar.gz) = 42756
+SHA256 (cabal/tagsoup-0.13.3.tar.gz) = 32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d
+SIZE (cabal/tagsoup-0.13.3.tar.gz) = 42279
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 823a069add8a..0e3d7a58f096 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tagstream-conduit
-PORTVERSION= 0.5.5.1
-PORTREVISION= 1
+PORTVERSION= 0.5.5.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Streamlined HTML tag parser
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec blaze-builder case-insensitive conduit>=0.5 \
- conduit-extra data-default>=0.5.0 resourcet text \
+USE_CABAL= attoparsec>=0.10 blaze-builder case-insensitive conduit>=1.2 \
+ conduit-extra>=1.1.0 data-default>=0.5.0 resourcet text \
xml-conduit>=1.1.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index a0dfbb65d619..8f1a799e4a18 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.5.5.1.tar.gz) = c7cad491fb468244bea58329d595a721bffa4b55028ede19b7ee458c3194fd2e
-SIZE (cabal/tagstream-conduit-0.5.5.1.tar.gz) = 9828
+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-tagstream-conduit/files/patch-tagstream-conduit.cabal b/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
deleted file mode 100644
index 9c8afd3d18d8..000000000000
--- a/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./tagstream-conduit.cabal.orig 2014-04-01 08:43:35.000000000 +0200
-+++ ./tagstream-conduit.cabal 2014-07-13 00:59:44.000000000 +0200
-@@ -43,8 +43,6 @@
- , resourcet
- , attoparsec
- , blaze-builder
-- , blaze-builder-conduit >= 0.5 && < 1.2
-- , attoparsec-conduit >= 0.5
- , xml-conduit >= 1.1.0.0
- , data-default >= 0.5.0
-
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 2a47f37f71f8..4ff2f905816e 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.8.0.1
+PORTVERSION= 0.8.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,11 @@ COMMENT= Conversion between formats used to represent mathematics
LICENSE= GPLv2
-USE_CABAL= mtl network pandoc-types>=1.12.3.3 parsec>=3 syb xml
+USE_CABAL= aeson mtl network>=2.6 network-uri>=2.6 \
+ pandoc-types>=1.12.3.3 parsec>=3 syb text xml
-FLAGS_DISABLE= executable network-uri
+FLAGS_ENABLE= network-uri
+FLAGS_DISABLE= executable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 89cfd939a99a..34e754c60b68 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.8.0.1.tar.gz) = 9625e7106c76199f1228777569a49900bf300e1f4880c69c22986358d5d5c8cc
-SIZE (cabal/texmath-0.8.0.1.tar.gz) = 1595283
+SHA256 (cabal/texmath-0.8.3.tar.gz) = 553d4e8785caf97370aa8d1b626c0e310fe0a1dec15abf2b146dc2ee219e1d34
+SIZE (cabal/texmath-0.8.3.tar.gz) = 1599129
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
index c09b0173a770..c2120ab0400e 100644
--- a/textproc/hs-uri/Makefile
+++ b/textproc/hs-uri/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uri
-PORTVERSION= 0.1.6.2
-PORTREVISION= 1
+PORTVERSION= 0.1.6.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-uri/distinfo b/textproc/hs-uri/distinfo
index 8323c3ec0723..1fabe2295498 100644
--- a/textproc/hs-uri/distinfo
+++ b/textproc/hs-uri/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uri-0.1.6.2.tar.gz) = 7a4030532dece7990f4940abbed086b6e2ab7b05361a5d11bfa793ca15d25538
-SIZE (cabal/uri-0.1.6.2.tar.gz) = 5296
+SHA256 (cabal/uri-0.1.6.3.tar.gz) = 321165b9897aaab108170ee3b6073ec718150ebf650a3f76042a0e5c89cd15b6
+SIZE (cabal/uri-0.1.6.3.tar.gz) = 5331
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 2713eacf1ecc..d6c975ed9cc3 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.3.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
-LICENSE= BSD3CLAUSE
+LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2 blaze-html>=0.5 \
- blaze-markup>=0.5 conduit>=1.0 conduit-extra data-default \
- monad-control>=0.3 resourcet>=0.3 system-filepath>=0.4 \
+ blaze-markup>=0.5 conduit>=1.0 conduit-extra>=1.1 \
+ data-default monad-control>=0.3 resourcet>=0.3 \
text>=0.7 xml-types>=0.3.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index b6e3aa28c4ff..c8f65e35aa18 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-1.2.1.tar.gz) = 20f00e72922eecbd6c0e1fa5e6d1ca74a5a2f971372e5f70137d35869d6800ae
-SIZE (cabal/xml-conduit-1.2.1.tar.gz) = 30847
+SHA256 (cabal/xml-conduit-1.3.1.tar.gz) = 19e65bb1753f99c8a9f2011f2088639db3b8c06f72d29fea1464f623879b8f24
+SIZE (cabal/xml-conduit-1.3.1.tar.gz) = 33304
diff --git a/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal b/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
deleted file mode 100644
index 1d5bac0f2448..000000000000
--- a/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xml-conduit.cabal.orig 2014-05-23 05:44:22.000000000 +0200
-+++ ./xml-conduit.cabal 2014-07-12 23:46:45.000000000 +0200
-@@ -31,8 +31,6 @@
- , conduit >= 1.0 && < 1.2
- , conduit-extra
- , resourcet >= 0.3 && < 1.2
-- , attoparsec-conduit >= 1.0
-- , blaze-builder-conduit >= 1.0
- , bytestring >= 0.9
- , text >= 0.7
- , containers >= 0.2
diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile
index ecbd7ec9c32b..74212580fecb 100644
--- a/textproc/hs-xml-hamlet/Makefile
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-hamlet
-PORTVERSION= 0.4.0.9
-PORTREVISION= 1
+PORTVERSION= 0.4.0.11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo
index ccff49ad100f..9d6e0383184a 100644
--- a/textproc/hs-xml-hamlet/distinfo
+++ b/textproc/hs-xml-hamlet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-hamlet-0.4.0.9.tar.gz) = 02498a736aac8bba3648349b63ba139bdd54c1830f5a1df5186a14273794a46e
-SIZE (cabal/xml-hamlet-0.4.0.9.tar.gz) = 6068
+SHA256 (cabal/xml-hamlet-0.4.0.11.tar.gz) = 3d598ad387e310e76a07f213afe35db06662611840d1bce3bcdf202668bc1e89
+SIZE (cabal/xml-hamlet-0.4.0.11.tar.gz) = 6080
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index 3e1a861dcbd3..b05032d9f66f 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-types
-PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index 6ccfcf14d54a..1a24c3c65033 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-types-0.3.4.tar.gz) = 1ee502b032e9a97c43250f476af69f65147667e3a1b4dd3bd404f64eb28c0999
-SIZE (cabal/xml-types-0.3.4.tar.gz) = 3857
+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 cdcd289ee3d8..b47de97846e9 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xml
-PORTVERSION= 1.3.13
-PORTREVISION= 6
+PORTVERSION= 1.3.14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml/distinfo b/textproc/hs-xml/distinfo
index ecabcbb0789f..c1622a7f273e 100644
--- a/textproc/hs-xml/distinfo
+++ b/textproc/hs-xml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-1.3.13.tar.gz) = c33607cef8a48d878b0e617e115135fc6f025fe43dcb65c2c7afb8285415b813
-SIZE (cabal/xml-1.3.13.tar.gz) = 12082
+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 10934338ad2c..72bf23d3eb49 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.3.2
-PORTREVISION= 1
+PORTVERSION= 0.2.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index ccd82da2e9f5..51880d55b4b6 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.3.2.tar.gz) = 2300b2fcd873644f754b6ec7217b3d1cd8a4989672bd152c88313907414b5cb6
-SIZE (cabal/xmlhtml-0.2.3.2.tar.gz) = 124711
+SHA256 (cabal/xmlhtml-0.2.3.4.tar.gz) = d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533
+SIZE (cabal/xmlhtml-0.2.3.4.tar.gz) = 124760
diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
new file mode 100644
index 000000000000..af6d22559c75
--- /dev/null
+++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
@@ -0,0 +1,15 @@
+--- xmlhtml.cabal.orig 2014-12-24 20:41:19 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,
+ 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 7bc6de31b275..e2d386d32a82 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.8.4
-PORTREVISION= 1
+PORTVERSION= 0.8.13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +9,10 @@ COMMENT= Support for parsing and rendering YAML documents
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.5 attoparsec conduit>=1.0.11 resourcet>=0.3 \
- scientific text unordered-containers vector
+USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \
+ resourcet>=0.3 scientific text unordered-containers vector
-EXECUTABLE= yaml2json json2yaml
+EXECUTABLE= json2yaml yaml2json
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 7b5bbe3e2494..2cb796dc3985 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.8.4.tar.gz) = eb3066ab9eb3faed4f208a254301f109915443a88c5f634b06736366ccee05d6
-SIZE (cabal/yaml-0.8.8.4.tar.gz) = 71446
+SHA256 (cabal/yaml-0.8.13.tar.gz) = f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a
+SIZE (cabal/yaml-0.8.13.tar.gz) = 74369