Attachment #117277 for bug #159348

View | Details | Raw Unified | Return to bug 159348
Collapse All | Expand All




#

PORTNAME=	git-annex
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 files with git, without checking their contents into 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

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

MAN1SRC=	.
MAN1=		git-union-merge.1 git-annex-shell.1 git-annex.1
		bin/git-union-merge

.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>

Lines 1-2 Link Here

(-)hs-git-annex/distinfo (-2 / +2 lines)
1	SHA256 (git-annex/3.20110702) = 66d633bcbd49d4a34b241222bf83f35e85af3207454de3fde4afaf1dd1409580	1	SHA256 (cabal/git-annex-3.20110707.tar.gz) = 174713eb7af035d10f90b8189ed1dc241ce379f70eba9ca416ac2c66089a0461
2	SIZE (git-annex/3.20110702) = 378351	2	SIZE (cabal/git-annex-3.20110707.tar.gz) = 374279




--- ./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
 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
 
+manuals: $(mans)
+
@@ -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
-
 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 \

Line 0 Link Here

(-)hs-git-annex/files/patch-Setup.hs (+14 lines)
	1	--- ./Setup.hs.orig 2011-07-02 23:11:40.000000000 +0200
	2	+++ ./Setup.hs 2011-07-08 23:11:28.256484379 +0200
	3	@@ -9,9 +9,9 @@
	4	}
	5
	6	makeSources _ _ = do
	7	- system "make sources"
	8	+ system "gmake sources manuals"
	9	return (Nothing, [])
	10
	11	makeClean _ _ _ _ = do
	12	- system "make clean"
	13	+ system "gmake clean"
	14	return ()

Return to bug 159348

Lines 6-51 Link Here

(-)hs-git-annex/Makefile (-36 / +23 lines)
6	#	6	#
7		7
8	PORTNAME= git-annex	8	PORTNAME= git-annex
9	PORTVERSION= 3.20110702	9	PORTVERSION= 3.20110707
10	CATEGORIES= devel haskell	10	CATEGORIES= devel haskell
11	MASTER_SITES= http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/
12	DISTFILES= ${PORTVERSION}
13	DIST_SUBDIR= ${PORTNAME}
14		11
15	MAINTAINER= frase@frase.id.au	12	MAINTAINER= frase@frase.id.au
16	COMMENT= Manage file hierarchies with git	13	COMMENT= Manage files with git, without checking their contents into git
17
18	BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
19	hs-MissingH>=0:${PORTSDIR}/devel/hs-MissingH \
20	hs-pcre-light>=0:${PORTSDIR}/devel/hs-pcre-light \
21	hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \
22	hs-SHA>=0:${PORTSDIR}/security/hs-SHA \
23	hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \
24	hs-curl>0:${PORTSDIR}/ftp/hs-curl \
25	git:${PORTSDIR}/devel/git \
26	rsync:${PORTSDIR}/net/rsync
27
28	RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
29	hs-MissingH>=0:${PORTSDIR}/devel/hs-MissingH \
30	hs-pcre-light>=0:${PORTSDIR}/devel/hs-pcre-light \
31	hs-utf8-string>=0:${PORTSDIR}/devel/hs-utf8-string \
32	hs-SHA>=0:${PORTSDIR}/security/hs-SHA \
33	hs-dataenc>=0:${PORTSDIR}/converters/hs-dataenc \
34	hs-curl>0:${PORTSDIR}/ftp/hs-curl \
35	git:${PORTSDIR}/devel/git \
36	rsync:${PORTSDIR}/net/rsync
37
38	USE_PERL5= yes
39	USE_GMAKE= yes
40
41	MAN1= git-annex.1 \
42	git-annex-shell.1 \
43	git-union-merge.1
44		14
45	LICENSE= GPLv3	15	LICENSE= GPLv3
		16	FILE_LICENSE= GPL
		17
		18	USE_CABAL= dataenc hS3 hslogger HTTP MissingH mtl network pcre-light \
		19	SHA utf8-string
		20	CABAL_SETUP= Setup.hs
		21
		22	USE_GMAKE= yes
		23	USE_PERL5_BUILD= yes
		24
		25	BUILD_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
		26	git:${PORTSDIR}/devel/git
		27
		28	RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
		29	git:${PORTSDIR}/devel/git
		30
		31	EXECUTABLE= git-union-merge git-annex-shell git-annex
		32	STANDALONE= yes
46		33
47	PLIST_FILES= bin/git-annex \	34	MAN1SRC= .
48	bin/git-annex-shell \	35	MAN1= git-union-merge.1 git-annex-shell.1 git-annex.1
49	bin/git-union-merge
50		36
51	.include <bsd.port.mk>	37	.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
		38	.include <bsd.port.mk>

Lines 1-45 Link Here

(-)hs-git-annex/files/patch-Makefile (-43 / +9 lines)
1	--- ./Makefile.orig 2011-07-02 21:08:05.000000000 +0200	1	--- ./Makefile.orig 2011-07-02 23:11:38.000000000 +0200
2	+++ ./Makefile 2011-08-01 09:35:21.000000000 +0200	2	+++ ./Makefile 2011-07-08 23:10:32.979799493 +0200
3	@@ -1,4 +1,4 @@	3	@@ -73,6 +73,8 @@
4	-PREFIX=/usr	4	IKIWIKI=ikiwiki
5	+PREFIX?=/usr/local	5	endif
6	IGNORE=-ignore-package monads-fd
7	GHCFLAGS=-O2 -Wall $(IGNORE) -fspec-constr-count=5
8	ifdef PROFILE
9	@@ -43,12 +43,8 @@
10	install: all
11	install -d $(DESTDIR)$(PREFIX)/bin
12	install $(bins) $(DESTDIR)$(PREFIX)/bin
13	- install -d $(DESTDIR)$(PREFIX)/share/man/man1
14	- install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/share/man/man1
15	- install -d $(DESTDIR)$(PREFIX)/share/doc/git-annex
16	- if [ -d html ]; then \
17	- rsync -a --delete html/ $(DESTDIR)$(PREFIX)/share/doc/git-annex/html/; \
18	- fi
19	+ install -d $(DESTDIR)$(PREFIX)/man/man1
20	+ install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/man/man1
21		6
22	test: $(bins)	7	+manuals: $(mans)
23	@if ! $(GHCMAKE) -O0 test; then \	8	+
24	@@ -65,21 +61,7 @@
25	@hpc report test --exclude=Main --exclude=QC
26	@hpc markup test --exclude=Main --exclude=QC --destdir=.hpc >/dev/null
27
28	-# If ikiwiki is available, build static html docs suitable for being
29	-# shipped in the software package.
30	-ifeq ($(shell which ikiwiki),)
31	-IKIWIKI=@echo "** ikiwiki not found, skipping building docs" >&2; true
32	-else
33	-IKIWIKI=ikiwiki
34	-endif
35	-
36	docs: $(mans)	9	docs: $(mans)
37	- $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \	10	$(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \
38	- --no-usedirs --disable-plugin=openid --plugin=sidebar \	11	--no-usedirs --disable-plugin=openid --plugin=sidebar \
39	- --underlaydir=/dev/null --disable-plugin=shortcut \
40	- --disable-plugin=smiley \
41	- --plugin=comments --set comments_pagespec="*" \
42	- --exclude='news/.*'
43
44	clean:
45	rm -rf build $(bins) $(mans) test configure *.tix .hpc \