40 files changed, 109 insertions, 102 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index b1709f2ade3a..7cc8e091bc03 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -266,6 +266,7 @@
     SUBDIR += hs-regex-compat
     SUBDIR += hs-regex-pcre-builtin
     SUBDIR += hs-regex-posix
+    SUBDIR += hs-regex-tdfa
     SUBDIR += hs-stringsearch
     SUBDIR += hs-tagsoup
     SUBDIR += hs-tagstream-conduit
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index d42715455fb6..2fd545d3dcbc 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	HStringTemplate
-PORTVERSION=	0.6.12
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT=	StringTemplate implementation in Haskell
 
 LICENSE=	BSD
 
-USE_CABAL=	blaze-builder mtl parsec syb syb-with-class text utf8-string
+USE_CABAL=	blaze-builder mtl parsec syb text utf8-string 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 d95bedbb3588..78a7998fa05c 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.6.12.tar.gz) = 371c0603eb85c47376394476e3999bd481af164dec5ba483bb5d12bdb0005d0a
-SIZE (cabal/HStringTemplate-0.6.12.tar.gz) = 16091
+SHA256 (cabal/HStringTemplate-0.7.1.tar.gz) = 8d12e36b69c8c98974f2b449b7308cecc8cf59a82049c43985f1ab6e12090c43
+SIZE (cabal/HStringTemplate-0.7.1.tar.gz) = 16457
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index 35017507d093..c8514302d444 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	attoparsec-conduit
-PORTVERSION=	0.5.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT=	Consume attoparsec parsers via conduit
 
 LICENSE=	BSD
 
-USE_CABAL=	attoparsec>=0.10 conduit>=0.5 text>=0.11 transformers>=0.2.2
+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
index f8731ccef533..c5e4a7c58361 100644
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ b/textproc/hs-attoparsec-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = bc7947c9a57e46098f024efb7d35e4644528a6fb4749af4ccfaa8e84ebd965d8
-SIZE (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = 3779
+SHA256 (cabal/attoparsec-conduit-1.0.0.tar.gz) = 68c50163ab30c614d8d2fe125d332812e693548ceac1af4cbbbc43ce703880ab
+SIZE (cabal/attoparsec-conduit-1.0.0.tar.gz) = 3761
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 20285e3330d7..78b2f004a3c2 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	attoparsec-enumerator
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index bb39514275ab..c10b051905a3 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	attoparsec
-PORTVERSION=	0.10.3.0
+PORTVERSION=	0.10.4.0
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index dddb24578e60..f7172f960663 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-0.10.3.0.tar.gz) = a04426cf283367814e8e69751fd6ae3a2ba4d834765cd0b7cb375b6f9fb38cd0
-SIZE (cabal/attoparsec-0.10.3.0.tar.gz) = 36214
+SHA256 (cabal/attoparsec-0.10.4.0.tar.gz) = b6b84e0dbd1c3beec1dedea578ac2f4d62afbe66b383582b7b3349406866d346
+SIZE (cabal/attoparsec-0.10.4.0.tar.gz) = 36268
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 3bff6de6fbd0..85a4f5734dd3 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	blaze-html
-PORTVERSION=	0.5.1.3
+PORTVERSION=	0.6.0.0
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 2384f90c44e8..3262656819f1 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.5.1.3.tar.gz) = 3c40a8a1169207baea6267ce2b657f9d0d136e023815c48931875143c6bc4745
-SIZE (cabal/blaze-html-0.5.1.3.tar.gz) = 77446
+SHA256 (cabal/blaze-html-0.6.0.0.tar.gz) = 94b6927d5a268fccc5156e0e9f1a54a800f2da20174ab4bcbb49684675bd1259
+SIZE (cabal/blaze-html-0.6.0.0.tar.gz) = 77780
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index faea1ff0c83a..cd88aaf4f642 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	case-insensitive
-PORTVERSION=	0.4.0.4
+PORTVERSION=	1.0
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT=	Case insensitive string comparison
 
 LICENSE=	BSD
 
