Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2012 02:30:11 +0000 (UTC)
From:      Gabor Pali <pgj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r301879 - in head: archivers/hs-tar archivers/hs-zip-archive archivers/hs-zlib archivers/hs-zlib-bindings archivers/hs-zlib-enum audio/hs-ALUT audio/hs-OpenAL audio/hs-libmpd benchmarks...
Message-ID:  <201208030230.q732UBax057422@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pgj
Date: Fri Aug  3 02:30:07 2012
New Revision: 301879
URL: http://svn.freebsd.org/changeset/ports/301879

Log:
  - Teach the Haskell Cabal ports to use the new options framework
  - Remove some cruft
  
  Obtained from:	FreeBSD Haskell

Deleted:
  head/lang/ghc/bsd.cabal.options.mk
Modified:
  head/archivers/hs-tar/Makefile
  head/archivers/hs-zip-archive/Makefile
  head/archivers/hs-zlib-bindings/Makefile
  head/archivers/hs-zlib-enum/Makefile
  head/archivers/hs-zlib/Makefile
  head/audio/hs-ALUT/Makefile
  head/audio/hs-OpenAL/Makefile
  head/audio/hs-libmpd/Makefile
  head/benchmarks/hs-criterion/Makefile
  head/converters/hs-aeson/Makefile
  head/converters/hs-dataenc/Makefile
  head/converters/hs-json/Makefile
  head/databases/hs-mysql/Makefile
  head/databases/hs-persistent-sqlite/Makefile
  head/databases/hs-persistent-template/Makefile
  head/databases/hs-persistent/Makefile
  head/devel/hs-Boolean/Makefile
  head/devel/hs-ConfigFile/Makefile
  head/devel/hs-DeepArrow/Makefile
  head/devel/hs-HUnit/Makefile
  head/devel/hs-IORefCAS/Makefile
  head/devel/hs-IfElse/Makefile
  head/devel/hs-MaybeT/Makefile
  head/devel/hs-MemoTrie/Makefile
  head/devel/hs-MissingH/Makefile
  head/devel/hs-MonadCatchIO-mtl/Makefile
  head/devel/hs-MonadCatchIO-transformers/Makefile
  head/devel/hs-ObjectName/Makefile
  head/devel/hs-PSQueue/Makefile
  head/devel/hs-QuickCheck/Makefile
  head/devel/hs-StateVar/Makefile
  head/devel/hs-Stream/Makefile
  head/devel/hs-Tensor/Makefile
  head/devel/hs-TypeCompose/Makefile
  head/devel/hs-abstract-deque/Makefile
  head/devel/hs-abstract-par/Makefile
  head/devel/hs-alex/Makefile
  head/devel/hs-ansi-terminal/Makefile
  head/devel/hs-ansi-wl-pprint/Makefile
  head/devel/hs-arrows/Makefile
  head/devel/hs-asn1-data/Makefile
  head/devel/hs-attempt/Makefile
  head/devel/hs-base-unicode-symbols/Makefile
  head/devel/hs-bits-atomic/Makefile
  head/devel/hs-blaze-builder-conduit/Makefile
  head/devel/hs-blaze-builder-enumerator/Makefile
  head/devel/hs-blaze-builder/Makefile
  head/devel/hs-blaze-textual/Makefile
  head/devel/hs-bsd-sysctl/Makefile
  head/devel/hs-byteorder/Makefile
  head/devel/hs-bytestring-nums/Makefile
  head/devel/hs-c2hs/Makefile
  head/devel/hs-cabal-install/Makefile
  head/devel/hs-checkers/Makefile
  head/devel/hs-cmdargs/Makefile
  head/devel/hs-conduit/Makefile
  head/devel/hs-configurator/Makefile
  head/devel/hs-convertible/Makefile
  head/devel/hs-darcs/Makefile
  head/devel/hs-data-default/Makefile
  head/devel/hs-datetime/Makefile
  head/devel/hs-dlist/Makefile
  head/devel/hs-edit-distance/Makefile
  head/devel/hs-enumerator/Makefile
  head/devel/hs-failure/Makefile
  head/devel/hs-fast-logger/Makefile
  head/devel/hs-fgl/Makefile
  head/devel/hs-file-embed/Makefile
  head/devel/hs-filemanip/Makefile
  head/devel/hs-filestore/Makefile
  head/devel/hs-filesystem-conduit/Makefile
  head/devel/hs-gconf/Makefile
  head/devel/hs-ghc-events/Makefile
  head/devel/hs-ghc-mtl/Makefile
  head/devel/hs-ghc-paths/Makefile
  head/devel/hs-gio/Makefile
  head/devel/hs-git-annex/Makefile
  head/devel/hs-glade/Makefile
  head/devel/hs-glib/Makefile
  head/devel/hs-gtk2hs-buildtools/Makefile
  head/devel/hs-haddock/Makefile
  head/devel/hs-happy/Makefile
  head/devel/hs-hashable/Makefile
  head/devel/hs-hashed-storage/Makefile
  head/devel/hs-hashtables/Makefile
  head/devel/hs-haskeline/Makefile
  head/devel/hs-haskell-platform/Makefile
  head/devel/hs-haskell-src-exts/Makefile
  head/devel/hs-haskell-src/Makefile
  head/devel/hs-hint/Makefile
  head/devel/hs-hlibev/Makefile
  head/devel/hs-hoogle/Makefile
  head/devel/hs-hslogger/Makefile
  head/devel/hs-language-c/Makefile
  head/devel/hs-language-javascript/Makefile
  head/devel/hs-largeword/Makefile
  head/devel/hs-lazysmallcheck/Makefile
  head/devel/hs-lifted-base/Makefile
  head/devel/hs-logict/Makefile
  head/devel/hs-monad-control/Makefile
  head/devel/hs-monad-par-extras/Makefile
  head/devel/hs-monad-par/Makefile
  head/devel/hs-mtl/Makefile
  head/devel/hs-mueval/Makefile
  head/devel/hs-murmur-hash/Makefile
  head/devel/hs-parallel/Makefile
  head/devel/hs-pcre-light/Makefile
  head/devel/hs-pool-conduit/Makefile
  head/devel/hs-primitive/Makefile
  head/devel/hs-random/Makefile
  head/devel/hs-ranges/Makefile
  head/devel/hs-reactive/Makefile
  head/devel/hs-readline/Makefile
  head/devel/hs-resource-pool/Makefile
  head/devel/hs-safe/Makefile
  head/devel/hs-show/Makefile
  head/devel/hs-smallcheck/Makefile
  head/devel/hs-stm/Makefile
  head/devel/hs-strict/Makefile
  head/devel/hs-syb-with-class-instances-text/Makefile
  head/devel/hs-syb-with-class/Makefile
  head/devel/hs-syb/Makefile
  head/devel/hs-system-filepath/Makefile
  head/devel/hs-tagged/Makefile
  head/devel/hs-temporary/Makefile
  head/devel/hs-test-framework-hunit/Makefile
  head/devel/hs-test-framework-quickcheck2/Makefile
  head/devel/hs-test-framework/Makefile
  head/devel/hs-testpack/Makefile
  head/devel/hs-text/Makefile
  head/devel/hs-threadscope/Makefile
  head/devel/hs-transformers-base/Makefile
  head/devel/hs-transformers/Makefile
  head/devel/hs-unamb/Makefile
  head/devel/hs-uniplate/Makefile
  head/devel/hs-unix-compat/Makefile
  head/devel/hs-unordered-containers/Makefile
  head/devel/hs-utf8-light/Makefile
  head/devel/hs-utf8-string/Makefile
  head/devel/hs-utility-ht/Makefile
  head/devel/hs-uuagc-bootstrap/Makefile
  head/devel/hs-uuagc-cabal/Makefile
  head/devel/hs-uuagc/Makefile
  head/devel/hs-uulib/Makefile
  head/devel/hs-vault/Makefile
  head/devel/hs-vector-algorithms/Makefile
  head/devel/hs-vector/Makefile
  head/ftp/hs-curl/Makefile
  head/graphics/hs-HGL/Makefile
  head/graphics/hs-cairo/Makefile
  head/graphics/hs-soegtk/Makefile
  head/graphics/hs-svgcairo/Makefile
  head/lang/ghc/bsd.cabal.mk
  head/lang/hs-brainfuck/Makefile
  head/lang/hs-epic/Makefile
  head/lang/hs-unlambda/Makefile
  head/mail/hs-email-validate/Makefile
  head/mail/hs-mime-mail/Makefile
  head/math/hs-Agda-executable/Makefile
  head/math/hs-Agda/Makefile
  head/math/hs-NumInstances/Makefile
  head/math/hs-categories/Makefile
  head/math/hs-comonad/Makefile
  head/math/hs-contravariant/Makefile
  head/math/hs-data-lens-template/Makefile
  head/math/hs-data-lens/Makefile
  head/math/hs-distributive/Makefile
  head/math/hs-erf/Makefile
  head/math/hs-ieee754/Makefile
  head/math/hs-math-functions/Makefile
  head/math/hs-mwc-random/Makefile
  head/math/hs-pointed/Makefile
  head/math/hs-probability/Makefile
  head/math/hs-semigroups/Makefile
  head/math/hs-statistics/Makefile
  head/multimedia/hs-gstreamer/Makefile
  head/net/hs-hostname/Makefile
  head/net/hs-network-conduit/Makefile
  head/net/hs-network/Makefile
  head/net/hs-pcap/Makefile
  head/net/hs-sendfile/Makefile
  head/net/hs-socks/Makefile
  head/ports-mgmt/hs-porte/Makefile
  head/science/hs-bio/Makefile
  head/security/hs-Crypto/Makefile
  head/security/hs-RSA/Makefile
  head/security/hs-SHA/Makefile
  head/security/hs-certificate/Makefile
  head/security/hs-clientsession/Makefile
  head/security/hs-cprng-aes/Makefile
  head/security/hs-crypto-api/Makefile
  head/security/hs-crypto-conduit/Makefile
  head/security/hs-crypto-pubkey-types/Makefile
  head/security/hs-cryptohash/Makefile
  head/security/hs-digest/Makefile
  head/security/hs-entropy/Makefile
  head/security/hs-monadcryptorandom/Makefile
  head/security/hs-pem/Makefile
  head/security/hs-pureMD5/Makefile
  head/security/hs-pwstore-fast/Makefile
  head/security/hs-skein/Makefile
  head/security/hs-tls-extra/Makefile
  head/security/hs-tls/Makefile
  head/sysutils/hs-angel/Makefile
  head/textproc/hs-Diff/Makefile
  head/textproc/hs-HStringTemplate/Makefile
  head/textproc/hs-attoparsec-conduit/Makefile
  head/textproc/hs-attoparsec-enumerator/Makefile
  head/textproc/hs-attoparsec/Makefile
  head/textproc/hs-blaze-markup/Makefile
  head/textproc/hs-bytestring-csv/Makefile
  head/textproc/hs-case-insensitive/Makefile
  head/textproc/hs-citeproc-hs/Makefile
  head/textproc/hs-csv/Makefile
  head/textproc/hs-double-conversion/Makefile
  head/textproc/hs-feed/Makefile
  head/textproc/hs-highlighting-kate/Makefile
  head/textproc/hs-hs-bibutils/Makefile
  head/textproc/hs-html-conduit/Makefile
  head/textproc/hs-html/Makefile
  head/textproc/hs-hxt-charproperties/Makefile
  head/textproc/hs-hxt-regex-xmlschema/Makefile
  head/textproc/hs-hxt-unicode/Makefile
  head/textproc/hs-hxt/Makefile
  head/textproc/hs-lhs2tex/Makefile
  head/textproc/hs-libxml/Makefile
  head/textproc/hs-pandoc-types/Makefile
  head/textproc/hs-parsec/Makefile
  head/textproc/hs-polyparse/Makefile
  head/textproc/hs-regex-base/Makefile
  head/textproc/hs-regex-compat/Makefile
  head/textproc/hs-regex-pcre-builtin/Makefile
  head/textproc/hs-regex-posix/Makefile
  head/textproc/hs-stringsearch/Makefile
  head/textproc/hs-tagsoup/Makefile
  head/textproc/hs-tagstream-conduit/Makefile
  head/textproc/hs-texmath/Makefile
  head/textproc/hs-xhtml/Makefile
  head/textproc/hs-xml-conduit/Makefile
  head/textproc/hs-xml/Makefile
  head/www/hs-HTTP/Makefile
  head/www/hs-authenticate/Makefile
  head/www/hs-cgi/Makefile
  head/www/hs-cookie/Makefile
  head/www/hs-css-text/Makefile
  head/www/hs-fastcgi/Makefile
  head/www/hs-hS3/Makefile
  head/www/hs-happstack/Makefile
  head/www/hs-hjsmin/Makefile
  head/www/hs-http-date/Makefile
  head/www/hs-http-server/Makefile
  head/www/hs-http-types/Makefile
  head/www/hs-oeis/Makefile
  head/www/hs-path-pieces/Makefile
  head/www/hs-recaptcha/Makefile
  head/www/hs-scgi/Makefile
  head/www/hs-shakespeare-css/Makefile
  head/www/hs-shakespeare-i18n/Makefile
  head/www/hs-shakespeare-js/Makefile
  head/www/hs-shakespeare-text/Makefile
  head/www/hs-shakespeare/Makefile
  head/www/hs-url/Makefile
  head/www/hs-wai-logger/Makefile
  head/www/hs-wai-test/Makefile
  head/www/hs-webkit/Makefile
  head/www/hs-xss-sanitize/Makefile
  head/www/hs-yesod-default/Makefile
  head/www/hs-yesod-json/Makefile
  head/www/hs-yesod-persistent/Makefile
  head/www/hs-yesod-routes/Makefile
  head/www/hs-yesod-static/Makefile
  head/x11-toolkits/hs-GLUT/Makefile
  head/x11-toolkits/hs-OpenGL/Makefile
  head/x11-toolkits/hs-gtk2hs/Makefile
  head/x11-toolkits/hs-gtkglext/Makefile
  head/x11-toolkits/hs-gtksourceview2/Makefile
  head/x11-toolkits/hs-pango/Makefile
  head/x11-toolkits/hs-vte/Makefile
  head/x11-toolkits/hs-wx/Makefile
  head/x11-toolkits/hs-wxdirect/Makefile
  head/x11-wm/hs-xmonad-contrib/Makefile
  head/x11-wm/hs-xmonad/Makefile
  head/x11/hs-X11-xft/Makefile
  head/x11/hs-X11/Makefile
  head/x11/hs-xmobar/Makefile

