- Teach the Haskell Cabal ports to use the new options framework

- Remove some cruft

Obtained from:	FreeBSD Haskell

17 files changed, 23 insertions, 9 deletions

diff --git a/math/hs-Agda-executable/Makefile b/math/hs-Agda-executable/Makefile
index 2fd3a90c1d28..b528cb5daf6b 100644
--- a/math/hs-Agda-executable/Makefile
+++ b/math/hs-Agda-executable/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Agda-executable
 PORTVERSION=	2.3.0.1
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 3214dd20d9c2..4077c6d640bd 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	Agda
 PORTVERSION=	2.3.0.1
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A dependently typed functional programming language and proof assistant
 
-
 CABAL_SETUP=	Setup.hs
 
 USE_CABAL=	hashable hashtables haskeline>=0.6.3.2 \
@@ -29,19 +29,20 @@ INSTALL_PORTDATA=	(cd ${WRKSRC} && ${INSTALL_DATA} README ${DATADIR}; \
 
 SHOW_PKGMSG=	yes
 
-OPTIONS=	USE_LOCALE "Use encoding specified by the locale" off \
-		EPIC       "Install the Epic compiler" off
+OPTIONS_DEFINE=		USE_LOCALE EPIC
+
+USE_LOCALE_DESC=	Use encoding specified by the locale
+EPIC_DESC=		Install the Epic compiler
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
 .include <bsd.port.options.mk>
 
-.if defined(WITH_USE_LOCALE)
+.if ${PORT_OPTIONS:MUSE_LOCALE}
 CONFIGURE_ARGS+=	--flags="use-locale"
 .else
 CONFIGURE_ARGS+=	--flags="-use-locale"
 .endif
 
-.if defined(WITH_EPIC)
+.if ${PORT_OPTIONS:MEPIC}
 CONFIGURE_ARGS+=	--flags="epic"
 USE_CABAL+=		epic>=0.1.13
 .else
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index adb401e54723..9de383e9f574 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	NumInstances
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 0f5a676bbf57..6a8cb3e84322 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	categories
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 91e3288dcf86..ed7d226b69aa 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	comonad
 PORTVERSION=	1.1.1.6
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index 23710f2a10eb..ab1baa2a2c64 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	contravariant
 PORTVERSION=	0.2.0.2
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index 451660367f3a..27fd1c45d9af 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	data-lens-template
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index 6b5acf255b1f..a176f79f1be2 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	data-lens
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index 64ee3c48fb04..1e73736f0a58 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	distributive
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index c29dbe2343d0..da31ad843827 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erf
 PORTVERSION=	2.0.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index 86f9c53abf46..96c87a844274 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ieee754
 PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index 9c61870ea83c..f6dc7faaf478 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	math-functions
 PORTVERSION=	0.1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math haskell
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index 95109b272212..302b0b7a054f 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mwc-random
 PORTVERSION=	0.12.0.0
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 43332af83cfc..6b9be33d58d8 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pointed
 PORTVERSION=	2.1.0.2
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 342f9121faa3..ed338b99f4aa 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	probability
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 632568d66806..2d25fae23967 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	semigroups
 PORTVERSION=	0.8.3.2
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 81b14f0b3d2a..0244f3f6cb59 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	statistics
 PORTVERSION=	0.10.1.0
+PORTREVISION=	1
 CATEGORIES=	math haskell
 
 MAINTAINER=	haskell@FreeBSD.org