-CABAL_SETUP=	Setup.hs
-
 USE_CABAL=	hashable>=1.0 text>=0.3
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 10362bca2ab1..5b7543ed72c9 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-0.4.0.4.tar.gz) = 8d578b2ae3276121ab5cfb68fe9f4f008cb217eaf8b3beb7336d6d844cccf7f7
-SIZE (cabal/case-insensitive-0.4.0.4.tar.gz) = 3360
+SHA256 (cabal/case-insensitive-1.0.tar.gz) = f323b4b486523a1778841c1c5d0917a1dfd7dca68298dc8a022341efcb3a83f4
+SIZE (cabal/case-insensitive-1.0.tar.gz) = 4772
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index d8c15accc41a..1626e64cfa2d 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	citeproc-hs
-PORTVERSION=	0.3.7
+PORTVERSION=	0.3.8
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
index 4d63dde56f12..4a477d271b95 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.7.tar.gz) = 6bb498a3e1c4132565e729807119dfdce70704dacf990441a0a4a38afef1a947
-SIZE (cabal/citeproc-hs-0.3.7.tar.gz) = 105112
+SHA256 (cabal/citeproc-hs-0.3.8.tar.gz) = e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72
+SIZE (cabal/citeproc-hs-0.3.8.tar.gz) = 105544
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 5bbfe88ed503..aa73b37bf36f 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	highlighting-kate
-PORTVERSION=	0.5.3.5
+PORTVERSION=	0.5.3.8
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index 6edf75bbe5be..b55f6b5c5f71 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.3.5.tar.gz) = 637bf142fb40c7fc748b3f6ee97661799ef87c7d78fe4769b3e7f017c780e654
-SIZE (cabal/highlighting-kate-0.5.3.5.tar.gz) = 628362
+SHA256 (cabal/highlighting-kate-0.5.3.8.tar.gz) = 5ca00f73773b1638bbbdae736d41c889d3f971dbdfbfacdf7ab5001e21afafb9
+SIZE (cabal/highlighting-kate-0.5.3.8.tar.gz) = 661579
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 85544129c79e..dcc2b1efb266 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hs-bibutils
-PORTVERSION=	4.16
+PORTVERSION=	4.17
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 0da465f8e1a3..34cf13114ce9 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-4.16.tar.gz) = abc7e96edc6dd8121252027fd14bc0f8196d1dc879e862dead8dd30e36760114
-SIZE (cabal/hs-bibutils-4.16.tar.gz) = 436535
+SHA256 (cabal/hs-bibutils-4.17.tar.gz) = aff139a7f589d71ebbaa918f9e1be55a0f2d1d5378f77db9b36171bebac6616f
+SIZE (cabal/hs-bibutils-4.17.tar.gz) = 443548
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index 74e0992e4c13..ac1efd772553 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	html-conduit
-PORTVERSION=	0.1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -12,9 +11,9 @@ LICENSE=	MIT
 
 CABAL_SETUP=	Setup.hs
 
-USE_CABAL=	conduit>=0.5 filesystem-conduit>=0.5 resourcet>=0.3 \
+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.0 xml-types>=0.3
+		transformers 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 af6d2c66e5cd..5b21bb9b1eaa 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-0.1.0.4.tar.gz) = e8c4a66e4a093cf19e50fbf9d2bc278a025e2c1060525d48692afc660a3a41bc
-SIZE (cabal/html-conduit-0.1.0.4.tar.gz) = 3797
+SHA256 (cabal/html-conduit-1.1.0.tar.gz) = a3d47dee8983828688bf9ebceccfa256c3bf1414664010a79fc82e48efc9b386
+SIZE (cabal/html-conduit-1.1.0.tar.gz) = 3789
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 6794b595feeb..59e74dae053d 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	hxt-regex-xmlschema
-PORTVERSION=	9.0.4
-PORTREVISION=	4
+PORTVERSION=	9.1.0
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	A regular expression library for W3C XML Schema regular expressions
+COMMENT=	Regular expression library for W3C XML Schema regular expressions
+
+LICENSE=	MIT
 
 CABAL_SETUP=	Setup.hs
 
