aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2014-08-10 22:34:50 +0000
committerGabor Pali <pgj@FreeBSD.org>2014-08-10 22:34:50 +0000
commitcc555442337c7591ab5c3fd19ad8e3e185a256b0 (patch)
treea6a0dfa4f440949889fc7b609c83f74555f6894e /textproc
parent5e492199d1e024a681c6d21087c8d948cb3b7bc3 (diff)
downloadports-cc555442337c7591ab5c3fd19ad8e3e185a256b0.tar.gz
ports-cc555442337c7591ab5c3fd19ad8e3e185a256b0.zip
Notes
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile6
-rw-r--r--textproc/hs-Diff/Makefile5
-rw-r--r--textproc/hs-Diff/distinfo4
-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-appar/Makefile (renamed from textproc/hs-xhtml/Makefile)9
-rw-r--r--textproc/hs-appar/distinfo2
-rw-r--r--textproc/hs-appar/pkg-descr3
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile16
-rw-r--r--textproc/hs-attoparsec-conduit/distinfo2
-rw-r--r--textproc/hs-attoparsec-conduit/pkg-descr3
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile3
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo4
-rw-r--r--textproc/hs-attoparsec-enumerator/pkg-descr2
-rw-r--r--textproc/hs-attoparsec/Makefile4
-rw-r--r--textproc/hs-blaze-html/Makefile7
-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/Makefile9
-rw-r--r--textproc/hs-case-insensitive/Makefile7
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/Makefile42
-rw-r--r--textproc/hs-citeproc-hs/distinfo4
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-double-conversion/Makefile4
-rw-r--r--textproc/hs-feed/Makefile7
-rw-r--r--textproc/hs-feed/distinfo4
-rw-r--r--textproc/hs-feed/pkg-descr2
-rw-r--r--textproc/hs-hexpat/Makefile8
-rw-r--r--textproc/hs-hexpat/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/Makefile21
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/Makefile5
-rw-r--r--textproc/hs-html-conduit/Makefile8
-rw-r--r--textproc/hs-html-conduit/distinfo4
-rw-r--r--textproc/hs-html/Makefile4
-rw-r--r--textproc/hs-hxt-charproperties/Makefile5
-rw-r--r--textproc/hs-hxt-charproperties/distinfo4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile2
-rw-r--r--textproc/hs-hxt-unicode/Makefile7
-rw-r--r--textproc/hs-hxt-unicode/distinfo4
-rw-r--r--textproc/hs-hxt/Makefile5
-rw-r--r--textproc/hs-hxt/distinfo4
-rw-r--r--textproc/hs-lhs2tex/Makefile4
-rw-r--r--textproc/hs-libxml-sax/Makefile18
-rw-r--r--textproc/hs-libxml-sax/distinfo2
-rw-r--r--textproc/hs-libxml-sax/pkg-descr3
-rw-r--r--textproc/hs-libxml/Makefile4
-rw-r--r--textproc/hs-pandoc-types/Makefile5
-rw-r--r--textproc/hs-pandoc-types/distinfo4
-rw-r--r--textproc/hs-pandoc/Makefile40
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/files/patch-Setup.hs14
-rw-r--r--textproc/hs-pandoc/files/patch-pandoc.cabal11
-rw-r--r--textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs11
-rw-r--r--textproc/hs-pandoc/pkg-descr29
-rw-r--r--textproc/hs-parsec/Makefile5
-rw-r--r--textproc/hs-parsec/distinfo4
-rw-r--r--textproc/hs-parsec/pkg-descr11
-rw-r--r--textproc/hs-polyparse/Makefile2
-rw-r--r--textproc/hs-regex-base/Makefile4
-rw-r--r--textproc/hs-regex-compat/Makefile4
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile5
-rw-r--r--textproc/hs-regex-pcre-builtin/distinfo4
-rw-r--r--textproc/hs-regex-pcre-builtin/pkg-descr3
-rw-r--r--textproc/hs-regex-posix/Makefile4
-rw-r--r--textproc/hs-regex-tdfa/Makefile5
-rw-r--r--textproc/hs-regex-tdfa/distinfo4
-rw-r--r--textproc/hs-stringsearch/Makefile5
-rw-r--r--textproc/hs-stringsearch/distinfo4
-rw-r--r--textproc/hs-tagsoup/Makefile10
-rw-r--r--textproc/hs-tagsoup/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/Makefile11
-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/Makefile20
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-uri/Makefile15
-rw-r--r--textproc/hs-uri/distinfo2
-rw-r--r--textproc/hs-uri/pkg-descr4
-rw-r--r--textproc/hs-xhtml/distinfo2
-rw-r--r--textproc/hs-xhtml/pkg-descr4
-rw-r--r--textproc/hs-xml-conduit/Makefile14
-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/Makefile15
-rw-r--r--textproc/hs-xml-hamlet/distinfo2
-rw-r--r--textproc/hs-xml-hamlet/pkg-descr3
-rw-r--r--textproc/hs-xml-types/Makefile3
-rw-r--r--textproc/hs-xml-types/distinfo4
-rw-r--r--textproc/hs-xml/Makefile4
-rw-r--r--textproc/hs-xmlhtml/Makefile5
-rw-r--r--textproc/hs-xmlhtml/distinfo4
-rw-r--r--textproc/hs-yaml/Makefile11
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--textproc/hs-yaml/pkg-descr2
99 files changed, 358 insertions, 307 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index 9d629bb6ea24..0299035b829b 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -223,8 +223,8 @@
SUBDIR += hs-Diff
SUBDIR += hs-HStringTemplate
SUBDIR += hs-HaXml
+ SUBDIR += hs-appar
SUBDIR += hs-attoparsec
- SUBDIR += hs-attoparsec-conduit
SUBDIR += hs-attoparsec-enumerator
SUBDIR += hs-blaze-html
SUBDIR += hs-blaze-markup
@@ -245,6 +245,7 @@
SUBDIR += hs-hxt-unicode
SUBDIR += hs-lhs2tex
SUBDIR += hs-libxml
+ SUBDIR += hs-libxml-sax
SUBDIR += hs-pandoc
SUBDIR += hs-pandoc-types
SUBDIR += hs-parsec
@@ -258,9 +259,10 @@
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
SUBDIR += hs-texmath
- SUBDIR += hs-xhtml
+ SUBDIR += hs-uri
SUBDIR += hs-xml
SUBDIR += hs-xml-conduit
+ SUBDIR += hs-xml-hamlet
SUBDIR += hs-xml-types
SUBDIR += hs-xmlhtml
SUBDIR += hs-yaml
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 9f703a467cd7..4cd249fc9da3 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= Diff
-PORTVERSION= 0.2.0
-PORTREVISION= 5
+PORTVERSION= 0.3.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= O(ND) diff algorithm in haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 7a8f00fd29b9..55cb6d8570ea 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Diff-0.2.0.tar.gz) = f3a4bf6ae69627e67be0ba02b1d32b21442a89674d12b95067ce4ac57f9e0d96
-SIZE (cabal/Diff-0.2.0.tar.gz) = 3201
+SHA256 (cabal/Diff-0.3.0.tar.gz) = 28f96d7f4bb0f88a13fa0b59e89cc8b93fa901c6cbe6ca82e84540cb2291ee4c
+SIZE (cabal/Diff-0.3.0.tar.gz) = 4128
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 69cdc28d1c36..854730506498 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.7.1
-PORTREVISION= 5
+PORTVERSION= 0.7.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= StringTemplate implementation in Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder mtl parsec syb text utf8-string void
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 78a7998fa05c..78d260f490e7 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.7.1.tar.gz) = 8d12e36b69c8c98974f2b449b7308cecc8cf59a82049c43985f1ab6e12090c43
-SIZE (cabal/HStringTemplate-0.7.1.tar.gz) = 16457
+SHA256 (cabal/HStringTemplate-0.7.3.tar.gz) = 883fbfd35c14ab46cd1545a8643da700094297f0cb74462f460781694dd884bf
+SIZE (cabal/HStringTemplate-0.7.3.tar.gz) = 15961
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index dd09be1056f9..758c73e5a139 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.24
-PORTREVISION= 4
+PORTVERSION= 1.24.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Collection of utilities for using Haskell and XML together
+COMMENT= Utilities for manipulating XML documents
LICENSE= LGPL21
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index a3c48a69d916..31395f642092 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HaXml-1.24.tar.gz) = b6f9b147f80dbac04b11633d0bd9309c7ce9d2b0cff67b83086212a4f0567ba2
-SIZE (cabal/HaXml-1.24.tar.gz) = 143107
+SHA256 (cabal/HaXml-1.24.1.tar.gz) = 5f258c7c6291ad54bb9a65280dd30efcbca3fc79a499d5b6575a753d3f7b78df
+SIZE (cabal/HaXml-1.24.1.tar.gz) = 142739
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-appar/Makefile
index eb361eb0b263..2a69d9bd92fa 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
-PORTNAME= xhtml
-PORTVERSION= 3000.2.1
-PORTREVISION= 8
+PORTNAME= appar
+PORTVERSION= 0.1.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= XHTML combinator library
+COMMENT= Simple applicative parser
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-appar/distinfo b/textproc/hs-appar/distinfo
new file mode 100644
index 000000000000..4515d2ce6a34
--- /dev/null
+++ b/textproc/hs-appar/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/appar-0.1.4.tar.gz) = 58ea66abe4dd502d2fc01eecdb0828d5e214704a3c1b33b1f8b33974644c4b26
+SIZE (cabal/appar-0.1.4.tar.gz) = 3904
diff --git a/textproc/hs-appar/pkg-descr b/textproc/hs-appar/pkg-descr
new file mode 100644
index 000000000000..84b63d5d3d67
--- /dev/null
+++ b/textproc/hs-appar/pkg-descr
@@ -0,0 +1,3 @@
+A simple applicative parser in Parsec style.
+
+WWW: http://hackage.haskell.org/package/appar
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
deleted file mode 100644
index a790f4dae787..000000000000
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= attoparsec-conduit
-PORTVERSION= 1.0.1
-PORTREVISION= 4
-CATEGORIES= textproc haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Consume attoparsec parsers via conduit
-
-LICENSE= BSD
-
-USE_CABAL= attoparsec>=0.10 conduit>=1.0 text>=0.11 transformers>=0.2.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec-conduit/distinfo b/textproc/hs-attoparsec-conduit/distinfo
deleted file mode 100644
index 8d87d383a715..000000000000
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/attoparsec-conduit-1.0.1.tar.gz) = e55d67165e53a5d228e6f863be1d78b31052a6ccb0791905eae16da94bf56691
-SIZE (cabal/attoparsec-conduit-1.0.1.tar.gz) = 4237
diff --git a/textproc/hs-attoparsec-conduit/pkg-descr b/textproc/hs-attoparsec-conduit/pkg-descr
deleted file mode 100644
index 2111049bda72..000000000000
--- a/textproc/hs-attoparsec-conduit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Consume attoparsec parsers via conduit.
-
-WWW: http://github.com/snoyberg/conduit
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 2de50b384f5e..bc6b94d6589c 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec-enumerator
-PORTVERSION= 0.3.1
-PORTREVISION= 7
+PORTVERSION= 0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index 252241cfe23a..98dde5c6df30 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-enumerator-0.3.1.tar.gz) = a78a9f6ade2ae43659243b1a9e925a8c1bc2c05d94e894ca853a32b887880682
-SIZE (cabal/attoparsec-enumerator-0.3.1.tar.gz) = 2498
+SHA256 (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 3cf105cdc29120a5c21487708783155a35fd9d4df29f72e56c22ed93f85aa77c
+SIZE (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 2484
diff --git a/textproc/hs-attoparsec-enumerator/pkg-descr b/textproc/hs-attoparsec-enumerator/pkg-descr
index bdb70e667e13..9567c51433cb 100644
--- a/textproc/hs-attoparsec-enumerator/pkg-descr
+++ b/textproc/hs-attoparsec-enumerator/pkg-descr
@@ -2,4 +2,4 @@ This library allows an Attoparsec parser to receive input incrementally from
an enumerator. This could be used for parsing large files, or implementing
binary network protocols.
-WWW: http://john-millikin.com/software/attoparsec-enumerator/
+WWW: https://john-millikin.com/software/attoparsec-enumerator/
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index 14a766a09ff5..854bb4a41a69 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -2,13 +2,13 @@
PORTNAME= attoparsec
PORTVERSION= 0.10.4.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast combinator parsing for bytestrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.11.1.5
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 46817a9d2d56..3e289cbbe838 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.6.1.1
-PORTREVISION= 4
+PORTVERSION= 0.7.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Blazingly fast HTML combinator library for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.5.1 text>=0.10
+USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.6 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 405d372eb92a..f6d39a3e6ea6 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.6.1.1.tar.gz) = 2cafc98ccbb3b9dc9c444ae306337b2aa7fd0be54b650bf208a656a8f6acee23
-SIZE (cabal/blaze-html-0.6.1.1.tar.gz) = 77759
+SHA256 (cabal/blaze-html-0.7.0.2.tar.gz) = 5b74f65b9201b1ac81b58f6c7350a2ab493e7777eb429c3ec5a0fb9c6da90f7b
+SIZE (cabal/blaze-html-0.7.0.2.tar.gz) = 75815
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index eed91b3786d0..5002fc810b12 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.5.1.5
-PORTREVISION= 4
+PORTVERSION= 0.6.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Blazingly fast markup combinator library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2 text>=0.10
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index f10c9b261512..d3f24c05fe72 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.5.1.5.tar.gz) = e4d034560e6808c5fdb8ca2eeef0031f3caff5398ba4fee72a049eea43ad7a3c
-SIZE (cabal/blaze-markup-0.5.1.5.tar.gz) = 11885
+SHA256 (cabal/blaze-markup-0.6.1.0.tar.gz) = f45c0a5f3c9d9d91af3b4d0ea6d88293c036d000a71a8e63d37a21193c19b379
+SIZE (cabal/blaze-markup-0.6.1.0.tar.gz) = 12738
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index a24021200179..a131b88c7538 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,15 +3,20 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parse CSV formatted data efficiently with Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= dlist
+USE_ALEX= yes
+
+# Force regeneration of the lexer.
+post-patch::
+ @${RM} -rf ${WRKSRC}/dist
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 8d246349c7bc..0e83a6cffbcd 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.0.0.2
-PORTREVISION= 4
+PORTVERSION= 1.1.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Case insensitive string comparison
+COMMENT= Case-insensitive string comparison
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= hashable>=1.0 text>=0.3
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 4845ef4e792c..cc78d76b060c 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-1.0.0.2.tar.gz) = c2952ea7e2fe052c5f8fc07d2cded328c50cb3282006d9a276d7f8101eff8c85
-SIZE (cabal/case-insensitive-1.0.0.2.tar.gz) = 4803
+SHA256 (cabal/case-insensitive-1.1.0.3.tar.gz) = 7b255fe63155d53ab84b248ab5ba9306fd4bec47a6198e3275cf9cb41c4d263b
+SIZE (cabal/case-insensitive-1.1.0.3.tar.gz) = 5188
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index 06a0bae89fab..79fcf36f08e9 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,46 +1,34 @@
# $FreeBSD$
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.8
-PORTREVISION= 5
+PORTVERSION= 0.3.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Citation Style Language implementation in Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-OPTIONS_DEFINE= BIBUTILS HEXPAT NETWORK
-OPTIONS_DEFAULT= BIBUTILS HEXPAT NETWORK
+FLAGS_DEFINE= BIBUTILS 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
+
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
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MBIBUTILS}
-CONFIGURE_ARGS+= --flags="bibutils"
-USE_CABAL+= hs-bibutils>=0.3
-.else
-CONFIGURE_ARGS+= --flags="-bibutils"
-.endif
-
-.if ${PORT_OPTIONS:MHEXPAT}
-CONFIGURE_ARGS+= --flags="hexpat"
-USE_CABAL+= hexpat>=0.20.2
-.else
-CONFIGURE_ARGS+= --flags="-hexpat"
-.endif
-
-.if ${PORT_OPTIONS:MNETWORK}
-CONFIGURE_ARGS+= --flags="network"
-USE_CABAL+= HTTP>=4000.0.9 network>=2
-.else
-CONFIGURE_ARGS+= --flags="-network"
-.endif
+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
index 4a477d271b95..47a3e039ec5a 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.8.tar.gz) = e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72
-SIZE (cabal/citeproc-hs-0.3.8.tar.gz) = 105544
+SHA256 (cabal/citeproc-hs-0.3.9.tar.gz) = 4f6b7db9b731789f25e4faebce8ec2ea4a19a920aaad6951a5e8b23cd4187438
+SIZE (cabal/citeproc-hs-0.3.9.tar.gz) = 114621
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index f9b547ffd1bc..dce7da0aaa04 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 097b17e72267..8795e77ae2be 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -2,13 +2,13 @@
PORTNAME= double-conversion
PORTVERSION= 0.2.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast conversion between double-precision floating-point and text
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.11.0.8
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index cb4f047e388a..9cd8859e011d 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 0.3.8
-PORTREVISION= 13
+PORTVERSION= 0.3.9.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell
+COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= utf8-string xml>=1.2.6
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 4b32dddea11f..41fb6a479ed8 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/feed-0.3.8.tar.gz) = e614f7019a035c1eaa8952cdcfe5291c539f670f218ab591727d33b4367b71fb
-SIZE (cabal/feed-0.3.8.tar.gz) = 72269
+SHA256 (cabal/feed-0.3.9.2.tar.gz) = ef1d23d130b766186a0bacd6e4807279cab681712b0fb09d1ed1ee1b3c154f17
+SIZE (cabal/feed-0.3.9.2.tar.gz) = 73353
diff --git a/textproc/hs-feed/pkg-descr b/textproc/hs-feed/pkg-descr
index 849d5d32a39e..281194338b87 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: http://hackage.haskell.org/package/feed
+WWW: https://github.com/sof/feed
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 081d3207f881..1d01d9c1607e 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= hexpat
-PORTVERSION= 0.20.3
-PORTREVISION= 6
+PORTVERSION= 0.20.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= XML parser/formatter based on expat
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions>=0.1 List>=0.4.2 text>=0.5 transformers \
- utf8-string
+USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hexpat/distinfo b/textproc/hs-hexpat/distinfo
index 2c2f97f160dc..2334a5732270 100644
--- a/textproc/hs-hexpat/distinfo
+++ b/textproc/hs-hexpat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hexpat-0.20.3.tar.gz) = 3aeff6da3ea6abf2ec529d48f3774f8dea386fc2c66a662d89dedcca3603b08d
-SIZE (cabal/hexpat-0.20.3.tar.gz) = 133330
+SHA256 (cabal/hexpat-0.20.6.tar.gz) = 0b98fb2726e0be4c98102edd68025b7731b0dc8aeb9029719e601a091935ba0a
+SIZE (cabal/hexpat-0.20.6.tar.gz) = 133394
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 2f62f3cf69f7..8e5720305ff7 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.3.9
-PORTREVISION= 4
+PORTVERSION= 0.5.8.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,20 +9,14 @@ COMMENT= Syntax highlighting
LICENSE= GPLv2
-USE_CABAL= blaze-html>=0.4.2 mtl parsec regex-pcre-builtin
+USE_CABAL= blaze-html>=0.4.2 mtl parsec \
+ regex-pcre-builtin>=0.94.4.8.8.35 utf8-string
-OPTIONS_DEFINE= EXECUTABLE
+FLAGS_DEFINE= EXECUTABLE
-EXECUTABLE_DESC= Build the Highlight executable
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="executable"
-EXECUTABLE+= Highlight
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
+EXECUTABLE_DESC= Build the Highlight executable
+EXECUTABLE_FLAG_ENABLE= executable
+EXECUTABLE_FLAG_EXECUTABLE= Highlight
.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 f7f16086c03d..296702ada891 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.3.9.tar.gz) = 0ca2abc648da30cebfffcdf22140a380df3c5d98c80984bf97ee416c351a1395
-SIZE (cabal/highlighting-kate-0.5.3.9.tar.gz) = 662621
+SHA256 (cabal/highlighting-kate-0.5.8.5.tar.gz) = d386eb0b49303c454b0cb20e2a771d48e6b51407a3e3ff130a845ce95c5fd677
+SIZE (cabal/highlighting-kate-0.5.8.5.tar.gz) = 724217
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 925d6e2a7ab4..7c8ef8e9d784 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hs-bibutils
PORTVERSION= 5.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,6 @@ COMMENT= Bindings to bibutils, the bibliography conversion utilities
LICENSE= GPLv2
-BUILD_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
-RUN_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
-
USE_CABAL= syb
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index c0416e85c965..8e9b3b43dab8 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
-PORTREVISION= 5
+PORTVERSION= 1.1.0.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,8 @@ COMMENT= Parse HTML documents using xml-conduit datatypes
LICENSE= MIT
-USE_CABAL= conduit>=1.0 filesystem-conduit>=1.0 resourcet>=0.3 \
- system-filepath>=0.4 tagstream-conduit>=0.4 text \
- transformers xml-conduit>=1.1 xml-types>=0.3
+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
.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 5b21bb9b1eaa..2282ea35be75 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-1.1.0.tar.gz) = a3d47dee8983828688bf9ebceccfa256c3bf1414664010a79fc82e48efc9b386
-SIZE (cabal/html-conduit-1.1.0.tar.gz) = 3789
+SHA256 (cabal/html-conduit-1.1.0.5.tar.gz) = 560bac7c5601554c8958099cc7a0035af270e1c8f93b2d76d40ea4476754bbfb
+SIZE (cabal/html-conduit-1.1.0.5.tar.gz) = 4048
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 2068c7ba452d..05bb2249610d 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,13 +2,13 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTML combinator library
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index a3471be0d881..3fecb343a7da 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
PORTNAME= hxt-charproperties
-PORTVERSION= 9.1.1
-PORTREVISION= 9
+PORTVERSION= 9.1.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Character properties and classes for XML and Unicode
+LICENSE= MIT
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-charproperties/distinfo b/textproc/hs-hxt-charproperties/distinfo
index 0023f94b6b41..c7ee18a4db6f 100644
--- a/textproc/hs-hxt-charproperties/distinfo
+++ b/textproc/hs-hxt-charproperties/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-charproperties-9.1.1.tar.gz) = a8c54f7068fe8295f216e44e33d2d1e9f9cd12518eb0abe3a36802080306bb93
-SIZE (cabal/hxt-charproperties-9.1.1.tar.gz) = 225490
+SHA256 (cabal/hxt-charproperties-9.1.1.1.tar.gz) = e800393a12f3469e37d76cd5449ab22b5eccca565fdf65f075a0698fb9ae0ca9
+SIZE (cabal/hxt-charproperties-9.1.1.1.tar.gz) = 225230
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 0a340622d0cd..b9b70abe8a8c 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 9174312ba89a..04548f1017e3 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -1,12 +1,13 @@
# $FreeBSD$
PORTNAME= hxt-unicode
-PORTVERSION= 9.0.2
-PORTREVISION= 9
+PORTVERSION= 9.0.2.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Unicode functions for UTF-8, iso-latin-* and other encodings
+COMMENT= Unicode en-/decoding functions for utf8, iso-latin-* and other encodings
+
+LICENSE= MIT
USE_CABAL= hxt-charproperties>=9
diff --git a/textproc/hs-hxt-unicode/distinfo b/textproc/hs-hxt-unicode/distinfo
index a0e27d7c238d..69cb83e062bb 100644
--- a/textproc/hs-hxt-unicode/distinfo
+++ b/textproc/hs-hxt-unicode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-unicode-9.0.2.tar.gz) = ad4132d081cc5a39b67927ca3ad725300f42758cd10783aa7a5b2d20510a23e6
-SIZE (cabal/hxt-unicode-9.0.2.tar.gz) = 13853
+SHA256 (cabal/hxt-unicode-9.0.2.2.tar.gz) = 193dbe7bb829ef3c9b8d2f5ad71bd603990310dfe02e910a9d9cb4e3ce5c92c6
+SIZE (cabal/hxt-unicode-9.0.2.2.tar.gz) = 13978
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index ad6d7a30088d..132cc7748d9b 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt
-PORTVERSION= 9.3.1.1
-PORTREVISION= 7
+PORTVERSION= 9.3.1.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ 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.1 parsec>=2.1
+ hxt-unicode>=9.0.1 mtl>=2 network>=2.4 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 252398aba52d..c44d75431976 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-9.3.1.1.tar.gz) = bea0544c7945b6a268ee340be0fe0699335182602454f9565a4227d277411ff4
-SIZE (cabal/hxt-9.3.1.1.tar.gz) = 228205
+SHA256 (cabal/hxt-9.3.1.4.tar.gz) = 2e07afe8b81f01f04c586f85c44e1f13710c2565df7e5123bfb0e5822d7b964e
+SIZE (cabal/hxt-9.3.1.4.tar.gz) = 233730
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 70823f5e2168..0cac8acfa329 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.18.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +17,7 @@ USE_TEX= latex dvipsk
STANDALONE= yes
EXECUTABLE= lhs2TeX
-MAN1= lhs2TeX.1
+MAN1PAGES= lhs2TeX.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
new file mode 100644
index 000000000000..4c3347d92522
--- /dev/null
+++ b/textproc/hs-libxml-sax/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= libxml-sax
+PORTVERSION= 0.7.5
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Bindings for the libXML2 SAX interface
+
+LICENSE= MIT
+
+USE_CABAL= text>=0.7 xml-types>=0.3
+
+USES= pkgconfig
+LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-libxml-sax/distinfo b/textproc/hs-libxml-sax/distinfo
new file mode 100644
index 000000000000..3b51b84ab854
--- /dev/null
+++ b/textproc/hs-libxml-sax/distinfo
@@ -0,0 +1,2 @@
+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-sax/pkg-descr b/textproc/hs-libxml-sax/pkg-descr
new file mode 100644
index 000000000000..c1ca3f694846
--- /dev/null
+++ b/textproc/hs-libxml-sax/pkg-descr
@@ -0,0 +1,3 @@
+Bindings for the libXML2 SAX interface.
+
+WWW: https://john-millikin.com/software/haskell-libxml/
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index c52cce9e987c..75f75d95ecdc 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,13 +2,13 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to libxml2
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
USE_GNOME= libxml2
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index d78092d0bc75..beebcb72a886 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.10
-PORTREVISION= 5
+PORTVERSION= 1.12.4.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Types for representing a structured document
LICENSE= GPLv2
-USE_CABAL= syb
+USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 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 d77689522877..1a40430a7e1f 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-types-1.10.tar.gz) = e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5
-SIZE (cabal/pandoc-types-1.10.tar.gz) = 13830
+SHA256 (cabal/pandoc-types-1.12.4.1.tar.gz) = 187bda4b12746b9cc460ae98b39d0964adace2bcca2fd0e343b1ea4234a86ff1
+SIZE (cabal/pandoc-types-1.12.4.1.tar.gz) = 18909
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 58077670ef0b..023b419d35e0 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.11.1
-PORTREVISION= 7
+PORTVERSION= 1.12.4.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,32 +10,35 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
- citeproc-hs>=0.3.7 data-default>=0.4 highlighting-kate>=0.5.3.7 \
- HTTP>=4000.0.5 json>=0.4 mtl>=1.1 network>=2 \
- pandoc-types>=1.10 parsec>=3.1 random>=1 syb>=0.1 \
- tagsoup>=0.12.5 temporary>=1.1 texmath>=0.6.1.3 \
- text>=0.11 xml>=1.3.12 zip-archive>=0.1.3.3 zlib>=0.5
+USE_CABAL= aeson>=0.7 attoparsec>=0.10 base64-bytestring>=0.1 \
+ blaze-html>=0.5 blaze-markup>=0.5.1 data-default>=0.4 \
+ extensible-exceptions>=0.1 highlighting-kate>=0.5.8 \
+ hslua>=0.3 HTTP>=4000.0.5 http-conduit>=1.9 http-types>=0.8 \
+ mtl>=1.1 network>=2 pandoc-types>=1.12.3.3 parsec>=3.1 \
+ random>=1 scientific>=0.2 syb>=0.1 tagsoup>=0.13.1 \
+ temporary>=1.1 texmath>=0.6.6.1 text>=0.11 \
+ unordered-containers>=0.2 vector>=0.10 xml>=1.3.12 \
+ yaml>=0.8.8.2 zip-archive>=0.1.3.3 zlib>=0.5
+USE_ALEX= yes
+USE_HAPPY= yes
EXECUTABLE= pandoc
# For PDF generation
USE_TEX= texmf:run
-MAN1= pandoc.1
-MAN5= pandoc_markdown.5
+MAN1PAGES= pandoc.1
+MAN5PAGES= pandoc_markdown.5
-OPTIONS_DEFINE= EMBED_DATA_FILES
+FLAGS_DEFINE= EMBED_DATA_FILES HTTP_CONDUIT
+FLAGS_DEFAULT= HTTP_CONDUIT
-EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
+EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
+EMBED_DATA_FILES_FLAG_ENABLE= embed_data_files
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEMBED_DATA_FILES}
-CONFIGURE_ARGS+= --flags="embed_data_files"
-.else
-CONFIGURE_ARGS+= --flags="-embed_data_files"
-.endif
+HTTP_CONDUIT_DESC= Enable downloading of resources over HTTPS
+HTTP_CONDUIT_FLAG_ENABLE= http-conduit
+HTTP_CONDUIT_FLAG_CABAL= http-conduit>=1.9 http-types>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index f0ca3b6cb903..03e14a741d66 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.11.1.tar.gz) = ebb090b08b5439d719d1d01575aa91262035cb9b8de61ffaf49a853a5fde432c
-SIZE (cabal/pandoc-1.11.1.tar.gz) = 1093354
+SHA256 (cabal/pandoc-1.12.4.2.tar.gz) = 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45
+SIZE (cabal/pandoc-1.12.4.2.tar.gz) = 1048263
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 244447974f1a..d7882e836375 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,15 +1,15 @@
---- ./Setup.hs.orig 2013-01-29 01:14:38.000000000 +0100
-+++ ./Setup.hs 2013-02-17 00:48:54.000000000 +0100
-@@ -8,7 +8,7 @@
+--- ./Setup.hs.orig 2013-12-09 04:22:42.000000000 +0100
++++ ./Setup.hs 2013-12-27 02:49:01.000000000 +0100
+@@ -9,7 +9,7 @@
import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
--import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
-+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
+-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest), toPathTemplate)
++import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest), toPathTemplate)
import Distribution.Simple.Utils (installOrdinaryFiles, info)
+ import Distribution.Simple.Test (test)
import Prelude hiding (catch)
- import System.Process ( rawSystem )
-@@ -53,7 +53,7 @@
+@@ -59,7 +59,7 @@
installManpages :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpages pkg lbi verbosity copy =
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
new file mode 100644
index 000000000000..e3c233a8eb6b
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-pandoc.cabal
@@ -0,0 +1,11 @@
+--- ./pandoc.cabal.orig 2014-05-15 00:07:54.000000000 +0200
++++ ./pandoc.cabal 2014-07-13 00:56:47.000000000 +0200
+@@ -234,7 +234,7 @@
+ blaze-markup >= 0.5.1 && < 0.7,
+ attoparsec >= 0.10 && < 0.12,
+ yaml >= 0.8.8.2 && < 0.9,
+- scientific >= 0.2 && < 0.3,
++ scientific >= 0.2 && < 0.4,
+ vector >= 0.10 && < 0.11,
+ hslua >= 0.3 && < 0.4,
+ binary >= 0.5 && < 0.8
diff --git a/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs b/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs
new file mode 100644
index 000000000000..ee7e5f4ae50a
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs
@@ -0,0 +1,11 @@
+--- ./src/Text/Pandoc/Readers/TeXMath.hs.orig 2014-05-15 00:07:52.000000000 +0200
++++ ./src/Text/Pandoc/Readers/TeXMath.hs 2014-07-29 12:58:00.000000000 +0200
+@@ -30,7 +30,7 @@
+ module Text.Pandoc.Readers.TeXMath ( readTeXMath, readTeXMath' ) where
+
+ import Text.Pandoc.Definition
+-import Text.TeXMath
++import Text.TeXMath ( texMathToPandoc, DisplayType(DisplayBlock, DisplayInline) )
+
+ -- | Converts a raw TeX math formula to a list of 'Pandoc' inlines.
+ -- Defaults to raw formula between @$@ or @$$@ characters if entire formula
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index dab008ebc876..da61bb64cd19 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,19 +1,20 @@
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, and Textile, and it can write markdown,
-reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, Word
-docx, RTF, MediaWiki, Textile, groff man pages, plain text, Emacs
-Org-Mode, AsciiDoc, EPUB (v2 and v3), FictionBook2, and S5, Slidy and
-Slideous HTML slide shows. 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.
+MediaWiki markup, Haddock markup, OPML, Emacs Org-Mode, and Textile, and
+it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
+OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, groff man
+pages, plain text, Emacs Org-Mode, AsciiDoc, 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. 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://johnmacfarlane.net/pandoc
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index c8894501752a..04ad32624ee8 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= parsec
-PORTVERSION= 3.1.3
-PORTREVISION= 6
+PORTVERSION= 3.1.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Monadic parser combinators
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl text>=0.2
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index 92c2d95c54f4..9661ca9c9bce 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parsec-3.1.3.tar.gz) = 9f14bb4da77eb9b0e4dbe8112559ed49409b0af8e9aef5d08941dd97e37fc4a8
-SIZE (cabal/parsec-3.1.3.tar.gz) = 27866
+SHA256 (cabal/parsec-3.1.5.tar.gz) = c572245d72bc3aff3491ce4f89215fcaa1e01c5e7b280d4c105a87db31793cb8
+SIZE (cabal/parsec-3.1.5.tar.gz) = 27894
diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr
index c2e9c7f00317..03d2fd02ff90 100644
--- a/textproc/hs-parsec/pkg-descr
+++ b/textproc/hs-parsec/pkg-descr
@@ -1,8 +1,7 @@
Parsec is designed from scratch as an industrial-strength parser
-library. It is simple, safe, well documented (on the package
-homepage), 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.
+library. It is simple, safe, well documented (on the package homepage),
+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://legacy.cs.uu.nl/daan/parsec.html
+WWW: http://www.cs.uu.nl/~daan/parsec.html
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 8362c78de26a..85b026c72be0 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= polyparse
PORTVERSION= 1.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index f49d00bdb0e7..6f6e45f46546 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,13 +2,13 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Interface API for regex-posix,pcre,parsec,tdfa,dfa
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= mtl
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 22040ed682d4..e646578d7ce9 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,13 +2,13 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= regex-base>=0.93 regex-posix>=0.95.1
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index c30b14878bfb..eb28d20d8e52 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= regex-pcre-builtin
-PORTVERSION= 0.94.4.5.8.31
-PORTREVISION= 5
+PORTVERSION= 0.94.4.8.8.35
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= regex-base>=0.93
diff --git a/textproc/hs-regex-pcre-builtin/distinfo b/textproc/hs-regex-pcre-builtin/distinfo
index 2d16d458674f..55054846dcae 100644
--- a/textproc/hs-regex-pcre-builtin/distinfo
+++ b/textproc/hs-regex-pcre-builtin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-pcre-builtin-0.94.4.5.8.31.tar.gz) = ba43c3b7e711afca22363a9af4fae8a5bb2f1eae0acc48f3d549f52a194cf9b0
-SIZE (cabal/regex-pcre-builtin-0.94.4.5.8.31.tar.gz) = 287845
+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-builtin/pkg-descr b/textproc/hs-regex-pcre-builtin/pkg-descr
index f18a0b4df0e2..a837303f2a2e 100644
--- a/textproc/hs-regex-pcre-builtin/pkg-descr
+++ b/textproc/hs-regex-pcre-builtin/pkg-descr
@@ -1,4 +1,3 @@
-The PCRE backend to accompany regex-base, with bundled code from
-<http://www.pcre.org>.
+The PCRE backend to accompany regex-base.
WWW: http://hackage.haskell.org/package/regex-pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 093a7edc71fe..cded778645ee 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,13 +2,13 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/enhances Text.Regex
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= regex-base>=0.93
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index 336acbe78a86..e88be7658f93 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -1,13 +1,14 @@
# $FreeBSD$
PORTNAME= regex-tdfa
-PORTVERSION= 1.1.8
-PORTREVISION= 5
+PORTVERSION= 1.2.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
+LICENSE= BSD3CLAUSE
+
USE_CABAL= mtl parsec regex-base>=0.93.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
index 3b82ec9b7dd0..7a01b8d1a802 100644
--- a/textproc/hs-regex-tdfa/distinfo
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-tdfa-1.1.8.tar.gz) = 7d9ca2ff95e602c46090dfa56f3176fe903d8d08ac9d725c79af56be0aece5d4
-SIZE (cabal/regex-tdfa-1.1.8.tar.gz) = 65948
+SHA256 (cabal/regex-tdfa-1.2.0.tar.gz) = fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401
+SIZE (cabal/regex-tdfa-1.2.0.tar.gz) = 66039
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index c51efb998364..0f26e7675e7a 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= stringsearch
-PORTVERSION= 0.3.6.4
-PORTREVISION= 6
+PORTVERSION= 0.3.6.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast searching, splitting and replacing of ByteStrings
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index ade02142f724..f6e76a9eb1bc 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stringsearch-0.3.6.4.tar.gz) = 2ba4faa9759037c622091625d1d6b04d4401472d79f023631d6f8d8e2ce8e099
-SIZE (cabal/stringsearch-0.3.6.4.tar.gz) = 40116
+SHA256 (cabal/stringsearch-0.3.6.5.tar.gz) = 58d3409a551f71ccc55ded74be3f6f43b23614d74e12bc71d97d3a9271585bd6
+SIZE (cabal/stringsearch-0.3.6.5.tar.gz) = 38994
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index 30c43d4ec1d4..a01d7d8aa91a 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -2,18 +2,22 @@
# $FreeBSD$
PORTNAME= tagsoup
-PORTVERSION= 0.12.8
-PORTREVISION= 6
+PORTVERSION= 0.13.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parsing and extracting information from HTML/XML documents
-LICENSE= BSD
+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
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index ef2bb76593e1..0b6a6d8008b9 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagsoup-0.12.8.tar.gz) = a31e49133690b546a6b948a9ab9f924aaf5bd94f9e3e0afb99bb570c104c9515
-SIZE (cabal/tagsoup-0.12.8.tar.gz) = 30647
+SHA256 (cabal/tagsoup-0.13.1.tar.gz) = 1314020e877b8208f42866f4683db40403099595edcd50e556772f31a5e7355c
+SIZE (cabal/tagsoup-0.13.1.tar.gz) = 42756
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index a494ffbe238f..13e06beb2e17 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= tagstream-conduit
-PORTVERSION= 0.5.4
-PORTREVISION= 5
+PORTVERSION= 0.5.5.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Streamlined HTML tag parser
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec attoparsec-conduit>=0.5 blaze-builder \
- blaze-builder-conduit>=0.5 case-insensitive conduit>=0.5 \
- text transformers>=0.3
+USE_CABAL= attoparsec blaze-builder case-insensitive conduit>=0.5 \
+ conduit-extra data-default>=0.5.0 resourcet text \
+ xml-conduit>=1.1.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index 689383ea8f7e..a0dfbb65d619 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.5.4.tar.gz) = 1119944e51796b76138b47b52f02ce5ed669054f4e201d2b6f9ad461a7314eb6
-SIZE (cabal/tagstream-conduit-0.5.4.tar.gz) = 7904
+SHA256 (cabal/tagstream-conduit-0.5.5.1.tar.gz) = c7cad491fb468244bea58329d595a721bffa4b55028ede19b7ee458c3194fd2e
+SIZE (cabal/tagstream-conduit-0.5.5.1.tar.gz) = 9828
diff --git a/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal b/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
new file mode 100644
index 000000000000..9c8afd3d18d8
--- /dev/null
+++ b/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
@@ -0,0 +1,11 @@
+--- ./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 8b93102a31f5..2576481f27f6 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.6.1.5
-PORTREVISION= 4
+PORTVERSION= 0.6.7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,21 +10,16 @@ COMMENT= Conversion of LaTeX math formulas to MathML or OMML
LICENSE= GPLv2
-USE_CABAL= parsec>=3 syb xml
+USE_CABAL= mtl pandoc-types>=1.12.3.3 parsec>=3 syb xml
-OPTIONS_DEFINE= CGI
+FLAGS_DEFINE= CGI
CGI_DESC= Compile CGI executable
+CGI_FLAG_ENABLE= cgi
+CGI_FLAG_CABAL= cgi json utf8-string
+CGI_FLAG_EXECUTABLE= texmath-cgi
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MCGI}
-CONFIGURE_ARGS+= --flags="cgi"
-USE_CABAL+= cgi json utf8-string
-EXECUTABLE+= texmath-cgi
-.else
-CONFIGURE_ARGS+= --flags="-cgi"
-.endif
+FLAGS_DISABLE= test
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 1a4a212d7b33..0a3ae630bbc4 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.1.5.tar.gz) = 888cca454fc585272ed5fa41711943250f76efebbff302534d02c349409c9d95
-SIZE (cabal/texmath-0.6.1.5.tar.gz) = 43225
+SHA256 (cabal/texmath-0.6.7.tar.gz) = bfb9c02578f26bb435d3871b38a99522fbf7c8f6f083e0deed2b0e28d0aeb610
+SIZE (cabal/texmath-0.6.7.tar.gz) = 634186
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
new file mode 100644
index 000000000000..4702e41a2298
--- /dev/null
+++ b/textproc/hs-uri/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uri
+PORTVERSION= 0.1.6.2
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Library for working with URIs
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec>=3.0 safe utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-uri/distinfo b/textproc/hs-uri/distinfo
new file mode 100644
index 000000000000..8323c3ec0723
--- /dev/null
+++ b/textproc/hs-uri/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/uri-0.1.6.2.tar.gz) = 7a4030532dece7990f4940abbed086b6e2ab7b05361a5d11bfa793ca15d25538
+SIZE (cabal/uri-0.1.6.2.tar.gz) = 5296
diff --git a/textproc/hs-uri/pkg-descr b/textproc/hs-uri/pkg-descr
new file mode 100644
index 000000000000..0b1ed5965986
--- /dev/null
+++ b/textproc/hs-uri/pkg-descr
@@ -0,0 +1,4 @@
+Library for working with URIs, including parsing, rendering, merging,
+escaping.
+
+WWW: http://gitorious.org/uri
diff --git a/textproc/hs-xhtml/distinfo b/textproc/hs-xhtml/distinfo
deleted file mode 100644
index 325d004f492d..000000000000
--- a/textproc/hs-xhtml/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/xhtml-3000.2.1.tar.gz) = 33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8
-SIZE (cabal/xhtml-3000.2.1.tar.gz) = 14555
diff --git a/textproc/hs-xhtml/pkg-descr b/textproc/hs-xhtml/pkg-descr
deleted file mode 100644
index e548a9ec0e64..000000000000
--- a/textproc/hs-xhtml/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package provides combinators for producing XHTML 1.0, including the
-Strict, Transitional and Frameset variants.
-
-WWW: https://github.com/haskell/xhtml
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 1c5b65e86bc6..cc22aeba871c 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,20 +1,18 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.1.0.3
-PORTREVISION= 5
+PORTVERSION= 1.2.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=1.0 blaze-builder>=0.2 \
- blaze-builder-conduit>=1.0 blaze-html>=0.5 blaze-markup>=0.5 \
- conduit>=1.0 data-default failure>=0.1 monad-control>=0.3 \
- resourcet>=0.3 system-filepath>=0.4 text>=0.7 \
- transformers>=0.2 xml-types>=0.3.3
+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 \
+ text>=0.7 xml-types>=0.3.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index 14fe3cd4be87..b6e3aa28c4ff 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-1.1.0.3.tar.gz) = 24aed3c6b2e30ab7f9f4fb2af6f83ab4d14cda62893e02b6da70ae95a4b1b612
-SIZE (cabal/xml-conduit-1.1.0.3.tar.gz) = 29449
+SHA256 (cabal/xml-conduit-1.2.1.tar.gz) = 20f00e72922eecbd6c0e1fa5e6d1ca74a5a2f971372e5f70137d35869d6800ae
+SIZE (cabal/xml-conduit-1.2.1.tar.gz) = 30847
diff --git a/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal b/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
new file mode 100644
index 000000000000..1d5bac0f2448
--- /dev/null
+++ b/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
@@ -0,0 +1,11 @@
+--- ./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
new file mode 100644
index 000000000000..b3a875134519
--- /dev/null
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= xml-hamlet
+PORTVERSION= 0.4.0.9
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Hamlet-style quasiquoter for XML content
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec>=2.0 shakespeare>=1.0 text>=0.10 xml-conduit>=1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo
new file mode 100644
index 000000000000..ccff49ad100f
--- /dev/null
+++ b/textproc/hs-xml-hamlet/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/xml-hamlet-0.4.0.9.tar.gz) = 02498a736aac8bba3648349b63ba139bdd54c1830f5a1df5186a14273794a46e
+SIZE (cabal/xml-hamlet-0.4.0.9.tar.gz) = 6068
diff --git a/textproc/hs-xml-hamlet/pkg-descr b/textproc/hs-xml-hamlet/pkg-descr
new file mode 100644
index 000000000000..6d9e1277b535
--- /dev/null
+++ b/textproc/hs-xml-hamlet/pkg-descr
@@ -0,0 +1,3 @@
+Hamlet-style quasiquoter for XML content.
+
+WWW: http://www.yesodweb.com/
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index 1c817fb8e0cb..86d2deb04947 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-types
-PORTVERSION= 0.3.3
-PORTREVISION= 6
+PORTVERSION= 0.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index d0f9971573a2..6ccfcf14d54a 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-types-0.3.3.tar.gz) = 963d3a195e3407b151692173422d3ec09a7e143fd08ed35503cc6a5cff836c4b
-SIZE (cabal/xml-types-0.3.3.tar.gz) = 3606
+SHA256 (cabal/xml-types-0.3.4.tar.gz) = 1ee502b032e9a97c43250f476af69f65147667e3a1b4dd3bd404f64eb28c0999
+SIZE (cabal/xml-types-0.3.4.tar.gz) = 3857
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index 655846d7d9e3..4983dbc8cef2 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -3,13 +3,13 @@
PORTNAME= xml
PORTVERSION= 1.3.13
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple XML library for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 7269193ecbc7..0baac01a9aff 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTVERSION= 0.2.3.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= XML parser and renderer with HTML 5 quirks mode
-LICENSE= BSD
+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
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index d97bade9a97b..ccd82da2e9f5 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.1.tar.gz) = cf2988cffcbe95835f44af33bae4ceca7fc3acbfc677bae5edffe47fe19213db
-SIZE (cabal/xmlhtml-0.2.1.tar.gz) = 124425
+SHA256 (cabal/xmlhtml-0.2.3.2.tar.gz) = 2300b2fcd873644f754b6ec7217b3d1cd8a4989672bd152c88313907414b5cb6
+SIZE (cabal/xmlhtml-0.2.3.2.tar.gz) = 124711
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index aeb7e943d3c0..9db2499f6eb5 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,17 +1,18 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.2.4
-PORTREVISION= 4
+PORTVERSION= 0.8.8.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Support for parsing and rendering YAML documents
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.5 attoparsec conduit>=0.5 resourcet>=0.3 text \
- transformers>=0.1 unordered-containers vector
+USE_CABAL= aeson>=0.5 attoparsec conduit>=1.0.11 resourcet>=0.3 \
+ scientific text unordered-containers vector
+
+EXECUTABLE= yaml2json json2yaml
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 20238c5b6945..7b5bbe3e2494 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.2.4.tar.gz) = a00da810d835c04c49940eb73d3de9f0cd9cf52c508622579428a0eef880623e
-SIZE (cabal/yaml-0.8.2.4.tar.gz) = 66338
+SHA256 (cabal/yaml-0.8.8.4.tar.gz) = eb3066ab9eb3faed4f208a254301f109915443a88c5f634b06736366ccee05d6
+SIZE (cabal/yaml-0.8.8.4.tar.gz) = 71446
diff --git a/textproc/hs-yaml/pkg-descr b/textproc/hs-yaml/pkg-descr
index cb96676ec9f3..902ebfdc6b93 100644
--- a/textproc/hs-yaml/pkg-descr
+++ b/textproc/hs-yaml/pkg-descr
@@ -1,4 +1,4 @@
-Provides support for parsing and emitting Yaml documents. This package
+Provides support for parsing and emitting Yaml documents. This package
includes the full libyaml C library version 0.1.2 by Kirill Simonov in
the package so you don't need to worry about any non-Haskell
dependencies.