aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/hs-tar/Makefile1
-rw-r--r--archivers/hs-zip-archive/Makefile10
-rw-r--r--archivers/hs-zlib-bindings/Makefile1
-rw-r--r--archivers/hs-zlib-enum/Makefile1
-rw-r--r--archivers/hs-zlib/Makefile1
-rw-r--r--audio/hs-ALUT/Makefile2
-rw-r--r--audio/hs-OpenAL/Makefile1
-rw-r--r--audio/hs-libmpd/Makefile1
-rw-r--r--benchmarks/hs-criterion/Makefile2
-rw-r--r--converters/hs-aeson/Makefile1
-rw-r--r--converters/hs-dataenc/Makefile2
-rw-r--r--converters/hs-json/Makefile1
-rw-r--r--databases/hs-mysql/Makefile1
-rw-r--r--databases/hs-persistent-sqlite/Makefile1
-rw-r--r--databases/hs-persistent-template/Makefile1
-rw-r--r--databases/hs-persistent/Makefile1
-rw-r--r--devel/hs-Boolean/Makefile2
-rw-r--r--devel/hs-ConfigFile/Makefile2
-rw-r--r--devel/hs-DeepArrow/Makefile2
-rw-r--r--devel/hs-HUnit/Makefile2
-rw-r--r--devel/hs-IORefCAS/Makefile1
-rw-r--r--devel/hs-IfElse/Makefile1
-rw-r--r--devel/hs-MaybeT/Makefile2
-rw-r--r--devel/hs-MemoTrie/Makefile1
-rw-r--r--devel/hs-MissingH/Makefile2
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile2
-rw-r--r--devel/hs-MonadCatchIO-transformers/Makefile1
-rw-r--r--devel/hs-ObjectName/Makefile2
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-QuickCheck/Makefile1
-rw-r--r--devel/hs-StateVar/Makefile2
-rw-r--r--devel/hs-Stream/Makefile2
-rw-r--r--devel/hs-Tensor/Makefile2
-rw-r--r--devel/hs-TypeCompose/Makefile2
-rw-r--r--devel/hs-abstract-deque/Makefile1
-rw-r--r--devel/hs-abstract-par/Makefile1
-rw-r--r--devel/hs-alex/Makefile1
-rw-r--r--devel/hs-ansi-terminal/Makefile12
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile12
-rw-r--r--devel/hs-arrows/Makefile2
-rw-r--r--devel/hs-asn1-data/Makefile1
-rw-r--r--devel/hs-attempt/Makefile1
-rw-r--r--devel/hs-base-unicode-symbols/Makefile2
-rw-r--r--devel/hs-bits-atomic/Makefile1
-rw-r--r--devel/hs-blaze-builder-conduit/Makefile1
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile1
-rw-r--r--devel/hs-blaze-builder/Makefile2
-rw-r--r--devel/hs-blaze-textual/Makefile2
-rw-r--r--devel/hs-bsd-sysctl/Makefile1
-rw-r--r--devel/hs-byteorder/Makefile2
-rw-r--r--devel/hs-bytestring-nums/Makefile2
-rw-r--r--devel/hs-c2hs/Makefile2
-rw-r--r--devel/hs-cabal-install/Makefile1
-rw-r--r--devel/hs-checkers/Makefile1
-rw-r--r--devel/hs-cmdargs/Makefile1
-rw-r--r--devel/hs-conduit/Makefile1
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-convertible/Makefile1
-rw-r--r--devel/hs-darcs/Makefile39
-rw-r--r--devel/hs-data-default/Makefile1
-rw-r--r--devel/hs-datetime/Makefile2
-rw-r--r--devel/hs-dlist/Makefile2
-rw-r--r--devel/hs-edit-distance/Makefile1
-rw-r--r--devel/hs-enumerator/Makefile1
-rw-r--r--devel/hs-failure/Makefile1
-rw-r--r--devel/hs-fast-logger/Makefile2
-rw-r--r--devel/hs-fgl/Makefile2
-rw-r--r--devel/hs-file-embed/Makefile1
-rw-r--r--devel/hs-filemanip/Makefile2
-rw-r--r--devel/hs-filestore/Makefile1
-rw-r--r--devel/hs-filesystem-conduit/Makefile1
-rw-r--r--devel/hs-gconf/Makefile2
-rw-r--r--devel/hs-ghc-events/Makefile2
-rw-r--r--devel/hs-ghc-mtl/Makefile2
-rw-r--r--devel/hs-ghc-paths/Makefile2
-rw-r--r--devel/hs-gio/Makefile1
-rw-r--r--devel/hs-git-annex/Makefile1
-rw-r--r--devel/hs-glade/Makefile2
-rw-r--r--devel/hs-glib/Makefile1
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile1
-rw-r--r--devel/hs-haddock/Makefile1
-rw-r--r--devel/hs-happy/Makefile1
-rw-r--r--devel/hs-hashable/Makefile1
-rw-r--r--devel/hs-hashed-storage/Makefile15
-rw-r--r--devel/hs-hashtables/Makefile1
-rw-r--r--devel/hs-haskeline/Makefile1
-rw-r--r--devel/hs-haskell-platform/Makefile53
-rw-r--r--devel/hs-haskell-src-exts/Makefile1
-rw-r--r--devel/hs-haskell-src/Makefile1
-rw-r--r--devel/hs-hint/Makefile1
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hoogle/Makefile1
-rw-r--r--devel/hs-hslogger/Makefile2
-rw-r--r--devel/hs-language-c/Makefile2
-rw-r--r--devel/hs-language-javascript/Makefile1
-rw-r--r--devel/hs-largeword/Makefile2
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lifted-base/Makefile1
-rw-r--r--devel/hs-logict/Makefile1
-rw-r--r--devel/hs-monad-control/Makefile1
-rw-r--r--devel/hs-monad-par-extras/Makefile1
-rw-r--r--devel/hs-monad-par/Makefile1
-rw-r--r--devel/hs-mtl/Makefile1
-rw-r--r--devel/hs-mueval/Makefile1
-rw-r--r--devel/hs-murmur-hash/Makefile2
-rw-r--r--devel/hs-parallel/Makefile1
-rw-r--r--devel/hs-pcre-light/Makefile2
-rw-r--r--devel/hs-pool-conduit/Makefile1
-rw-r--r--devel/hs-primitive/Makefile2
-rw-r--r--devel/hs-random/Makefile1
-rw-r--r--devel/hs-ranges/Makefile2
-rw-r--r--devel/hs-reactive/Makefile2
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-resource-pool/Makefile1
-rw-r--r--devel/hs-safe/Makefile2
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-smallcheck/Makefile1
-rw-r--r--devel/hs-stm/Makefile1
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile2
-rw-r--r--devel/hs-syb-with-class/Makefile2
-rw-r--r--devel/hs-syb/Makefile1
-rw-r--r--devel/hs-system-filepath/Makefile1
-rw-r--r--devel/hs-tagged/Makefile1
-rw-r--r--devel/hs-temporary/Makefile1
-rw-r--r--devel/hs-test-framework-hunit/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile1
-rw-r--r--devel/hs-test-framework/Makefile1
-rw-r--r--devel/hs-testpack/Makefile1
-rw-r--r--devel/hs-text/Makefile1
-rw-r--r--devel/hs-threadscope/Makefile2
-rw-r--r--devel/hs-transformers-base/Makefile2
-rw-r--r--devel/hs-transformers/Makefile1
-rw-r--r--devel/hs-unamb/Makefile1
-rw-r--r--devel/hs-uniplate/Makefile1
-rw-r--r--devel/hs-unix-compat/Makefile1
-rw-r--r--devel/hs-unordered-containers/Makefile1
-rw-r--r--devel/hs-utf8-light/Makefile1
-rw-r--r--devel/hs-utf8-string/Makefile2
-rw-r--r--devel/hs-utility-ht/Makefile1
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-cabal/Makefile2
-rw-r--r--devel/hs-uuagc/Makefile1
-rw-r--r--devel/hs-uulib/Makefile2
-rw-r--r--devel/hs-vault/Makefile1
-rw-r--r--devel/hs-vector-algorithms/Makefile1
-rw-r--r--devel/hs-vector/Makefile2
-rw-r--r--ftp/hs-curl/Makefile2
-rw-r--r--graphics/hs-HGL/Makefile2
-rw-r--r--graphics/hs-cairo/Makefile1
-rw-r--r--graphics/hs-soegtk/Makefile2
-rw-r--r--graphics/hs-svgcairo/Makefile1
-rw-r--r--lang/ghc/bsd.cabal.mk74
-rw-r--r--lang/ghc/bsd.cabal.options.mk11
-rw-r--r--lang/hs-brainfuck/Makefile2
-rw-r--r--lang/hs-epic/Makefile1
-rw-r--r--lang/hs-unlambda/Makefile2
-rw-r--r--mail/hs-email-validate/Makefile1
-rw-r--r--mail/hs-mime-mail/Makefile2
-rw-r--r--math/hs-Agda-executable/Makefile1
-rw-r--r--math/hs-Agda/Makefile13
-rw-r--r--math/hs-NumInstances/Makefile2
-rw-r--r--math/hs-categories/Makefile1
-rw-r--r--math/hs-comonad/Makefile1
-rw-r--r--math/hs-contravariant/Makefile1
-rw-r--r--math/hs-data-lens-template/Makefile1
-rw-r--r--math/hs-data-lens/Makefile1
-rw-r--r--math/hs-distributive/Makefile1
-rw-r--r--math/hs-erf/Makefile2
-rw-r--r--math/hs-ieee754/Makefile1
-rw-r--r--math/hs-math-functions/Makefile2
-rw-r--r--math/hs-mwc-random/Makefile1
-rw-r--r--math/hs-pointed/Makefile1
-rw-r--r--math/hs-probability/Makefile1
-rw-r--r--math/hs-semigroups/Makefile1
-rw-r--r--math/hs-statistics/Makefile1
-rw-r--r--multimedia/hs-gstreamer/Makefile1
-rw-r--r--net/hs-hostname/Makefile2
-rw-r--r--net/hs-network-conduit/Makefile1
-rw-r--r--net/hs-network/Makefile1
-rw-r--r--net/hs-pcap/Makefile2
-rw-r--r--net/hs-sendfile/Makefile1
-rw-r--r--net/hs-socks/Makefile1
-rw-r--r--ports-mgmt/hs-porte/Makefile2
-rw-r--r--science/hs-bio/Makefile1
-rw-r--r--security/hs-Crypto/Makefile1
-rw-r--r--security/hs-RSA/Makefile13
-rw-r--r--security/hs-SHA/Makefile15
-rw-r--r--security/hs-certificate/Makefile8
-rw-r--r--security/hs-clientsession/Makefile1
-rw-r--r--security/hs-cprng-aes/Makefile2
-rw-r--r--security/hs-crypto-api/Makefile1
-rw-r--r--security/hs-crypto-conduit/Makefile1
-rw-r--r--security/hs-crypto-pubkey-types/Makefile1
-rw-r--r--security/hs-cryptohash/Makefile1
-rw-r--r--security/hs-digest/Makefile1
-rw-r--r--security/hs-entropy/Makefile2
-rw-r--r--security/hs-monadcryptorandom/Makefile1
-rw-r--r--security/hs-pem/Makefile1
-rw-r--r--security/hs-pureMD5/Makefile2
-rw-r--r--security/hs-pwstore-fast/Makefile2
-rw-r--r--security/hs-skein/Makefile1
-rw-r--r--security/hs-tls-extra/Makefile1
-rw-r--r--security/hs-tls/Makefile8
-rw-r--r--sysutils/hs-angel/Makefile1
-rw-r--r--textproc/hs-Diff/Makefile2
-rw-r--r--textproc/hs-HStringTemplate/Makefile2
-rw-r--r--textproc/hs-attoparsec-conduit/Makefile1
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile2
-rw-r--r--textproc/hs-attoparsec/Makefile1
-rw-r--r--textproc/hs-blaze-markup/Makefile1
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile2
-rw-r--r--textproc/hs-citeproc-hs/Makefile13
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-double-conversion/Makefile2
-rw-r--r--textproc/hs-feed/Makefile2
-rw-r--r--textproc/hs-highlighting-kate/Makefile8
-rw-r--r--textproc/hs-hs-bibutils/Makefile2
-rw-r--r--textproc/hs-html-conduit/Makefile1
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-hxt-charproperties/Makefile2
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile2
-rw-r--r--textproc/hs-hxt-unicode/Makefile2
-rw-r--r--textproc/hs-hxt/Makefile1
-rw-r--r--textproc/hs-lhs2tex/Makefile2
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-pandoc-types/Makefile1
-rw-r--r--textproc/hs-parsec/Makefile1
-rw-r--r--textproc/hs-polyparse/Makefile1
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-posix/Makefile2
-rw-r--r--textproc/hs-stringsearch/Makefile2
-rw-r--r--textproc/hs-tagsoup/Makefile2
-rw-r--r--textproc/hs-tagstream-conduit/Makefile1
-rw-r--r--textproc/hs-texmath/Makefile8
-rw-r--r--textproc/hs-xhtml/Makefile1
-rw-r--r--textproc/hs-xml-conduit/Makefile1
-rw-r--r--textproc/hs-xml/Makefile2
-rw-r--r--www/hs-HTTP/Makefile1
-rw-r--r--www/hs-authenticate/Makefile1
-rw-r--r--www/hs-cgi/Makefile2
-rw-r--r--www/hs-cookie/Makefile1
-rw-r--r--www/hs-css-text/Makefile2
-rw-r--r--www/hs-fastcgi/Makefile2
-rw-r--r--www/hs-hS3/Makefile2
-rw-r--r--www/hs-happstack/Makefile1
-rw-r--r--www/hs-hjsmin/Makefile3
-rw-r--r--www/hs-http-date/Makefile1
-rw-r--r--www/hs-http-server/Makefile2
-rw-r--r--www/hs-http-types/Makefile1
-rw-r--r--www/hs-oeis/Makefile2
-rw-r--r--www/hs-path-pieces/Makefile1
-rw-r--r--www/hs-recaptcha/Makefile2
-rw-r--r--www/hs-scgi/Makefile2
-rw-r--r--www/hs-shakespeare-css/Makefile1
-rw-r--r--www/hs-shakespeare-i18n/Makefile1
-rw-r--r--www/hs-shakespeare-js/Makefile1
-rw-r--r--www/hs-shakespeare-text/Makefile1
-rw-r--r--www/hs-shakespeare/Makefile1
-rw-r--r--www/hs-url/Makefile1
-rw-r--r--www/hs-wai-logger/Makefile1
-rw-r--r--www/hs-wai-test/Makefile1
-rw-r--r--www/hs-webkit/Makefile1
-rw-r--r--www/hs-xss-sanitize/Makefile1
-rw-r--r--www/hs-yesod-default/Makefile1
-rw-r--r--www/hs-yesod-json/Makefile1
-rw-r--r--www/hs-yesod-persistent/Makefile1
-rw-r--r--www/hs-yesod-routes/Makefile1
-rw-r--r--www/hs-yesod-static/Makefile1
-rw-r--r--x11-toolkits/hs-GLUT/Makefile2
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile1
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile43
-rw-r--r--x11-toolkits/hs-gtkglext/Makefile2
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile1
-rw-r--r--x11-toolkits/hs-pango/Makefile1
-rw-r--r--x11-toolkits/hs-vte/Makefile2
-rw-r--r--x11-toolkits/hs-wx/Makefile1
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile1
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile10
-rw-r--r--x11-wm/hs-xmonad/Makefile2
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile10
-rw-r--r--x11/hs-xmobar/Makefile20
286 files changed, 454 insertions, 318 deletions
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index ea1c91250f3c..8449de0fa97e 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tar
PORTVERSION= 0.4.0.0
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 335d66479561..92e78da810b6 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -7,6 +7,7 @@
PORTNAME= zip-archive
PORTVERSION= 0.1.1.8
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,18 +17,17 @@ LICENSE= BSD
USE_CABAL= digest>=0.0.0.1 mtl utf8-string>=0.3.1 zlib
-OPTIONS= EXECUTABLE "Build the Zip executable" off
+OPTIONS_DEFINE= EXECUTABLE
+
+EXECUTABLE_DESC= Build the Zip 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= Zip
-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/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 3bb5f606195b..7c4e88d64368 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -6,6 +6,7 @@
PORTNAME= zlib-bindings
PORTVERSION= 0.1.0.1
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index c451ca52ad35..f68d6261e3ce 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -6,6 +6,7 @@
PORTNAME= zlib-enum
PORTVERSION= 0.2.2.1
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index 41caa10bb571..579dd703c9dd 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -6,6 +6,7 @@
PORTNAME= zlib
PORTVERSION= 0.5.3.3
+PORTREVISION= 1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index bf5b6359eb33..31bb59456b04 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ALUT
PORTVERSION= 2.2.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index b7375f896a6e..fb60804e0471 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -7,6 +7,7 @@
PORTNAME= OpenAL
PORTVERSION= 1.4.0.1
+PORTREVISION= 1
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index d86546dbac16..523ab12afd47 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libmpd
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index bc45ccc5097d..8cec0dcb5bf2 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -7,7 +7,7 @@
PORTNAME= criterion
PORTVERSION= 0.6.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 53b48ecad9a0..17fc8df13027 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aeson
PORTVERSION= 0.6.0.2
+PORTREVISION= 1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index b673c9daa831..7baf8832d51d 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dataenc
PORTVERSION= 0.14.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 5d95091c40d3..9a1da303d89c 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -7,6 +7,7 @@
PORTNAME= json
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index 0806e13e2a13..10e40f79c59c 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mysql
PORTVERSION= 0.1.1.4
+PORTREVISION= 1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index 66b582ea1f7c..a6b88542aa11 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -7,6 +7,7 @@
PORTNAME= persistent-sqlite
PORTVERSION= 0.9.0.2
+PORTREVISION= 1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index 0d6435cec0ec..724ac37aeea8 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -7,6 +7,7 @@
PORTNAME= persistent-template
PORTVERSION= 0.9.0.2
+PORTREVISION= 1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 6364b18d1ff2..4435bbeb003a 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -7,6 +7,7 @@
PORTNAME= persistent
PORTVERSION= 0.9.0.4
+PORTREVISION= 1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index eaa1f8b40129..2fef53aea3d8 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Boolean
PORTVERSION= 0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 19e3cbf56d0b..953f1e67d3d6 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ConfigFile
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-DeepArrow/Makefile b/devel/hs-DeepArrow/Makefile
index 5e4a0e4a0e1e..329b9373d13c 100644
--- a/devel/hs-DeepArrow/Makefile
+++ b/devel/hs-DeepArrow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= DeepArrow
PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index b065901b1891..ccc7d2aa93fe 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= HUnit
PORTVERSION= 1.2.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IORefCAS/Makefile b/devel/hs-IORefCAS/Makefile
index a0cee988be0e..c6bd2a63c2e4 100644
--- a/devel/hs-IORefCAS/Makefile
+++ b/devel/hs-IORefCAS/Makefile
@@ -7,6 +7,7 @@
PORTNAME= IORefCAS
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index d8adc8824dcc..442a009b7c3e 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-MaybeT/Makefile
index 37544d7bf837..43b1fac85e36 100644
--- a/devel/hs-MaybeT/Makefile
+++ b/devel/hs-MaybeT/Makefile
@@ -7,7 +7,7 @@
PORTNAME= MaybeT
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index 87512a71a3a5..729273a8b21b 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -7,6 +7,7 @@
PORTNAME= MemoTrie
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index eeff1d106d32..b5404a84156b 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -7,7 +7,7 @@
PORTNAME= MissingH
PORTVERSION= 1.1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index 40cccc111e14..76044fbd7321 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= MonadCatchIO-mtl
PORTVERSION= 0.3.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile
index 9cd07e32d9b8..b147d1307e44 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-MonadCatchIO-transformers/Makefile
@@ -7,6 +7,7 @@
PORTNAME= MonadCatchIO-transformers
PORTVERSION= 0.3.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index fc6245c39fb5..25ecd431dc56 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ObjectName
PORTVERSION= 1.0.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index e9482019bf29..3ba39b338213 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -7,7 +7,7 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index c650e1efc203..58b00beda61a 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -6,6 +6,7 @@
PORTNAME= QuickCheck
PORTVERSION= 2.4.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index c7e92276ecef..8edfed2b907d 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= StateVar
PORTVERSION= 1.0.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index b6c55815b2d6..6aa4482f4852 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -6,7 +6,7 @@
PORTNAME= Stream
PORTVERSION= 0.4.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile
index 0367f896c479..374928f792ed 100644
--- a/devel/hs-Tensor/Makefile
+++ b/devel/hs-Tensor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tensor
PORTVERSION= 1.0.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 225c548e5925..873aad1f62b8 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -7,7 +7,7 @@
PORTNAME= TypeCompose
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 0068535bca7a..511d546cc47a 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -7,6 +7,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.1.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index dd535636349c..c2e797a3a996 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -7,6 +7,7 @@
PORTNAME= abstract-par
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 66059742d197..51d7cafad385 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -6,6 +6,7 @@
PORTNAME= alex
PORTVERSION= 3.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index cb0dd3aef4b1..eb9008c3a59e 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -7,25 +7,15 @@
PORTNAME= ansi-terminal
PORTVERSION= 0.5.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Simple ANSI terminal support, with Windows compatibility
-OPTIONS= EXAMPLE "Build the example application" off
-
LICENSE= BSD
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_EXAMPLE)
-CONFIGURE_ARGS+= --flags="Example"
-EXECUTABLE= ansi-terminal-example
-.else
CONFIGURE_ARGS+= --flags="-Example"
-.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index 0a417b7d7202..89ae5be821da 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ansi-wl-pprint
PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,17 +17,7 @@ LICENSE= BSD
USE_CABAL= ansi-terminal>=0.4.0
-OPTIONS= EXAMPLE "Build the example application" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_EXAMPLE)
-CONFIGURE_ARGS+= --flags="Example"
-EXECUTABLE= ansi-wl-pprint-example
-.else
CONFIGURE_ARGS+= --flags="-Example"
-.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index c206e172dec7..8858143a9840 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -7,7 +7,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 5adee55042fb..c7e94930c227 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asn1-data
PORTVERSION= 0.6.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-attempt/Makefile b/devel/hs-attempt/Makefile
index 837da03a388b..71f2e261b4a6 100644
--- a/devel/hs-attempt/Makefile
+++ b/devel/hs-attempt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= attempt
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 124e57d518c5..5e395dc8f7d5 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -7,7 +7,7 @@
PORTNAME= base-unicode-symbols
PORTVERSION= 0.2.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index cec27924e85d..692183457bea 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-conduit/Makefile b/devel/hs-blaze-builder-conduit/Makefile
index 9232b747321d..220beb9f5179 100644
--- a/devel/hs-blaze-builder-conduit/Makefile
+++ b/devel/hs-blaze-builder-conduit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= blaze-builder-conduit
PORTVERSION= 0.4.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index acf3162e2b8d..39b5aac94b35 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -7,6 +7,7 @@
PORTNAME= blaze-builder-enumerator
PORTVERSION= 0.2.0.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index e1f0781df4fb..39b9a308c9a8 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blaze-builder
PORTVERSION= 0.3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index baf4a7e26e41..bcd5a7aada0c 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blaze-textual
PORTVERSION= 0.2.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 5d45f07c7a3d..8dbe691cbb14 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index b8b34ba2423c..feaece83b392 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index 40367e519512..ac8244b7e11d 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bytestring-nums
PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 9c72b32ad71c..40f914b91904 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= c2hs
PORTVERSION= 0.16.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 45fbdbf9e22d..bff7afcbd183 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cabal-install
PORTVERSION= 0.14.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 1670092d90f7..4513bd7edd28 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -7,6 +7,7 @@
PORTNAME= checkers
PORTVERSION= 0.2.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index ac61e945b7e8..a49d94241bf1 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cmdargs
PORTVERSION= 0.9.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index f232013658a3..c0546e68e2de 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= conduit
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index 609ed68f3501..a409408b2704 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= configurator
PORTVERSION= 0.2.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 9d064b31a155..7e4727c54ecb 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -7,6 +7,7 @@
PORTNAME= convertible
PORTVERSION= 1.0.11.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 9b71f6f42c66..9be8f55e133b 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= darcs
PORTVERSION= 2.8.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -24,63 +25,63 @@ EXECUTABLE= darcs
MAN1= darcs.1
-OPTIONS= CURL "Use libcurl for HTTP support" on \
- HTTP "Use the pure HTTP package" off \
- STATIC "Build static binary" off \
- TERMINFO "Use the terminfo package" off \
- THREADED "Use threading and SMP support" on \
- COLOR "Use ANSI color escapes" off \
- MMAP "Compile with mmap support" off
+OPTIONS_DEFINE= STATIC TERMINFO THREADED COLOR MMAP
+OPTIONS_MULTI= HTTP
+OPTIONS_MULTI_HTTP= CURL HTTP
+OPTIONS_DEFAULT= CURL THREADED
+
+CURL_DESC= Use libcurl for HTTP support
+HTTP_DESC= Use the pure HTTP package
+STATIC_DESC= Build static binary
+TERMINFO_DESC= Use the terminfo package
+THREADED_DESC= Use threading and SMP support
+COLOR_DESC= Use ANSI color escapes
+MMAP_DESC= Compile with mmap support
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
CONFIGURE_ARGS+= --flags="library executable"
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
CONFIGURE_ARGS+= --flags="curl"
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+= --flags="-curl"
.endif
-.if defined(WITH_HTTP)
+.if ${PORT_OPTIONS:MHTTP}
CONFIGURE_ARGS+= --flags="http"
USE_CABAL+= HTTP>=4000.0.8 network>=2.2
.else
CONFIGURE_ARGS+= --flags="-http"
.endif
-.if !defined(WITH_CURL) && !defined(WITH_HTTP)
-IGNORE= cannot be compiled without HTTP support. Please (re)run 'make config' and choose either CURL or HTTP
-.endif
-
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
CONFIGURE_ARGS+= --flags="static"
.else
CONFIGURE_ARGS+= --flags="-static"
.endif
-.if defined(WITH_TERMINFO)
+.if ${PORT_OPTIONS:MTERMINFO}
CONFIGURE_ARGS+= --flags="terminfo"
USE_CABAL+= terminfo>=0.3
.else
CONFIGURE_ARGS+= --flags="-terminfo"
.endif
-.if defined(WITH_THREADED)
+.if ${PORT_OPTIONS:MTHREADED}
CONFIGURE_ARGS+= --flags="threaded"
.else
CONFIGURE_ARGS+= --flags="-threaded"
.endif
-.if defined(WITH_COLOR)
+.if ${PORT_OPTIONS:MCOLOR}
CONFIGURE_ARGS+= --flags="color"
.else
CONFIGURE_ARGS+= --flags="-color"
.endif
-.if defined(WITH_MMAP)
+.if ${PORT_OPTIONS:MMMAP}
CONFIGURE_ARGS+= --flags="mmap"
USE_CABAL+= mmap>=0.5
.else
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 9c5cb5d2d8bf..d3d6d034e72d 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -7,6 +7,7 @@
PORTNAME= data-default
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 3746f3dd4435..72d09bde7cf9 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= datetime
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 2239d78492d5..f294a1319c57 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -6,7 +6,7 @@
PORTNAME= dlist
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 96027ddbeeb8..8193b2e425c8 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -7,6 +7,7 @@
PORTNAME= edit-distance
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index cbe419b32377..c8af86ff88df 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enumerator
PORTVERSION= 0.4.19
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-failure/Makefile b/devel/hs-failure/Makefile
index 057e4c29754c..597ce01c8a1b 100644
--- a/devel/hs-failure/Makefile
+++ b/devel/hs-failure/Makefile
@@ -7,6 +7,7 @@
PORTNAME= failure
PORTVERSION= 0.2.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 072658e2723e..45f4fb44a9f5 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fast-logger
PORTVERSION= 0.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 578d290a25a7..e7293f6bf48f 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fgl
PORTVERSION= 5.4.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 9bd38ea43a48..65fb75694eb5 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -7,6 +7,7 @@
PORTNAME= file-embed
PORTVERSION= 0.0.4.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index aba59983c4f7..cd5af6eebde5 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= filemanip
PORTVERSION= 0.3.5.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index b72c194bf8cd..b2a172ace45d 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -7,6 +7,7 @@
PORTNAME= filestore
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filesystem-conduit/Makefile b/devel/hs-filesystem-conduit/Makefile
index e4b609eed574..1c495a701ae4 100644
--- a/devel/hs-filesystem-conduit/Makefile
+++ b/devel/hs-filesystem-conduit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= filesystem-conduit
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index d5d35caa018c..2e80c6bd221e 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gconf
PORTVERSION= 0.12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index 1e1588484876..f7da6d6f1abd 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghc-events
PORTVERSION= 0.4.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index e178dcaf4d52..863b590a5431 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ghc-mtl
PORTVERSION= 1.0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index a0527ef6e5a4..8d859ec613d0 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -6,7 +6,7 @@
PORTNAME= ghc-paths
PORTVERSION= 0.1.0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index a4ffaa32c552..c8b92549be86 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gio
PORTVERSION= 0.12.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index b69685475ca4..05739180623b 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -7,6 +7,7 @@
PORTNAME= git-annex
PORTVERSION= 3.20120522
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= frase@frase.id.au
diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile
index c4b1d62f46be..b06880ce9c8d 100644
--- a/devel/hs-glade/Makefile
+++ b/devel/hs-glade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glade
PORTVERSION= 0.12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index 1c5a972e8301..a4efa91dcaef 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= glib
PORTVERSION= 0.12.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index aa6e04375eda..9fa3dff35277 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk2hs-buildtools
PORTVERSION= 0.12.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index af2af4fd509b..e1c27602fdc6 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -6,6 +6,7 @@
PORTNAME= haddock
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 5838c843509b..724e48729740 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -6,6 +6,7 @@
PORTNAME= happy
PORTVERSION= 1.18.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 9208365cdd33..7a9fb76933ad 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hashable
PORTVERSION= 1.1.2.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index fd66cee2a46f..6a9082a6d52c 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hashed-storage
PORTVERSION= 0.5.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,20 +18,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
USE_CABAL= dataenc mmap>=0.5 mtl zlib
-OPTIONS= TEST "Build tests" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.include <bsd.port.options.mk>
-
-.if defined(WITH_TEST)
-CONFIGURE_ARGS+= --flags="test"
-USE_CABAL+= test-framework test-framework-hunit \
- test-framework-quickcheck2 HUnit \
- QuickCheck>=2.3 zip-archive
-EXECUTABLE+= hashed-storage-test
-.else
CONFIGURE_ARGS+= --flags="-test"
-.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index df02d89c4060..b100272b2bdf 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hashtables
PORTVERSION= 1.0.1.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile
index 3d186838f188..125d5fd22141 100644
--- a/devel/hs-haskeline/Makefile
+++ b/devel/hs-haskeline/Makefile
@@ -6,6 +6,7 @@
PORTNAME= haskeline
PORTVERSION= 0.6.4.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
index 3639d0aeb7b3..c3985f877348 100644
--- a/devel/hs-haskell-platform/Makefile
+++ b/devel/hs-haskell-platform/Makefile
@@ -7,6 +7,7 @@
PORTNAME= haskell-platform
PORTVERSION= 2012.2.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -15,32 +16,32 @@ COMMENT= The Haskell Platform
LICENSE= BSD
METAPORT= yes
-USE_CABAL= cgi==3001.1.7.4_3,1 \
- fgl==5.4.2.4_1 \
- GLUT==2.1.2.1_3,1 \
- haskell-src==1.0.1.5 \
- html==1.0.1.2_3 \
- HTTP==4000.2.3 \
- HUnit==1.2.4.2_1 \
- mtl==2.1.1 \
- network==2.3.0.13 \
- OpenGL==2.2.3.1,1 \
- parallel==3.2.0.2 \
- parsec==3.1.2 \
- QuickCheck==2.4.2 \
- random==1.0.1.1 \
- regex-base==0.93.2_3 \
- regex-compat==0.95.1_1 \
- regex-posix==0.95.1_1 \
- stm==2.3 \
- syb==0.3.6.1 \
- text=0.11.2.0 \
- transformers==0.3.0.0 \
- xhtml==3000.2.1 \
- zlib==0.5.3.3 \
- cabal-install==0.14.0 \
- alex==3.0.1 \
- happy==1.18.9
+USE_CABAL= cgi==3001.1.7.4_4,1 \
+ fgl==5.4.2.4_2 \
+ GLUT==2.1.2.1_4,1 \
+ haskell-src==1.0.1.5_1 \
+ html==1.0.1.2_4 \
+ HTTP==4000.2.3_1 \
+ HUnit==1.2.4.2_2 \
+ mtl==2.1.1_1 \
+ network==2.3.0.13_1 \
+ OpenGL==2.2.3.1_1,1 \
+ parallel==3.2.0.2_1 \
+ parsec==3.1.2_1 \
+ QuickCheck==2.4.2_1 \
+ random==1.0.1.1_1 \
+ regex-base==0.93.2_4 \
+ regex-compat==0.95.1_2 \
+ regex-posix==0.95.1_2 \
+ stm==2.3_1 \
+ syb==0.3.6.1_1 \
+ text=0.11.2.0_1 \
+ transformers==0.3.0.0_1 \
+ xhtml==3000.2.1_1 \
+ zlib==0.5.3.3_1 \
+ cabal-install==0.14.0_1 \
+ alex==3.0.1_1 \
+ happy==1.18.9_1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 4d8799263896..669411ac5c8b 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -7,6 +7,7 @@
PORTNAME= haskell-src-exts
PORTVERSION= 1.13.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 9fca56cb51c1..04e34c9c7702 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -7,6 +7,7 @@
PORTNAME= haskell-src
PORTVERSION= 1.0.1.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index f6b7964bec3f..d71e100a756a 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hint
PORTVERSION= 0.3.3.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index a3007857fa9e..b08ba8032dfd 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index d1660de3aba7..ed67535356e5 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hoogle
PORTVERSION= 4.2.11
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 13c1d7ac7d45..72cb44f65eab 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hslogger
PORTVERSION= 1.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 6a3649377e0c..421cce3d85e8 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -7,7 +7,7 @@
PORTNAME= language-c
PORTVERSION= 0.3.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 6fdefbdbc27f..995162770277 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -7,6 +7,7 @@
PORTNAME= language-javascript
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 5fc050eb2f6e..5f10130e80b2 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -7,7 +7,7 @@
PORTNAME= largeword
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index b5f70e4cdf74..fd474318b338 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index 5435bf523bd5..a676eff1b11f 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lifted-base
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 0482f2a9405c..1d9be4f7e32b 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -7,6 +7,7 @@
PORTNAME= logict
PORTVERSION= 0.5.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 410f2b1fb444..911cbbbdfeea 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monad-control
PORTVERSION= 0.3.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index 9746dbc95822..ff2c384ac529 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monad-par-extras
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 3ac2f1b7ad3a..5fece4da14fa 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monad-par
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index c76ff20f5cf8..a35ebb2b142f 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mtl
PORTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 327fa62d432e..022f9d3e9908 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mueval
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index cb29b5f80c99..2304c022a08a 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= murmur-hash
PORTVERSION= 0.1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 7264ec042691..e081d52cf0bd 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= parallel
PORTVERSION= 3.2.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 93c113dd9d44..66842d253488 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pcre-light
PORTVERSION= 0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pool-conduit/Makefile b/devel/hs-pool-conduit/Makefile
index 182cbfdddc29..45d47ca7d347 100644
--- a/devel/hs-pool-conduit/Makefile
+++ b/devel/hs-pool-conduit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pool-conduit
PORTVERSION= 0.1.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index 2b9a473a5248..b1ddb500d803 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= primitive
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index a6561a6e64d1..7889efc3d48c 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -7,6 +7,7 @@
PORTNAME= random
PORTVERSION= 1.0.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ranges/Makefile b/devel/hs-ranges/Makefile
index 447a8392640e..39e13f3753a9 100644
--- a/devel/hs-ranges/Makefile
+++ b/devel/hs-ranges/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ranges
PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile
index 0f26ed76c86b..ac2c97030b63 100644
--- a/devel/hs-reactive/Makefile
+++ b/devel/hs-reactive/Makefile
@@ -7,7 +7,7 @@
PORTNAME= reactive
PORTVERSION= 0.11.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 8e3d115920dd..560a8f6cdfb7 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -6,7 +6,7 @@
PORTNAME= readline
PORTVERSION= 1.0.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index e9a913c596ef..53caf824a4d1 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -7,6 +7,7 @@
PORTNAME= resource-pool
PORTVERSION= 0.2.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index a149fb8e9221..795867ddfe1f 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= safe
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 0a75bfcd1953..bed2712bee18 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -7,7 +7,7 @@
PORTNAME= show
PORTVERSION= 0.4.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index 365a550127ae..b312f0c7eb8a 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smallcheck
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index 8280bd74b34f..32cfd8df3599 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stm
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index d135196414a6..932110dfd872 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -7,7 +7,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
index 33abd875af6a..22f2d421b879 100644
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ b/devel/hs-syb-with-class-instances-text/Makefile
@@ -7,7 +7,7 @@
PORTNAME= syb-with-class-instances-text
PORTVERSION= 0.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index 9b3bbfe48c89..393908678351 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -7,7 +7,7 @@
PORTNAME= syb-with-class
PORTVERSION= 0.6.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 0a29ec992593..2c547fd156b0 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= syb
PORTVERSION= 0.3.6.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index d290952a7b7b..0036679d6cfe 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -7,6 +7,7 @@
PORTNAME= system-filepath
PORTVERSION= 0.4.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 82e827975278..3de528281d04 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tagged
PORTVERSION= 0.4.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index be7644b2c961..8bd0aa2f167b 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -7,6 +7,7 @@
PORTNAME= temporary
PORTVERSION= 1.1.2.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 77530942ada1..3d8d670f8bde 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= test-framework-hunit
PORTVERSION= 0.2.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index a539849dc1d7..91d30f2aa366 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= test-framework-quickcheck2
PORTVERSION= 0.2.12.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index e92a3f486bd2..3cd00840fa0a 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -7,6 +7,7 @@
PORTNAME= test-framework
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index 22904e80bc05..d02eae478efa 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -7,6 +7,7 @@
PORTNAME= testpack
PORTVERSION= 2.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index d9a7f5d1500f..4b84942277b7 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -7,6 +7,7 @@
PORTNAME= text
PORTVERSION= 0.11.2.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 9dace5505b55..1624f8e7f6ee 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -7,7 +7,7 @@
PORTNAME= threadscope
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index 3819af2e33cf..6dad71f77955 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transformers-base
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile
index 19b5ff91b988..e0c35577c27f 100644
--- a/devel/hs-transformers/Makefile
+++ b/devel/hs-transformers/Makefile
@@ -7,6 +7,7 @@
PORTNAME= transformers
PORTVERSION= 0.3.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index 296c6c707a11..cf494858e4ea 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 9bcbcdc0b797..1dbffe6a303e 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index 0d1bea20e407..e5a531aefedb 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -7,6 +7,7 @@
PORTNAME= unix-compat
PORTVERSION= 0.3.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index a999c8ca3924..470433d32074 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -7,6 +7,7 @@
PORTNAME= unordered-containers
PORTVERSION= 0.2.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index 560e75015a89..c3bf43a7a3bf 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -7,6 +7,7 @@
PORTNAME= utf8-light
PORTVERSION= 0.4.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 80ad5507fe85..6f950a047a72 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -7,7 +7,7 @@
PORTNAME= utf8-string
PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 27b6b62201e5..44e77289e4bc 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -7,6 +7,7 @@
PORTNAME= utility-ht
PORTVERSION= 0.0.8
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 0bf049861bb9..9b66824a0e76 100644
--- a/devel/hs-uuagc-bootstrap/Makefile
+++ b/devel/hs-uuagc-bootstrap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uuagc-bootstrap
PORTVERSION= 0.9.40.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 1c03c7dd950a..25d9fa00e463 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uuagc-cabal
PORTVERSION= 1.0.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index 1d9f7f58e047..1b2451555a3a 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.40.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 795dfd014819..7abfb716f328 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uulib
PORTVERSION= 0.9.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 0c2475f2c78e..625c679c641d 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vault
PORTVERSION= 0.2.0.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index d99f93d7bc1f..a32b8c20aff3 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vector-algorithms
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 11f2e3efd284..fa25e8487dd0 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vector
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 5f104d9528a7..c6072f1d343a 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= curl
PORTVERSION= 1.3.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index c9084c7e7fca..b24817335e4d 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -7,7 +7,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index 6a7edf8855a5..54fe3f0f7888 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cairo
PORTVERSION= 0.12.3.1
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile
index d0ed91545c40..6616cdfe028f 100644
--- a/graphics/hs-soegtk/Makefile
+++ b/graphics/hs-soegtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= soegtk
PORTVERSION= 0.12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index 43256a5f781b..a45b408db986 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= svgcairo
PORTVERSION= 0.12.1.1
+PORTREVISION= 1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 825b138e373a..8af1717357c4 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -79,6 +79,25 @@ CPPFLAGS+= -I${LOCALBASE}/include
INSTALL_PORTDATA?=
INSTALL_PORTEXAMPLES?=
+HSCOLOUR_DESC?= Colorize generated documentation by HsColour
+DYNAMIC_DESC?= Add support for dynamic linking
+PROFILE_DESC?= Add support for profiling
+
+.include <bsd.port.options.mk>
+
+.if exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi)
+OPTIONS_DEFINE+= DYNAMIC
+.endif
+
+.if exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.p_hi)
+OPTIONS_DEFINE+= PROFILE
+.endif
+
+.if exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)
+OPTIONS_DEFINE+= DOCS HSCOLOUR
+OPTIONS_DEFAULT+= DOCS
+.endif
+
.if defined(USE_ALEX)
BUILD_DEPENDS+= ${ALEX_CMD}:${PORTSDIR}/devel/hs-alex
CONFIGURE_ARGS+= --with-alex=${ALEX_CMD}
@@ -99,7 +118,7 @@ LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
USE_ICONV= yes
.endif
-.if defined(EXECUTABLE)
+.if defined(EXECUTABLE) && ${PORT_OPTIONS:MDOCS}
HADDOCK_EXE?= --executables
.endif
@@ -137,23 +156,18 @@ RUN_DEPENDS+= ${dependencies}
USE_PERL5_BUILD= 5.8+
.endif
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
.if !defined(XMLDOCS)
+
HADDOCK_OPTS= ${HADDOCK_EXE}
-.if defined(WITH_HSCOLOUR_DOCS)
+.if ${PORT_OPTIONS:MHSCOLOUR}
BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
HSCOLOUR_VERSION= 1.19
HSCOLOUR_DATADIR= ${LOCALBASE}/share/ghc-${GHC_VERSION}/cabal/hscolour-${HSCOLOUR_VERSION}
HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
+.endif # HSCOLOUR
.endif
@@ -169,32 +183,24 @@ USE_GMAKE= yes
PORTDOCS= *
.endif # !METAPORT
-.endif # !NOPORTDOCS
+.endif # DOCS
-.if defined(PORTDATA) && defined(NOPORTDATA)
-__handle_datadir__= --datadir='' --datasubdir='' --docdir='${DOCSDIR}'
-.else
__handle_datadir__= --datadir='${DATADIR}' --datasubdir='' --docdir='${DOCSDIR}'
-.endif
-.if !defined(XMLDOCS) && !defined(NOPORTDOCS)
+.if !defined(XMLDOCS) && ${PORT_OPTIONS:MDOCS}
CONFIGURE_ARGS+= --haddock-options=-w --with-haddock=${HADDOCK_CMD}
.endif
-.if !defined(WITHOUT_DYNAMIC)
+.if ${PORT_OPTIONS:MDYNAMIC}
CONFIGURE_ARGS+= --enable-shared
-PLIST_SUB+= DYNAMIC=""
.else
CONFIGURE_ARGS+= --disable-shared
-PLIST_SUB+= DYNAMIC="@comment "
.endif
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
CONFIGURE_ARGS+= --enable-executable-profiling --enable-library-profiling
-PLIST_SUB+= PROFILE=""
.else
CONFIGURE_ARGS+= --disable-executable-profiling --disable-library-profiling
-PLIST_SUB+= PROFILE="@comment "
.endif
.SILENT:
@@ -228,11 +234,11 @@ do-configure:
cd ${WRKSRC} && ${SETENV} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
${SETUP_CMD} configure --ghc --prefix=${PREFIX} --extra-include-dirs="${LOCALBASE}/include" --extra-lib-dirs="${LOCALBASE}/lib" ${__handle_datadir__} ${CONFIGURE_ARGS}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
.if defined(XMLDOCS) && defined(USE_AUTOTOOLS)
cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX}
.endif
-.endif # !NOPORTDOCS
+.endif # DOCS
.else
${DO_NADA}
.endif # !METAPORT
@@ -246,14 +252,14 @@ do-build:
cd ${WRKSRC} && ${SETUP_CMD} register --gen-script
.endif
-.if !defined(NOPORTDOCS)
-.if !defined(XMLDOCS) && !defined(STANDALONE)
+.if ${PORT_OPTIONS:MDOCS}
+.if !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC} && ${SETUP_CMD} haddock ${HADDOCK_OPTS}
.endif # STANDALONE
.if defined(XMLDOCS)
@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
.endif # XMLDOCS
-.endif # !NOPORTDOCS
+.endif # DOCS
.else
${DO_NADA}
.endif # !METAPORT
@@ -268,12 +274,12 @@ do-install:
cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
.endif
-.if !empty(INSTALL_PORTDATA) && !defined(NOPORTDATA)
+.if !empty(INSTALL_PORTDATA)
@${MKDIR} ${DATADIR}
${INSTALL_PORTDATA}
.endif
-.if !empty(INSTALL_PORTEXAMPLES) && !defined(NOPORTEXAMPLES)
+.if !empty(INSTALL_PORTEXAMPLES) && ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_PORTEXAMPLES}
.endif
@@ -284,7 +290,7 @@ do-install:
.endfor
.endif # MAN1SRC
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
.if !empty(XMLDOCS)
.for xmldoc in ${XMLDOCS}
@(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${DOCSDIR}/${xmldoc:C/^.*://g})
@@ -315,10 +321,8 @@ add-plist-cabal:
.if !defined(METAPORT)
@if [ -f ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh ]; then \
(${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh'; \
- ${ECHO_CMD} '@exec ${RM} -f %D/lib/ghc-${GHC_VERSION}/package.conf.old'; \
- ${ECHO_CMD} '@unexec %D/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}'; \
- ${ECHO_CMD} '@unexec ${RM} -f %D/lib/ghc-${GHC_VERSION}/package.conf.old') >> ${TMPPLIST}; fi
-.if defined(NOPORTDOCS)
+ ${ECHO_CMD} '@unexec %D/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}') >> ${TMPPLIST}; fi
+.if empty(PORT_OPTIONS:MDOCS)
@if [ -f ${DOCSDIR}/${FILE_LICENSE} ]; then \
(${ECHO_CMD} '${DOCSDIR_REL}/${FILE_LICENSE}'; \
${ECHO_CMD} '@unexec ${RMDIR} "%D/${DOCSDIR_REL}" 2>/dev/null || true') >>${TMPPLIST}; fi
@@ -334,7 +338,7 @@ add-plist-cabal:
post-install::
.if !defined(METAPORT)
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@if [ -f ${PREFIX}/${GHC_LIB_DOCSDIR_REL}/gen_contents_index ]; then \
${LN} -s ${DOCSDIR}/html ${PREFIX}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \
cd ${PREFIX}/${GHC_LIB_DOCSDIR_REL} && \
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
deleted file mode 100644
index 438f371c28f8..000000000000
--- a/lang/ghc/bsd.cabal.options.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $FreeBSD$
-#
-# bsd.cabal.options.mk -- Support options for ports based on Haskell Cabal.
-#
-# Created by: Gabor Pali <pgj@FreeBSD.org>
-#
-# Maintained by: haskell@FreeBSD.org
-#
-
-PKGNAMEPREFIX?= hs-
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index 895bb169de37..eafd160eaa70 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brainfuck
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-epic/Makefile b/lang/hs-epic/Makefile
index 740b6cfaab85..9f05a9589311 100644
--- a/lang/hs-epic/Makefile
+++ b/lang/hs-epic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= epic
PORTVERSION= 0.9.3
+PORTREVISION= 1
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 6c545eb49ca6..a5b901ecc00c 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= unlambda
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 955af837e358..98ffe71658f0 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -7,6 +7,7 @@
PORTNAME= email-validate
PORTVERSION= 0.2.8
+PORTREVISION= 1
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 5c5a72e43718..9525165044f4 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mime-mail
PORTVERSION= 0.4.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
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
diff --git a/multimedia/hs-gstreamer/Makefile b/multimedia/hs-gstreamer/Makefile
index 43db83be1771..4c12e63b8781 100644
--- a/multimedia/hs-gstreamer/Makefile
+++ b/multimedia/hs-gstreamer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.12.1.1
+PORTREVISION= 1
CATEGORIES= multimedia haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index 0c9b5a385bd5..f371bd9a4c4f 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-conduit/Makefile b/net/hs-network-conduit/Makefile
index d8c432c2920b..b2e88fb460e7 100644
--- a/net/hs-network-conduit/Makefile
+++ b/net/hs-network-conduit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= network-conduit
PORTVERSION= 0.4.0.1
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index 3f7556f3b5cb..d3f999010e23 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -7,6 +7,7 @@
PORTNAME= network
PORTVERSION= 2.3.0.13
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index 9c91d574e4a3..4c2c9f792b67 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 0a0f860583ac..08677529df54 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sendfile
PORTVERSION= 0.7.6
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index 060273a9d8f7..cf1123f9190d 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -7,6 +7,7 @@
PORTNAME= socks
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index d063ca641ef5..ca08e5d74cdf 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -6,7 +6,7 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index 378b5bcc7702..c339b505dbe5 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bio
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= science haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 06262b6b3d2a..40d91f535e73 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 3ac87e7ca170..30aef7812354 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -7,6 +7,7 @@
PORTNAME= RSA
PORTVERSION= 1.2.1.0
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,20 +18,22 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
USE_CABAL= crypto-api>=0.10 crypto-pubkey-types monadcryptorandom SHA
-OPTIONS= MD5 "Include support for using MD5" on \
- BINARY "Use the binary package for serialization" on
+OPTIONS_DEFINE= MD5 BINARY
+OPTIONS_DEFAULT= MD5 BINARY
+
+MD5_DESC= Include support for using MD5
+BINARY_DESC= Use the binary package for serialization
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
-.if defined(WITH_MD5)
+.if ${PORT_OPTIONS:MMD5}
CONFIGURE_ARGS+= --flags="IncludeMD5"
USE_CABAL+= pureMD5
.else
CONFIGURE_ARGS+= --flags="-IncludeMD5"
.endif
-.if defined(WITH_BINARY)
+.if ${PORT_OPTIONS:MBINARY}
CONFIGURE_ARGS+= --flags="UseBinary"
.else
CONFIGURE_ARGS+= --flags="-UseBinary"
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index ae1da19a6562..b696fd0b73a9 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -7,6 +7,7 @@
PORTNAME= SHA
PORTVERSION= 1.5.0.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,21 +17,15 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
-OPTIONS= TEST "Build the SHA test suite" off \
- EXE "Build a SHA2-384 executable similar to 'md5sum'" off
+OPTIONS_DEFINE= EXE
+
+EXE_DESC= Build a SHA2-384 executable similar to 'md5sum'
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
-.if defined(WITH_TEST)
-CONFIGURE_ARGS+= --flags="Test"
-USE_CABAL+= QuickCheck>=2 test-framework>=0.3 test-framework-quickcheck2>=0.2
-EXECUTABLE+= test_sha
-.else
CONFIGURE_ARGS+= --flags="-Test"
-.endif
-.if defined(WITH_EXE)
+.if ${PORT_OPTIONS:MEXE}
CONFIGURE_ARGS+= --flags="exe"
EXECUTABLE+= sha1 sha384
.else
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index 186b599975a5..c732c661bb31 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -7,6 +7,7 @@
PORTNAME= certificate
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,12 +19,13 @@ CABAL_SETUP= Setup.hs
USE_CABAL= asn1-data>=0.6.1.3 crypto-pubkey-types>=0.1 mtl pem>=0.1
-OPTIONS= EXECUTABLE "Build the executable" off
+OPTIONS_DEFINE= EXECUTABLE
+
+EXECUTABLE_DESC= Build the 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"
USE_CABAL+= cmdargs text>=0.11 cryptohash cryptocipher>=0.3.0
EXECUTABLE+= certificate
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index d513df039b03..c04a5389deef 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clientsession
PORTVERSION= 0.7.5
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index c4b38b81be8f..0ccca95a953b 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cprng-aes
PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index d4535322a3a7..390fb3c78a63 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -7,6 +7,7 @@
PORTNAME= crypto-api
PORTVERSION= 0.10.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 33db39c274c6..66c28dbc9bdf 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= crypto-conduit
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index 112cf9410444..3de98969aef0 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -7,6 +7,7 @@
PORTNAME= crypto-pubkey-types
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index ac381ff99887..c8b2f6fed56b 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cryptohash
PORTVERSION= 0.7.5
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index b61ea190cab0..1baa1a644594 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -7,6 +7,7 @@
PORTNAME= digest
PORTVERSION= 0.0.1.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 3b4ad0784c09..00e91591ce46 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= entropy
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index 36bab79ad77a..cb30acb9fac3 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -7,6 +7,7 @@
PORTNAME= monadcryptorandom
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index 8766696ce471..799cf6c8f721 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pem
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index befcc5457e20..baa58982c89a 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index 5fdf0f13df28..ce87c046a09a 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pwstore-fast
PORTVERSION= 2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 45e18dcab8b2..9cfb15ab670b 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -7,6 +7,7 @@
PORTNAME= skein
PORTVERSION= 0.1.0.7
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile
index 742ec52c51e5..8195250b1ece 100644
--- a/security/hs-tls-extra/Makefile
+++ b/security/hs-tls-extra/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tls-extra
PORTVERSION= 0.4.6
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 3658ba1761d1..510a2db20a54 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tls
PORTVERSION= 0.9.5
+PORTREVISION= 1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -19,12 +20,13 @@ CABAL_SETUP= Setup.hs
USE_CABAL= cereal>=0.3 certificate>=1.2.0 crypto-api>=0.5 \
cryptocipher>=0.3.0 cryptohash>=0.6 mtl
-OPTIONS= EXECUTABLE "Build the executables" off
+OPTIONS_DEFINE= EXECUTABLE
+
+EXECUTABLE_DESC= Build the executables
-.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"
USE_CABAL+= cmdargs cprng-aes>=0.2.3 network
EXECUTABLE+= stunnel checkciphers retrievecertificate simpleclient
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index cc1def512789..b202dbfc1da0 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= angel
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
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
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index c3cc6af0c489..57aa23b922f4 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -7,6 +7,7 @@
PORTNAME= HTTP
PORTVERSION= 4000.2.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index e899197179d7..44c33f7e9aec 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -7,6 +7,7 @@
PORTNAME= authenticate
PORTVERSION= 1.2.1.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 76f3436f7ab6..00e89775a5aa 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cgi
PORTVERSION= 3001.1.7.4
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= www haskell
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index 48ace54f12e8..ece285a160f3 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cookie
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 1da62b78119c..3eb85e63020f 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -7,7 +7,7 @@
PORTNAME= css-text
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 9a7d0d680baf..fe9bb4a3e4ac 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 3f3ca5c6d1ec..267820df6ced 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hS3
PORTVERSION= 0.5.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index ae92a198a811..496c2cd66ee1 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -7,6 +7,7 @@
PORTNAME= happstack
PORTVERSION= 7.0.0
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 80d26b574091..be11b366e126 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -7,10 +7,11 @@
PORTNAME= hjsmin
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell implementation of a JavaScript minifier
+COMMENT= Haskell implementation of a javascript minifier
LICENSE= BSD
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index cfb9b94c512b..0baf2d26fb58 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -7,6 +7,7 @@
PORTNAME= http-date
PORTVERSION= 0.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index e3c61e122722..36f1b05cecb4 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= http-server
PORTVERSION= 1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 4a7dd2ee54e4..42959dbb5090 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -7,6 +7,7 @@
PORTNAME= http-types
PORTVERSION= 0.6.11
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index e4897d395945..1057e59d7e72 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oeis
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index 08e9a54300c8..e26ff19abfd3 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -7,6 +7,7 @@
PORTNAME= path-pieces
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index 6b48d611be4e..410940c6dd85 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -7,7 +7,7 @@
PORTNAME= recaptcha
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index f34eff70d020..fda2ffe0411b 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -9,7 +9,7 @@
PORTNAME= scgi
PORTVERSION= 0.3.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
index c82bf2952990..5c454c635dd9 100644
--- a/www/hs-shakespeare-css/Makefile
+++ b/www/hs-shakespeare-css/Makefile
@@ -7,6 +7,7 @@
PORTNAME= shakespeare-css
PORTVERSION= 1.0.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
index c7a2901a63ab..f8d235e62ef4 100644
--- a/www/hs-shakespeare-i18n/Makefile
+++ b/www/hs-shakespeare-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= shakespeare-i18n
PORTVERSION= 1.0.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
index a01c04ebec37..4cd170c97d64 100644
--- a/www/hs-shakespeare-js/Makefile
+++ b/www/hs-shakespeare-js/Makefile
@@ -7,6 +7,7 @@
PORTNAME= shakespeare-js
PORTVERSION= 1.0.0.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
index 50d41b8ced37..702bb20272bf 100644
--- a/www/hs-shakespeare-text/Makefile
+++ b/www/hs-shakespeare-text/Makefile
@@ -7,6 +7,7 @@
PORTNAME= shakespeare-text
PORTVERSION= 1.0.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index 107406465922..d3a6308e9e83 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -7,6 +7,7 @@
PORTNAME= shakespeare
PORTVERSION= 1.0.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index b864aed6bae5..06a77328f327 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -7,6 +7,7 @@
PORTNAME= url
PORTVERSION= 2.1.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 08adf9a8b91f..dd4ca80542af 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wai-logger
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
index 56ae3b811221..f1791789c18a 100644
--- a/www/hs-wai-test/Makefile
+++ b/www/hs-wai-test/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wai-test
PORTVERSION= 1.2.0.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index b03a2205c3a0..a506ae9d558d 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= webkit
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index 581edb69b1f5..dacfe16c26d0 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xss-sanitize
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-default/Makefile b/www/hs-yesod-default/Makefile
index a32de6bdc4c8..14232cef9436 100644
--- a/www/hs-yesod-default/Makefile
+++ b/www/hs-yesod-default/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yesod-default
PORTVERSION= 1.0.1.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-json/Makefile b/www/hs-yesod-json/Makefile
index 3f062eed6664..bfa06475fd8b 100644
--- a/www/hs-yesod-json/Makefile
+++ b/www/hs-yesod-json/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yesod-json
PORTVERSION= 1.0.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index 30198fdb39c2..609ab4460463 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yesod-persistent
PORTVERSION= 1.0.0.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
index decb96e22f6b..1d327dcfc2e6 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yesod-routes
PORTVERSION= 1.0.1.2
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 5ebbfab4f9a3..c603fef6926d 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yesod-static
PORTVERSION= 1.0.0.3
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 7150c4b13dde..18590b70a237 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -6,7 +6,7 @@
PORTNAME= GLUT
PORTVERSION= 2.1.2.1
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index d85f549d61cf..20c6d3070a1e 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -6,6 +6,7 @@
PORTNAME= OpenGL
PORTVERSION= 2.2.3.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 171055139f47..49118293eb82 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk2hs
PORTVERSION= 0.12.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
@@ -17,52 +17,53 @@ COMMENT= A GTK2 Binding for Haskell
METAPORT= yes
USE_CABAL= glib gio cairo pango gtk
-OPTIONS= GCONF "GConf2 configuration system" off \
- GLADE "libglade UI loader" off \
- GSTREAMER "Media codec library" off \
- GTKGLEXT "Gtk+ OpenGL extension" off \
- GTKSOURCEVIEW2 "Source code editor" off \
- SVGCAIRO "Cairo SVG loader" off \
- VTE "Terminal emulator" off \
- WEBKIT "WebKit rendering engine" off \
- SOEGTK "Examples for Haskell SoE" off
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
+OPTIONS_DEFINE= GCONF GLADE GSTREAMER GTKGLEXT GTKSOURCEVIEW2 SVGCAIRO VTE WEBKIT SOEGTK
+
+GCONF_DESC= GConf2 configuration system
+GLADE_DESC= libglade UI loader
+GSTREAMER_DESC= Media codec library
+GTKGLEXT_DESC= Gtk+ OpenGL extension
+GTKSOURCEVIEW2_DESC= Source code editor
+SVGCAIRO_DESC= Cairo SVG loader
+VTE_DESC= Terminal emulator
+WEBKIT_DESC= WebKit rendering engine
+SOEGTK_DESC= Examples for Haskell SoE
+
.include <bsd.port.options.mk>
-.if defined(WITH_GCONF)
+.if ${PORT_OPTIONS:MGCONF}
USE_CABAL+= gconf
.endif
-.if defined(WITH_GLADE)
+.if ${PORT_OPTIONS:MGLADE}
USE_CABAL+= glade
.endif
-.if defined(WITH_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
USE_CABAL+= gstreamer
.endif
-.if defined(WITH_GTKGLEXT)
+.if ${PORT_OPTIONS:MGTKGLEXT}
USE_CABAL+= gtkglext
.endif
-.if defined(WITH_GSOURCEVIEW2)
+.if ${PORT_OPTIONS:MGSOURCEVIEW2}
USE_CABAL+= gsourceview2
.endif
-.if defined(WITH_SVGCAIRO)
+.if ${PORT_OPTIONS:MSVGCAIRO}
USE_CABAL+= svgcairo
.endif
-.if defined(WITH_VTE)
+.if ${PORT_OPTIONS:MVTE}
USE_CABAL+= vte
.endif
-.if defined(WITH_WEBKIT)
+.if ${PORT_OPTIONS:MWEBKIT}
USE_CABAL+= webkit
.endif
-.if defined(WITH_SOEGTK)
+.if ${PORT_OPTIONS:MSOEGTK}
USE_CABAL+= soegtk
.endif
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
index 44650c0291f9..db03c2f2d3b0 100644
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ b/x11-toolkits/hs-gtkglext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglext
PORTVERSION= 0.12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 22670a8847b8..5df85ee36b5f 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 0.12.3.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index 1548edb88ab2..07c07393c2b2 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 0.12.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index d3f660878296..fa3c4de1b405 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vte
PORTVERSION= 0.12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 09da037f0c12..40c2cb41609b 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wx
PORTVERSION= 0.90.0.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index 81f69aac4aa6..5f489bed7d1f 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wxdirect
PORTVERSION= 0.90.0.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index e0698c675e25..dd76beabee37 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -20,12 +20,14 @@ USE_XORG= x11
RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
-OPTIONS= XFT "Enable Xft support for fonts" On
+OPTIONS_DEFINE= XFT
+OPTIONS_DEFAULT= XFT
+
+XFT_DESC= Enable Xft support for fonts
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
-.if defined(WITH_XFT)
+.if ${PORT_OPTIONS:MXFT}
CONFIGURE_ARGS+= --flags="use_xft"
USE_CABAL+= X11-xft>=0.2
.endif
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index aa0208818cfe..3fc0e28dc57c 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmonad
PORTVERSION= 0.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index c736c4390aaa..c33663b18ef3 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= X11-xft
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 45adc59235c3..4543b1659853 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -6,7 +6,7 @@
PORTNAME= X11
PORTVERSION= 1.5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,12 +18,14 @@ CABAL_SETUP= Setup.hs
USE_CABAL= syb
USE_XORG= x11 xext sm
-OPTIONS= XINERAMA "Build with Xinerama support" on
+OPTIONS_DEFINE= XINERAMA
+OPTIONS_DEFAULT= XINERAMA
+
+XINERAMA_DESC= Build with Xinerama support
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
-.if defined(WITH_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
USE_XORG+= xinerama
CONFIGURE_ARGS+= --configure-option="--with-xinerama"
.else
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 0ec95c7b56cb..a3cb9ad3dbbf 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xmobar
PORTVERSION= 0.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -22,33 +22,35 @@ STANDALONE= yes
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${DATADIR}
-OPTIONS= XFT "Use Xft to render text (UTF-8 support included)" off \
- UTF8 "UTF-8 support" on \
- MPD "mpd support" off
+OPTIONS_DEFINE= XFT UTF8 MPD
+OPTIONS_DEFAULT= UFT8
+
+XFT_DESC= Use Xft to render text (UTF-8 support included)
+UTF8_DESC= UTF-8 support
+MPD_DESC= mpd support
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
# Disable Linux-only options
CONFIGURE_ARGS+= --flags="-with_inotify -with_iwlib"
-.if defined(WITH_XFT)
+.if ${PORT_OPTIONS:MXFT}
CONFIGURE_ARGS+= --flags="with_xft"
USE_CABAL+= utf8-string X11-xft>=0.2
.else
CONFIGURE_ARGS+= --flags="-with_xft"
.endif
-.if defined(WITH_UTF8)
+.if ${PORT_OPTIONS:MUTF8}
CONFIGURE_ARGS+= --flags="with_utf8"
-.if !defined(WITH_XFT)
+.if empty(PORT_OPTIONS:MXFT)
USE_CABAL+= utf8-string
.endif
.else
CONFIGURE_ARGS+= --flags="-with_utf8"
.endif
-.if defined(WITH_MPD)
+.if ${PORT_OPTIONS:MMPD}
CONFIGURE_ARGS+= --flags="with_mpd"
USE_CABAL+= libmpd
.else