Attachment #78591 for bug #113030

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




#

PORTNAME=	git
PORTVERSION=	1.5.2
CATEGORIES=	devel
MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/


		git-bisect.1 \
		git-blame.1 \
		git-branch.1 \
		git-bundle.1 \
		git-cat-file.1 \
		git-check-attr.1 \
		git-check-ref-format.1 \
		git-checkout-index.1 \
		git-checkout.1 \

		git-describe.1 \
		git-diff-files.1 \
		git-diff-index.1 \
		git-diff-stages.1 \
		git-diff-tree.1 \
		git-diff.1 \
		git-fast-import.1 \

		git-mailinfo.1 \
		git-mailsplit.1 \
		git-merge.1 \
		git-mergetool.1 \
		git-merge-base.1 \
		git-merge-file.1 \
		git-merge-index.1 \

		git-request-pull.1 \
		git-rerere.1 \
		git-reset.1 \
		git-resolve.1 \
		git-rev-list.1 \
		git-rev-parse.1 \
		git-revert.1 \

		git-write-tree.1 \
		gitk.1
MAN3=		Git.3
MAN5=		gitattributes.5
MAN7=		git.7

USE_BZIP2=	yes


.ifndef WITHOUT_GUI
PLIST_SUB+=	GUI=""
GITGUIVERSION=	0.6-GITGUI
RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
.else
PLIST_SUB+=	GUI="@comment "
MAKE_ENV+=	NO_TCLTK=yes
.endif

# We should place version files to avoid git's attempt to figure it by itself
post-patch:
	${ECHO} "GIT_VERSION = ${PORTVERSION}-dirty" > ${WRKSRC}/GIT-VERSION-FILE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/GIT-VERSION-GEN
.ifndef WITHOUT_GUI
	${ECHO} "GIT_VERSION = ${GITGUIVERSION}-dirty" > ${WRKSRC}/git-gui/GIT-VERSION-FILE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/git-gui/GIT-VERSION-GEN
.endif

post-install:
	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \

Lines 1-3 Link Here

(-)devel/git/distinfo (-3 / +3 lines)
1	MD5 (git-1.5.0.3.tar.bz2) = ea7a01dbde1da8fce235dde689bfeeea	1	MD5 (git-1.5.2.tar.bz2) = 79c749b720c29c024d948163fdc47dac
2	SHA256 (git-1.5.0.3.tar.bz2) = 950be95ece89a4c03aa22cd93626a27619536d1b9d40631b4369c339d63c120a	2	SHA256 (git-1.5.2.tar.bz2) = 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5
3	SIZE (git-1.5.0.3.tar.bz2) = 1047037	3	SIZE (git-1.5.2.tar.bz2) = 1180424




bin/git-bisect
bin/git-blame
bin/git-branch
bin/git-bundle
bin/git-cat-file
bin/git-check-attr
bin/git-check-ref-format
bin/git-checkout
bin/git-checkout-index

bin/git-diff
bin/git-diff-files
bin/git-diff-index
bin/git-diff-stages
bin/git-diff-tree
bin/git-fast-import
bin/git-fetch
bin/git-fetch--tool
bin/git-fetch-pack
bin/git-fmt-merge-msg
bin/git-for-each-ref

bin/git-merge-recursive
bin/git-merge-resolve
bin/git-merge-stupid
bin/git-merge-subtree
bin/git-merge-tree
bin/git-mergetool
bin/git-mktag
bin/git-mktree
bin/git-mv

bin/git-request-pull
bin/git-rerere
bin/git-reset
bin/git-resolve
bin/git-rev-list
bin/git-rev-parse
bin/git-revert

share/git-core/templates/hooks/applypatch-msg
share/git-core/templates/hooks/commit-msg
share/git-core/templates/hooks/post-commit
share/git-core/templates/hooks/post-receive
share/git-core/templates/hooks/post-update
share/git-core/templates/hooks/pre-applypatch
share/git-core/templates/hooks/pre-commit
share/git-core/templates/hooks/pre-rebase
share/git-core/templates/hooks/update
share/git-core/templates/info/exclude
%%GUI%%share/git-gui/lib/blame.tcl
%%GUI%%share/git-gui/lib/branch.tcl
%%GUI%%share/git-gui/lib/browser.tcl
%%GUI%%share/git-gui/lib/class.tcl
%%GUI%%share/git-gui/lib/commit.tcl
%%GUI%%share/git-gui/lib/console.tcl
%%GUI%%share/git-gui/lib/database.tcl
%%GUI%%share/git-gui/lib/diff.tcl
%%GUI%%share/git-gui/lib/error.tcl
%%GUI%%share/git-gui/lib/index.tcl
%%GUI%%share/git-gui/lib/merge.tcl
%%GUI%%share/git-gui/lib/option.tcl
%%GUI%%share/git-gui/lib/remote.tcl
%%GUI%%share/git-gui/lib/shortcut.tcl
%%GUI%%share/git-gui/lib/tclIndex
%%GUI%%share/git-gui/lib/transport.tcl
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
@dirrm lib/xemacs/site-lisp/git
@dirrmtry lib/xemacs/site-lisp