Modified: head/archivers/hs-tar/Makefile
==============================================================================
--- head/archivers/hs-tar/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/archivers/hs-tar/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	tar
 PORTVERSION=	0.4.0.0
+PORTREVISION=	1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/archivers/hs-zip-archive/Makefile
==============================================================================
--- head/archivers/hs-zip-archive/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/archivers/hs-zip-archive/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -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"

Modified: head/archivers/hs-zlib-bindings/Makefile
==============================================================================
--- head/archivers/hs-zlib-bindings/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/archivers/hs-zlib-bindings/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,6 +6,7 @@
 
 PORTNAME=	zlib-bindings
 PORTVERSION=	0.1.0.1
+PORTREVISION=	1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/archivers/hs-zlib-enum/Makefile
==============================================================================
--- head/archivers/hs-zlib-enum/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/archivers/hs-zlib-enum/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,6 +6,7 @@
 
 PORTNAME=	zlib-enum
 PORTVERSION=	0.2.2.1
+PORTREVISION=	1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/archivers/hs-zlib/Makefile
==============================================================================
--- head/archivers/hs-zlib/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/archivers/hs-zlib/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,6 +6,7 @@
 
 PORTNAME=	zlib
 PORTVERSION=	0.5.3.3
+PORTREVISION=	1
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/audio/hs-ALUT/Makefile
==============================================================================
--- head/audio/hs-ALUT/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/audio/hs-ALUT/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	ALUT
 PORTVERSION=	2.2.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/audio/hs-OpenAL/Makefile
