ports/158667: [maintainer update] devel/git-annex to 3.20110702

[Fraser Tweedale]

>Number:         158667
>Category:       ports
>Synopsis:       [maintainer update] devel/git-annex to 3.20110702
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 05 12:00:22 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Fraser Tweedale
>Release:        FreeBSD 8.2-RC3 amd64
>Organization:
>Environment:
System: FreeBSD bacardi 8.2-RC3 FreeBSD 8.2-RC3 #8 r218185: Wed Feb 2 21:04:05 EST 2011 Fraser at bacardi:/usr/obj/usr/src/sys/BACARDI amd64


	
>Description:
	
>How-To-Repeat:
	
>Fix:


Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/git-annex/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	26 Jun 2011 08:15:16 -0000	1.1
+++ Makefile	5 Jul 2011 11:46:31 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git-annex
-PORTVERSION=	0.20110601
+PORTVERSION=	3.20110702
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/
 DISTFILES=	${PORTVERSION}
@@ -20,22 +20,29 @@
 		hs-pcre-light>=0:${PORTSDIR}/devel/hs-pcre-light \
 		hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \
 		hs-SHA>=0:${PORTSDIR}/security/hs-SHA \
-		hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc
+		hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \
+		hs-curl>0:${PORTSDIR}/ftp/hs-curl
 RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-MissingH>=0:${PORTSDIR}/devel/hs-MissingH \
 		hs-pcre-light>=0:${PORTSDIR}/devel/hs-pcre-light \
 		hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \
 		hs-SHA>=0:${PORTSDIR}/security/hs-SHA \
-		hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc
+		hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \
+		hs-curl>0:${PORTSDIR}/ftp/hs-curl \
+		git:${PORTSDIR}/devel/git \
+		rsync:${PORTSDIR}/net/rsync
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
 
-MAN1=		git-annex.1 git-annex-shell.1
+MAN1=		git-annex.1 \
+		git-annex-shell.1 \
+		git-union-merge.1
 
 LICENSE=	GPLv3
 
 PLIST_FILES=	bin/git-annex \
-		bin/git-annex-shell
+		bin/git-annex-shell \
+		bin/git-union-merge
 
 .include	<bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/git-annex/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	26 Jun 2011 08:15:16 -0000	1.1
+++ distinfo	5 Jul 2011 11:46:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (git-annex/0.20110601) = 2718e5634a4384d8a2a284bac66f1cff76d2c048b6c57662c24c575a97e9193b
-SIZE (git-annex/0.20110601) = 358008
+SHA256 (git-annex/3.20110702) = 66d633bcbd49d4a34b241222bf83f35e85af3207454de3fde4afaf1dd1409580
+SIZE (git-annex/3.20110702) = 378351
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/git-annex/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile	26 Jun 2011 08:15:16 -0000	1.1
+++ files/patch-Makefile	5 Jul 2011 11:46:31 -0000
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 286c3a6..3ed7a59 100644
+index 786fd91..df9bbf0 100644
 --- Makefile
 +++ Makefile
 @@ -1,4 +1,4 @@
@@ -8,7 +8,7 @@
  IGNORE=-ignore-package monads-fd
  GHCFLAGS=-O2 -Wall $(IGNORE) -fspec-constr-count=5
  ifdef PROFILE
-@@ -37,12 +37,8 @@ git-annex-shell.1: doc/git-annex-shell.mdwn
+@@ -43,12 +43,8 @@ git-union-merge.1: doc/git-union-merge.mdwn
  install: all
  	install -d $(DESTDIR)$(PREFIX)/bin
  	install $(bins) $(DESTDIR)$(PREFIX)/bin
@@ -22,8 +22,8 @@
 +	install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/man/man1
  
  test: $(bins)
- 	if ! $(GHCMAKE) -O0 test; then \
-@@ -59,21 +55,7 @@ testcoverage: $(bins)
+ 	@if ! $(GHCMAKE) -O0 test; then \
+@@ -65,21 +61,7 @@ testcoverage: $(bins)
  	@hpc report test --exclude=Main --exclude=QC
  	@hpc markup test --exclude=Main --exclude=QC --destdir=.hpc >/dev/null
  

>Release-Note:
>Audit-Trail:
>Unformatted: