From owner-svn-ports-head@FreeBSD.ORG Tue Sep 4 21:08:31 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8751F1065673; Tue, 4 Sep 2012 21:08:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 59F9B8FC14; Tue, 4 Sep 2012 21:08:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q84L8Vri019322; Tue, 4 Sep 2012 21:08:31 GMT (envelope-from pgj@svn.freebsd.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84L8VMD019319; Tue, 4 Sep 2012 21:08:31 GMT (envelope-from pgj@svn.freebsd.org) Message-Id: <201209042108.q84L8VMD019319@svn.freebsd.org> From: Gabor Pali Date: Tue, 4 Sep 2012 21:08:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303673 - head/devel/hs-git-annex X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 21:08:31 -0000 Author: pgj Date: Tue Sep 4 21:08:30 2012 New Revision: 303673 URL: http://svn.freebsd.org/changeset/ports/303673 Log: - Update to 3.20120807 - Add options - Take maintainership for haskell PR: ports/170785 Submitted by: pgj Approved by: maintainer (timeout) Obtained from: FreeBSD Haskell Modified: head/devel/hs-git-annex/Makefile head/devel/hs-git-annex/distinfo Modified: head/devel/hs-git-annex/Makefile ============================================================================== --- head/devel/hs-git-annex/Makefile Tue Sep 4 21:05:15 2012 (r303672) +++ head/devel/hs-git-annex/Makefile Tue Sep 4 21:08:30 2012 (r303673) @@ -6,11 +6,10 @@ # PORTNAME= git-annex -PORTVERSION= 3.20120522 -PORTREVISION= 1 +PORTVERSION= 3.20120807 CATEGORIES= devel haskell -MAINTAINER= frase@frase.id.au +MAINTAINER= haskell@FreeBSD.org COMMENT= Manage files with git, without checking their contents into git LICENSE= GPLv3 @@ -18,10 +17,9 @@ FILE_LICENSE= GPL CABAL_SETUP= Setup.hs -USE_CABAL= bloomfilter dataenc edit-distance hslogger HTTP IfElse \ - json lifted-base MissingH monad-control mtl network \ - pcre-light QuickCheck>=2.1 SHA text transformers-base \ - utf8-string +USE_CABAL= bloomfilter dataenc edit-distance hslogger HTTP IfElse json \ + lifted-base MissingH monad-control mtl network pcre-light \ + QuickCheck>=2.1 SHA text transformers-base utf8-string USE_GMAKE= yes USE_PERL5_BUILD= yes @@ -35,5 +33,27 @@ RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsyn EXECUTABLE= git-annex git-annex-shell STANDALONE= yes +OPTIONS_DEFINE= S3 ASSISTANT +OPTIONS_DEFAULT= S3 ASSISTANT + +S3_DESC= S3 support +ASSISTANT_DESC= 'assistant' and 'watch' commands + +.include + +.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+= stm>=2.3 +.else +CONFIGURE_ARGS+= --flags="-Assistant" +.endif + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Modified: head/devel/hs-git-annex/distinfo ============================================================================== --- head/devel/hs-git-annex/distinfo Tue Sep 4 21:05:15 2012 (r303672) +++ head/devel/hs-git-annex/distinfo Tue Sep 4 21:08:30 2012 (r303673) @@ -1,2 +1,2 @@ -SHA256 (cabal/git-annex-3.20120522.tar.gz) = 694e59c93e8049172a54e6898c274b200c62d62b9b3064687a76c318727b5925 -SIZE (cabal/git-annex-3.20120522.tar.gz) = 638849 +SHA256 (cabal/git-annex-3.20120807.tar.gz) = 89c2a504c5570e2162809a81ee470f41709fb6b7a32c3f18f59f2fd8e5a149fb +SIZE (cabal/git-annex-3.20120807.tar.gz) = 1183955