==============================================================================
--- head/audio/hs-OpenAL/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/audio/hs-OpenAL/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	OpenAL
 PORTVERSION=	1.4.0.1
+PORTREVISION=	1
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/audio/hs-libmpd/Makefile
==============================================================================
--- head/audio/hs-libmpd/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/audio/hs-libmpd/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	libmpd
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/benchmarks/hs-criterion/Makefile
==============================================================================
--- head/benchmarks/hs-criterion/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/benchmarks/hs-criterion/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	criterion
 PORTVERSION=	0.6.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	benchmarks haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/converters/hs-aeson/Makefile
==============================================================================
--- head/converters/hs-aeson/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/converters/hs-aeson/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	aeson
 PORTVERSION=	0.6.0.2
+PORTREVISION=	1
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/converters/hs-dataenc/Makefile
==============================================================================
--- head/converters/hs-dataenc/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/converters/hs-dataenc/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	dataenc
 PORTVERSION=	0.14.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/converters/hs-json/Makefile
==============================================================================
--- head/converters/hs-json/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/converters/hs-json/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	json
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/databases/hs-mysql/Makefile
==============================================================================
--- head/databases/hs-mysql/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/databases/hs-mysql/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	mysql
 PORTVERSION=	0.1.1.4
+PORTREVISION=	1
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/databases/hs-persistent-sqlite/Makefile
==============================================================================
--- head/databases/hs-persistent-sqlite/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/databases/hs-persistent-sqlite/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	persistent-sqlite
 PORTVERSION=	0.9.0.2
