1 files changed, 73 insertions, 64 deletions

diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 21552bb1841d..f8bb74ee5649 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git-annex
-PORTVERSION=	4.20130601
-PORTREVISION=	4
+PORTVERSION=	5.20140717
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,15 +10,17 @@ COMMENT=	Manage files with git, without checking their contents into git
 
 LICENSE=	GPLv3
 
-USE_CABAL=	bloomfilter dataenc dlist edit-distance extensible-exceptions \
-		hslogger HTTP IfElse json MissingH MonadCatchIO-transformers \
-		monad-control mtl>=2 network>=2.0 QuickCheck>=2.1 random \
-		SafeSemaphore SHA text unix-compat utf8-string uuid
+USE_CABAL=	MissingH hslogger utf8-string network>=2.0 mtl>=2 HTTP \
+		extensible-exceptions exceptions>=0.5 dataenc SHA json \
+		monad-control MonadCatchIO-transformers IfElse text \
+		QuickCheck>=2.1 bloomfilter edit-distance SafeSemaphore \
+		uuid random dlist unix-compat aeson data-default \
+		case-insensitive
 
 USES=		gmake perl5
 USE_PERL5=	build
 
-MAN1=		git-annex.1 git-annex-shell.1
+MAN1PAGES=	git-annex.1 git-annex-shell.1
 
 BUILD_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
 		git:${PORTSDIR}/devel/git \
@@ -32,72 +33,80 @@ RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
 EXECUTABLE=	git-annex git-annex-shell
 STANDALONE=	yes
 
-OPTIONS_DEFINE=		S3 ASSISTANT INOTIFY WEBAPP PAIRING PRODUCTION TDFA
-OPTIONS_DEFAULT=	S3 ASSISTANT
+FLAGS_DEFINE=	S3 ASSISTANT INOTIFY WEBDAV WEBAPP WEBAPP_SECURE PAIRING \
+		XMPP DNS PRODUCTION TDFA FEED QUVI CRYPTOHASH EKG TAHOE
+FLAGS_DEFAULT=	S3 ASSISTANT
 
 S3_DESC=		S3 support
+S3_FLAG_ENABLE=		S3
+S3_FLAG_CABAL=		hS3
+
 ASSISTANT_DESC=		'assistant' and 'watch' commands
+ASSISTANT_FLAG_ENABLE=	Assistant
+ASSISTANT_FLAG_CABAL=	async stm>=2.3
+
 INOTIFY_DESC=		File system notifications support
+INOTIFY_FLAG_ENABLE=	Inotify
+INOTIFY_FLAG_CABAL=	kqueue
+
 WEBAPP_DESC=		Web application (requires assistant)
+WEBAPP_FLAG_DEPENDS=	ASSISTANT
+WEBAPP_FLAG_ENABLE=	Webapp
+WEBAPP_FLAG_CABAL=	yesod yesod-static yesod-static yesod-form yesod-core \
+			case-insensitive http-types wai wai-logger warp \
+			blaze-builder crypto-api shakespeare clientsession \
+			data-default warp-tls path-pieces
+
+WEBAPP_SECURE_DESC=		Secure webapp (requires webbapp)
+WEBAPP_SECURE_FLAG_DEPENDS=	WEBAPP
+WEBAPP_SECURE_FLAG_ENABLE=	Webapp-secure
+WEBAPP_SECURE_FLAG_CABAL=	warp-tls>=1.4 securemem byteable
+
 PAIRING_DESC=		Enable pairing (requires web application)
+PAIRING_FLAG_DEPENDS=	WEBAPP
+PAIRING_FLAG_ENABLE=	Pairing
+PAIRING_FLAG_CABAL=	network-multicast network-info
+
+XMPP_DESC=		Enable notifications using XMPP (requires assistant)
+XMPP_FLAG_DEPENDS=	ASSISTANT
+XMPP_FLAG_ENABLE=	XMPP
+XMPP_FLAG_CABAL=	gnutls>=0.1.4 network-protocol-xmpp xml-types
+
+DNS_DESC=		Use the DNS library for lookups (requires XMPP)
+DNS_FLAG_DEPENDS=	ASSISTANT XMPP
+DNS_FLAG_ENABLE=	DNS
+DNS_FLAG_CABAL=		dns
+
 PRODUCTION_DESC=	Production build