diff --git a/textproc/hs-hxt-regex-xmlschema/distinfo b/textproc/hs-hxt-regex-xmlschema/distinfo
index b1e833ddd29e..8e7f39a485fa 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.0.4.tar.gz) = eef1c9ae42b3d2ed78019bec6bed92034b1395ea5aa725a459df9ca5d34d884a
-SIZE (cabal/hxt-regex-xmlschema-9.0.4.tar.gz) = 27212
+SHA256 (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 99bf7f8c7e2b0d930c84ce699861549e02408716902f1e5febf51abaf3cc2751
+SIZE (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 26675
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index e48d63f858f0..f61ae640769a 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hxt
 PORTVERSION=	9.3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 98931676c394..1087e1488cb6 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pandoc-types
-PORTVERSION=	1.9.1
-PORTREVISION=	3
+PORTVERSION=	1.10
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 711c6f548b9d..d77689522877 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-types-1.9.1.tar.gz) = 3188ea41957a0276fded01b64147b439e5da8fc50f663c870de78117d5b4e484
-SIZE (cabal/pandoc-types-1.9.1.tar.gz) = 13941
+SHA256 (cabal/pandoc-types-1.10.tar.gz) = e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5
+SIZE (cabal/pandoc-types-1.10.tar.gz) = 13830
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 3bcc670b26cd..0003ff03c210 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pandoc
-PORTVERSION=	1.9.4.5
-PORTREVISION=	1
+PORTVERSION=	1.11.1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -14,37 +13,28 @@ FILE_LICENSE=	COPYING
 
 CABAL_SETUP=	Setup.hs
 
-USE_CABAL=	base64-bytestring>=0.1 blaze-html>=0.4.3.0 citeproc-hs>=0.3.4 \
-		highlighting-kate>=0.5.0.2 HTTP>=4000.0.5 json>=0.4 \
-		mtl>=1.1 network>=2 pandoc-types>=1.9.0.2 parsec>=3.1 \
-		random>=1 syb>=0.1 tagsoup>=0.12.5 temporary>=1.1 \
-		texmath>=0.6.0.2 utf8-string>=0.3 xml>=1.3.12 \
-		zip-archive>=0.1.1.7 zlib>=0.5
+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
+
+EXECUTABLE=	pandoc
 
 MAN1=		pandoc.1
 MAN5=		pandoc_markdown.5
 
-OPTIONS_MULTI=		FORMAT
-OPTIONS_MULTI_FORMAT=	EXECUTABLE LIBRARY
-OPTIONS_DEFAULT=	EXECUTABLE LIBRARY
+OPTIONS_DEFINE=		EMBED_DATA_FILES
 
-EXECUTABLE_DESC=	Build the pandoc executable
-LIBRARY_DESC=		Build the pandoc library
+EMBED_DATA_FILES_DESC=	Embed data files in binary for relocatable executable
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
 
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+=	--flags="exectuable"
-EXECUTABLE+=		pandoc
-.else
-CONFIGURE_ARGS+=	--flags="-executable"
-.endif
-
-.if ${PORT_OPTIONS:MLIBRARY}
-CONFIGURE_ARGS+=	--flags="library"
+.if ${PORT_OPTIONS:MEMBED_DATA_FILES}
+CONFIGURE_ARGS+=	--flags="embed_data_files"
 .else
-CONFIGURE_ARGS+=	--flags="-library"
-STANDALONE=		yes
+CONFIGURE_ARGS+=	--flags="-embed_data_files"
 .endif
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index b064335c32a1..f0ca3b6cb903 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.9.4.5.tar.gz) = cb993c42549746712a6261b5d8a5b89aa8ee2ed46f9a45fb01d5947346896816
-SIZE (cabal/pandoc-1.9.4.5.tar.gz) = 574992
+SHA256 (cabal/pandoc-1.11.1.tar.gz) = ebb090b08b5439d719d1d01575aa91262035cb9b8de61ffaf49a853a5fde432c
+SIZE (cabal/pandoc-1.11.1.tar.gz) = 1093354
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 27c5e204c9f7..244447974f1a 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,18 +1,20 @@
---- ./Setup.hs.orig	2012-10-21 23:06:41.000000000 +0200
-+++ ./Setup.hs	2012-10-23 18:33:48.000000000 +0200
-@@ -6,7 +6,7 @@
+--- ./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 @@
  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.Utils (installOrdinaryFiles)
+ import Distribution.Simple.Utils (installOrdinaryFiles, info)
  import Prelude hiding (catch)
  import System.Process ( rawSystem )
-@@ -49,5 +49,5 @@
+@@ -53,7 +53,7 @@
  installManpages :: PackageDescription -> LocalBuildInfo
                  -> Verbosity -> CopyDest -> IO ()
  installManpages pkg lbi verbosity copy =
 -  installOrdinaryFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
 +  installOrdinaryFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> manDir)
               (zip (repeat manDir) manpages)
+ 
+ ppBlobSuffixHandler :: PPSuffixHandler
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index 4c16865ec933..dab008ebc876 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,9 +1,10 @@
 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) reStructuredText, HTML, LaTeX 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, and S5 and Slidy and