+PORTREVISION=	1
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/databases/hs-persistent-template/Makefile
==============================================================================
--- head/databases/hs-persistent-template/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/databases/hs-persistent-template/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	persistent-template
 PORTVERSION=	0.9.0.2
+PORTREVISION=	1
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/databases/hs-persistent/Makefile
==============================================================================
--- head/databases/hs-persistent/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/databases/hs-persistent/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	persistent
 PORTVERSION=	0.9.0.4
+PORTREVISION=	1
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-Boolean/Makefile
==============================================================================
--- head/devel/hs-Boolean/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-Boolean/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	Boolean
 PORTVERSION=	0.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-ConfigFile/Makefile
==============================================================================
--- head/devel/hs-ConfigFile/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-ConfigFile/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	ConfigFile
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-DeepArrow/Makefile
==============================================================================
--- head/devel/hs-DeepArrow/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-DeepArrow/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	DeepArrow
 PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-HUnit/Makefile
==============================================================================
--- head/devel/hs-HUnit/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-HUnit/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	HUnit
 PORTVERSION=	1.2.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-IORefCAS/Makefile
==============================================================================
--- head/devel/hs-IORefCAS/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-IORefCAS/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	IORefCAS
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-IfElse/Makefile
==============================================================================
--- head/devel/hs-IfElse/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-IfElse/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	IfElse
 PORTVERSION=	0.85
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-MaybeT/Makefile
==============================================================================
--- head/devel/hs-MaybeT/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-MaybeT/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	MaybeT
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-MemoTrie/Makefile
==============================================================================
--- head/devel/hs-MemoTrie/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-MemoTrie/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	MemoTrie
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-MissingH/Makefile
==============================================================================
--- head/devel/hs-MissingH/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-MissingH/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	MissingH
 PORTVERSION=	1.1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-MonadCatchIO-mtl/Makefile
