svn commit: r366121 - in head/devel/hs-git-annex: . files

[Gabor Pali]

Author: pgj
Date: Mon Aug 25 18:24:39 2014
New Revision: 366121
URL: http://svnweb.freebsd.org/changeset/ports/366121
QAT: https://qat.redports.org/buildarchive/r366121/

Log:
  - Update to 5.20140817
  
  Obtained from:	FreeBSD Haskell

Modified:
  head/devel/hs-git-annex/Makefile
  head/devel/hs-git-annex/distinfo
  head/devel/hs-git-annex/files/patch-git-annex.cabal

Modified: head/devel/hs-git-annex/Makefile
==============================================================================
--- head/devel/hs-git-annex/Makefile	Mon Aug 25 18:23:53 2014	(r366120)
+++ head/devel/hs-git-annex/Makefile	Mon Aug 25 18:24:39 2014	(r366121)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git-annex
-PORTVERSION=	5.20140717
+PORTVERSION=	5.20140817
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell at FreeBSD.org
@@ -33,9 +33,10 @@ RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsyn
 EXECUTABLE=	git-annex git-annex-shell
 STANDALONE=	yes
 
-FLAGS_DEFINE=	S3 ASSISTANT INOTIFY WEBDAV WEBAPP WEBAPP_SECURE PAIRING \
-		XMPP DNS PRODUCTION TDFA FEED QUVI CRYPTOHASH EKG TAHOE
-FLAGS_DEFAULT=	S3 ASSISTANT
+FLAGS_DEFINE=	S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
+		XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE CRYPTOHASH EKG
+FLAGS_DEFAULT=	S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
+		XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE CRYPTOHASH
 
 S3_DESC=		S3 support
 S3_FLAG_ENABLE=		S3

Modified: head/devel/hs-git-annex/distinfo
==============================================================================
--- head/devel/hs-git-annex/distinfo	Mon Aug 25 18:23:53 2014	(r366120)
+++ head/devel/hs-git-annex/distinfo	Mon Aug 25 18:24:39 2014	(r366121)
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-5.20140717.tar.gz) = 746570ffafc92b3acd19bef84ffea6ee126cf2b043e8adc7f3b61b57d0c52fa5
-SIZE (cabal/git-annex-5.20140717.tar.gz) = 4390361
+SHA256 (cabal/git-annex-5.20140817.tar.gz) = acc3c1ef2875b16864448b6d00f204a7fc5eb268ea7dfd678c1814d1720a9e32
+SIZE (cabal/git-annex-5.20140817.tar.gz) = 4464505

Modified: head/devel/hs-git-annex/files/patch-git-annex.cabal
==============================================================================
--- head/devel/hs-git-annex/files/patch-git-annex.cabal	Mon Aug 25 18:23:53 2014	(r366120)
+++ head/devel/hs-git-annex/files/patch-git-annex.cabal	Mon Aug 25 18:24:39 2014	(r366121)
@@ -1,6 +1,6 @@
---- ./git-annex.cabal.orig	2014-07-17 17:53:21.000000000 +0200
-+++ ./git-annex.cabal	2014-07-28 19:40:41.000000000 +0200
-@@ -187,10 +187,11 @@
+--- ./git-annex.cabal.orig	2014-08-17 16:50:18.000000000 +0200
++++ ./git-annex.cabal	2014-08-25 13:15:46.000000000 +0200
+@@ -185,10 +185,11 @@
      CPP-Options: -DANDROID_SPLICES
  
    if flag(Webapp)
@@ -8,7 +8,7 @@
      Build-Depends:
 -     yesod, yesod-default, yesod-static, yesod-form, yesod-core,
 +     yesod (>= 1.2), yesod-static, yesod-form, yesod-core,
-      http-types, transformers, wai, wai-extra, warp, warp-tls,
+      wai, wai-extra, warp, warp-tls,
 -     blaze-builder, crypto-api, hamlet, clientsession,
 +     blaze-builder, crypto-api, clientsession,
       template-haskell, data-default, aeson, path-pieces,