aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2011-05-09 05:28:57 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2011-05-09 05:28:57 +0000
commit0c76a8384fc1de4958eb1228befbee727f00c596 (patch)
tree28680b3da252da7f45a2d25108e4e2a6e41a77e5 /textproc
parentf2febc81eeab0d296325ecc49e1825762e5cd5d7 (diff)
downloadports-0c76a8384fc1de4958eb1228befbee727f00c596.tar.gz
ports-0c76a8384fc1de4958eb1228befbee727f00c596.zip
Notes
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile12
-rw-r--r--textproc/hs-Diff/Makefile3
-rw-r--r--textproc/hs-Diff/distinfo1
-rw-r--r--textproc/hs-Diff/pkg-plist15
-rw-r--r--textproc/hs-HaXml/Makefile6
-rw-r--r--textproc/hs-HaXml/distinfo1
-rw-r--r--textproc/hs-HaXml/pkg-plist57
-rw-r--r--textproc/hs-bytestring-csv/Makefile6
-rw-r--r--textproc/hs-bytestring-csv/distinfo1
-rw-r--r--textproc/hs-bytestring-csv/pkg-plist17
-rw-r--r--textproc/hs-citeproc-hs/Makefile18
-rw-r--r--textproc/hs-citeproc-hs/distinfo5
-rw-r--r--textproc/hs-citeproc-hs/pkg-plist30
-rw-r--r--textproc/hs-feed/Makefile6
-rw-r--r--textproc/hs-feed/distinfo5
-rw-r--r--textproc/hs-feed/pkg-plist42
-rw-r--r--textproc/hs-highlighting-kate/Makefile8
-rw-r--r--textproc/hs-highlighting-kate/distinfo5
-rw-r--r--textproc/hs-highlighting-kate/pkg-plist80
-rw-r--r--textproc/hs-hs-bibutils/Makefile6
-rw-r--r--textproc/hs-hs-bibutils/distinfo5
-rw-r--r--textproc/hs-hs-bibutils/pkg-plist14
-rw-r--r--textproc/hs-hxt/Makefile5
-rw-r--r--textproc/hs-hxt/distinfo5
-rw-r--r--textproc/hs-hxt/pkg-plist121
-rw-r--r--textproc/hs-lhs2tex/Makefile47
-rw-r--r--textproc/hs-lhs2tex/distinfo5
-rw-r--r--textproc/hs-lhs2tex/files/patch-Makefile34
-rw-r--r--textproc/hs-lhs2tex/files/patch-MathPoly.lhs11
-rw-r--r--textproc/hs-lhs2tex/files/patch-Setup.hs23
-rw-r--r--textproc/hs-lhs2tex/files/patch-configure66
-rw-r--r--textproc/hs-lhs2tex/pkg-descr5
-rw-r--r--textproc/hs-lhs2tex/pkg-plist4
-rw-r--r--textproc/hs-libxml/Makefile4
-rw-r--r--textproc/hs-libxml/distinfo1
-rw-r--r--textproc/hs-libxml/pkg-plist20
-rw-r--r--textproc/hs-pandoc/Makefile30
-rw-r--r--textproc/hs-pandoc/distinfo5
-rw-r--r--textproc/hs-pandoc/files/patch-Setup.hs10
-rw-r--r--textproc/hs-pandoc/pkg-plist51
-rw-r--r--textproc/hs-polyparse/Makefile5
-rw-r--r--textproc/hs-polyparse/distinfo5
-rw-r--r--textproc/hs-polyparse/pkg-plist27
-rw-r--r--textproc/hs-stringsearch/Makefile5
-rw-r--r--textproc/hs-stringsearch/distinfo5
-rw-r--r--textproc/hs-stringsearch/pkg-plist32
-rw-r--r--textproc/hs-tagsoup/Makefile19
-rw-r--r--textproc/hs-tagsoup/distinfo5
-rw-r--r--textproc/hs-tagsoup/pkg-plist30
-rw-r--r--textproc/hs-texmath/Makefile22
-rw-r--r--textproc/hs-texmath/distinfo5
-rw-r--r--textproc/hs-texmath/pkg-plist19
52 files changed, 169 insertions, 800 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index e990f9b3b86c..76bc97d4a3a1 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -227,13 +227,25 @@
SUBDIR += hs-feed
SUBDIR += hs-highlighting-kate
SUBDIR += hs-hs-bibutils
+ SUBDIR += hs-html
SUBDIR += hs-hxt
+ SUBDIR += hs-hxt-charproperties
+ SUBDIR += hs-hxt-regex-xmlschema
+ SUBDIR += hs-hxt-unicode
SUBDIR += hs-libxml
+ SUBDIR += hs-lhs2tex
SUBDIR += hs-pandoc
+ SUBDIR += hs-pandoc-types
+ SUBDIR += hs-parsec
SUBDIR += hs-polyparse
+ SUBDIR += hs-regex-base
+ SUBDIR += hs-regex-compat
+ SUBDIR += hs-regex-pcre-builtin
+ SUBDIR += hs-regex-posix
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-texmath
+ SUBDIR += hs-xhtml
SUBDIR += hs-xml
SUBDIR += hsb-aspell
SUBDIR += htdig
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index c77c6b581773..1c2092c084d5 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -7,10 +7,13 @@
PORTNAME= Diff
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= O(ND) diff algorithm in haskell
+LICENSE= BSD
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 4c71fcb592bd..1115684725f3 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/Diff-0.1.2.tar.gz) = d7efbd54c6c1dba78970deb579000b04
SHA256 (cabal/Diff-0.1.2.tar.gz) = f831ce6029a75b54dd69801d865ed45284f7dacf723fe5fd81758ad03f8eef5e
SIZE (cabal/Diff-0.1.2.tar.gz) = 2799
diff --git a/textproc/hs-Diff/pkg-plist b/textproc/hs-Diff/pkg-plist
deleted file mode 100644
index b6f30e1fd48e..000000000000
--- a/textproc/hs-Diff/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Algorithm/Diff.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Algorithm
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index fdf2ec689ac2..e2fbe35c9fe5 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -6,13 +6,17 @@
PORTNAME= HaXml
PORTVERSION= 1.20.2
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A collection of utilities for using Haskell and XML together
+LICENSE= LGPL21
+FILE_LICENSE= COPYRIGHT
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= polyparse>=1.2
+USE_CABAL= polyparse>=1.2
EXECUTABLE= Canonicalise CanonicaliseLazy \
DtdToHaskell MkOneOf Validate \
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index f89ec6470e4b..bfcbf699ec17 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/HaXml-1.20.2.tar.gz) = 9635c348e70c0446e74783e7c267050c
SHA256 (cabal/HaXml-1.20.2.tar.gz) = c32c10b95446ecb938dc6cd34585187efd3fcb4b21f7d0c7cbd646ba94c87516
SIZE (cabal/HaXml-1.20.2.tar.gz) = 642240
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
deleted file mode 100644
index ce55b177c260..000000000000
--- a/textproc/hs-HaXml/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-@comment $FreeBSD$
-bin/Canonicalise
-bin/CanonicaliseLazy
-bin/DtdToHaskell
-bin/MkOneOf
-bin/Validate
-bin/Xtract
-bin/XtractLazy
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ByteStringPP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/ParseLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ParseLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Posn.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/SAX.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ShowXmlLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/TypeMapping.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Util.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Haskell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 2129294cdbac..8ab69ebc8bc4 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -6,13 +6,15 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parse CSV formatted data efficiently with Haskell
-USE_HACKAGE= dlist
+LICENSE= BSD
+
+USE_CABAL= dlist
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-bytestring-csv/distinfo b/textproc/hs-bytestring-csv/distinfo
index 8a8763c95c41..08fe78053e97 100644
--- a/textproc/hs-bytestring-csv/distinfo
+++ b/textproc/hs-bytestring-csv/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/bytestring-csv-0.1.2.tar.gz) = 45adcabc345af6bc8201e254a7de0683
SHA256 (cabal/bytestring-csv-0.1.2.tar.gz) = 19480f2f60c474b18ef507a657daa63b18a40f97a3171883cf9d4b33169df874
SIZE (cabal/bytestring-csv-0.1.2.tar.gz) = 76022
diff --git a/textproc/hs-bytestring-csv/pkg-plist b/textproc/hs-bytestring-csv/pkg-plist
deleted file mode 100644
index d7e5c5675d0c..000000000000
--- a/textproc/hs-bytestring-csv/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString/Lex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV/ByteString
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSV
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index e2e991bf7606..5f7cd4cf79c6 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -6,27 +6,37 @@
#
PORTNAME= citeproc-hs
-PORTVERSION= 0.2
+PORTVERSION= 0.3.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A Citation Style Language implementation in Haskell
-USE_HACKAGE= hxt>=8.1
+LICENSE= BSD
+
+USE_CABAL= json mtl pandoc-types>=1.8 utf8-string xml
PORTDATA= *
-OPTIONS= BIBUTILS "Use Chris Putnam's Bibutils" off
+OPTIONS= BIBUTILS "Use Chris Putnam's Bibutils" on \
+ NETWORK "Use network and HTTP to retrieve CSL file" on
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
.if defined(WITH_BIBUTILS)
CONFIGURE_ARGS+= --flags="bibutils"
-USE_HACKAGE+= hs-bibutils
+USE_CABAL+= hs-bibutils>=0.3
.else
CONFIGURE_ARGS+= --flags="-bibutils"
.endif
+.if defined(WITH_NETWORK)
+CONFIGURE_ARGS+= --flags="network"
+USE_CABAL+= HTTP>=4000.0.9 network>=2
+.else
+CONFIGURE_ARGS+= --flags="-network"
+.endif
+
.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 444325e49387..a96f3aa9b524 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/citeproc-hs-0.2.tar.gz) = d9fd2f297917861ee4131f144d44042b
-SHA256 (cabal/citeproc-hs-0.2.tar.gz) = d7cf725e6bab06cde4bbc51d8e3b816ecf16f7b1a1e4face326692965c65302c
-SIZE (cabal/citeproc-hs-0.2.tar.gz) = 64300
+SHA256 (cabal/citeproc-hs-0.3.2.tar.gz) = eedd04b29521c38394d090e37d36edc7b8a46220fce2a85324562be903079812
+SIZE (cabal/citeproc-hs-0.3.2.tar.gz) = 90757
diff --git a/textproc/hs-citeproc-hs/pkg-plist b/textproc/hs-citeproc-hs/pkg-plist
deleted file mode 100644
index 068c76915c7e..000000000000
--- a/textproc/hs-citeproc-hs/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_citeproc_hs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Eval.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Input/Bibutils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Input/MODS.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Output/Pandoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Output/Plain.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Proc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Proc/Collapse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Proc/Disamb.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Reference.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Style.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Proc
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Output
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL/Input
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/CSL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index 245e8d9927bd..35ee8e4de91d 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -6,14 +6,16 @@
#
PORTNAME= feed
-PORTVERSION= 0.3.7
+PORTVERSION= 0.3.8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= utf8-string xml>=1.2.6
+USE_CABAL= utf8-string xml>=1.2.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 4a74bf31e0e6..4b32dddea11f 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/feed-0.3.7.tar.gz) = 1c48ada3060fc18121b07e137dc6e47f
-SHA256 (cabal/feed-0.3.7.tar.gz) = c2d539f763cdce1b1498f1fd0707b12078337aff690f01e41db0b6e3569c08aa
-SIZE (cabal/feed-0.3.7.tar.gz) = 72592
+SHA256 (cabal/feed-0.3.8.tar.gz) = e614f7019a035c1eaa8952cdcfe5291c539f670f218ab591727d33b4367b71fb
+SIZE (cabal/feed-0.3.8.tar.gz) = 72269
diff --git a/textproc/hs-feed/pkg-plist b/textproc/hs-feed/pkg-plist
deleted file mode 100644
index cce617f2e0d4..000000000000
--- a/textproc/hs-feed/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Feed.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Feed/Export.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Feed/Import.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Feed/Link.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Feed/Validate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Pub.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Pub/Export.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/DublinCore/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed/Constructor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed/Export.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed/Import.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed/Query.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed/Translate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed/Util.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS/Export.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS/Import.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS1/Export.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS1/Import.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS1/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS1/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS1
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/RSS
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Feed
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/DublinCore
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Pub
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom/Feed
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Atom
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 5305a1a3a061..6c84b6b9c75f 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -6,13 +6,15 @@
#
PORTNAME= highlighting-kate
-PORTVERSION= 0.2.7.1
+PORTVERSION= 0.2.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A Haskell syntax highlighting library for 50+ languages
-USE_HACKAGE= pcre-light
+LICENSE= GPLv2
+
+USE_CABAL= parsec regex-pcre-builtin xhtml
OPTIONS= EXECUTABLE "Build the Highlight executable" off
@@ -22,10 +24,8 @@ OPTIONS= EXECUTABLE "Build the Highlight executable" off
.if defined(WITH_EXECUTABLE)
CONFIGURE_ARGS+= --flags="executable"
EXECUTABLE+= Highlight
-PLIST_SUB+= MAYBE_EXECUTABLE=""
.else
CONFIGURE_ARGS+= --flags="-executable"
-PLIST_SUB+= MAYBE_EXECUTABLE="@comment "
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index fb739d506a2d..9f45967d4b92 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/highlighting-kate-0.2.7.1.tar.gz) = 6e85c3f558ffe33490523ded7cbdded3
-SHA256 (cabal/highlighting-kate-0.2.7.1.tar.gz) = 330c5fdc6b5dae62c12ee2455892319df12723346aa75401aea05ea0b24cf5ed
-SIZE (cabal/highlighting-kate-0.2.7.1.tar.gz) = 451384
+SHA256 (cabal/highlighting-kate-0.2.9.tar.gz) = f3ad0a001848f161270a9589242a91e590108c612d96dca8b4db705c03a86856
+SIZE (cabal/highlighting-kate-0.2.9.tar.gz) = 767587
diff --git a/textproc/hs-highlighting-kate/pkg-plist b/textproc/hs-highlighting-kate/pkg-plist
deleted file mode 100644
index dd44d76892bb..000000000000
--- a/textproc/hs-highlighting-kate/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_EXECUTABLE%%bin/Highlight
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_highlighting_kate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Common.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Definitions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Format.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ada.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Alert.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Asp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Awk.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bash.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Bibtex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/C.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cmake.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Coldfusion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Commonlisp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Cpp.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Css.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/D.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Djangotemplate.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Doxygen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Dtd.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Eiffel.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Erlang.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Fortran.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Haskell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Html.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Java.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javadoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Javascript.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Json.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Latex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/LiterateHaskell.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Lua.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Makefile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Matlab.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Mediawiki.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Modula3.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Nasm.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Objectivec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ocaml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Octave.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Pascal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Perl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Php.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Postscript.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Prolog.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Python.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Relaxngcompact.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Rhtml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Ruby.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scala.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Scheme.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sgml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Sql.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlMysql.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/SqlPostgresql.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Tcl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Texinfo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Xslt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax/Yacc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate/Syntax
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting/Kate
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Highlighting
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index 37fc4a7feb11..57f0616393d8 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -6,14 +6,18 @@
#
PORTNAME= hs-bibutils
-PORTVERSION= 0.3
+PORTVERSION= 4.12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell bindings to bibutils, the bibliography conversion utilities
+LICENSE= GPLv2
+
BUILD_DEPENDS= bibutils>=4.9:${PORTSDIR}/textproc/bibutils
RUN_DEPENDS= bibutils>=4.9:${PORTSDIR}/textproc/bibutils
+USE_CABAL= syb
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 12e09f063853..a1580d1ba1c7 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/hs-bibutils-0.3.tar.gz) = 1c17fc71397cd91e7a4fa22eb47bff2e
-SHA256 (cabal/hs-bibutils-0.3.tar.gz) = 162e04d8c4187c2edc3b302554efbd3286ac08b9b8bf82844b59f9a954055e5e
-SIZE (cabal/hs-bibutils-0.3.tar.gz) = 404384
+SHA256 (cabal/hs-bibutils-4.12.tar.gz) = 67949b90a3810774a40c77f87fffdb6cf740194f8afa521260651ead92897d2a
+SIZE (cabal/hs-bibutils-4.12.tar.gz) = 409820
diff --git a/textproc/hs-hs-bibutils/pkg-plist b/textproc/hs-hs-bibutils/pkg-plist
deleted file mode 100644
index b8d37e402516..000000000000
--- a/textproc/hs-hs-bibutils/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Bibutils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index d1e837220d97..ae8f07890cae 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= hxt
-PORTVERSION= 8.5.4
+PORTVERSION= 9.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A collection of tools for processing XML with Haskell
-USE_HACKAGE= curl>=1.3 deepseq>=1.1 tagsoup>=0.8
+USE_CABAL= binary>=0.5 deepseq>=1.1 HUnit>=1.2 hxt-charproperties>=9.1 \
+ hxt-regex-xmlschema>=9 hxt-unicode>=9 network>=2.1 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 916117ad9bd2..48ffa9301260 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/hxt-8.5.4.tar.gz) = 41833fb54fe376555510d97648a607b8
-SHA256 (cabal/hxt-8.5.4.tar.gz) = c888aaf740258a52d465859641b1794a4fc1940a87be55c34b4843bd18b891d9
-SIZE (cabal/hxt-8.5.4.tar.gz) = 256802
+SHA256 (cabal/hxt-9.1.1.tar.gz) = d98d8c10e13a34dfd9a86be8f7d48f58b8186e1f9c14671776861e9a12a71311
+SIZE (cabal/hxt-9.1.1.tar.gz) = 226325
diff --git a/textproc/hs-hxt/pkg-plist b/textproc/hs-hxt/pkg-plist
deleted file mode 100644
index beda42286c11..000000000000
--- a/textproc/hs-hxt/pkg-plist
+++ /dev/null
@@ -1,121 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ArrowIO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ArrowIf.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ArrowList.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ArrowNF.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ArrowState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ArrowTree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/IOListArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/IOStateListArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ListArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/ListArrows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/StateListArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/AssocList.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Atom.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Char/UTF8.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tree/Class.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tree/NTree/TypeDefs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/DTDProcessing.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/DocumentInput.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/DocumentOutput.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/Edit.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/GeneralEntitySubstitution.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/Namespace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/ParserInterface.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/Pickle.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/Pickle/DTD.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/Pickle/Schema.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/Pickle/Xml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/ProcessDocument.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/ReadDocument.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/WriteDocument.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/XmlArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/XmlIOStateArrow.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/XmlRegex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/FormatXmlTree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/Interface.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/IsoLatinTables.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/MimeTypeDefaults.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/MimeTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/QualifiedName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/ShowXml.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/TypeDefs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/UTF8Decoding.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/Unicode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/Util.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/XmlKeywords.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/XmlNode.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM/XmlOptions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/AttributeValueValidation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/DTDValidation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/DocTransformation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/DocValidation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/IdValidation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/RE.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/TypeDefs.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/Validation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation/XmlRE.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/IO/GetFILE.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/IO/GetHTTPLibCurl.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/HtmlParsec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/ProtocolHandlerUtil.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/TagSoup.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/XhtmlEntities.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/XmlCharParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/XmlDTDParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/XmlDTDTokenParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/XmlEntities.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/XmlParsec.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser/XmlTokenParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/BasicArrows.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/CreatePattern.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/DataTypeLibMysql.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/DataTypeLibUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/DataTypeLibraries.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/DataTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/PatternFunctions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/PatternToString.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Schema.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/SchemaGrammar.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Simplification.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Unicode/Blocks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Unicode/CharProps.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Validation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Validator.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/XmlSchema/DataTypeLibW3C.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/XmlSchema/Regex.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/XmlSchema/RegexMatch.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/XmlSchema/RegexParser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Version.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/XmlSchema
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Unicode
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Parser
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/IO
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DTDValidation
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/DOM
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow/Pickle
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/Arrow
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tree/NTree
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Tree
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Char
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 2a0697e8b7a0..6e3b8dba09bd 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -7,44 +7,25 @@
#
PORTNAME= lhs2tex
-PORTVERSION= 1.15
-PORTREVISION= 2
-CATEGORIES= devel haskell
-MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/
+PORTVERSION= 1.16
+CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A preprocessor to generate LaTeX code from literate Haskell sources
+COMMENT= Preprocessor for typesetting Haskell sources with LaTeX
-BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \
- mktexlsr:${PORTSDIR}/print/teTeX-base \
- hs-utf8-string>=0.3:${PORTSDIR}/devel/hs-utf8-string
+LICENSE= GPLv2
-RUN_DEPENDS= mktexlsr:${PORTSDIR}/print/teTeX-base
+CABAL_SETUP= Setup.hs
+USE_CABAL= regex-compat
+BUILD_DEPENDS+= mktexlsr:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS+= mktexlsr:${PORTSDIR}/print/teTeX-base
-USE_GMAKE= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX} \
- --datadir=${PREFIX}/share \
- --docdir=${DOCSDIR} \
- --mandir=${MANPREFIX}/man
-
-DOCSDIR=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS= *
-DATADIR=${PREFIX}/share/${PORTNAME}-${PORTVERSION}
-PORTDATA= *
-
-.include <bsd.port.pre.mk>
-
-INSTALL_TARGET= install
-
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+= install-doc
-.endif
-
-.if !defined(NOPORTDATA)
-INSTALL_TARGET+= install-data
-.endif
+STANDALONE= yes
+EXECUTABLE= lhs2TeX
MAN1= lhs2TeX.1
-.include <bsd.port.post.mk>
+PORTDATA= *
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index 0910f9c2ae69..5cfbc116227b 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,3 +1,2 @@
-MD5 (lhs2tex-1.15.tar.gz) = 13c886a829e71e895fa172c617f31bd0
-SHA256 (lhs2tex-1.15.tar.gz) = 77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124
-SIZE (lhs2tex-1.15.tar.gz) = 580361
+SHA256 (cabal/lhs2tex-1.16.tar.gz) = aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f
+SIZE (cabal/lhs2tex-1.16.tar.gz) = 581362
diff --git a/textproc/hs-lhs2tex/files/patch-Makefile b/textproc/hs-lhs2tex/files/patch-Makefile
deleted file mode 100644
index 08746efe6d38..000000000000
--- a/textproc/hs-lhs2tex/files/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig 2008-10-24 10:50:41.000000000 +0200
-+++ Makefile 2009-03-04 11:19:34.000000000 +0100
-@@ -135,14 +135,9 @@
- print : Lhs2TeX.dvi
- $(DVIPS) -D600 -f Lhs2TeX.dvi | lpr -Pa -Zl
-
--install : bin doc
-+install : bin
- $(MKINSTDIR) $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 lhs2TeX $(DESTDIR)$(bindir)
-- $(MKINSTDIR) $(DESTDIR)$(stydir)
-- $(INSTALL) -m 644 lhs2TeX.sty lhs2TeX.fmt $(DESTDIR)$(stydir)
-- $(INSTALL) -m 644 Library/*.fmt $(DESTDIR)$(stydir)
-- $(MKINSTDIR) $(DESTDIR)$(docdir)
-- $(INSTALL) -m 644 doc/Guide2.pdf $(DESTDIR)$(docdir)
- $(MKINSTDIR) $(DESTDIR)$(mandir)/man1
- $(INSTALL) -m 644 lhs2TeX.1 $(DESTDIR)$(mandir)/man1
- ifeq ($(INSTALL_POLYTABLE),yes)
-@@ -158,6 +153,15 @@
- echo "Please update the TeX filename database."
- endif
-
-+install-doc : doc
-+ $(MKINSTDIR) $(DESTDIR)$(docdir)
-+ $(INSTALL) -m 644 doc/Guide2.pdf $(DESTDIR)$(docdir)
-+
-+install-data : bin
-+ $(MKINSTDIR) $(DESTDIR)$(stydir)
-+ $(INSTALL) -m 644 lhs2TeX.sty lhs2TeX.fmt $(DESTDIR)$(stydir)
-+ $(INSTALL) -m 644 Library/*.fmt $(DESTDIR)$(stydir)
-+
- srcdist : INSTALL doc
- if test -d $(DISTDIR); then $(RM) -rf $(DISTDIR); fi
- $(MKINSTDIR) $(DISTDIR)
diff --git a/textproc/hs-lhs2tex/files/patch-MathPoly.lhs b/textproc/hs-lhs2tex/files/patch-MathPoly.lhs
new file mode 100644
index 000000000000..7c4ca99a1acd
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-MathPoly.lhs
@@ -0,0 +1,11 @@
+--- ./MathPoly.lhs.orig 2010-07-22 12:13:20.000000000 +0200
++++ ./MathPoly.lhs 2011-03-27 01:52:26.469094252 +0100
+@@ -358,7 +358,7 @@
+ > (rn,rc) = findrel (n,c) rstack
+ > -- Schritt 3: Zeile auf Stack legen
+ > fstack = (c,l) : rstack
+-> in mkFromTo fstack rn n rc [fromToken $ TeX False (indent (rn,rc) (n,c))] p ls
++> in mkFromTo fstack rn n rc [fromToken $ (TeX False (indent (rn,rc) (n,c))) :: Token] p ls
+ >
+ >
+ > | c `elem` z -> mkFromTo stack n (n ++ "E") c ts rs ls
diff --git a/textproc/hs-lhs2tex/files/patch-Setup.hs b/textproc/hs-lhs2tex/files/patch-Setup.hs
new file mode 100644
index 000000000000..a5ea584380dc
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-Setup.hs
@@ -0,0 +1,23 @@
+--- ./Setup.hs.orig 2010-07-22 12:13:20.000000000 +0200
++++ ./Setup.hs 2011-03-27 01:53:35.109600797 +0100
+@@ -204,7 +204,7 @@
+ else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
+ let manDir = if isWindows
+ then dataPref `joinFileName` "Documentation"
+- else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
++ else prefix (absoluteInstallDirs pd lbi cd) `joinFileName` "man" `joinFileName` "man1"
+ createDirectoryIfMissing True docDir
+ copyFileVerbose v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf")
+ when (not isWindows) $
+@@ -291,9 +291,9 @@
+ do let mProg = lookupProgram (simpleProgram progName) programConf
+ case mProg of
+ Just (ConfiguredProgram { programLocation = UserSpecified p,
+- programArgs = args }) -> return (p,args)
++ programDefaultArgs = args }) -> return (p,args)
+ Just (ConfiguredProgram { programLocation = FoundOnSystem p,
+- programArgs = args }) -> return (p,args)
++ programDefaultArgs = args }) -> return (p,args)
+ _ -> (die (progName ++ " command not found"))
+
+ -- | Run a command in a specific environment and return the output and errors.
diff --git a/textproc/hs-lhs2tex/files/patch-configure b/textproc/hs-lhs2tex/files/patch-configure
deleted file mode 100644
index f4c2b4ae0a39..000000000000
--- a/textproc/hs-lhs2tex/files/patch-configure
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./configure.orig 2009-12-18 13:21:18.000000000 +0100
-+++ ./configure 2010-01-07 19:34:38.000000000 +0100
-@@ -2745,54 +2745,6 @@
- POLYTABLE_INSTALL=yes
- fi
-
--if test "z$POLYTABLE_INSTALL" = "zyes"; then
--
--{ $as_echo "$as_me:$LINENO: checking for the polytable package" >&5
--$as_echo_n "checking for the polytable package... " >&6; }
--if test -x "$KPSEWHICH"; then
-- POLYTABLE="`$KPSEWHICH polytable.sty`"
--fi
--if test -f "$POLYTABLE"; then
-- { $as_echo "$as_me:$LINENO: result: $POLYTABLE" >&5
--$as_echo "$POLYTABLE" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for version of polytable" >&5
--$as_echo_n "checking for version of polytable... " >&6; }
-- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"`
-- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
--$as_echo "$POLYTABLE_VERSION" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
-- # does polytable need to be installed?
-- { $as_echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5
--$as_echo_n "checking whether polytable needs to be installed... " >&6; }
-- POLYTABLE_INSTALL=no
-- if test -n $POLYTABLE; then
-- if ( IFS=".";
-- a="$POLYTABLE_VERSION"; b="0.8.2";
-- while test -n "$a$b"
-- do
-- set -- $a; h1="$1"; shift 2>/dev/null; a="$*"
-- set -- $b; h2="$1"; shift 2>/dev/null; b="$*"
-- test -n "$h1" || h1=0; test -n "$h2" || h2=0
-- test ${h1} -eq ${h2} || break
-- done
-- test ${h1} -lt ${h2}
-- )
--then
-- POLYTABLE_INSTALL=yes
--
--fi
--
-- else
-- POLYTABLE_INSTALL=yes
-- fi
-- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
--$as_echo "$POLYTABLE_INSTALL" >&6; }
--fi
--
- # Extract the first word of "mktexlsr", so it can be a program name with args.
- set dummy mktexlsr; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -2834,8 +2786,6 @@
-
-
-
--# docdir and expansion
--docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
-
- stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION"
-
diff --git a/textproc/hs-lhs2tex/pkg-descr b/textproc/hs-lhs2tex/pkg-descr
index 9e915cafea0b..0c58501a3309 100644
--- a/textproc/hs-lhs2tex/pkg-descr
+++ b/textproc/hs-lhs2tex/pkg-descr
@@ -1,4 +1,3 @@
-lhs2TeX is a preprocessor to generate LaTeX code from literate Haskell
-sources. It is released under the GPL.
+Preprocessor for typesetting Haskell sources with LaTeX.
-WWW: http://people.cs.uu.nl/andres/
+WWW: http://www.andres-loeh.de/lhs2tex/
diff --git a/textproc/hs-lhs2tex/pkg-plist b/textproc/hs-lhs2tex/pkg-plist
index 17c5274b397d..883595e8b6c6 100644
--- a/textproc/hs-lhs2tex/pkg-plist
+++ b/textproc/hs-lhs2tex/pkg-plist
@@ -1,4 +1,6 @@
-bin/lhs2TeX
+@comment $FreeBSD$
+%%NOPORTDOCS%%%%DOCSDIR%%/doc/Guide2.pdf
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%/doc
share/texmf-local/tex/latex/polytable/lazylist.sty
share/texmf-local/tex/latex/polytable/polytable.sty
@dirrm share/texmf-local/tex/latex/polytable
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 456bd51f268e..f7d82af9c089 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -7,11 +7,15 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding to libxml2
+LICENSE= BSD
+
+USE_CABAL= mtl
USE_GNOME= libxml2
CONFIGURE_ARGS+= --extra-include-dirs="${LOCALBASE}/include/libxml2"
diff --git a/textproc/hs-libxml/distinfo b/textproc/hs-libxml/distinfo
index fbc0e354213b..6cac89f65758 100644
--- a/textproc/hs-libxml/distinfo
+++ b/textproc/hs-libxml/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/libxml-0.1.1.tar.gz) = 417ec538637b313bd4d5ef9545624ab5
SHA256 (cabal/libxml-0.1.1.tar.gz) = d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07
SIZE (cabal/libxml-0.1.1.tar.gz) = 3959
diff --git a/textproc/hs-libxml/pkg-plist b/textproc/hs-libxml/pkg-plist
deleted file mode 100644
index 2d7d5e25053a..000000000000
--- a/textproc/hs-libxml/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/LibXML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/LibXML/Internals.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/LibXML/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/LibXML/Tree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/LibXML/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/LibXML
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index b9eb5156155e..525467d1ef2c 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -6,16 +6,23 @@
#
PORTNAME= pandoc
-PORTVERSION= 1.6
+PORTVERSION= 1.8.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A general markup converter
+LICENSE= GPLv2
+FILE_LICENSE= COPYING
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= utf8-string>=0.3 zip-archive>=0.1.1.4 xml>=1.3.5 texmath HTTP>=4000.0.5
+USE_CABAL= citeproc-hs>=0.3.1 dlist>=0.4 HTTP>=4000.0.5 json>=0.4 \
+ mtl>=1.1 network>=2 pandoc-types>=1.8 parsec>=2.1 \
+ tagsoup>=0.12 texmath>=0.5 utf8-string>=0.3 \
+ xhtml>=3000.0 xml>=1.3.5 zip-archive>=0.1.1.7
MAN1= pandoc.1 markdown2pdf.1
+MAN5= pandoc_markdown.5
PORTDATA= *
@@ -23,14 +30,14 @@ OPTIONS= HIGHLIGHTING "Compile in support for syntax highlighting" off \
EXECUTABLE "Build the pandoc executable" on \
WRAPPERS "Build the wrappers (markdown2pdf)" on \
LIBRARY "Build the pandoc library" on \
- CITEPROC "Compile in support for citeproc-hs" off
+ THREADED "Compile markdown2pdf with -threaded option" on
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
.if defined(WITH_HIGHLIGHTING)
CONFIGURE_ARGS+= --flags="highlighting"
-USE_HACKAGE+= highlighting-kate
+USE_CABAL+= highlighting-kate
.else
CONFIGURE_ARGS+= --flags="-highlighting"
.endif
@@ -38,16 +45,13 @@ CONFIGURE_ARGS+= --flags="-highlighting"
.if defined(WITH_EXECUTABLE)
CONFIGURE_ARGS+= --flags="exectuable"
EXECUTABLE+= pandoc
-PLIST_SUB+= MAYBE_EXECUTABLE=""
.else
CONFIGURE_ARGS+= --flags="-executable"
-PLIST_SUB+= MAYBE_EXECUTABLE="@comment "
.endif
.if defined(WITH_WRAPPERS)
CONFIGURE_ARGS+= --flags="wrappers"
EXECUTABLE+= markdown2pdf
-PLIST_SUB+= MAYBE_WRAPPERS=""
.if !defined(WITH_EXECUTABLE)
IGNORE= cannot be compiled since wrappers require an executable. Please (re)run 'make config' and choose EXECUTABLE
@@ -55,15 +59,12 @@ IGNORE= cannot be compiled since wrappers require an executable. Please (re)ru
.else
CONFIGURE_ARGS+= --flags="-wrappers"
-PLIST_SUB+= MAYBE_WRAPPERS="@comment "
.endif
.if defined(WITH_LIBRARY)
CONFIGURE_ARGS+= --flags="library"
-PLIST_SUB+= MAYBE_LIBRARY=""
.else
CONFIGURE_ARGS+= --flags="-library"
-PLIST_SUB+= MAYBE_LIBRARY="@comment "
STANDALONE= yes
.endif
@@ -71,13 +72,10 @@ STANDALONE= yes
IGNORE= cannot be compiled in this configuration. Please (re)run 'make config' and choose either EXECUTABLE or LIBRARY or both
.endif
-.if defined(WITH_CITEPROC)
-CONFIGURE_ARGS+= --flags="citeproc"
-USE_HACKAGE+= citeproc-hs
-PLIST_SUB+= MAYBE_CITEPROC=""
+.if defined(WITH_THREADED)
+CONFIGURE_ARGS+= --flags="threaded"
.else
-CONFIGURE_ARGS+= --flags="-citeproc"
-PLIST_SUB+= MAYBE_CITEPROC="@comment "
+CONFIGURE_ARGS+= --flags="-threaded"
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 14c06345582f..663636dc5b08 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/pandoc-1.6.tar.gz) = c24014cd65471a056938cf0f08e1dfd4
-SHA256 (cabal/pandoc-1.6.tar.gz) = 9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b
-SIZE (cabal/pandoc-1.6.tar.gz) = 360842
+SHA256 (cabal/pandoc-1.8.1.1.tar.gz) = 526355ddcbff69c0df7757d30d37e08864995b7ebd899916e329ecd19104c83c
+SIZE (cabal/pandoc-1.8.1.1.tar.gz) = 459135
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 1de649dd9d37..b666d2d2005c 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,5 +1,5 @@
---- ./Setup.hs.orig 2010-03-29 16:24:56.000000000 +0200
-+++ ./Setup.hs 2010-05-15 13:39:12.000000000 +0200
+--- ./Setup.hs.orig 2011-02-13 18:03:00.000000000 +0100
++++ ./Setup.hs 2011-03-13 01:14:26.580023488 +0100
@@ -6,7 +6,7 @@
import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
@@ -9,12 +9,12 @@
import Distribution.Simple.Utils (copyFiles)
import Control.Exception ( bracket_ )
import Control.Monad ( unless )
-@@ -86,7 +86,7 @@
+@@ -85,7 +85,7 @@
installManpages :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpages pkg lbi verbosity copy =
-- copyFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
-+ copyFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> "man/man1")
+- copyFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
++ copyFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> "man")
(zip (repeat manDir) manpages)
-- | Returns a list of 'dependencies' that have been modified after 'file'.
diff --git a/textproc/hs-pandoc/pkg-plist b/textproc/hs-pandoc/pkg-plist
deleted file mode 100644
index 6a30dd84b8a8..000000000000
--- a/textproc/hs-pandoc/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_WRAPPERS%%bin/markdown2pdf
-%%MAYBE_EXECUTABLE%%bin/pandoc
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi
-%%MAYBE_LIBRARY%%%%MAYBE_CITEPROC%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Biblio.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Highlighting.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Parsing.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/S5.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/UTF8.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/UUID.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/HTML.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/LaTeX.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/Markdown.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/RST.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/TeXMath.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Shared.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Templates.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ConTeXt.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Docbook.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/EPUB.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/HTML.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/LaTeX.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Man.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Markdown.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/MediaWiki.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Native.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/OpenDocument.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ODT.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RST.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RTF.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Texinfo.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/XML.hi
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
-%%NOPORTDOCS%%@dirrm %%DOCSDIR%%
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%
-%%MAYBE_LIBRARY%%@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-%%MAYBE_LIBRARY%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-%%MAYBE_LIBRARY%%@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-%%MAYBE_LIBRARY%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 9bd9fbbbf6f8..0c3e37ae5937 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -6,12 +6,15 @@
#
PORTNAME= polyparse
-PORTVERSION= 1.4
+PORTVERSION= 1.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Alternative parser combinator libraries for Haskell
+LICENSE= LGPL21
+FILE_LICENSE= COPYRIGHT
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index 71dc9c66dc83..940053701404 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/polyparse-1.4.tar.gz) = 1783867124b49eefdbdc9ac39caf3174
-SHA256 (cabal/polyparse-1.4.tar.gz) = 6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44
-SIZE (cabal/polyparse-1.4.tar.gz) = 18002
+SHA256 (cabal/polyparse-1.5.tar.gz) = 50f39d71a94dd00f12e7eb90436ef6512ea4b34c60bb7e4521ad706ac4e920f9
+SIZE (cabal/polyparse-1.5.tar.gz) = 21291
diff --git a/textproc/hs-polyparse/pkg-plist b/textproc/hs-polyparse/pkg-plist
deleted file mode 100644
index 64c92e0ef130..000000000000
--- a/textproc/hs-polyparse/pkg-plist
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse/ByteString.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/HuttonMeijerWallace.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Base.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/ByteString.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Lazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/Plain.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/State.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly/StateLazy.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators/Poly
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/ParserCombinators
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Parse
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index b6421e18ed8b..c38e9cb1f245 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -5,12 +5,15 @@
# $FreeBSD$
PORTNAME= stringsearch
-PORTVERSION= 0.3.0
+PORTVERSION= 0.3.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Boyer-Moore/Knuth-Morris-Pratt string search library
+LICENSE= BSD
+FILE_LICENSE= LICENCE
+
CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index e593436ebac0..8d11a0efcde6 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/stringsearch-0.3.0.tar.gz) = 707123ceed7b55df0e92266f2c100d93
-SHA256 (cabal/stringsearch-0.3.0.tar.gz) = 0cac37bc53526c29d571e2c7fe2670f8387feb90e16eae7a79de7c4795f063a4
-SIZE (cabal/stringsearch-0.3.0.tar.gz) = 35459
+SHA256 (cabal/stringsearch-0.3.3.tar.gz) = 510650feccf69652921741585835613cc228d216ba351ced1052d6b9d9842ea6
+SIZE (cabal/stringsearch-0.3.3.tar.gz) = 35733
diff --git a/textproc/hs-stringsearch/pkg-plist b/textproc/hs-stringsearch/pkg-plist
deleted file mode 100644
index d050c6e20106..000000000000
--- a/textproc/hs-stringsearch/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/BoyerMoore.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/DFA.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KarpRabin.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KMP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KnuthMorrisPratt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/Substitution.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/Search.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/Search/DFA.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/Search/KarpRabin.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/Search/KMP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/Internal/BoyerMoore.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/Internal/KnuthMorrisPratt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/Internal/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENCE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy/Search
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Lazy
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/Internal
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index c8fa3f575ebf..1d1ed2596f60 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -6,32 +6,19 @@
#
PORTNAME= tagsoup
-PORTVERSION= 0.10.1
+PORTVERSION= 0.12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A Haskell library for extracting information from HTML documents
+LICENSE= BSD
+
CABAL_SETUP= Setup.hs
PORTDATA= *
INSTALL_PORTDATA= cd ${WRKSRC} && \
${INSTALL_DATA} ${WRKSRC}/tagsoup.htm ${DATADIR}
-OPTIONS= TESTPROG "Build the test program" on
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_TESTPROG)
-CONFIGURE_ARGS+= --flags="testprog"
-EXECUTABLE+= tagsoup
-USE_HACKAGE+= deepseq==1.1.0.0 HTTP QuickCheck>=2.1.0.0
-PLIST_SUB+= MAYBE_TESTPROG=""
-.else
-CONFIGURE_ARGS+= --flags="-testprog"
-PLIST_SUB+= MAYBE_TESTPROG="@comment "
-.endif
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 27cc6683951d..f1f95cba456b 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/tagsoup-0.10.1.tar.gz) = a0a15e88465282de5263ea3d19b68290
-SHA256 (cabal/tagsoup-0.10.1.tar.gz) = d47a8d5db237bf1d84c650129753fb50f581e4a2200e81c7901ea4938b745a2f
-SIZE (cabal/tagsoup-0.10.1.tar.gz) = 28949
+SHA256 (cabal/tagsoup-0.12.tar.gz) = e7d59b1e2473cb0f6b307a43fae943f5d35218a34b7733467bc76a85b0c95849
+SIZE (cabal/tagsoup-0.12.tar.gz) = 29306
diff --git a/textproc/hs-tagsoup/pkg-plist b/textproc/hs-tagsoup/pkg-plist
deleted file mode 100644
index 5b05fe5038e9..000000000000
--- a/textproc/hs-tagsoup/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_TESTPROG%%bin/tagsoup
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/Download.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Entity.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Generated.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Implementation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Manual.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Match.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Options.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Render.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Specification.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Tree.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup/Type.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/StringLike.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML/TagSoup
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/HTML
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 260793b7f217..162a190c78e2 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -6,17 +6,18 @@
#
PORTNAME= texmath
-PORTVERSION= 0.3.0.2
+PORTVERSION= 0.5.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Conversion of LaTeX math formulas to MathML for Haskell
+LICENSE= GPLv2
+
CABAL_SETUP= Setup.hs
-USE_HACKAGE= xml utf8-string
+USE_CABAL= parsec>=2 syb xml
-OPTIONS= CGI "Compile CGI executable" off \
- TEST "Compile test executable" off
+OPTIONS= CGI "Compile CGI executable" off
PORTDATA= *
@@ -25,21 +26,10 @@ PORTDATA= *
.if defined(WITH_CGI)
CONFIGURE_ARGS+= --flags="cgi"
-USE_HACKAGE+= cgi json
+USE_CABAL+= cgi json utf8-string
EXECUTABLE+= texmath-cgi
-PLIST_SUB+= MAYBE_CGI=""
.else
CONFIGURE_ARGS+= --flags="-cgi"
-PLIST_SUB+= MAYBE_CGI="@comment "
-.endif
-
-.if defined(WITH_TEST)
-CONFIGURE_ARGS+= --flags="test"
-EXECUTABLE+= testTeXMathML
-PLIST_SUB+= MAYBE_TEST=""
-.else
-CONFIGURE_ARGS+= --flags="-test"
-PLIST_SUB+= MAYBE_TEST="@comment "
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index eb6ee03bc81c..3424c65e40e5 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/texmath-0.3.0.2.tar.gz) = 7748c1628eadf8ba3a26e0782df3dcfc
-SHA256 (cabal/texmath-0.3.0.2.tar.gz) = 8d2bb26fc5aab09ae92d2c194ec39acb4e04c054ad2caf1a1db0dc9b53b4b1d4
-SIZE (cabal/texmath-0.3.0.2.tar.gz) = 25370
+SHA256 (cabal/texmath-0.5.0.1.tar.gz) = bedd883728fbd84bf07c1d1c851440db6d8be6b9e221024533851cd7c21a824f
+SIZE (cabal/texmath-0.5.0.1.tar.gz) = 27958
diff --git a/textproc/hs-texmath/pkg-plist b/textproc/hs-texmath/pkg-plist
deleted file mode 100644
index 16bd4a0b1700..000000000000
--- a/textproc/hs-texmath/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-%%MAYBE_TEST%%bin/testTeXMathML
-%%MAYBE_CGI%%bin/texmath-cgi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/TeXMath.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/TeXMath/MathMLWriter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/TeXMath/Parser.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/TeXMath
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old