==============================================================================
--- head/devel/hs-MonadCatchIO-mtl/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-MonadCatchIO-mtl/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	MonadCatchIO-mtl
 PORTVERSION=	0.3.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-MonadCatchIO-transformers/Makefile
==============================================================================
--- head/devel/hs-MonadCatchIO-transformers/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-MonadCatchIO-transformers/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	MonadCatchIO-transformers
 PORTVERSION=	0.3.0.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-ObjectName/Makefile
==============================================================================
--- head/devel/hs-ObjectName/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-ObjectName/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	ObjectName
 PORTVERSION=	1.0.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-PSQueue/Makefile
==============================================================================
--- head/devel/hs-PSQueue/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-PSQueue/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	PSQueue
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-QuickCheck/Makefile
==============================================================================
--- head/devel/hs-QuickCheck/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-QuickCheck/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,6 +6,7 @@
 
 PORTNAME=	QuickCheck
 PORTVERSION=	2.4.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-StateVar/Makefile
==============================================================================
--- head/devel/hs-StateVar/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-StateVar/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	StateVar
 PORTVERSION=	1.0.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-Stream/Makefile
==============================================================================
--- head/devel/hs-Stream/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-Stream/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,7 +6,7 @@
 
 PORTNAME=	Stream
 PORTVERSION=	0.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-Tensor/Makefile
