aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
committerGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
commit109269205e521bb1d2d87678a391e5adefff88d6 (patch)
tree93f1f9278a9a48902904b7ff4a5ce711c10efe08 /textproc
parentad7295cafd0e46ece6fcbf594ef39a767c296d0e (diff)
downloadports-109269205e521bb1d2d87678a391e5adefff88d6.tar.gz
ports-109269205e521bb1d2d87678a391e5adefff88d6.zip
Notes
Diffstat (limited to 'textproc')
-rw-r--r--textproc/bibutils/Makefile22
-rw-r--r--textproc/bibutils/distinfo4
-rw-r--r--textproc/bibutils/files/patch-Makefile_start36
-rw-r--r--textproc/bibutils/files/patch-bin__Makefile11
-rw-r--r--textproc/bibutils/files/patch-bin__Makefile.dynamic11
-rw-r--r--textproc/bibutils/files/patch-bin__Makefile.static11
-rw-r--r--textproc/bibutils/files/patch-configure24
-rw-r--r--textproc/bibutils/files/patch-lib__Makefile.static24
-rw-r--r--textproc/bibutils/pkg-descr2
-rw-r--r--textproc/bibutils/pkg-plist19
-rw-r--r--textproc/hs-Diff/Makefile1
-rw-r--r--textproc/hs-HStringTemplate/Makefile1
-rw-r--r--textproc/hs-HaXml/Makefile9
-rw-r--r--textproc/hs-HaXml/distinfo4
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile2
-rw-r--r--textproc/hs-attoparsec-conduit/distinfo4
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile4
-rw-r--r--textproc/hs-attoparsec/Makefile1
-rw-r--r--textproc/hs-blaze-html/Makefile6
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-markup/Makefile4
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile2
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/Makefile3
-rw-r--r--textproc/hs-csv/Makefile6
-rw-r--r--textproc/hs-double-conversion/Makefile1
-rw-r--r--textproc/hs-feed/Makefile3
-rw-r--r--textproc/hs-hexpat/Makefile5
-rw-r--r--textproc/hs-highlighting-kate/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/Makefile6
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-html-conduit/Makefile3
-rw-r--r--textproc/hs-html/Makefile4
-rw-r--r--textproc/hs-hxt-charproperties/Makefile4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile3
-rw-r--r--textproc/hs-hxt-unicode/Makefile4
-rw-r--r--textproc/hs-hxt/Makefile4
-rw-r--r--textproc/hs-hxt/files/patch-hxt.cabal11
-rw-r--r--textproc/hs-lhs2tex/Makefile3
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-pandoc-types/Makefile4
-rw-r--r--textproc/hs-pandoc/Makefile9
-rw-r--r--textproc/hs-parsec/Makefile3
-rw-r--r--textproc/hs-polyparse/Makefile8
-rw-r--r--textproc/hs-polyparse/distinfo4
-rw-r--r--textproc/hs-regex-base/Makefile3
-rw-r--r--textproc/hs-regex-compat/Makefile3
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile3
-rw-r--r--textproc/hs-regex-posix/Makefile3
-rw-r--r--textproc/hs-regex-tdfa/Makefile3
-rw-r--r--textproc/hs-stringsearch/Makefile5
-rw-r--r--textproc/hs-tagsoup/Makefile4
-rw-r--r--textproc/hs-tagstream-conduit/Makefile3
-rw-r--r--textproc/hs-texmath/Makefile4
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-xhtml/Makefile6
-rw-r--r--textproc/hs-xml-conduit/Makefile1
-rw-r--r--textproc/hs-xml-types/Makefile5
-rw-r--r--textproc/hs-xml/Makefile7
-rw-r--r--textproc/hs-xml/distinfo4
-rw-r--r--textproc/hs-xml/pkg-descr5
-rw-r--r--textproc/hs-xmlhtml/Makefile3
-rw-r--r--textproc/hs-yaml/Makefile2
-rw-r--r--textproc/hs-yaml/distinfo4
67 files changed, 111 insertions, 277 deletions
diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile
index 5758c4edfabf..2ebe1c9a1de0 100644
--- a/textproc/bibutils/Makefile
+++ b/textproc/bibutils/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for: bibutils
-# Date created: May 14, 2010
-# Whom: Gabor Pali <pgj@FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= bibutils
-PORTVERSION= 4.12
+PORTVERSION= 5.0
CATEGORIES= textproc
-MASTER_SITES= http://www.scripps.edu/~cdputnam/software/bibutils/
+MASTER_SITES= SF/${PORTNAME}/
+
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
EXTRACT_SUFX= .tgz
@@ -21,14 +17,18 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
-post-patch:
- @${REINPLACE_CMD} 's|make |gmake |g' \
- ${WRKSRC}/Makefile_start
-
do-configure:
@cd ${WRKSRC} && ./configure --install-dir ${PREFIX}/bin
test: all
cd ${WRKSRC}/test && ${GMAKE} all test
+BINARIES= bib2xml biblatex2xml copac2xml ebi2xml end2xml endx2xml \
+ isi2xml med2xml modsclean ris2xml wordbib2xml xml2ads \
+ xml2bib xml2end xml2isi xml2ris xml2wordbib
+
+.for binary in ${BINARIES}
+PLIST_FILES+= bin/${binary}
+.endfor
+
.include <bsd.port.mk>
diff --git a/textproc/bibutils/distinfo b/textproc/bibutils/distinfo
index 0665ded962fb..e4ee4a233c59 100644
--- a/textproc/bibutils/distinfo
+++ b/textproc/bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bibutils_4.12_src.tgz) = 2b19875f9a525350e0a7ca5f3b95a1408fb3530fac11276d42e0b2e6c0dfe648
-SIZE (bibutils_4.12_src.tgz) = 816430
+SHA256 (bibutils_5.0_src.tgz) = 0a3f1dfc8f3ee98c2f6507e68358678fe355c5a3b3d0157dcab5d4fa2e6c662b
+SIZE (bibutils_5.0_src.tgz) = 458532
diff --git a/textproc/bibutils/files/patch-Makefile_start b/textproc/bibutils/files/patch-Makefile_start
deleted file mode 100644
index 9403ddd7000e..000000000000
--- a/textproc/bibutils/files/patch-Makefile_start
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./Makefile_start.orig 2010-10-10 19:42:50.000000000 +0200
-+++ ./Makefile_start 2011-07-31 01:06:08.000000000 +0200
-@@ -1,6 +1,6 @@
- POSTFIX=REPLACE_POSTFIX
--CC = REPLACE_CC
--RANLIB=REPLACE_RANLIB
-+%%SET_CC%%
-+%%SET_RANLIB%%
- INSTALLDIR=REPLACE_INSTALLDIR
- LIBINSTALLDIR=REPLACE_LIBINSTALLDIR
-
-@@ -12,8 +12,8 @@
- xml2ads xml2bib xml2end xml2isi xml2ris xml2wordbib modsclean
-
- all : FORCE
-- cd lib; make -k $(CC) -k $(RANLIB); cd ..
-- cd bin; make -k $(CC) -k VERSION="$(VERSION)" -k DATE="$(DATE)"; cd ..
-+ cd lib; make ; cd ..
-+ cd bin; make VERSION="$(VERSION)" DATE="$(DATE)"; cd ..
-
- clean: FORCE
- cd lib ; make clean ; cd ..
-@@ -31,11 +31,12 @@
- cd bin ; make test; cd ..
-
- install: all FORCE
-- cd lib ; make -k LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
-+ cd lib ; make LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
- sed 's/VERSION/${VERSION}/g' packageconfig_start > lib/bibutils.pc
- @for p in ${PROGRAMS}; \
- do ( cp bin/$$p ${INSTALLDIR}/$$p ); \
- done
-+ cp lib/libbibutils.a ${INSTALLDIR}/../lib
-
- package: all FORCE
- csh -f maketgz.csh ${VERSION} ${POSTFIX}
diff --git a/textproc/bibutils/files/patch-bin__Makefile b/textproc/bibutils/files/patch-bin__Makefile
deleted file mode 100644
index 041aa21928e5..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.orig 2010-10-10 19:49:05.000000000 +0200
-+++ ./bin/Makefile 2011-07-31 01:05:18.000000000 +0200
-@@ -2,7 +2,7 @@
- # bibutils converters MAKEFILE
- #
-
--CFLAGS = -I ../lib
-+CFLAGS += -I ../lib
- LIBDIR = -L../lib
-
- TOMODS = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-bin__Makefile.dynamic b/textproc/bibutils/files/patch-bin__Makefile.dynamic
deleted file mode 100644
index fafe20bac3d2..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile.dynamic
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.dynamic.orig 2010-10-10 19:07:17.000000000 +0200
-+++ ./bin/Makefile.dynamic 2011-07-31 01:05:18.000000000 +0200
-@@ -4,7 +4,7 @@
- # dynamic linkage version
- #
-
--CFLAGS = -I ../lib
-+CFLAGS += -I ../lib
- LDFLAGS = -L ../lib
- LDLIBS = -lbibutils
-
diff --git a/textproc/bibutils/files/patch-bin__Makefile.static b/textproc/bibutils/files/patch-bin__Makefile.static
deleted file mode 100644
index ab69b1a81e23..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile.static
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.static.orig 2010-10-08 01:57:09.000000000 +0200
-+++ ./bin/Makefile.static 2011-07-31 01:05:18.000000000 +0200
-@@ -2,7 +2,7 @@
- # bibutils converters MAKEFILE
- #
-
--CFLAGS = -I ../lib
-+CFLAGS += -I ../lib
- LIBDIR = -L../lib
-
- TOMODS = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-configure b/textproc/bibutils/files/patch-configure
index 8de3874cff3d..c0b5f708301b 100644
--- a/textproc/bibutils/files/patch-configure
+++ b/textproc/bibutils/files/patch-configure
@@ -1,13 +1,11 @@
---- ./configure.orig 2010-10-10 19:38:32.000000000 +0200
-+++ ./configure 2011-07-31 01:05:18.000000000 +0200
-@@ -153,8 +153,8 @@
- endif
-
- cat $INPUT_FILE | \
--sed "s/REPLACE_CC/CC=${CC}/" | \
--sed "s/REPLACE_RANLIB/RANLIB=${RANLIB}/" | \
-+sed "s/%%SET_CC%%/CC?=${CC}/" | \
-+sed "s/%%SET_RANLIB%%/RANLIB?=${RANLIB}/" | \
- sed "s|REPLACE_INSTALLDIR|${INSTALLDIR}|" | \
- sed "s|REPLACE_LIBINSTALLDIR|${LIBINSTALLDIR}|" | \
- sed "s/REPLACE_POSTFIX/${POSTFIX}/" > $OUTPUT_FILE
+--- ./configure.orig 2013-05-28 07:21:47.000000000 +0200
++++ ./configure 2013-06-03 01:00:10.000000000 +0200
+@@ -247,7 +247,7 @@
+ RANLIB='ranlib'
+ POSTFIX='_netbsd'
+ elif [ "$type" = "FreeBSD" ] ; then
+- CC='gcc'
++ CC='cc'
+ CFLAGS='-Wall'
+ if [ "$LIBTYPE" = "dynamic" ] ; then
+ CLIBFLAGS='-Wall -fPIC'
diff --git a/textproc/bibutils/files/patch-lib__Makefile.static b/textproc/bibutils/files/patch-lib__Makefile.static
deleted file mode 100644
index b37dfc308f13..000000000000
--- a/textproc/bibutils/files/patch-lib__Makefile.static
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./lib/Makefile.static.orig 2010-10-08 01:57:00.000000000 +0200
-+++ ./lib/Makefile.static 2011-07-31 01:05:18.000000000 +0200
-@@ -1,5 +1,5 @@
- #CC = gcc -Wall
--RANLIB = echo
-+#RANLIB = echo
-
- SIMPLE_OBJS = is_ws.o strsearch.o charsets.o
-
-@@ -31,12 +31,10 @@
- all: libbibcore.a libbibutils.a
-
- libbibcore.a: $(BIBCORE_OBJS)
-- ar -cr $@ $^
-- $(RANLIB) $@
-+ $(AR) -cr $@ $^
-
- libbibutils.a: $(BIBUTILS_OBJS)
-- ar -cr $@ $^
-- $(RANLIB) $@
-+ $(AR) -cr $@ $^
-
- clean:
- /bin/rm -f *.o core
diff --git a/textproc/bibutils/pkg-descr b/textproc/bibutils/pkg-descr
index 7aa3e4f84efd..b91ce0091214 100644
--- a/textproc/bibutils/pkg-descr
+++ b/textproc/bibutils/pkg-descr
@@ -5,4 +5,4 @@ RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N
programs are required and not N^2-N. These programs operate on the
command line and are styled after standard UNIX-like filters.
-WWW: http://www.scripps.edu/~cdputnam/software/bibutils/
+WWW: http://sourceforge.net/p/bibutils/home/Bibutils/
diff --git a/textproc/bibutils/pkg-plist b/textproc/bibutils/pkg-plist
deleted file mode 100644
index 3813820ebbd6..000000000000
--- a/textproc/bibutils/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-bin/bib2xml
-bin/biblatex2xml
-bin/copac2xml
-bin/ebi2xml
-bin/end2xml
-bin/endx2xml
-bin/isi2xml
-bin/med2xml
-bin/modsclean
-bin/ris2xml
-bin/wordbib2xml
-bin/xml2ads
-bin/xml2bib
-bin/xml2end
-bin/xml2isi
-bin/xml2ris
-bin/xml2wordbib
-lib/libbibutils.a
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 011fbefe37a2..280bcf5e5cf3 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Diff
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 2fd545d3dcbc..1c7b04df5b8e 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= HStringTemplate
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index f6bc34bbd443..4e0b08251324 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,18 +2,15 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.23.3
-PORTREVISION= 2
+PORTVERSION= 1.24
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A collection of utilities for using Haskell and XML together
+COMMENT= Collection of utilities for using Haskell and XML together
LICENSE= LGPL21
-FILE_LICENSE= COPYRIGHT
-CABAL_SETUP= Setup.hs
-USE_CABAL= polyparse>=1.5 random
+USE_CABAL= polyparse>=1.9 random
EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \
MkOneOf Validate XsdToHaskell Xtract
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index a3522caffe99..a3c48a69d916 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HaXml-1.23.3.tar.gz) = 0fe925a45f78ca87e197c8ac98976b0dd9737f56d2f9ac415b298287b6dce3be
-SIZE (cabal/HaXml-1.23.3.tar.gz) = 146596
+SHA256 (cabal/HaXml-1.24.tar.gz) = b6f9b147f80dbac04b11633d0bd9309c7ce9d2b0cff67b83086212a4f0567ba2
+SIZE (cabal/HaXml-1.24.tar.gz) = 143107
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index c8514302d444..9f6e41155682 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec-conduit
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-conduit/distinfo b/textproc/hs-attoparsec-conduit/distinfo
index c5e4a7c58361..8d87d383a715 100644
--- a/textproc/hs-attoparsec-conduit/distinfo
+++ b/textproc/hs-attoparsec-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-conduit-1.0.0.tar.gz) = 68c50163ab30c614d8d2fe125d332812e693548ceac1af4cbbbc43ce703880ab
-SIZE (cabal/attoparsec-conduit-1.0.0.tar.gz) = 3761
+SHA256 (cabal/attoparsec-conduit-1.0.1.tar.gz) = e55d67165e53a5d228e6f863be1d78b31052a6ccb0791905eae16da94bf56691
+SIZE (cabal/attoparsec-conduit-1.0.1.tar.gz) = 4237
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 78b2f004a3c2..bc73b5705c4e 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -2,16 +2,14 @@
PORTNAME= attoparsec-enumerator
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pass input from an enumerator to an Attoparsec parser
LICENSE= MIT
-FILE_LICENSE= license.txt
-CABAL_SETUP= Setup.hs
USE_CABAL= attoparsec>=0.10 enumerator>=0.4 text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index c10b051905a3..98fc7f3213a3 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -2,6 +2,7 @@
PORTNAME= attoparsec
PORTVERSION= 0.10.4.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 85a4f5734dd3..49ef0c39c43e 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.6.0.0
+PORTVERSION= 0.6.1.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A blazingly fast HTML combinator library for Haskell
+COMMENT= Blazingly fast HTML combinator library for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.5.1 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index 3262656819f1..405d372eb92a 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.6.0.0.tar.gz) = 94b6927d5a268fccc5156e0e9f1a54a800f2da20174ab4bcbb49684675bd1259
-SIZE (cabal/blaze-html-0.6.0.0.tar.gz) = 77780
+SHA256 (cabal/blaze-html-0.6.1.1.tar.gz) = 2cafc98ccbb3b9dc9c444ae306337b2aa7fd0be54b650bf208a656a8f6acee23
+SIZE (cabal/blaze-html-0.6.1.1.tar.gz) = 77759
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 78c8bebc81f7..9a4f15bdf705 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.5.1.4
+PORTVERSION= 0.5.1.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,6 @@ COMMENT= Blazingly fast markup combinator library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index d8c2ac50968f..f10c9b261512 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.5.1.4.tar.gz) = 39933d9b6f966c2f08ae72bc00142aa44277d50866240e90f166fb332136613c
-SIZE (cabal/blaze-markup-0.5.1.4.tar.gz) = 11889
+SHA256 (cabal/blaze-markup-0.5.1.5.tar.gz) = e4d034560e6808c5fdb8ca2eeef0031f3caff5398ba4fee72a049eea43ad7a3c
+SIZE (cabal/blaze-markup-0.5.1.5.tar.gz) = 11885
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index a092b092d08e..4189767edfcf 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index cd88aaf4f642..166b8e8fb7f0 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.0
+PORTVERSION= 1.0.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index 5b7543ed72c9..4845ef4e792c 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-1.0.tar.gz) = f323b4b486523a1778841c1c5d0917a1dfd7dca68298dc8a022341efcb3a83f4
-SIZE (cabal/case-insensitive-1.0.tar.gz) = 4772
+SHA256 (cabal/case-insensitive-1.0.0.2.tar.gz) = c2952ea7e2fe052c5f8fc07d2cded328c50cb3282006d9a276d7f8101eff8c85
+SIZE (cabal/case-insensitive-1.0.0.2.tar.gz) = 4803
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index 1626e64cfa2d..48ee3d2f423b 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -2,10 +2,11 @@
PORTNAME= citeproc-hs
PORTVERSION= 0.3.8
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A Citation Style Language implementation in Haskell
+COMMENT= Citation Style Language implementation in Haskell
LICENSE= BSD
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 4d7f8ef5e81f..67e9cc80de73 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,16 +3,14 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A CSV library for Haskell
+COMMENT= CSV library for Haskell
LICENSE= MIT
-FILE_LICENSE= COPYING
-CABAL_SETUP= Setup.hs
USE_CABAL= parsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 4b5b8647d571..8e66f527ed60 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -2,6 +2,7 @@
PORTNAME= double-conversion
PORTVERSION= 0.2.0.6
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index a5a680dd9b87..fd4ee0605a82 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= feed
PORTVERSION= 0.3.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= utf8-string xml>=1.2.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 42e4ac97e2fa..bd2e47cd87ea 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hexpat
PORTVERSION= 0.20.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,8 @@ COMMENT= XML parser/formatter based on expat
LICENSE= BSD
-USE_CABAL= List>=0.4.2 text>=0.5 transformers utf8-string
+USE_CABAL= extensible-exceptions>=0.1 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-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index aa73b37bf36f..85851c3e6020 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.3.8
+PORTVERSION= 0.5.3.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index b55f6b5c5f71..f7f16086c03d 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.3.8.tar.gz) = 5ca00f73773b1638bbbdae736d41c889d3f971dbdfbfacdf7ab5001e21afafb9
-SIZE (cabal/highlighting-kate-0.5.3.8.tar.gz) = 661579
+SHA256 (cabal/highlighting-kate-0.5.3.9.tar.gz) = 0ca2abc648da30cebfffcdf22140a380df3c5d98c80984bf97ee416c351a1395
+SIZE (cabal/highlighting-kate-0.5.3.9.tar.gz) = 662621
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index dcc2b1efb266..f4b2f85ccd63 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 4.17
+PORTVERSION= 5.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= 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
+BUILD_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
+RUN_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils
USE_CABAL= syb
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 34cf13114ce9..5ee776de4369 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-4.17.tar.gz) = aff139a7f589d71ebbaa918f9e1be55a0f2d1d5378f77db9b36171bebac6616f
-SIZE (cabal/hs-bibutils-4.17.tar.gz) = 443548
+SHA256 (cabal/hs-bibutils-5.0.tar.gz) = 54403646b4530649e9a48b01f0d23818566d62691c651ba4ff9889278c85eca1
+SIZE (cabal/hs-bibutils-5.0.tar.gz) = 428490
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index ac1efd772553..f2eb8265c076 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= html-conduit
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Parse HTML documents using xml-conduit datatypes
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= conduit>=1.0 filesystem-conduit>=1.0 resourcet>=0.3 \
system-filepath>=0.4 tagstream-conduit>=0.4 text \
transformers xml-conduit>=1.1 xml-types>=0.3
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index b85292a2c042..d31b4558d292 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,5 @@ COMMENT= HTML combinator library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 41885e1f8f6a..ba3fa083c822 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -2,13 +2,11 @@
PORTNAME= hxt-charproperties
PORTVERSION= 9.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Character properties and classes for XML and Unicode
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 59e74dae053d..8e74814022d2 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hxt-regex-xmlschema
PORTVERSION= 9.1.0
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Regular expression library for W3C XML Schema regular expressions
LICENSE= MIT
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hxt-charproperties>=9 parsec>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 9653f138b360..45f9be00d2b1 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -2,14 +2,12 @@
PORTNAME= hxt-unicode
PORTVERSION= 9.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Unicode functions for UTF-8, iso-latin-* and other encodings
-CABAL_SETUP= Setup.hs
-
USE_CABAL= hxt-charproperties>=9
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index f61ae640769a..de24e47974d2 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -2,11 +2,11 @@
PORTNAME= hxt
PORTVERSION= 9.3.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A collection of tools for processing XML with Haskell
+COMMENT= Collection of tools for processing XML with Haskell
LICENSE= MIT
diff --git a/textproc/hs-hxt/files/patch-hxt.cabal b/textproc/hs-hxt/files/patch-hxt.cabal
deleted file mode 100644
index 1ce1d1ce667e..000000000000
--- a/textproc/hs-hxt/files/patch-hxt.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index b969a05429a3..beb2689e83b9 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lhs2tex
PORTVERSION= 1.18.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,6 @@ COMMENT= Preprocessor for typesetting Haskell sources with LaTeX
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl regex-compat
USE_TEX= latex
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 24de02f19f6b..d72c5b525a47 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 1087e1488cb6..17310b0d9902 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -2,15 +2,13 @@
PORTNAME= pandoc-types
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Types for representing a structured document
LICENSE= GPLv2
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= syb
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 539cee27513f..21bd6defcb81 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -3,16 +3,13 @@
PORTNAME= pandoc
PORTVERSION= 1.11.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Conversion between markup formats
LICENSE= GPLv2
-FILE_LICENSE= COPYING
-
-CABAL_SETUP= Setup.hs
USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
citeproc-hs>=0.3.7 data-default>=0.4 highlighting-kate>=0.5.3.7 \
@@ -23,6 +20,10 @@ USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
EXECUTABLE= pandoc
+# For PDF generation
+RUN_DEPENDS+= latex-ifluatex>=1.3:${PORTSDIR}/print/latex-ifluatex \
+ ifxetex>=0:${PORTSDIR}/print/ifxetex
+
MAN1= pandoc.1
MAN5= pandoc_markdown.5
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index f0429c329e40..e351d06f0aad 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -2,7 +2,7 @@
PORTNAME= parsec
PORTVERSION= 3.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Monadic parser combinators
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl text>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 065e049af281..5ae3826bf27d 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,17 +1,13 @@
# $FreeBSD$
PORTNAME= polyparse
-PORTVERSION= 1.8
-PORTREVISION= 3
+PORTVERSION= 1.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A variety of alternative parser combinator libraries
+COMMENT= Variety of alternative parser combinator libraries
LICENSE= LGPL21
-FILE_LICENSE= COPYRIGHT
-
-CABAL_SETUP= Setup.hs
USE_CABAL= text
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index e025f2d04ad2..b4c0d24ffbb4 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/polyparse-1.8.tar.gz) = 96fbc3ce3c239c6ce566437e17dc98649982e72dc3edcb68ef5ee083b210d922
-SIZE (cabal/polyparse-1.8.tar.gz) = 22223
+SHA256 (cabal/polyparse-1.9.tar.gz) = 9f12d6821594166af881941d6c346a6ad617eae18a0ee8659044ef163694708a
+SIZE (cabal/polyparse-1.9.tar.gz) = 22256
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index a749cc87d7b8..f0de37bcc186 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Interface API for regex-posix,pcre,parsec,tdfa,dfa
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index c2b4deaa5c69..ac432fc1cdbd 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Replaces/Enhances Text.Regex
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= regex-base>=0.93 regex-posix>=0.95.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 1ccb9ab35ebb..05c5a318fa25 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= regex-pcre-builtin
PORTVERSION= 0.94.4.5.8.31
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Replaces/Enhances Text.Regex
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= regex-base>=0.93
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index 233428590a16..8ab18d99ecee 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,6 @@ COMMENT= Replaces/enhances Text.Regex
LICENSE= BSD
-CABAL_SETUP= Setup.hs
USE_CABAL= regex-base>=0.93
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index 69350b0c8250..57f013d2739d 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -2,13 +2,12 @@
PORTNAME= regex-tdfa
PORTVERSION= 1.1.8
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Replaces/Enhances Text.Regex
-CABAL_SETUP= Setup.hs
-
USE_CABAL= mtl parsec regex-base>=0.93.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 65621a3b2bfc..10d3f62b0ac0 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -3,16 +3,13 @@
PORTNAME= stringsearch
PORTVERSION= 0.3.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast searching, splitting and replacing of ByteStrings
LICENSE= BSD
-FILE_LICENSE= LICENCE
-
-CABAL_SETUP= Setup.hs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index a87a92a744e0..5bfbd71e1415 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tagsoup
PORTVERSION= 0.12.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,6 @@ 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-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index d7e03be24649..d0e4fcf6e797 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tagstream-conduit
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Streamlined HTML tag parser
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= attoparsec attoparsec-conduit>=0.5 blaze-builder \
blaze-builder-conduit>=0.5 case-insensitive conduit>=0.5 \
text transformers>=0.3
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 31c842e6be57..8e4347a524f5 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.6.1.3
+PORTVERSION= 0.6.1.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +10,6 @@ COMMENT= Conversion of LaTeX math formulas to MathML or OMML
LICENSE= GPLv2
-CABAL_SETUP= Setup.hs
-
USE_CABAL= parsec>=3 syb xml
OPTIONS_DEFINE= CGI
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index b483e2df659c..1a4a212d7b33 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.1.3.tar.gz) = 0570c4feae01905b64656b03aeb6d0fdb7ebbc4968fcc3774b35532e939a50b8
-SIZE (cabal/texmath-0.6.1.3.tar.gz) = 43978
+SHA256 (cabal/texmath-0.6.1.5.tar.gz) = 888cca454fc585272ed5fa41711943250f76efebbff302534d02c349409c9d95
+SIZE (cabal/texmath-0.6.1.5.tar.gz) = 43225
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile
index cab760be4e19..5b9c61cd8f9c 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-xhtml/Makefile
@@ -2,15 +2,13 @@
PORTNAME= xhtml
PORTVERSION= 3000.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= An XHTML combinator library
+COMMENT= XHTML combinator library
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 0668cede3748..9b4f1dd6b6e7 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xml-conduit
PORTVERSION= 1.1.0.3
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index e20ac244448c..66577b103dc3 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -2,16 +2,13 @@
PORTNAME= xml-types
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Basic types for representing XML
LICENSE= MIT
-FILE_LICENSE= license.txt
-
-CABAL_SETUP= Setup.hs
USE_CABAL= text
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index 442426a02aeb..73039df14569 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -2,17 +2,14 @@
# $FreeBSD$
PORTNAME= xml
-PORTVERSION= 1.3.12
-PORTREVISION= 4
+PORTVERSION= 1.3.13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= A simple XML library for Haskell
+COMMENT= Simple XML library for Haskell
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-xml/distinfo b/textproc/hs-xml/distinfo
index eb7a8e844f4c..ecabcbb0789f 100644
--- a/textproc/hs-xml/distinfo
+++ b/textproc/hs-xml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-1.3.12.tar.gz) = 51410e12facc989bad32133a58d3ffc624a2ce8e1b1b4cfc49c27fa0ecb7b8d2
-SIZE (cabal/xml-1.3.12.tar.gz) = 11921
+SHA256 (cabal/xml-1.3.13.tar.gz) = c33607cef8a48d878b0e617e115135fc6f025fe43dcb65c2c7afb8285415b813
+SIZE (cabal/xml-1.3.13.tar.gz) = 12082
diff --git a/textproc/hs-xml/pkg-descr b/textproc/hs-xml/pkg-descr
index b47d2bc63727..625325f56044 100644
--- a/textproc/hs-xml/pkg-descr
+++ b/textproc/hs-xml/pkg-descr
@@ -1,3 +1,4 @@
-A simple XML library for Haskell.
+A simple XML library.
+
+WWW: http://code.galois.com/
-WWW: http://hackage.haskell.org/package/xml
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index d3fc9dc08adb..9d9085b30e41 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xmlhtml
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= XML parser and renderer with HTML 5 quirks mode
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5 \
parsec>=3.1.2 text>=0.11 unordered-containers>=0.1.4
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 6faa529bb6bb..2272cea74281 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.2.3
+PORTVERSION= 0.8.2.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 509073958787..20238c5b6945 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.2.3.tar.gz) = 8a8fce53772722087631a1c7475ff2eb50a975751128e8449dafcff5924946b7
-SIZE (cabal/yaml-0.8.2.3.tar.gz) = 66311
+SHA256 (cabal/yaml-0.8.2.4.tar.gz) = a00da810d835c04c49940eb73d3de9f0cd9cf52c508622579428a0eef880623e
+SIZE (cabal/yaml-0.8.2.4.tar.gz) = 66338