+PRODUCTION_FLAG_ENABLE=	Production
+
 TDFA_DESC=		Use regex-tdfa for wildcards
+TDFA_FLAG_ENABLE=	TDFA
+TDFA_FLAG_CABAL=	regex-tdfa
+
+WEBDAV_DESC=		WebDAV support
+WEBDAV_FLAG_ENABLE=	WebDAV
+WEBDAV_FLAG_CABAL=	DAV>=0.3 http-conduit xml-conduit http-types
+
+FEED_DESC=		Podcast feed support
+FEED_FLAG_ENABLE=	Feed
+FEED_FLAG_CABAL=	feed
+
+QUVI_DESC=		quvi to download videos
+QUVI_FLAG_ENABLE=	Quvi
+QUVI_FLAG_CABAL=	aeson
+
+CRYPTOHASH_DESC=	cryptohash for checksumming
+CRYPTOHASH_FLAG_ENABLE=	CryptoHash
+CRYPTOHASH_FLAG_CABAL=	cryptohash>=0.10.0
+
+EKG_DESC=		EKG for run-time monitoring
+EKG_FLAG_ENABLE=	EKG
+EKG_FLAG_CABAL=		ekg
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MS3}
-CONFIGURE_ARGS+=	--flags="S3"
-USE_CABAL+=		hS3
-.else
-CONFIGURE_ARGS+=	--flags="-S3"
-.endif
-
-.if ${PORT_OPTIONS:MASSISTANT}
-CONFIGURE_ARGS+=	--flags="Assistant"
-USE_CABAL+=		async stm>=2.3
-.else
-CONFIGURE_ARGS+=	--flags="-Assistant"
-.endif
-
-.if ${PORT_OPTIONS:MINOTIFY}
-CONFIGURE_ARGS+=	--flags="Inotify"
-USE_CABAL+=		kqueue
-.else
-CONFIGURE_ARGS+=	--flags="-Inotify"
-.endif
-
-.if ${PORT_OPTIONS:MWEBAPP} && ${PORT_OPTIONS:MASSISTANT}
-CONFIGURE_ARGS+=	--flags="Webapp"
-USE_CABAL+=		yesod yesod-static case-insensitive http-types \
-			transformers wai wai-logger warp blaze-builder \
-			blaze-html crypto-api hamlet clientsession \
-			yesod-default>=1.1.0 data-default
-.else
-CONFIGURE_ARGS+=	--flags="-Webapp"
-.endif
-
-.if ${PORT_OPTIONS:MWEBAPP} && ${PORT_OPTIONS:MPAIRING}
-CONFIGURE_ARGS+=	--flags="Pairing"
-USE_CABAL+=		network-multicast network-info
-.else
-CONFIGURE_ARGS+=	--flags="-Pairing"
-.endif
-
-# Disable all the other options
-CONFIGURE_ARGS+=	--flags="-DNS -XMPP -Dbus -WebDAV"
-
-.if ${PORT_OPTIONS:MPRODUCTION}
-CONFIGURE_ARGS+=	--flags="Production"
-.else
-CONFIGURE_ARGS+=	--flags="-Production"
-.endif
-
-.if ${PORT_OPTIONS:MTDFA}
-CONFIGURE_ARGS+=	--flags="TDFA"
-USE_CABAL+=		regex-tdfa
-.else
-CONFIGURE_ARGS+=	--flags="-TDFA"
-.endif
+TAHOE_DESC=		Enable the tahoe special remote
+TAHOE_FLAG_ENABLE=	Tahoe
+TAHOE_FLAG_CABAL=	aeson
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>