==============================================================================
--- head/devel/hs-Tensor/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-Tensor/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	Tensor
 PORTVERSION=	1.0.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-TypeCompose/Makefile
==============================================================================
--- head/devel/hs-TypeCompose/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-TypeCompose/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	TypeCompose
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-abstract-deque/Makefile
==============================================================================
--- head/devel/hs-abstract-deque/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-abstract-deque/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	abstract-deque
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-abstract-par/Makefile
==============================================================================
--- head/devel/hs-abstract-par/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-abstract-par/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	abstract-par
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-alex/Makefile
==============================================================================
--- head/devel/hs-alex/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-alex/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,6 +6,7 @@
 
 PORTNAME=	alex
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-ansi-terminal/Makefile
==============================================================================
--- head/devel/hs-ansi-terminal/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-ansi-terminal/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -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>

Modified: head/devel/hs-ansi-wl-pprint/Makefile
==============================================================================
--- head/devel/hs-ansi-wl-pprint/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-ansi-wl-pprint/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -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>

Modified: head/devel/hs-arrows/Makefile
==============================================================================
--- head/devel/hs-arrows/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-arrows/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	arrows
 PORTVERSION=	0.4.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-asn1-data/Makefile
==============================================================================
--- head/devel/hs-asn1-data/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-asn1-data/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	asn1-data
 PORTVERSION=	0.6.1.3
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-attempt/Makefile
==============================================================================
--- head/devel/hs-attempt/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-attempt/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	attempt
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-base-unicode-symbols/Makefile
==============================================================================
--- head/devel/hs-base-unicode-symbols/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-base-unicode-symbols/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	base-unicode-symbols
 PORTVERSION=	0.2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-bits-atomic/Makefile
==============================================================================
--- head/devel/hs-bits-atomic/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-bits-atomic/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	bits-atomic
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-blaze-builder-conduit/Makefile
==============================================================================
--- head/devel/hs-blaze-builder-conduit/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-blaze-builder-conduit/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	blaze-builder-conduit
 PORTVERSION=	0.4.0.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-blaze-builder-enumerator/Makefile
==============================================================================
--- head/devel/hs-blaze-builder-enumerator/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-blaze-builder-enumerator/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	blaze-builder-enumerator
 PORTVERSION=	0.2.0.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-blaze-builder/Makefile
==============================================================================
--- head/devel/hs-blaze-builder/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-blaze-builder/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	blaze-builder
 PORTVERSION=	0.3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-blaze-textual/Makefile
==============================================================================
--- head/devel/hs-blaze-textual/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-blaze-textual/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	blaze-textual
 PORTVERSION=	0.2.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-bsd-sysctl/Makefile
==============================================================================
--- head/devel/hs-bsd-sysctl/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-bsd-sysctl/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	bsd-sysctl
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-byteorder/Makefile
==============================================================================
--- head/devel/hs-byteorder/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-byteorder/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	byteorder
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-bytestring-nums/Makefile
==============================================================================
--- head/devel/hs-bytestring-nums/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-bytestring-nums/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	bytestring-nums
 PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-c2hs/Makefile
==============================================================================
--- head/devel/hs-c2hs/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-c2hs/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	c2hs
 PORTVERSION=	0.16.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-cabal-install/Makefile
==============================================================================
--- head/devel/hs-cabal-install/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-cabal-install/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	cabal-install
 PORTVERSION=	0.14.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-checkers/Makefile
==============================================================================
--- head/devel/hs-checkers/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-checkers/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	checkers
 PORTVERSION=	0.2.9
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-cmdargs/Makefile
==============================================================================
--- head/devel/hs-cmdargs/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-cmdargs/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmdargs
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-conduit/Makefile
==============================================================================
--- head/devel/hs-conduit/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-conduit/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	conduit
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-configurator/Makefile
==============================================================================
--- head/devel/hs-configurator/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-configurator/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	configurator
 PORTVERSION=	0.2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-convertible/Makefile
==============================================================================
--- head/devel/hs-convertible/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-convertible/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	convertible
 PORTVERSION=	1.0.11.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-darcs/Makefile