@dirrm share/git-core/templates/info
@dirrm share/git-core/templates
@dirrm share/git-core
%%GUI%%@dirrm share/git-gui/lib
%%GUI%%@dirrm share/git-gui

Return to bug 113030

Lines 6-12 Link Here

(-)devel/git/Makefile (-13 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= git	8	PORTNAME= git
9	PORTVERSION= 1.5.0.3	9	PORTVERSION= 1.5.2
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://www.kernel.org/pub/software/scm/git/	11	MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
12		12
Lines 36-42 Link Here
36	git-bisect.1 \	36	git-bisect.1 \
37	git-blame.1 \	37	git-blame.1 \
38	git-branch.1 \	38	git-branch.1 \
		39	git-bundle.1 \
39	git-cat-file.1 \	40	git-cat-file.1 \
		41	git-check-attr.1 \
40	git-check-ref-format.1 \	42	git-check-ref-format.1 \
41	git-checkout-index.1 \	43	git-checkout-index.1 \
42	git-checkout.1 \	44	git-checkout.1 \
Lines 56-62 Link Here
56	git-describe.1 \	58	git-describe.1 \
57	git-diff-files.1 \	59	git-diff-files.1 \
58	git-diff-index.1 \	60	git-diff-index.1 \
59	git-diff-stages.1 \
60	git-diff-tree.1 \	61	git-diff-tree.1 \
61	git-diff.1 \	62	git-diff.1 \
62	git-fast-import.1 \	63	git-fast-import.1 \
Lines 87-92 Link Here
87	git-mailinfo.1 \	88	git-mailinfo.1 \
88	git-mailsplit.1 \	89	git-mailsplit.1 \
89	git-merge.1 \	90	git-merge.1 \
		91	git-mergetool.1 \
90	git-merge-base.1 \	92	git-merge-base.1 \
91	git-merge-file.1 \	93	git-merge-file.1 \
92	git-merge-index.1 \	94	git-merge-index.1 \
Lines 119-125 Link Here
119	git-request-pull.1 \	121	git-request-pull.1 \
120	git-rerere.1 \	122	git-rerere.1 \
121	git-reset.1 \	123	git-reset.1 \
122	git-resolve.1 \
123	git-rev-list.1 \	124	git-rev-list.1 \
124	git-rev-parse.1 \	125	git-rev-parse.1 \
125	git-revert.1 \	126	git-revert.1 \
Lines 157-162 Link Here
157	git-write-tree.1 \	158	git-write-tree.1 \
158	gitk.1	159	gitk.1
159	MAN3= Git.3	160	MAN3= Git.3
		161	MAN5= gitattributes.5
160	MAN7= git.7	162	MAN7= git.7
161		163
162	USE_BZIP2= yes	164	USE_BZIP2= yes
Lines 177-198 Link Here
177		179
178	.ifndef WITHOUT_GUI	180	.ifndef WITHOUT_GUI
179	PLIST_SUB+= GUI=""	181	PLIST_SUB+= GUI=""
180	GITGUIVERSION= 0.6-GITGUI
181	RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84	182	RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
182	.else	183	.else
183	PLIST_SUB+= GUI="@comment "	184	PLIST_SUB+= GUI="@comment "
184	MAKE_ENV+= NO_GUI=yes	185	MAKE_ENV+= NO_TCLTK=yes
185	.endif
186
187	# We should place version files to avoid git's attempt to figure it by itself
188	post-patch:
189	${ECHO} "GIT_VERSION = ${PORTVERSION}-dirty" > ${WRKSRC}/GIT-VERSION-FILE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/GIT-VERSION-GEN
190	.ifndef WITHOUT_GUI
191	${ECHO} "GIT_VERSION = ${GITGUIVERSION}-dirty" > ${WRKSRC}/git-gui/GIT-VERSION-FILE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/git-gui/GIT-VERSION-GEN
192	.endif	186	.endif
193		187
194	post-install:	188	post-install:
195	${TEST} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod && ${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod	189	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
196	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git	190	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
197	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git	191	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
198	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \	192	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \

Lines 11-17 Link Here

(-)devel/git/pkg-plist (-2 / +24 lines)
11	bin/git-bisect	11	bin/git-bisect
12	bin/git-blame	12	bin/git-blame
13	bin/git-branch	13	bin/git-branch
		14	bin/git-bundle
14	bin/git-cat-file	15	bin/git-cat-file
		16	bin/git-check-attr
15	bin/git-check-ref-format	17	bin/git-check-ref-format
16	bin/git-checkout	18	bin/git-checkout
17	bin/git-checkout-index	19	bin/git-checkout-index
Lines 33-42 Link Here
33	bin/git-diff	35	bin/git-diff
34	bin/git-diff-files	36	bin/git-diff-files
35	bin/git-diff-index	37	bin/git-diff-index
36	bin/git-diff-stages
37	bin/git-diff-tree	38	bin/git-diff-tree
38	bin/git-fast-import	39	bin/git-fast-import
39	bin/git-fetch	40	bin/git-fetch
		41	bin/git-fetch--tool
40	bin/git-fetch-pack	42	bin/git-fetch-pack
41	bin/git-fmt-merge-msg	43	bin/git-fmt-merge-msg
42	bin/git-for-each-ref	44	bin/git-for-each-ref
Lines 73-79 Link Here
73	bin/git-merge-recursive	75	bin/git-merge-recursive
74	bin/git-merge-resolve	76	bin/git-merge-resolve
75	bin/git-merge-stupid	77	bin/git-merge-stupid
		78	bin/git-merge-subtree
76	bin/git-merge-tree	79	bin/git-merge-tree
		80	bin/git-mergetool
77	bin/git-mktag	81	bin/git-mktag
78	bin/git-mktree	82	bin/git-mktree
79	bin/git-mv	83	bin/git-mv
Lines 101-107 Link Here
101	bin/git-request-pull	105	bin/git-request-pull
102	bin/git-rerere	106	bin/git-rerere
103	bin/git-reset	107	bin/git-reset
104	bin/git-resolve
105	bin/git-rev-list	108	bin/git-rev-list
106	bin/git-rev-parse	109	bin/git-rev-parse
107	bin/git-revert	110	bin/git-revert
Lines 150-161 Link Here
150	share/git-core/templates/hooks/applypatch-msg	153	share/git-core/templates/hooks/applypatch-msg
151	share/git-core/templates/hooks/commit-msg	154	share/git-core/templates/hooks/commit-msg
152	share/git-core/templates/hooks/post-commit	155	share/git-core/templates/hooks/post-commit
		156	share/git-core/templates/hooks/post-receive
153	share/git-core/templates/hooks/post-update	157	share/git-core/templates/hooks/post-update
154	share/git-core/templates/hooks/pre-applypatch	158	share/git-core/templates/hooks/pre-applypatch
155	share/git-core/templates/hooks/pre-commit	159	share/git-core/templates/hooks/pre-commit
156	share/git-core/templates/hooks/pre-rebase	160	share/git-core/templates/hooks/pre-rebase
157	share/git-core/templates/hooks/update	161	share/git-core/templates/hooks/update
158	share/git-core/templates/info/exclude	162	share/git-core/templates/info/exclude
		163	%%GUI%%share/git-gui/lib/blame.tcl
		164	%%GUI%%share/git-gui/lib/branch.tcl
		165	%%GUI%%share/git-gui/lib/browser.tcl
		166	%%GUI%%share/git-gui/lib/class.tcl
		167	%%GUI%%share/git-gui/lib/commit.tcl
		168	%%GUI%%share/git-gui/lib/console.tcl
		169	%%GUI%%share/git-gui/lib/database.tcl
		170	%%GUI%%share/git-gui/lib/diff.tcl
		171	%%GUI%%share/git-gui/lib/error.tcl
		172	%%GUI%%share/git-gui/lib/index.tcl
		173	%%GUI%%share/git-gui/lib/merge.tcl
		174	%%GUI%%share/git-gui/lib/option.tcl
		175	%%GUI%%share/git-gui/lib/remote.tcl
		176	%%GUI%%share/git-gui/lib/shortcut.tcl
		177	%%GUI%%share/git-gui/lib/tclIndex
		178	%%GUI%%share/git-gui/lib/transport.tcl
159	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git	179	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
160	@dirrm lib/xemacs/site-lisp/git	180	@dirrm lib/xemacs/site-lisp/git
161	@dirrmtry lib/xemacs/site-lisp	181	@dirrmtry lib/xemacs/site-lisp
Lines 168-170 Link Here
168	@dirrm share/git-core/templates/info	188	@dirrm share/git-core/templates/info
169	@dirrm share/git-core/templates	189	@dirrm share/git-core/templates
170	@dirrm share/git-core	190	@dirrm share/git-core
		191	%%GUI%%@dirrm share/git-gui/lib
		192	%%GUI%%@dirrm share/git-gui