+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
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
new file mode 100644
index 000000000000..69350b0c8250
--- /dev/null
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	regex-tdfa
+PORTVERSION=	1.1.8
+CATEGORIES=	textproc haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Replaces/Enhances Text.Regex
+
+CABAL_SETUP=	Setup.hs
+
+USE_CABAL=	mtl parsec regex-base>=0.93.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo
new file mode 100644
index 000000000000..3b82ec9b7dd0
--- /dev/null
+++ b/textproc/hs-regex-tdfa/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/regex-tdfa-1.1.8.tar.gz) = 7d9ca2ff95e602c46090dfa56f3176fe903d8d08ac9d725c79af56be0aece5d4
+SIZE (cabal/regex-tdfa-1.1.8.tar.gz) = 65948
diff --git a/textproc/hs-regex-tdfa/pkg-descr b/textproc/hs-regex-tdfa/pkg-descr
new file mode 100644
index 000000000000..da68fb6f639f
--- /dev/null
+++ b/textproc/hs-regex-tdfa/pkg-descr
@@ -0,0 +1,3 @@
+A new all Haskell "tagged" DFA regex engine, inspired by libtre.
+
+WWW: http://hackage.haskell.org/package/regex-tdfa
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 091694c801ab..d7e03be24649 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tagstream-conduit
-PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTVERSION=	0.5.4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -12,8 +11,9 @@ LICENSE=	BSD
 
 CABAL_SETUP=	Setup.hs
 
-USE_CABAL=	attoparsec blaze-builder blaze-builder-conduit>=0.5 \
-		conduit>=0.5 text
+USE_CABAL=	attoparsec attoparsec-conduit>=0.5 blaze-builder \
+		blaze-builder-conduit>=0.5 case-insensitive conduit>=0.5 \
+		text transformers>=0.3
 
 .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 104114dd36b7..689383ea8f7e 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.5.3.tar.gz) = b4590928ccefed3e099a0b4e7b8a8d47eee7e907aa544f81bcb9a6b25623e321
-SIZE (cabal/tagstream-conduit-0.5.3.tar.gz) = 6963
+SHA256 (cabal/tagstream-conduit-0.5.4.tar.gz) = 1119944e51796b76138b47b52f02ce5ed669054f4e201d2b6f9ad461a7314eb6
+SIZE (cabal/tagstream-conduit-0.5.4.tar.gz) = 7904
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index eb2c8b28625c..0668cede3748 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml-conduit
-PORTVERSION=	1.0.3.3
-PORTREVISION=	1
+PORTVERSION=	1.1.0.3
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT=	Pure-Haskell utilities for dealing with XML with the conduit package
 
 LICENSE=	BSD
 
-USE_CABAL=	attoparsec>=0.10 attoparsec-conduit>=0.5 blaze-builder>=0.2 \
-		blaze-builder-conduit>=0.5 blaze-html>=0.5 blaze-markup>=0.5 \
-		conduit>=0.5 data-default failure>=0.1 monad-control>=0.3 \
+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
 
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index 7ee915e68518..14fe3cd4be87 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-1.0.3.3.tar.gz) = dfe2775aad74b68a6e8a06bc12645bb53118577c97c836df44b22f5637c9814b
-SIZE (cabal/xml-conduit-1.0.3.3.tar.gz) = 29317
+SHA256 (cabal/xml-conduit-1.1.0.3.tar.gz) = 24aed3c6b2e30ab7f9f4fb2af6f83ab4d14cda62893e02b6da70ae95a4b1b612
+SIZE (cabal/xml-conduit-1.1.0.3.tar.gz) = 29449
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 5e969e693a45..d3fc9dc08adb 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlhtml
-PORTVERSION=	0.2.0.3
-PORTREVISION=	1
+PORTVERSION=	0.2.1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index f788a0990a01..d97bade9a97b 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.0.3.tar.gz) = 6b07154e09ce6ed1c4b9f984de35a58ea832b215a9d266390b807dd546d57c0d
-SIZE (cabal/xmlhtml-0.2.0.3.tar.gz) = 120231
+SHA256 (cabal/xmlhtml-0.2.1.tar.gz) = cf2988cffcbe95835f44af33bae4ceca7fc3acbfc677bae5edffe47fe19213db
+SIZE (cabal/xmlhtml-0.2.1.tar.gz) = 124425
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 1682adf66199..6faa529bb6bb 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yaml
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.2.3
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index ebeb5ce5fe6d..509073958787 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.2.tar.gz) = a8068a17c170e752e07647655615a4f60e14bc8cb68ac9c92f82049f5fdf03b1
-SIZE (cabal/yaml-0.8.2.tar.gz) = 66383
+SHA256 (cabal/yaml-0.8.2.3.tar.gz) = 8a8fce53772722087631a1c7475ff2eb50a975751128e8449dafcff5924946b7
+SIZE (cabal/yaml-0.8.2.3.tar.gz) = 66311