Date: Mon, 1 Aug 2011 08:57:16 GMT From: Gabor PALI <pgj@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/159348: [patch] devel/git-annex: Update to 3.20110707 and Cabalize Message-ID: <201108010857.p718vG5g048010@red.freebsd.org> Resent-Message-ID: <201108010900.p7190Juc091612@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159348 >Category: ports >Synopsis: [patch] devel/git-annex: Update to 3.20110707 and Cabalize >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 01 09:00:19 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Gabor PALI >Release: n/a >Organization: The FreeBSD Project >Environment: n/a >Description: - Update to 3.20110707 - Rewrite the port as a Haskell Cabal package transcript - Move to devel/hs-git-annex (see the FreeBSD Haskell repository [1]) [1] https://github.com/freebsd-haskell/freebsd-haskell >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN git-annex/Makefile hs-git-annex/Makefile --- git-annex/Makefile 2011-08-01 10:01:55.000000000 +0200 +++ hs-git-annex/Makefile 2011-08-01 10:52:12.000000000 +0200 @@ -6,46 +6,33 @@ # PORTNAME= git-annex -PORTVERSION= 3.20110702 +PORTVERSION= 3.20110707 CATEGORIES= devel haskell -MASTER_SITES= http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/ -DISTFILES= ${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} MAINTAINER= frase@frase.id.au -COMMENT= Manage file hierarchies with git - -BUILD_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-curl>0:${PORTSDIR}/ftp/hs-curl \ - git:${PORTSDIR}/devel/git \ - rsync:${PORTSDIR}/net/rsync - -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-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 \ - git-union-merge.1 +COMMENT= Manage files with git, without checking their contents into git LICENSE= GPLv3 +FILE_LICENSE= GPL + +USE_CABAL= dataenc hS3 hslogger HTTP MissingH mtl network pcre-light \ + SHA utf8-string +CABAL_SETUP= Setup.hs + +USE_GMAKE= yes +USE_PERL5_BUILD= yes + +BUILD_DEPENDS+= rsync:${PORTSDIR}/net/rsync \ + git:${PORTSDIR}/devel/git + +RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \ + git:${PORTSDIR}/devel/git + +EXECUTABLE= git-union-merge git-annex-shell git-annex +STANDALONE= yes -PLIST_FILES= bin/git-annex \ - bin/git-annex-shell \ - bin/git-union-merge +MAN1SRC= . +MAN1= git-union-merge.1 git-annex-shell.1 git-annex.1 -.include <bsd.port.mk> +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include <bsd.port.mk> diff -urN git-annex/distinfo hs-git-annex/distinfo --- git-annex/distinfo 2011-07-31 17:16:24.000000000 +0200 +++ hs-git-annex/distinfo 2011-07-13 14:07:12.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (git-annex/3.20110702) = 66d633bcbd49d4a34b241222bf83f35e85af3207454de3fde4afaf1dd1409580 -SIZE (git-annex/3.20110702) = 378351 +SHA256 (cabal/git-annex-3.20110707.tar.gz) = 174713eb7af035d10f90b8189ed1dc241ce379f70eba9ca416ac2c66089a0461 +SIZE (cabal/git-annex-3.20110707.tar.gz) = 374279 diff -urN git-annex/files/patch-Makefile hs-git-annex/files/patch-Makefile --- git-annex/files/patch-Makefile 2011-08-01 09:35:37.000000000 +0200 +++ hs-git-annex/files/patch-Makefile 2011-07-10 20:01:25.000000000 +0200 @@ -1,45 +1,11 @@ ---- ./Makefile.orig 2011-07-02 21:08:05.000000000 +0200 -+++ ./Makefile 2011-08-01 09:35:21.000000000 +0200 -@@ -1,4 +1,4 @@ --PREFIX=/usr -+PREFIX?=/usr/local - IGNORE=-ignore-package monads-fd - GHCFLAGS=-O2 -Wall $(IGNORE) -fspec-constr-count=5 - ifdef PROFILE -@@ -43,12 +43,8 @@ - install: all - install -d $(DESTDIR)$(PREFIX)/bin - install $(bins) $(DESTDIR)$(PREFIX)/bin -- install -d $(DESTDIR)$(PREFIX)/share/man/man1 -- install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/share/man/man1 -- install -d $(DESTDIR)$(PREFIX)/share/doc/git-annex -- if [ -d html ]; then \ -- rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \ -- fi -+ install -d $(DESTDIR)$(PREFIX)/man/man1 -+ install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/man/man1 +--- ./Makefile.orig 2011-07-02 23:11:38.000000000 +0200 ++++ ./Makefile 2011-07-08 23:10:32.979799493 +0200 +@@ -73,6 +73,8 @@ + IKIWIKI=ikiwiki + endif - test: $(bins) - @if ! $(GHCMAKE) -O0 test; then \ -@@ -65,21 +61,7 @@ - @hpc report test --exclude=Main --exclude=QC - @hpc markup test --exclude=Main --exclude=QC --destdir=.hpc >/dev/null - --# If ikiwiki is available, build static html docs suitable for being --# shipped in the software package. --ifeq ($(shell which ikiwiki),) --IKIWIKI=@echo "** ikiwiki not found, skipping building docs" >&2; true --else --IKIWIKI=ikiwiki --endif -- ++manuals: $(mans) ++ docs: $(mans) -- $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \ -- --no-usedirs --disable-plugin=openid --plugin=sidebar \ -- --underlaydir=/dev/null --disable-plugin=shortcut \ -- --disable-plugin=smiley \ -- --plugin=comments --set comments_pagespec="*" \ -- --exclude='news/.*' - - clean: - rm -rf build $(bins) $(mans) test configure *.tix .hpc \ + $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \ + --no-usedirs --disable-plugin=openid --plugin=sidebar \ diff -urN git-annex/files/patch-Setup.hs hs-git-annex/files/patch-Setup.hs --- git-annex/files/patch-Setup.hs 1970-01-01 01:00:00.000000000 +0100 +++ hs-git-annex/files/patch-Setup.hs 2011-07-10 20:01:25.000000000 +0200 @@ -0,0 +1,14 @@ +--- ./Setup.hs.orig 2011-07-02 23:11:40.000000000 +0200 ++++ ./Setup.hs 2011-07-08 23:11:28.256484379 +0200 +@@ -9,9 +9,9 @@ + } + + makeSources _ _ = do +- system "make sources" ++ system "gmake sources manuals" + return (Nothing, []) + + makeClean _ _ _ _ = do +- system "make clean" ++ system "gmake clean" + return () >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108010857.p718vG5g048010>