==============================================================================
--- head/devel/hs-darcs/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-darcs/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -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

Modified: head/devel/hs-data-default/Makefile
==============================================================================
--- head/devel/hs-data-default/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-data-default/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	data-default
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-datetime/Makefile
==============================================================================
--- head/devel/hs-datetime/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-datetime/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	datetime
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-dlist/Makefile
==============================================================================
--- head/devel/hs-dlist/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-dlist/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,7 +6,7 @@
 
 PORTNAME=	dlist
 PORTVERSION=	0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-edit-distance/Makefile
==============================================================================
--- head/devel/hs-edit-distance/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-edit-distance/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	edit-distance
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-enumerator/Makefile
==============================================================================
--- head/devel/hs-enumerator/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-enumerator/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	enumerator
 PORTVERSION=	0.4.19
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-failure/Makefile
==============================================================================
--- head/devel/hs-failure/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-failure/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	failure
 PORTVERSION=	0.2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-fast-logger/Makefile
==============================================================================
--- head/devel/hs-fast-logger/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-fast-logger/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	fast-logger
 PORTVERSION=	0.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-fgl/Makefile
==============================================================================
--- head/devel/hs-fgl/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-fgl/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	fgl
 PORTVERSION=	5.4.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-file-embed/Makefile
==============================================================================
--- head/devel/hs-file-embed/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-file-embed/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	file-embed
 PORTVERSION=	0.0.4.4
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-filemanip/Makefile
==============================================================================
--- head/devel/hs-filemanip/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-filemanip/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	filemanip
 PORTVERSION=	0.3.5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-filestore/Makefile
==============================================================================
--- head/devel/hs-filestore/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-filestore/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	filestore
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-filesystem-conduit/Makefile
==============================================================================
--- head/devel/hs-filesystem-conduit/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-filesystem-conduit/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	filesystem-conduit
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-gconf/Makefile
==============================================================================
--- head/devel/hs-gconf/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-gconf/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	gconf
 PORTVERSION=	0.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-ghc-events/Makefile
==============================================================================
--- head/devel/hs-ghc-events/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-ghc-events/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghc-events
 PORTVERSION=	0.4.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-ghc-mtl/Makefile
==============================================================================
--- head/devel/hs-ghc-mtl/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-ghc-mtl/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghc-mtl
 PORTVERSION=	1.0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-ghc-paths/Makefile
==============================================================================
--- head/devel/hs-ghc-paths/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-ghc-paths/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,7 +6,7 @@
 
 PORTNAME=	ghc-paths
 PORTVERSION=	0.1.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-gio/Makefile
==============================================================================
--- head/devel/hs-gio/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-gio/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	gio
 PORTVERSION=	0.12.3
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-git-annex/Makefile
==============================================================================
--- head/devel/hs-git-annex/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-git-annex/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	git-annex
 PORTVERSION=	3.20120522
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	frase@frase.id.au

Modified: head/devel/hs-glade/Makefile
==============================================================================
--- head/devel/hs-glade/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-glade/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,7 +7,7 @@
 
 PORTNAME=	glade
 PORTVERSION=	0.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-glib/Makefile
==============================================================================
--- head/devel/hs-glib/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-glib/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	0.12.3.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-gtk2hs-buildtools/Makefile
==============================================================================
--- head/devel/hs-gtk2hs-buildtools/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-gtk2hs-buildtools/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk2hs-buildtools
 PORTVERSION=	0.12.3.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-haddock/Makefile
==============================================================================
--- head/devel/hs-haddock/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-haddock/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,6 +6,7 @@
 
 PORTNAME=	haddock
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-happy/Makefile
==============================================================================
--- head/devel/hs-happy/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-happy/Makefile	Fri Aug  3 02:30:07 2012	(r301879)
@@ -6,6 +6,7 @@
 
 PORTNAME=	happy
 PORTVERSION=	1.18.9
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: head/devel/hs-hashable/Makefile
==============================================================================
--- head/devel/hs-hashable/Makefile	Fri Aug  3 02:28:37 2012	(r301878)
+++ head/devel/hs-hashable/Makefile	Fri Aug  3 02:30:07 2012	(r301879)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208030230.q732UBax057422>