Date: Mon, 20 Aug 2012 14:46:15 GMT From: Gabor Pali <pgj@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/170785: [update] devel/hs-git-annex Message-ID: <201208201446.q7KEkFAR035302@red.freebsd.org> Resent-Message-ID: <201208201450.q7KEoBLb027431@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170785
>Category: ports
>Synopsis: [update] devel/hs-git-annex
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 20 14:50:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Gabor Pali
>Release: n/a
>Organization:
The FreeBSD Project
>Environment:
n/a
>Description:
- Update to 3.20120807
- Add options
- Take maintainership for haskell@ [1]
[1] The current maintainer does not seem to either submit updates for the port or
approve mines over more than a year, see ports/159348, ports/165256, ports/168711. Without waiting for the maintainer timeouts I could probably update
the port more frequently.
>How-To-Repeat:
>Fix:
See the attached patch.
Patch attached with submission follows:
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 0573918..e13ac9e 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -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/rsync \
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 <bsd.port.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+= stm>=2.3
+.else
+CONFIGURE_ARGS+= --flags="-Assistant"
+.endif
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-git-annex/distinfo b/devel/hs-git-annex/distinfo
index f0104c8..4de2446 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208201446.q7KEkFAR035302>