36 files changed, 51 insertions, 33 deletions

diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 5f066134da9a..31a0cf3390c6 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Diff
 PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 2f004f60e1f2..9fcfe19caaf7 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	HStringTemplate
 PORTVERSION=	0.6.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile
index 06380e5ef8b4..8393537d4c43 100644
--- a/textproc/hs-attoparsec-conduit/Makefile
+++ b/textproc/hs-attoparsec-conduit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	attoparsec-conduit
 PORTVERSION=	0.4.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index b00b434f7f01..87886216a5f5 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	attoparsec-enumerator
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index e1af986ab702..5dfec35101ec 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	attoparsec
 PORTVERSION=	0.10.2.0
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 20480d810ab4..562c8085dcc1 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blaze-markup
 PORTVERSION=	0.5.1.0
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 07001dbaebda..01ed8bb20920 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	bytestring-csv
 PORTVERSION=	0.1.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index e6afc2e1e9d5..0933149266ec 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	case-insensitive
 PORTVERSION=	0.4.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index b6d64a29f41e..34477a87324f 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	citeproc-hs
 PORTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -16,20 +17,22 @@ LICENSE=	BSD
 
 USE_CABAL=	json mtl pandoc-types>=1.8 utf8-string xml
 
-OPTIONS=	BIBUTILS "Use Chris Putnam's Bibutils" on \
-		NETWORK  "Use network and HTTP to retrieve CSL file" on
+OPTIONS_DEFINE=		BIBUTILS NETWORK
+OPTIONS_DEFAULT=	BIBUTILS NETWORK
+
+BIBUTILS_DESC=		Use Chris Putnam's Bibutils
+NETWORK_DESC=		Use network and HTTP to retrieve CSL file
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
 .include <bsd.port.options.mk>
 
-.if defined(WITH_BIBUTILS)
+.if ${PORT_OPTIONS:MBIBUTILS}
 CONFIGURE_ARGS+=	--flags="bibutils"
 USE_CABAL+=		hs-bibutils>=0.3
 .else
 CONFIGURE_ARGS+=	--flags="-bibutils"
 .endif
 
-.if defined(WITH_NETWORK)
+.if ${PORT_OPTIONS:MNETWORK}
 CONFIGURE_ARGS+=	--flags="network"
 USE_CABAL+=		HTTP>=4000.0.9 network>=2
 .else
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index b50068667e24..1a11c013ad01 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	csv
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 92b3960ff9c7..fc38c0dcff9e 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	double-conversion
 PORTVERSION=	0.2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index 84fae72ad9d3..1c642641e2c2 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	feed
 PORTVERSION=	0.3.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index c49cdc24d747..785258e3fa42 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	highlighting-kate
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -16,12 +17,13 @@ LICENSE=	GPLv2
 
 USE_CABAL=	blaze-html>=0.4.2 mtl parsec regex-pcre-builtin
 
-OPTIONS=	EXECUTABLE "Build the Highlight executable" off
+OPTIONS_DEFINE=		EXECUTABLE
+
+EXECUTABLE_DESC=	Build the Highlight executable
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
 .include <bsd.port.options.mk>
 
-.if defined(WITH_EXECUTABLE)
+.if ${PORT_OPTIONS:MEXECUTABLE}
 CONFIGURE_ARGS+=	--flags="executable"
 EXECUTABLE+=		Highlight
 .else
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index c678e747656d..7f8cff63d31e 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hs-bibutils
 PORTVERSION=	4.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index cad543ceabd2..a1e91906847a 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	html-conduit
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 3aedac1bccaf..011c63ad3710 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	html
 PORTVERSION=	1.0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index b62ea0f32f73..726749fc13b7 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hxt-charproperties
 PORTVERSION=	9.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 3aec85fbaa70..03a88b42a359 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hxt-regex-xmlschema
 PORTVERSION=	9.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 4863431f8adc..0051ca814e11 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hxt-unicode
 PORTVERSION=	9.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index af86863e2ad7..cde796afcb1b 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hxt
 PORTVERSION=	9.2.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 8435601ef81e..346b306827e0 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	lhs2tex
 PORTVERSION=	1.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 14a3adf34dd1..8d3c49f6553f 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	0.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index fdff82883427..d1f53c5653a8 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pandoc-types
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index e1aafcbdcca3..e8428dd25dd4 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	parsec
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index bc8e961f0978..7b534590afd6 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	polyparse
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index e27e4f4e1289..ad4c7c05f759 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	regex-base
 PORTVERSION=	0.93.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 525c89e9d288..fdbfbc6815a5 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	regex-compat
 PORTVERSION=	0.95.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 0438393a480b..69d4f072419d 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	regex-pcre-builtin
 PORTVERSION=	0.94.2.1.7.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index c24257be37fb..f6efc91c315f 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	regex-posix
 PORTVERSION=	0.95.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 8060c2a466ba..397cc570f57b 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	stringsearch
 PORTVERSION=	0.3.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index d1de57ecd897..a236688357d3 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tagsoup
 PORTVERSION=	0.12.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 77431a331154..66f5b528609f 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tagstream-conduit
 PORTVERSION=	0.3.2
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 93c2da817a6b..ce9c7049ab1f 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	texmath
 PORTVERSION=	0.6.0.6
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -18,12 +19,13 @@ CABAL_SETUP=	Setup.hs
 
 USE_CABAL=	parsec>=3 syb xml
 
-OPTIONS=	CGI	"Compile CGI executable"	off
+OPTIONS_DEFINE=		CGI
+
+CGI_DESC=		Compile CGI executable
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CGI)
+.if ${PORT_OPTIONS:MCGI}
 CONFIGURE_ARGS+=	--flags="cgi"
 USE_CABAL+=		cgi json utf8-string
 EXECUTABLE+=		texmath-cgi
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile
index 8fa8ceb38f50..45c4bd4c608f 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-xhtml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xhtml
 PORTVERSION=	3000.2.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 165001d4377b..283449caa44e 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xml-conduit
 PORTVERSION=	0.7.0.3
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index 1c4a08287ad2..da6c9186e8bc 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xml
 PORTVERSION=	1.3.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org