aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2012-12-20 02:23:04 +0000
committerGabor Pali <pgj@FreeBSD.org>2012-12-20 02:23:04 +0000
commitf6f83c9efc2c46d2970746758e2c682bb8a518ec (patch)
tree290f2ea61305744bf0f477895c56b92acaeb361f /textproc
parentaf071cfdc1f8578bd1523b823e683074a3139a34 (diff)
downloadports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.tar.gz
ports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.zip
Notes
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile2
-rw-r--r--textproc/hs-Diff/Makefile8
-rw-r--r--textproc/hs-HStringTemplate/Makefile10
-rw-r--r--textproc/hs-HStringTemplate/distinfo4
-rw-r--r--textproc/hs-HStringTemplate/pkg-descr2
-rw-r--r--textproc/hs-HaXml/Makefile6
-rw-r--r--textproc/hs-HaXml/pkg-descr2
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile12
-rw-r--r--textproc/hs-attoparsec-conduit/distinfo4
-rw-r--r--textproc/hs-attoparsec-conduit/pkg-descr4
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile8
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo4
-rw-r--r--textproc/hs-attoparsec-enumerator/pkg-descr2
-rw-r--r--textproc/hs-attoparsec/Makefile7
-rw-r--r--textproc/hs-attoparsec/pkg-descr2
-rw-r--r--textproc/hs-blaze-html/Makefile7
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-html/pkg-descr2
-rw-r--r--textproc/hs-blaze-markup/Makefile8
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-blaze-markup/pkg-descr2
-rw-r--r--textproc/hs-bytestring-csv/Makefile7
-rw-r--r--textproc/hs-case-insensitive/Makefile8
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-case-insensitive/pkg-descr2
-rw-r--r--textproc/hs-citeproc-hs/Makefile24
-rw-r--r--textproc/hs-citeproc-hs/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/pkg-descr2
-rw-r--r--textproc/hs-csv/Makefile8
-rw-r--r--textproc/hs-double-conversion/Makefile8
-rw-r--r--textproc/hs-double-conversion/distinfo4
-rw-r--r--textproc/hs-double-conversion/pkg-descr2
-rw-r--r--textproc/hs-feed/Makefile8
-rw-r--r--textproc/hs-hexpat/Makefile15
-rw-r--r--textproc/hs-hexpat/distinfo2
-rw-r--r--textproc/hs-hexpat/pkg-descr6
-rw-r--r--textproc/hs-highlighting-kate/Makefile10
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/pkg-descr6
-rw-r--r--textproc/hs-hs-bibutils/Makefile8
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/pkg-descr11
-rw-r--r--textproc/hs-html-conduit/Makefile14
-rw-r--r--textproc/hs-html-conduit/distinfo4
-rw-r--r--textproc/hs-html-conduit/pkg-descr2
-rw-r--r--textproc/hs-html/Makefile7
-rw-r--r--textproc/hs-hxt-charproperties/Makefile7
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile7
-rw-r--r--textproc/hs-hxt-unicode/Makefile7
-rw-r--r--textproc/hs-hxt/Makefile8
-rw-r--r--textproc/hs-hxt/distinfo4
-rw-r--r--textproc/hs-hxt/files/patch-hxt.cabal11
-rw-r--r--textproc/hs-hxt/pkg-descr2
-rw-r--r--textproc/hs-lhs2tex/Makefile13
-rw-r--r--textproc/hs-lhs2tex/distinfo4
-rw-r--r--textproc/hs-lhs2tex/pkg-descr2
-rw-r--r--textproc/hs-libxml/Makefile7
-rw-r--r--textproc/hs-pandoc-types/Makefile7
-rw-r--r--textproc/hs-pandoc-types/pkg-descr2
-rw-r--r--textproc/hs-pandoc/Makefile20
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/files/patch-Setup.hs20
-rw-r--r--textproc/hs-pandoc/pkg-descr2
-rw-r--r--textproc/hs-parsec/Makefile8
-rw-r--r--textproc/hs-parsec/distinfo4
-rw-r--r--textproc/hs-parsec/pkg-descr2
-rw-r--r--textproc/hs-polyparse/Makefile7
-rw-r--r--textproc/hs-polyparse/pkg-descr2
-rw-r--r--textproc/hs-regex-base/Makefile7
-rw-r--r--textproc/hs-regex-base/pkg-descr2
-rw-r--r--textproc/hs-regex-compat/Makefile7
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile11
-rw-r--r--textproc/hs-regex-pcre-builtin/distinfo4
-rw-r--r--textproc/hs-regex-pcre-builtin/pkg-descr5
-rw-r--r--textproc/hs-regex-posix/Makefile10
-rw-r--r--textproc/hs-regex-posix/distinfo4
-rw-r--r--textproc/hs-regex-posix/pkg-descr2
-rw-r--r--textproc/hs-stringsearch/Makefile10
-rw-r--r--textproc/hs-stringsearch/distinfo4
-rw-r--r--textproc/hs-stringsearch/pkg-descr11
-rw-r--r--textproc/hs-tagsoup/Makefile12
-rw-r--r--textproc/hs-tagsoup/distinfo4
-rw-r--r--textproc/hs-tagsoup/pkg-descr13
-rw-r--r--textproc/hs-tagstream-conduit/Makefile14
-rw-r--r--textproc/hs-tagstream-conduit/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/pkg-descr2
-rw-r--r--textproc/hs-texmath/Makefile11
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-texmath/pkg-descr2
-rw-r--r--textproc/hs-xhtml/Makefile7
-rw-r--r--textproc/hs-xhtml/pkg-descr2
-rw-r--r--textproc/hs-xml-conduit/Makefile18
-rw-r--r--textproc/hs-xml-conduit/distinfo4
-rw-r--r--textproc/hs-xml-conduit/pkg-descr2
-rw-r--r--textproc/hs-xml-types/Makefile7
-rw-r--r--textproc/hs-xml-types/distinfo4
-rw-r--r--textproc/hs-xml-types/pkg-descr2
-rw-r--r--textproc/hs-xml/Makefile8
-rw-r--r--textproc/hs-xml2html/Makefile21
-rw-r--r--textproc/hs-xml2html/distinfo2
-rw-r--r--textproc/hs-xml2html/pkg-descr3
-rw-r--r--textproc/hs-xmlhtml/Makefile7
-rw-r--r--textproc/hs-xmlhtml/distinfo4
-rw-r--r--textproc/hs-xmlhtml/pkg-descr2
-rw-r--r--textproc/hs-yaml/Makefile9
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--textproc/hs-yaml/pkg-descr9
107 files changed, 241 insertions, 445 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index 9ad9301e5bf6..94d32e14a356 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -248,6 +248,7 @@
SUBDIR += hs-csv
SUBDIR += hs-double-conversion
SUBDIR += hs-feed
+ SUBDIR += hs-hexpat
SUBDIR += hs-highlighting-kate
SUBDIR += hs-hs-bibutils
SUBDIR += hs-html
@@ -274,7 +275,6 @@
SUBDIR += hs-xml
SUBDIR += hs-xml-conduit
SUBDIR += hs-xml-types
- SUBDIR += hs-xml2html
SUBDIR += hs-xmlhtml
SUBDIR += hs-yaml
SUBDIR += hsb-aspell
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 31a0cf3390c6..d9fed3b6dedc 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-Diff
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= Diff
PORTVERSION= 0.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 9fcfe19caaf7..f8552fe9f029 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-HStringTemplate
-# Date created: December 2, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= HStringTemplate
-PORTVERSION= 0.6.8
-PORTREVISION= 2
+PORTVERSION= 0.6.12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell
LICENSE= BSD
-USE_CABAL= parsec syb text utf8-string
+USE_CABAL= blaze-builder mtl parsec syb syb-with-class text utf8-string
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 2d84fb089aa2..d95bedbb3588 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.6.8.tar.gz) = 79d26c2057efb1a9d546a43af2912cd5f921adf29b7d078335e82cb1c7dacbbb
-SIZE (cabal/HStringTemplate-0.6.8.tar.gz) = 16144
+SHA256 (cabal/HStringTemplate-0.6.12.tar.gz) = 371c0603eb85c47376394476e3999bd481af164dec5ba483bb5d12bdb0005d0a
+SIZE (cabal/HStringTemplate-0.6.12.tar.gz) = 16091
diff --git a/textproc/hs-HStringTemplate/pkg-descr b/textproc/hs-HStringTemplate/pkg-descr
index 2dff0d8f5b0f..169da7830160 100644
--- a/textproc/hs-HStringTemplate/pkg-descr
+++ b/textproc/hs-HStringTemplate/pkg-descr
@@ -1,3 +1,3 @@
A port of the Java library by Terrence Parr.
-WWW: http://hackage.haskell.org/package/HStringTemplate
+WWW: http://hackage.haskell.org/package/HStringTemplate
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index ea3e03c592ab..eb20245f12d9 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -1,11 +1,9 @@
-# New ports collection makefile for: HaXml
-# Date created: 01 June 2002
-# Whom: Oliver Braun <obraun@informatik.unibw-muenchen.de>
-#
+# Created by: Oliver Braun <obraun@informatik.unibw-muenchen.de>
# $FreeBSD$
PORTNAME= HaXml
PORTVERSION= 1.23.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HaXml/pkg-descr b/textproc/hs-HaXml/pkg-descr
index e3dc887ec5a4..35a25ac6d1d5 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://www.cs.york.ac.uk/fp/HaXml/
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index 8393537d4c43..4066ec2f8c4d 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -1,21 +1,15 @@
-# New ports collection makefile for: hs-attoparsec-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= attoparsec-conduit
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.5.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Turn attoparsec parsers into sinks
+COMMENT= Consume attoparsec parsers via conduit
LICENSE= BSD
-USE_CABAL= attoparsec>=0.10 conduit>=0.4 text>=0.11 transformers>=0.2.2
+USE_CABAL= attoparsec>=0.10 conduit>=0.5 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 7d056d8a3d5a..f8731ccef533 100644
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ b/textproc/hs-attoparsec-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-conduit-0.4.0.1.tar.gz) = 6ca6b22b2c636ed34d6dd89fe0196ad17c97b8f3625b65ddba380dc295ea01e4
-SIZE (cabal/attoparsec-conduit-0.4.0.1.tar.gz) = 2950
+SHA256 (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = bc7947c9a57e46098f024efb7d35e4644528a6fb4749af4ccfaa8e84ebd965d8
+SIZE (cabal/attoparsec-conduit-0.5.0.3.tar.gz) = 3779
diff --git a/textproc/hs-attoparsec-conduit/pkg-descr b/textproc/hs-attoparsec-conduit/pkg-descr
index 31922b9f7832..2111049bda72 100644
--- a/textproc/hs-attoparsec-conduit/pkg-descr
+++ b/textproc/hs-attoparsec-conduit/pkg-descr
@@ -1,3 +1,3 @@
-Turn attoparsec parsers into sinks.
+Consume attoparsec parsers via conduit.
-WWW: http://github.com/snoyberg/conduit
+WWW: http://github.com/snoyberg/conduit
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 87886216a5f5..ae723758bc31 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-attoparsec-enumerator
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= attoparsec-enumerator
-PORTVERSION= 0.3
-PORTREVISION= 2
+PORTVERSION= 0.3.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index f819b61c5be5..252241cfe23a 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-enumerator-0.3.tar.gz) = bb70595659c02b8394fa1901b156ee7602b184defcbdff817bc9db5d4366d8e9
-SIZE (cabal/attoparsec-enumerator-0.3.tar.gz) = 2496
+SHA256 (cabal/attoparsec-enumerator-0.3.1.tar.gz) = a78a9f6ade2ae43659243b1a9e925a8c1bc2c05d94e894ca853a32b887880682
+SIZE (cabal/attoparsec-enumerator-0.3.1.tar.gz) = 2498
diff --git a/textproc/hs-attoparsec-enumerator/pkg-descr b/textproc/hs-attoparsec-enumerator/pkg-descr
index c85ac9009c0d..bdb70e667e13 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: http://john-millikin.com/software/attoparsec-enumerator/
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index 5dfec35101ec..dfc1c913f5dc 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-attoparsec
-# Date created: September 19, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= attoparsec
PORTVERSION= 0.10.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/pkg-descr b/textproc/hs-attoparsec/pkg-descr
index 3eecb81e7145..dd1cb996de25 100644
--- a/textproc/hs-attoparsec/pkg-descr
+++ b/textproc/hs-attoparsec/pkg-descr
@@ -2,4 +2,4 @@ A fast parser combinator library, aimed particularly at dealing
efficiently with network protocols and complicated text/binary file
formats.
-WWW: https://github.com/bos/attoparsec
+WWW: https://github.com/bos/attoparsec
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index d1422c654381..3016b84c42dc 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-blaze-html
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-html
-PORTVERSION= 0.5.0.0
+PORTVERSION= 0.5.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 5283e4557fbf..01b89de0a932 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.5.0.0.tar.gz) = 924ffc5a5d0d8f5695c8e63217859d6f2e7b0a53c938798ee0a62e098a6bdb31
-SIZE (cabal/blaze-html-0.5.0.0.tar.gz) = 66175
+SHA256 (cabal/blaze-html-0.5.1.1.tar.gz) = 82aa58b0ba1a9cf872f3aae8ac1c09dc36e6e6f40b3a2bfa4efe6a02afb334fc
+SIZE (cabal/blaze-html-0.5.1.1.tar.gz) = 77442
diff --git a/textproc/hs-blaze-html/pkg-descr b/textproc/hs-blaze-html/pkg-descr
index 371105dddd90..f9c8d7c1c85f 100644
--- a/textproc/hs-blaze-html/pkg-descr
+++ b/textproc/hs-blaze-html/pkg-descr
@@ -1,3 +1,3 @@
A blazingly fast HTML combinator library for the Haskell programming language.
-WWW: http://jaspervdj.be/blaze
+WWW: http://jaspervdj.be/blaze
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 562c8085dcc1..64321689a6d5 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-blaze-markup
-# Date created: May 9, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= blaze-markup
-PORTVERSION= 0.5.1.0
-PORTREVISION= 1
+PORTVERSION= 0.5.1.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index aa16f7dd1cfc..195c2548b4f2 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.5.1.0.tar.gz) = ea8c196ba6773893d3da54ad6c70a0be7b63b5f523b66fdef2528fa0f8ef006f
-SIZE (cabal/blaze-markup-0.5.1.0.tar.gz) = 11856
+SHA256 (cabal/blaze-markup-0.5.1.2.tar.gz) = 15467d380656a8afc46568a54ed032ed7b3ffff8a877bb676e239d3256651cc7
+SIZE (cabal/blaze-markup-0.5.1.2.tar.gz) = 11892
diff --git a/textproc/hs-blaze-markup/pkg-descr b/textproc/hs-blaze-markup/pkg-descr
index 221c1fb3872a..b15b3a5b0385 100644
--- a/textproc/hs-blaze-markup/pkg-descr
+++ b/textproc/hs-blaze-markup/pkg-descr
@@ -1,4 +1,4 @@
Core modules of a blazingly fast markup combinator library for the Haskell
programming language.
-WWW: http://jaspervdj.be/blaze
+WWW: http://jaspervdj.be/blaze
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 01ed8bb20920..7111a68f8f7d 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: bytestring-csv
-# Date created: November 25, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 0933149266ec..7163e87893bc 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-case-insensitive
-# Date created: May 24, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= case-insensitive
-PORTVERSION= 0.4.0.1
-PORTREVISION= 2
+PORTVERSION= 0.4.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 54d511e29a9a..2cbbcc389e2e 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-0.4.0.1.tar.gz) = 072bc80e59d64105e61bb157b5b3276dcad92df2095e88ee11f4de20ebbf8c97
-SIZE (cabal/case-insensitive-0.4.0.1.tar.gz) = 3207
+SHA256 (cabal/case-insensitive-0.4.0.3.tar.gz) = ee57c6fbe4a57ec1ebcd93a75df3b9ed2023249636e36e0bdc35c6eeb8ebeed2
+SIZE (cabal/case-insensitive-0.4.0.3.tar.gz) = 3350
diff --git a/textproc/hs-case-insensitive/pkg-descr b/textproc/hs-case-insensitive/pkg-descr
index 2c357a8e0fd5..1554215766a6 100644
--- a/textproc/hs-case-insensitive/pkg-descr
+++ b/textproc/hs-case-insensitive/pkg-descr
@@ -3,4 +3,4 @@ be parameterised by a string-like type like: 'String', 'ByteString', 'Text',
etc. Comparisons of values of the resulting type will be insensitive to
cases.
-WWW: http://hackage.haskell.org/package/case-insensitive
+WWW: https://github.com/basvandijk/case-insensitive
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index 34477a87324f..4bae8c548bd4 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-citeproc-hs
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,15 +9,16 @@ COMMENT= A Citation Style Language implementation in Haskell
LICENSE= BSD
-USE_CABAL= json mtl pandoc-types>=1.8 utf8-string xml
+USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-OPTIONS_DEFINE= BIBUTILS NETWORK
-OPTIONS_DEFAULT= BIBUTILS NETWORK
+OPTIONS_DEFINE= BIBUTILS HEXPAT NETWORK
+OPTIONS_DEFAULT= BIBUTILS HEXPAT NETWORK
BIBUTILS_DESC= Use Chris Putnam's Bibutils
+HEXPAT_DESC= Use hexpat to parse XML
NETWORK_DESC= Use network and HTTP to retrieve CSL file
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MBIBUTILS}
CONFIGURE_ARGS+= --flags="bibutils"
@@ -32,6 +27,13 @@ USE_CABAL+= hs-bibutils>=0.3
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
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
index 06dd33d80602..0a07dc5af690 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.4.tar.gz) = db0aa3f34991c0e90bd04b4a6752048eeb36fef24693dfbb44cd2d48eb75869f
-SIZE (cabal/citeproc-hs-0.3.4.tar.gz) = 100279
+SHA256 (cabal/citeproc-hs-0.3.6.tar.gz) = 02173cb7e217b9cd962147ca7ffcf02ff4f7112ba1f5bc1bdce1bd138762bc7f
+SIZE (cabal/citeproc-hs-0.3.6.tar.gz) = 104345
diff --git a/textproc/hs-citeproc-hs/pkg-descr b/textproc/hs-citeproc-hs/pkg-descr
index bf6b6b9a0b62..f55261280c22 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://gorgias.mine.nu/repos/citeproc-hs/
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 1a11c013ad01..7218e58b1ba1 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-csv
-# Date created: 11 August 2011
-# Whom: Kaspars Bankovskis <kaspars@bankovskis.lv>
-#
+# Created by: Kaspars Bankovskis <kaspars@bankovskis.lv>
# $FreeBSD$
-#
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index fc38c0dcff9e..87a8a6e2fe2b 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-double-conversion
-# Date created: July 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= double-conversion
-PORTVERSION= 0.2.0.4
-PORTREVISION= 2
+PORTVERSION= 0.2.0.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/distinfo b/textproc/hs-double-conversion/distinfo
index 4ecdfec0cdfc..87cdcc72fa6c 100644
--- a/textproc/hs-double-conversion/distinfo
+++ b/textproc/hs-double-conversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/double-conversion-0.2.0.4.tar.gz) = 3da5f0c17875b2cbca805439e901f90fac97e25312a5e173820a083f85452b03
-SIZE (cabal/double-conversion-0.2.0.4.tar.gz) = 6833347
+SHA256 (cabal/double-conversion-0.2.0.5.tar.gz) = 0eaaa0469bbd11d40b724c47aa2b45ae1d95948d6c0a8b7c53b460eb345243fc
+SIZE (cabal/double-conversion-0.2.0.5.tar.gz) = 6830329
diff --git a/textproc/hs-double-conversion/pkg-descr b/textproc/hs-double-conversion/pkg-descr
index 6da6186995bc..71059e5abe4d 100644
--- a/textproc/hs-double-conversion/pkg-descr
+++ b/textproc/hs-double-conversion/pkg-descr
@@ -11,4 +11,4 @@ to be due to the cost of allocating ByteString values via malloc.)
As a final note, be aware that the bytestring-show package is about 50%
slower than simply using show.
-WWW: http://github.com/mailrank/double-conversion
+WWW: https://github.com/bos/double-conversion
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index 1c642641e2c2..e43fd92d51aa 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-feed
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= feed
PORTVERSION= 0.3.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
new file mode 100644
index 000000000000..8a2cae492cbb
--- /dev/null
+++ b/textproc/hs-hexpat/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= hexpat
+PORTVERSION= 0.20.3
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= XML parser/formatter based on expat
+
+LICENSE= BSD
+
+USE_CABAL= List>=0.4.2 text>=0.5 transformers 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
new file mode 100644
index 000000000000..2c2f97f160dc
--- /dev/null
+++ b/textproc/hs-hexpat/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hexpat-0.20.3.tar.gz) = 3aeff6da3ea6abf2ec529d48f3774f8dea386fc2c66a662d89dedcca3603b08d
+SIZE (cabal/hexpat-0.20.3.tar.gz) = 133330
diff --git a/textproc/hs-hexpat/pkg-descr b/textproc/hs-hexpat/pkg-descr
new file mode 100644
index 000000000000..c62d6b3191c6
--- /dev/null
+++ b/textproc/hs-hexpat/pkg-descr
@@ -0,0 +1,6 @@
+This package provides a general purpose Haskell XML library using Expat
+to do its parsing (a fast stream-oriented XML parser written in C). It
+is extensible to any string type, with String, ByteString and Text
+provided out of the box.
+
+WWW: http://haskell.org/haskellwiki/Hexpat/
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 785258e3fa42..0431537e0ed1 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: highlighting-kate
-# Date created: December 16, 2008
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTVERSION= 0.5.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -21,7 +15,7 @@ OPTIONS_DEFINE= EXECUTABLE
EXECUTABLE_DESC= Build the Highlight executable
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXECUTABLE}
CONFIGURE_ARGS+= --flags="executable"
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index ab2f7328d4ca..2a9a6f3845b8 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.1.tar.gz) = 5282ed3e2a35d37e92484835e126d0c82020aa4308121049cd49b3f372380f50
-SIZE (cabal/highlighting-kate-0.5.1.tar.gz) = 617979
+SHA256 (cabal/highlighting-kate-0.5.3.3.tar.gz) = 5680414b3ca5a332f096b66bfebdfa7df185b4d2c4b58583dc644da096a05d22
+SIZE (cabal/highlighting-kate-0.5.3.3.tar.gz) = 639766
diff --git a/textproc/hs-highlighting-kate/pkg-descr b/textproc/hs-highlighting-kate/pkg-descr
index eacf2cf1c96d..0cf8ce4c11f6 100644
--- a/textproc/hs-highlighting-kate/pkg-descr
+++ b/textproc/hs-highlighting-kate/pkg-descr
@@ -1,5 +1,5 @@
-The highlighting-kate is a syntax highlighting library for Haskell with
-support for over 50 languages. The syntax parsers are automatically
+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
@@ -7,4 +7,4 @@ descriptions.
[1] http://kate-editor.org/
-WWW: http://github.com/jgm/highlighting-kate
+WWW: http://github.com/jgm/highlighting-kate
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 7f8cff63d31e..864c263f01c5 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hs-bibutils
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= hs-bibutils
-PORTVERSION= 4.12
-PORTREVISION= 4
+PORTVERSION= 4.15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index a1580d1ba1c7..e7aad05bca5f 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-4.12.tar.gz) = 67949b90a3810774a40c77f87fffdb6cf740194f8afa521260651ead92897d2a
-SIZE (cabal/hs-bibutils-4.12.tar.gz) = 409820
+SHA256 (cabal/hs-bibutils-4.15.tar.gz) = e9a75f9922667e6dd16556433d52b32a12061dc1fbe3b2dde5a9c3ea4dc45bc0
+SIZE (cabal/hs-bibutils-4.15.tar.gz) = 422396
diff --git a/textproc/hs-hs-bibutils/pkg-descr b/textproc/hs-hs-bibutils/pkg-descr
index 822de78e8f51..1cfc23fb94f2 100644
--- a/textproc/hs-hs-bibutils/pkg-descr
+++ b/textproc/hs-hs-bibutils/pkg-descr
@@ -2,13 +2,4 @@ Haskell bindings to Chris Putnam's bibutils, a library that
interconverts between various bibliography formats using a common
MODS-format XML intermediate.
-hs-bibutils is available under the GNU GPL license. See the LICENSE file
-for details.
-
-For more details about bibutils, please check:
-<http://www.scripps.edu/~cdputnam/software/bibutils/>.
-
-The original API documentation is available here:
-<http://www.scripps.edu/~cdputnam/software/bibutils/library_specs.html>.
-
-WWW: http://code.haskell.org/hs-bibutils
+WWW: http://gorgias.mine.ru/repos/hs-bibutils/
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index a1e91906847a..2e0580653a28 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-html-conduit
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= html-conduit
-PORTVERSION= 0.0.1
-PORTREVISION= 1
+PORTVERSION= 0.1.0.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,9 +11,9 @@ LICENSE= MIT
CABAL_SETUP= Setup.hs
-USE_CABAL= conduit>=0.4 filesystem-conduit>=0.4 resourcet>=0.3 \
- system-filepath>=0.4 tagstream-conduit>=0.3 text \
- transformers xml-conduit>=0.7 xml-types>=0.3
+USE_CABAL= conduit>=0.5 filesystem-conduit>=0.5 resourcet>=0.3 \
+ system-filepath>=0.4 tagstream-conduit>=0.4 text \
+ transformers xml-conduit>=1.0 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 3bb2ed927126..af6d2c66e5cd 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-0.0.1.tar.gz) = 87866c66961b457450b5b739e485113ae3c238a2e594b4215e16666184bc9f6d
-SIZE (cabal/html-conduit-0.0.1.tar.gz) = 3285
+SHA256 (cabal/html-conduit-0.1.0.4.tar.gz) = e8c4a66e4a093cf19e50fbf9d2bc278a025e2c1060525d48692afc660a3a41bc
+SIZE (cabal/html-conduit-0.1.0.4.tar.gz) = 3797
diff --git a/textproc/hs-html-conduit/pkg-descr b/textproc/hs-html-conduit/pkg-descr
index 7947a18ad839..ac066c344fec 100644
--- a/textproc/hs-html-conduit/pkg-descr
+++ b/textproc/hs-html-conduit/pkg-descr
@@ -3,4 +3,4 @@ balances mismatched tags, so that there shouldn't be any parse failures.
It does not handle a full HTML document rendering, such as adding missing
html and head tags.
-WWW: https://github.com/snoyberg/xml
+WWW: https://github.com/snoyberg/xml
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 011c63ad3710..ca5a4abe2286 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-html
-# Date created: August 18, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 726749fc13b7..230d817c76df 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hxt-charproperties
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hxt-charproperties
PORTVERSION= 9.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 03a88b42a359..9857cc3772ee 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hxt-regex-xmlschema
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 0051ca814e11..73c840f414da 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-hxt-unicode
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index cde796afcb1b..5d69dce1f762 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-hxt
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= hxt
-PORTVERSION= 9.2.2
-PORTREVISION= 1
+PORTVERSION= 9.3.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo
index 0b5121077ce6..252398aba52d 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-9.2.2.tar.gz) = d9e8d0b82d64775a1529d3747adfe820852a743e386ce75b080b040cf5959045
-SIZE (cabal/hxt-9.2.2.tar.gz) = 226885
+SHA256 (cabal/hxt-9.3.1.1.tar.gz) = bea0544c7945b6a268ee340be0fe0699335182602454f9565a4227d277411ff4
+SIZE (cabal/hxt-9.3.1.1.tar.gz) = 228205
diff --git a/textproc/hs-hxt/files/patch-hxt.cabal b/textproc/hs-hxt/files/patch-hxt.cabal
new file mode 100644
index 000000000000..1ce1d1ce667e
--- /dev/null
+++ b/textproc/hs-hxt/files/patch-hxt.cabal
@@ -0,0 +1,11 @@
+--- ./hxt.cabal.orig 2012-09-26 12:02:16.000000000 +0200
++++ ./hxt.cabal 2012-10-20 00:32:05.000000000 +0200
+@@ -182,7 +182,7 @@
+ parsec >= 2.1 && < 4,
+ HUnit >= 1.2 && < 2,
+ mtl >= 2 && < 3,
+- network >= 2.4 && < 3,
++ network >= 2.3 && < 2.4,
+ deepseq >= 1.1 && < 2,
+ bytestring >= 0.9 && < 1,
+ binary >= 0.5 && < 1,
diff --git a/textproc/hs-hxt/pkg-descr b/textproc/hs-hxt/pkg-descr
index 4e0f5a7d2d9b..780e0f33b4a9 100644
--- a/textproc/hs-hxt/pkg-descr
+++ b/textproc/hs-hxt/pkg-descr
@@ -9,4 +9,4 @@ 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.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 346b306827e0..0ce27f946034 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -1,14 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for: lhs2TeX
-# Date created: April 24, 2007
-# Whom: mainland@apeiron.net
-#
+# Created by: mainland@apeiron.net
# $FreeBSD$
-#
PORTNAME= lhs2tex
-PORTVERSION= 1.17
-PORTREVISION= 4
+PORTVERSION= 1.18.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,7 +11,8 @@ COMMENT= Preprocessor for typesetting Haskell sources with LaTeX
LICENSE= GPLv2
CABAL_SETUP= Setup.hs
-USE_CABAL= regex-compat
+USE_CABAL= mtl regex-compat
+
BUILD_DEPENDS+= mktexlsr:${PORTSDIR}/print/teTeX-base
RUN_DEPENDS+= mktexlsr:${PORTSDIR}/print/teTeX-base
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index fb52aa0d782f..d894389f8582 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lhs2tex-1.17.tar.gz) = 2cf7495b951f44454a73d1be32617ffeba9b938af3e0c2a171a4f6524d1889f4
-SIZE (cabal/lhs2tex-1.17.tar.gz) = 662684
+SHA256 (cabal/lhs2tex-1.18.1.tar.gz) = dccae22231a1db64cddc38b6f7ac98ac4d5677f03df2f548b2efe9a5e63e9648
+SIZE (cabal/lhs2tex-1.18.1.tar.gz) = 661053
diff --git a/textproc/hs-lhs2tex/pkg-descr b/textproc/hs-lhs2tex/pkg-descr
index 0c58501a3309..e3f034d7643e 100644
--- a/textproc/hs-lhs2tex/pkg-descr
+++ b/textproc/hs-lhs2tex/pkg-descr
@@ -1,3 +1,3 @@
Preprocessor for typesetting Haskell sources with LaTeX.
-WWW: http://www.andres-loeh.de/lhs2tex/
+WWW: http://www.andres-loeh.de/lhs2tex/
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 8d3c49f6553f..b6d901d4ad4f 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-libxml
-# Date created: May 22, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index d1f53c5653a8..6964052303c8 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-pandoc-types
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= pandoc-types
PORTVERSION= 1.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/pkg-descr b/textproc/hs-pandoc-types/pkg-descr
index 9a4e3110b976..02a03c0c452e 100644
--- a/textproc/hs-pandoc-types/pkg-descr
+++ b/textproc/hs-pandoc-types/pkg-descr
@@ -5,4 +5,4 @@ split off, so that other packages can use them without drawing in all of
pandoc's dependencies, and pandoc itself can depend on packages (like
citeproc-hs) that use them.
-WWW: http://johnmacfarlane.net/pandoc
+WWW: http://johnmacfarlane.net/pandoc
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 7da972edbf3c..7fff03286452 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: pandoc
-# Date created: 9 February 2007
-# Whom: John MacFarlane <jgm@berkeley.edu>
-#
+# Created by: John MacFarlane <jgm@berkeley.edu>
# $FreeBSD$
-#
PORTNAME= pandoc
-PORTVERSION= 1.9.4.2
+PORTVERSION= 1.9.4.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,11 +14,11 @@ 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.1 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
+ 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
MAN1= pandoc.1
MAN5= pandoc_markdown.5
@@ -34,7 +30,7 @@ OPTIONS_DEFAULT= EXECUTABLE LIBRARY
EXECUTABLE_DESC= Build the pandoc executable
LIBRARY_DESC= Build the pandoc library
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXECUTABLE}
CONFIGURE_ARGS+= --flags="exectuable"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 641f1c6d050a..b064335c32a1 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.9.4.2.tar.gz) = 535380d76be30747e264950ca1df96bc3d480a5917ab5a54fcd0d7b84cc722ff
-SIZE (cabal/pandoc-1.9.4.2.tar.gz) = 575099
+SHA256 (cabal/pandoc-1.9.4.5.tar.gz) = cb993c42549746712a6261b5d8a5b89aa8ee2ed46f9a45fb01d5947346896816
+SIZE (cabal/pandoc-1.9.4.5.tar.gz) = 574992
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 091750ce1d47..27c5e204c9f7 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,20 +1,18 @@
---- ./Setup.hs.orig 2012-05-13 05:04:40.000000000 +0200
-+++ ./Setup.hs 2012-05-15 16:22:31.000000000 +0200
-@@ -7,7 +7,7 @@
+--- ./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 @@
+ import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
- import Distribution.Simple.GHC (ghcPackageDbOptions)
--import Distribution.Simple.InstallDirs (mandir, bindir, CopyDest (NoCopyDest))
-+import Distribution.Simple.InstallDirs (prefix, bindir, CopyDest (NoCopyDest))
+-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
++import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
import Distribution.Simple.Utils (installOrdinaryFiles)
- import Control.Exception ( bracket_ )
- import Control.Monad ( unless )
-@@ -86,7 +86,7 @@
+ import Prelude hiding (catch)
+ import System.Process ( rawSystem )
+@@ -49,5 +49,5 @@
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)
-
- -- | Returns a list of 'dependencies' that have been modified after 'file'.
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index 400d102d4c2f..4c16865ec933 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -15,4 +15,4 @@ 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
+WWW: http://johnmacfarlane.net/pandoc
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index e8428dd25dd4..492a95656c14 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-parsec-ghc
-# Date created: 2010-05-14
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= parsec
-PORTVERSION= 3.1.2
-PORTREVISION= 1
+PORTVERSION= 3.1.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index 1c0f16ecaca1..92c2d95c54f4 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parsec-3.1.2.tar.gz) = 90f124b91f5e4ff04ddd4dc7f43aeda1273b8caec6a58ec13b90ca22854c1652
-SIZE (cabal/parsec-3.1.2.tar.gz) = 27733
+SHA256 (cabal/parsec-3.1.3.tar.gz) = 9f14bb4da77eb9b0e4dbe8112559ed49409b0af8e9aef5d08941dd97e37fc4a8
+SIZE (cabal/parsec-3.1.3.tar.gz) = 27866
diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr
index 4516bfbef0fe..c2e9c7f00317 100644
--- a/textproc/hs-parsec/pkg-descr
+++ b/textproc/hs-parsec/pkg-descr
@@ -5,4 +5,4 @@ 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://legacy.cs.uu.nl/daan/parsec.html
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 7b534590afd6..ead43e343706 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-polyparse-ghc
-# Date created: January 23, 2009
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= polyparse
PORTVERSION= 1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/pkg-descr b/textproc/hs-polyparse/pkg-descr
index 51dccc62c066..d01bbdceae5f 100644
--- a/textproc/hs-polyparse/pkg-descr
+++ b/textproc/hs-polyparse/pkg-descr
@@ -4,4 +4,4 @@ arbitrary token type, running state, lazy parsing, and so on. Finally,
Text.Parse is a proposed replacement for the standard Read class, for
better deserialisation of Haskell values from Strings.
-WWW: http://code.haskell.org/~malcolm/polyparse/
+WWW: http://code.haskell.org/~malcolm/polyparse/
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index ad4c7c05f759..406bbe51853c 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-regex-base
-# Date created: 2010-08-10
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/pkg-descr b/textproc/hs-regex-base/pkg-descr
index 3f18aae62cb5..f1d4c2808f27 100644
--- a/textproc/hs-regex-base/pkg-descr
+++ b/textproc/hs-regex-base/pkg-descr
@@ -1,3 +1,3 @@
Interface API for regex-posix,pcre,parsec,tdfa,dfa.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: http://sourceforge.net/projects/lazy-regex
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index fdbfbc6815a5..32ae29953b64 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-regex-compat
-# Date created: August 18, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 69d4f072419d..3febeec8f8dc 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-regex-pcre-builtin
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-pcre-builtin
-PORTVERSION= 0.94.2.1.7.7
-PORTREVISION= 4
+PORTVERSION= 0.94.4.3.8.31
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +10,10 @@ COMMENT= Replaces/Enhances Text.Regex
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= regex-base>=0.93
+LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-regex-pcre-builtin/distinfo b/textproc/hs-regex-pcre-builtin/distinfo
index 8c905be73268..69c2ed0a0bc8 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.2.1.7.7.tar.gz) = 1ac5ae23a47d7a595f023e37c4acf9403b1e8db3525c8679bfcb8546a3eb9fb0
-SIZE (cabal/regex-pcre-builtin-0.94.2.1.7.7.tar.gz) = 223037
+SHA256 (cabal/regex-pcre-builtin-0.94.4.3.8.31.tar.gz) = 40d465882053af482b41c653c122fd26c279282a4388519413c98a36c8a76d79
+SIZE (cabal/regex-pcre-builtin-0.94.4.3.8.31.tar.gz) = 287858
diff --git a/textproc/hs-regex-pcre-builtin/pkg-descr b/textproc/hs-regex-pcre-builtin/pkg-descr
index 992288feddec..f18a0b4df0e2 100644
--- a/textproc/hs-regex-pcre-builtin/pkg-descr
+++ b/textproc/hs-regex-pcre-builtin/pkg-descr
@@ -1,3 +1,4 @@
-The PCRE backend to accompany regex-base, see <http://www.pcre.org>.
+The PCRE backend to accompany regex-base, with bundled code from
+<http://www.pcre.org>.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: http://hackage.haskell.org/package/regex-pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index f6efc91c315f..85164e98800d 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -1,17 +1,11 @@
-# New ports collection makefile for: hs-regex-posix
-# Date created: 2010-08-10
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= regex-posix
-PORTVERSION= 0.95.1
-PORTREVISION= 2
+PORTVERSION= 0.95.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= The posix regex backend for regex-base
+COMMENT= Replaces/enhances Text.Regex
LICENSE= BSD
diff --git a/textproc/hs-regex-posix/distinfo b/textproc/hs-regex-posix/distinfo
index bfeb4440f394..682ee5aeb002 100644
--- a/textproc/hs-regex-posix/distinfo
+++ b/textproc/hs-regex-posix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/regex-posix-0.95.1.tar.gz) = 74ed145b1a5b3c766a2694a58661f1d5e03a8dee283c5ddb9d689cff16efef0a
-SIZE (cabal/regex-posix-0.95.1.tar.gz) = 42808
+SHA256 (cabal/regex-posix-0.95.2.tar.gz) = 56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e
+SIZE (cabal/regex-posix-0.95.2.tar.gz) = 42916
diff --git a/textproc/hs-regex-posix/pkg-descr b/textproc/hs-regex-posix/pkg-descr
index 65d42af19f1c..7e6a8fd06da4 100644
--- a/textproc/hs-regex-posix/pkg-descr
+++ b/textproc/hs-regex-posix/pkg-descr
@@ -1,3 +1,3 @@
The posix regex backend for regex-base.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: http://sourceforge.net/projects/lazy-regex
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 397cc570f57b..d3b04482e263 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for: stringsearch
-# Date created: November 1, 2008
-# Whom: Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
# $FreeBSD$
PORTNAME= stringsearch
-PORTVERSION= 0.3.6.3
-PORTREVISION= 2
+PORTVERSION= 0.3.6.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Boyer-Moore/Knuth-Morris-Pratt string search library
+COMMENT= Fast searching, splitting and replacing of ByteStrings
LICENSE= BSD
FILE_LICENSE= LICENCE
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index c656a2f07031..ade02142f724 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stringsearch-0.3.6.3.tar.gz) = ffe983c4142f3f816e4b6f1e4ded0c51011b412c6f38a6e9a60f292f7fa01ab8
-SIZE (cabal/stringsearch-0.3.6.3.tar.gz) = 38998
+SHA256 (cabal/stringsearch-0.3.6.4.tar.gz) = 2ba4faa9759037c622091625d1d6b04d4401472d79f023631d6f8d8e2ce8e099
+SIZE (cabal/stringsearch-0.3.6.4.tar.gz) = 40116
diff --git a/textproc/hs-stringsearch/pkg-descr b/textproc/hs-stringsearch/pkg-descr
index 35e9b67bc1fe..7734f556919f 100644
--- a/textproc/hs-stringsearch/pkg-descr
+++ b/textproc/hs-stringsearch/pkg-descr
@@ -1,5 +1,8 @@
-This library provides Boyer-Moore and Knuth-Morris-Pratt string search
-implementations for Haskell bytestrings (with support for all strict and
-lazy ByteString permutations).
+This package provides several functions to quickly search for substrings
+in strict or lazy ByteStrings. It also provides functions for breaking or
+splitting on substrings and replacing all occurrences of a substring (the
+first in case of overlaps) with another. GHC before 6.10 are no longer
+supported, other compilers only if they support BangPatterns. If you need
+it to work with other compilers, send a feature request.
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stringsearch
+WWW: https://bitbucket.org/dafis/stringsearch
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index a236688357d3..017f0617fad1 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -1,21 +1,17 @@
-# New ports collection makefile for: hs-tagsoup
-# Date created: December 20 2009
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= tagsoup
-PORTVERSION= 0.12.6
-PORTREVISION= 2
+PORTVERSION= 0.12.8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Haskell library for extracting information from HTML documents
+COMMENT= Parsing and extracting information from HTML/XML documents
LICENSE= BSD
CABAL_SETUP= Setup.hs
+
USE_CABAL= text
INSTALL_PORTDATA= cd ${WRKSRC} && \
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 4b83d790d9df..ef2bb76593e1 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagsoup-0.12.6.tar.gz) = 65d35a8bbf6a55d4a602f4a756feec0fc410f589e2a8b9e2662e8c2095fe2de0
-SIZE (cabal/tagsoup-0.12.6.tar.gz) = 30467
+SHA256 (cabal/tagsoup-0.12.8.tar.gz) = a31e49133690b546a6b948a9ab9f924aaf5bd94f9e3e0afb99bb570c104c9515
+SIZE (cabal/tagsoup-0.12.8.tar.gz) = 30647
diff --git a/textproc/hs-tagsoup/pkg-descr b/textproc/hs-tagsoup/pkg-descr
index ffe056a8afa3..9ef9450aa8bc 100644
--- a/textproc/hs-tagsoup/pkg-descr
+++ b/textproc/hs-tagsoup/pkg-descr
@@ -1,8 +1,7 @@
-TagSoup is a Haskell library for extracting information out of
-unstructured HTML code, sometimes known as tag-soup. The HTML does not
-have to be well formed, or render properly within any particular
-framework. This library is for situations where the author of the HTML
-is not cooperating with the person trying to extract the information, but
-is also not trying to hide the information.
+TagSoup is a library for parsing HTML/XML. It supports the HTML 5
+specification, and can be used to parse either well-formed XML, or
+unstructured and malformed HTML from the web. The library also provides
+useful functions to extract information from an HTML document, making it
+ideal for screen-scraping.
-WWW: http://community.haskell.org/~ndm/tagsoup/
+WWW: http://community.haskell.org/~ndm/tagsoup/
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 66f5b528609f..1519a853ea28 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,24 +1,18 @@
-# New ports collection makefile for: hs-tagstream-conduit
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= tagstream-conduit
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.5.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= streamlined html tag parser
+COMMENT= Streamlined HTML tag parser
LICENSE= BSD
CABAL_SETUP= Setup.hs
-USE_CABAL= attoparsec blaze-builder blaze-builder-conduit>=0.4 \
- conduit>=0.4
+USE_CABAL= attoparsec blaze-builder blaze-builder-conduit>=0.5 \
+ conduit>=0.5 text
.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 b7827564c630..104114dd36b7 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.3.2.tar.gz) = ae66739ab4b7999f0f8476c68c21e31d780c5d7d2803f7e1ac17a17fb2b3c8cc
-SIZE (cabal/tagstream-conduit-0.3.2.tar.gz) = 6543
+SHA256 (cabal/tagstream-conduit-0.5.3.tar.gz) = b4590928ccefed3e099a0b4e7b8a8d47eee7e907aa544f81bcb9a6b25623e321
+SIZE (cabal/tagstream-conduit-0.5.3.tar.gz) = 6963
diff --git a/textproc/hs-tagstream-conduit/pkg-descr b/textproc/hs-tagstream-conduit/pkg-descr
index 2c664793c988..c7bf5cca10e4 100644
--- a/textproc/hs-tagstream-conduit/pkg-descr
+++ b/textproc/hs-tagstream-conduit/pkg-descr
@@ -3,4 +3,4 @@ parse unstructured and malformed HTML from the web. It also provides an
Enumeratee which can parse streamline html, which means it consumes constant
memory.
-WWW: http://github.com/yihuang/tagstream-conduit
+WWW: http://github.com/yihuang/tagstream-conduit
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index ce9c7049ab1f..6c7f0e90a986 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-texmath
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= texmath
-PORTVERSION= 0.6.0.6
-PORTREVISION= 1
+PORTVERSION= 0.6.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -23,7 +18,7 @@ OPTIONS_DEFINE= CGI
CGI_DESC= Compile CGI executable
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MCGI}
CONFIGURE_ARGS+= --flags="cgi"
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 0126b8f14fb9..e737c29c24ad 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.0.6.tar.gz) = 939c144a6ebd46a8bb35a079b2f6a4ae499185bd26f1f2e57394c4a777fab773
-SIZE (cabal/texmath-0.6.0.6.tar.gz) = 41544
+SHA256 (cabal/texmath-0.6.1.1.tar.gz) = 5fe16f60c6dc282be989fb91e5074ccc5c785883612e2f6d88edc8bb650ad31b
+SIZE (cabal/texmath-0.6.1.1.tar.gz) = 43980
diff --git a/textproc/hs-texmath/pkg-descr b/textproc/hs-texmath/pkg-descr
index 1c372b3fc827..7d16c9cba352 100644
--- a/textproc/hs-texmath/pkg-descr
+++ b/textproc/hs-texmath/pkg-descr
@@ -3,4 +3,4 @@ to presentation MathML (which can be used in HTML) or OMML (Office Math
Markup Language, used in Microsoft Office). It supports basic LaTeX and
AMS extensions, and it can parse and apply LaTeX macros.
-WWW: http://github.com/jgm/texmath
+WWW: http://github.com/jgm/texmath
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile
index 45c4bd4c608f..c4e0a72b8da4 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-xhtml/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: hs-xhtml
-# Date created: September 15, 2010
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xhtml
PORTVERSION= 3000.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xhtml/pkg-descr b/textproc/hs-xhtml/pkg-descr
index ee9b3d2fe100..e548a9ec0e64 100644
--- a/textproc/hs-xhtml/pkg-descr
+++ b/textproc/hs-xhtml/pkg-descr
@@ -1,4 +1,4 @@
This package provides combinators for producing XHTML 1.0, including the
Strict, Transitional and Frameset variants.
-WWW: https://github.com/haskell/xhtml
+WWW: https://github.com/haskell/xhtml
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 283449caa44e..f18d89c628d1 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for: hs-xml-conduit
-# Date created: December 30, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xml-conduit
-PORTVERSION= 0.7.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,11 +9,11 @@ COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
LICENSE= BSD
-USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=0.4 blaze-builder>=0.2 \
- blaze-builder-conduit>=0.4 conduit>=0.4 data-default>=0.2 \
- failure>=0.1 monad-control>=0.3 resourcet>=0.3 \
- system-filepath>=0.4 text>=0.7 transformers>=0.2 \
- xml-types>=0.3.1
+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 \
+ resourcet>=0.3 system-filepath>=0.4 text>=0.7 \
+ transformers>=0.2 xml-types>=0.3.3
.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 0be5183d52a5..7ee915e68518 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-0.7.0.3.tar.gz) = 7bef1e2a5e5b1c2dcc994b0c6eaf4f88e73b8cadec88a13eb573b22e2b6a6c90
-SIZE (cabal/xml-conduit-0.7.0.3.tar.gz) = 26522
+SHA256 (cabal/xml-conduit-1.0.3.3.tar.gz) = dfe2775aad74b68a6e8a06bc12645bb53118577c97c836df44b22f5637c9814b
+SIZE (cabal/xml-conduit-1.0.3.3.tar.gz) = 29317
diff --git a/textproc/hs-xml-conduit/pkg-descr b/textproc/hs-xml-conduit/pkg-descr
index 516e508c72ea..da7b64288cce 100644
--- a/textproc/hs-xml-conduit/pkg-descr
+++ b/textproc/hs-xml-conduit/pkg-descr
@@ -18,4 +18,4 @@ broken up into the following modules:
* Text.XML.Stream.Render: Streaming renderer.
-WWW: http://github.com/snoyberg/xml
+WWW: http://github.com/snoyberg/xml
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index b7bea36c4a57..429f138fe46d 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-xml-types
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xml-types
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index e3e2379b9956..d0f9971573a2 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-types-0.3.2.tar.gz) = 268d604d33aecb2b6bbc5e2ed2b160828bc89dee58e2d677760677686cd030aa
-SIZE (cabal/xml-types-0.3.2.tar.gz) = 3600
+SHA256 (cabal/xml-types-0.3.3.tar.gz) = 963d3a195e3407b151692173422d3ec09a7e143fd08ed35503cc6a5cff836c4b
+SIZE (cabal/xml-types-0.3.3.tar.gz) = 3606
diff --git a/textproc/hs-xml-types/pkg-descr b/textproc/hs-xml-types/pkg-descr
index 8b9ad8230997..19bec3592292 100644
--- a/textproc/hs-xml-types/pkg-descr
+++ b/textproc/hs-xml-types/pkg-descr
@@ -1,4 +1,4 @@
Basic types for representing XML.
-WWW: http://john-millikin.com/software/haskell-xml/
+WWW: http://john-millikin.com/software/haskell-xml/
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index da6c9186e8bc..e842370dc424 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: hs-xml
-# Date created: January 10 2010
-# Whom: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-#
+# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
-#
PORTNAME= xml
PORTVERSION= 1.3.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml2html/Makefile b/textproc/hs-xml2html/Makefile
deleted file mode 100644
index 4ce5561ff14e..000000000000
--- a/textproc/hs-xml2html/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for: hs-xml2html
-# Date created: June 10, 2012
-# Whom: haskell@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= xml2html
-PORTVERSION= 0.1.2.3
-PORTREVISION= 1
-CATEGORIES= textproc haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= blaze-html instances for xml-conduit types
-
-LICENSE= BSD
-
-USE_CABAL= blaze-html>=0.5 blaze-markup>=0.5.1 text>=0.5 xml-conduit>=0.5
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/textproc/hs-xml2html/distinfo b/textproc/hs-xml2html/distinfo
deleted file mode 100644
index 980421fa594b..000000000000
--- a/textproc/hs-xml2html/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/xml2html-0.1.2.3.tar.gz) = 4b8a4adff8256c1101cb4d1ddb3faf9ad409a2729853de54148058129e4a1f0a
-SIZE (cabal/xml2html-0.1.2.3.tar.gz) = 2449
diff --git a/textproc/hs-xml2html/pkg-descr b/textproc/hs-xml2html/pkg-descr
deleted file mode 100644
index 0a8284f1907c..000000000000
--- a/textproc/hs-xml2html/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-blaze-html instances for xml-conduit types.
-
-WWW: http://github.com/snoyberg/xml
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index dc1406cfc2a9..123270d6370e 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-xmlhtml
-# Date created: March 13, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= xmlhtml
-PORTVERSION= 0.2.0.2
+PORTVERSION= 0.2.0.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index 28a339af3d64..f788a0990a01 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.0.2.tar.gz) = 42cf86f94dcb56b7b1841d2d3bf18948066350e5753616ddb80a67cb46c71437
-SIZE (cabal/xmlhtml-0.2.0.2.tar.gz) = 124199
+SHA256 (cabal/xmlhtml-0.2.0.3.tar.gz) = 6b07154e09ce6ed1c4b9f984de35a58ea832b215a9d266390b807dd546d57c0d
+SIZE (cabal/xmlhtml-0.2.0.3.tar.gz) = 120231
diff --git a/textproc/hs-xmlhtml/pkg-descr b/textproc/hs-xmlhtml/pkg-descr
index 956508bc29d2..e1b4a7989886 100644
--- a/textproc/hs-xmlhtml/pkg-descr
+++ b/textproc/hs-xmlhtml/pkg-descr
@@ -12,4 +12,4 @@ not the HTML 5 node structure, but rather something closer to the physical
structure. For example, omitted start tags are not inserted (and so, their
corresponding end tags must also be omitted).
-WWW: http://hackage.haskell.org/package/xmlhtml
+WWW: http://hackage.haskell.org/package/xmlhtml
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 68a4de53a476..034d89ef7a58 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: hs-yaml
-# Date created: December 26, 2011
-# Whom: haskell@FreeBSD.org
-#
# $FreeBSD$
-#
PORTNAME= yaml
-PORTVERSION= 0.7.0.3
+PORTVERSION= 0.8.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +9,7 @@ COMMENT= Low-level binding to the libyaml C library
LICENSE= BSD
-USE_CABAL= aeson>=0.5 attoparsec conduit>=0.4 resourcet>=0.3 text \
+USE_CABAL= aeson>=0.5 attoparsec conduit>=0.5 resourcet>=0.3 text \
transformers>=0.1 unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 205e628ed699..48741591b15a 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.7.0.3.tar.gz) = b912937cae8b2ea729312386b6576e0bc6de46dde535990a8a7c5c8bc8d33df1
-SIZE (cabal/yaml-0.7.0.3.tar.gz) = 65242
+SHA256 (cabal/yaml-0.8.1.1.tar.gz) = 67a4e3bd1319e920724669d32947452663dcb620862f821ed9084be00a105558
+SIZE (cabal/yaml-0.8.1.1.tar.gz) = 65977
diff --git a/textproc/hs-yaml/pkg-descr b/textproc/hs-yaml/pkg-descr
index 96fa4ac60528..cb96676ec9f3 100644
--- a/textproc/hs-yaml/pkg-descr
+++ b/textproc/hs-yaml/pkg-descr
@@ -1,7 +1,6 @@
-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
+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.
-WWW: http://github.com/snoyberg/yaml/
+WWW: http://github.com/snoyberg/yaml/