Attachment #81358 for bug #116521

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




#

PORTNAME=	git
PORTVERSION=	1.5.3.2
CATEGORIES=	devel
MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \

		git-am.1 \
		git-annotate.1 \
		git-apply.1 \
		git-applymbox.1 \
		git-applypatch.1 \
		git-archimport.1 \
		git-archive.1 \
		git-bisect.1 \

		git-mktree.1 \
		git-mv.1 \
		git-name-rev.1 \
		git-p4import.1 \
		git-pack-objects.1 \
		git-pack-redundant.1 \
		git-pack-refs.1 \

		git-whatchanged.1 \
		git-write-tree.1 \
		gitk.1
MAN3PREFIX=	${PREFIX}/share
MAN3=		Git.3
MAN5=		gitattributes.5 gitignore.5
MAN7=		git.7

CFLAGS+=	-I${LOCALBASE}/include
MAKE_ENV+=	CURLDIR=${LOCALBASE} \
		NEEDS_LIBICONV=yes \
		WITH_P4IMPORT=yes \
		LDFLAGS="-L${LOCALBASE}/lib" \
		PYTHON_PATH=${LOCALBASE}/bin/python \
		PERL_PATH=${PERL}

MAKE_ENV+=	NO_TCLTK=yes
.endif

.ifdef WITH_GITSVN
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
		svn:${PORTSDIR}/devel/subversion
.endif

.include <bsd.port.pre.mk>

pre-everything::
	@${ECHO_MSG} ""
	@${ECHO_MSG} "This port has the following tunables:"
	@${ECHO_MSG} "WITHOUT_GUI:	disables Git GUI programs"
	@${ECHO_MSG} "WITH_GITSVN:	enables Git <-> SVN interface"
	@${ECHO_MSG} ""

post-build:
	${SED} -e'1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
		${WRKSRC}/contrib/p4import/git-p4import.py > \
		${WRKSRC}/contrib/p4import/git-p4import

post-install:
.for i in ${MAN1}
	${INSTALL_MAN} ${WRKDIR}/man1/${i} ${MANPREFIX}/man/man1/

	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \
		${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el

	${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import \
		${PREFIX}/bin/
	${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
		${PREFIX}/bin/

.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)../git/distinfo (-6 / +6 lines)
1	MD5 (git-1.5.2.1.tar.bz2) = 0a39e786a12974cbe7b14f2fe92dc163	1	MD5 (git-1.5.3.2.tar.bz2) = 2113337dd27141a6890ff84f25164901
2	SHA256 (git-1.5.2.1.tar.bz2) = 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37	2	SHA256 (git-1.5.3.2.tar.bz2) = e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45
3	SIZE (git-1.5.2.1.tar.bz2) = 1184392	3	SIZE (git-1.5.3.2.tar.bz2) = 1344171
4	MD5 (git-manpages-1.5.2.1.tar.bz2) = e9da37e899167a4f36a71c8fee46e6a0	4	MD5 (git-manpages-1.5.3.2.tar.bz2) = 375183e7370877f752674063e4336dfa
5	SHA256 (git-manpages-1.5.2.1.tar.bz2) = f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f	5	SHA256 (git-manpages-1.5.3.2.tar.bz2) = b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f
6	SIZE (git-manpages-1.5.2.1.tar.bz2) = 139651	6	SIZE (git-manpages-1.5.3.2.tar.bz2) = 147283




--- Makefile.orig	2007-09-19 22:02:17.000000000 +0400
+++ Makefile	2007-09-21 22:13:25.000000000 +0400
@@ -135,8 +135,8 @@
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.

 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
@@ -173,15 +173,15 @@
 
 export prefix bindir gitexecdir sharedir template_dir sysconfdir
 
-CC = gcc
-AR = ar
-RM = rm -f
-TAR = tar
-FIND = find
-INSTALL = install
-RPMBUILD = rpmbuild
-TCL_PATH = tclsh
-TCLTK_PATH = wish
+CC ?= gcc
+AR ?= ar
+RM ?= rm -f
+TAR ?= tar
+FIND ?= find
+INSTALL ?= install
+RPMBUILD ?= rpmbuild
+TCL_PATH ?= tclsh




bin/git-am
bin/git-annotate
bin/git-apply
bin/git-applymbox
bin/git-applypatch
bin/git-archimport
bin/git-archive
bin/git-bisect

bin/git-fetch
bin/git-fetch-pack
bin/git-fetch--tool
bin/git-filter-branch
bin/git-fmt-merge-msg
bin/git-for-each-ref
bin/git-format-patch

bin/git-mktree
bin/git-mv
bin/git-name-rev
bin/git-p4
bin/git-p4import
bin/git-pack-objects
bin/git-pack-redundant

bin/git-quiltimport
bin/git-read-tree
bin/git-rebase
bin/git-rebase--interactive
bin/git-receive-pack
bin/git-reflog
bin/git-relink

bin/git-ssh-push
bin/git-ssh-upload
bin/git-status
bin/git-stash
bin/git-stripspace
bin/git-submodule
bin/git-svn
bin/git-svnimport
bin/git-symbolic-ref

%%GUI%%share/git-gui/lib/tclIndex
%%GUI%%share/git-gui/lib/blame.tcl
%%GUI%%share/git-gui/lib/branch.tcl
%%GUI%%share/git-gui/lib/branch_checkout.tcl
%%GUI%%share/git-gui/lib/branch_create.tcl
%%GUI%%share/git-gui/lib/branch_delete.tcl
%%GUI%%share/git-gui/lib/branch_rename.tcl
%%GUI%%share/git-gui/lib/browser.tcl
%%GUI%%share/git-gui/lib/checkout_op.tcl
%%GUI%%share/git-gui/lib/choose_font.tcl
%%GUI%%share/git-gui/lib/choose_rev.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/encoding.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/remote_branch_delete.tcl
%%GUI%%share/git-gui/lib/shortcut.tcl
%%GUI%%share/git-gui/lib/status_bar.tcl
%%GUI%%share/git-gui/lib/transport.tcl
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
@dirrm lib/xemacs/site-lisp/git

Return to bug 116521

Lines 6-12 Link Here

(-)../git/Makefile (-7 / +27 lines)
6	#	6	#
7		7
8	PORTNAME= git	8	PORTNAME= git
9	PORTVERSION= 1.5.2.1	9	PORTVERSION= 1.5.3.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	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \	12	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
Lines 28-35 Link Here
28	git-am.1 \	28	git-am.1 \
29	git-annotate.1 \	29	git-annotate.1 \
30	git-apply.1 \	30	git-apply.1 \
31	git-applymbox.1 \
32	git-applypatch.1 \
33	git-archimport.1 \	31	git-archimport.1 \
34	git-archive.1 \	32	git-archive.1 \
35	git-bisect.1 \	33	git-bisect.1 \
Lines 97-103 Link Here
97	git-mktree.1 \	95	git-mktree.1 \
98	git-mv.1 \	96	git-mv.1 \
99	git-name-rev.1 \	97	git-name-rev.1 \
100	git-p4import.1 \
101	git-pack-objects.1 \	98	git-pack-objects.1 \
102	git-pack-redundant.1 \	99	git-pack-redundant.1 \
103	git-pack-refs.1 \	100	git-pack-refs.1 \
Lines 156-162 Link Here
156	git-whatchanged.1 \	153	git-whatchanged.1 \
157	git-write-tree.1 \	154	git-write-tree.1 \
158	gitk.1	155	gitk.1
159	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}	156	MAN3PREFIX= ${PREFIX}/share
160	MAN3= Git.3	157	MAN3= Git.3
161	MAN5= gitattributes.5 gitignore.5	158	MAN5= gitattributes.5 gitignore.5
162	MAN7= git.7	159	MAN7= git.7
Lines 169-175 Link Here
169	CFLAGS+= -I${LOCALBASE}/include	166	CFLAGS+= -I${LOCALBASE}/include
170	MAKE_ENV+= CURLDIR=${LOCALBASE} \	167	MAKE_ENV+= CURLDIR=${LOCALBASE} \
171	NEEDS_LIBICONV=yes \	168	NEEDS_LIBICONV=yes \
172	WITH_P4IMPORT=yes \
173	LDFLAGS="-L${LOCALBASE}/lib" \	169	LDFLAGS="-L${LOCALBASE}/lib" \
174	PYTHON_PATH=${LOCALBASE}/bin/python \	170	PYTHON_PATH=${LOCALBASE}/bin/python \
175	PERL_PATH=${PERL}	171	PERL_PATH=${PERL}
Lines 184-189 Link Here
184	MAKE_ENV+= NO_TCLTK=yes	180	MAKE_ENV+= NO_TCLTK=yes
185	.endif	181	.endif
186		182
		183	.ifdef WITH_GITSVN
		184	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
		185	svn:${PORTSDIR}/devel/subversion
		186	.endif
		187
		188	.include <bsd.port.pre.mk>
		189
		190	pre-everything::
		191	@${ECHO_MSG} ""
		192	@${ECHO_MSG} "This port has the following tunables:"
		193	@${ECHO_MSG} "WITHOUT_GUI: disables Git GUI programs"
		194	@${ECHO_MSG} "WITH_GITSVN: enables Git <-> SVN interface"
		195	@${ECHO_MSG} ""
		196
		197	post-build:
		198	${SED} -e'1s\|#!/usr/bin/python\|#!${PYTHON_CMD}\|' \
		199	${WRKSRC}/contrib/p4import/git-p4import.py > \
		200	${WRKSRC}/contrib/p4import/git-p4import
		201
187	post-install:	202	post-install:
188	.for i in ${MAN1}	203	.for i in ${MAN1}
189	${INSTALL_MAN} ${WRKDIR}/man1/${i} ${MANPREFIX}/man/man1/	204	${INSTALL_MAN} ${WRKDIR}/man1/${i} ${MANPREFIX}/man/man1/
Lines 207-210 Link Here
207	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \	222	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \
208	${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el	223	${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el
209		224
210	.include <bsd.port.mk>	225	${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import \
		226	${PREFIX}/bin/
		227	${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
		228	${PREFIX}/bin/
		229
		230	.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)../git/files/patch-Makefile (-3 / +7 lines)
1	--- Makefile Sun May 20 10:40:55 2007	1	--- Makefile.orig 2007-09-19 22:02:17.000000000 +0400
2	+++ Makefile Sat May 26 20:43:02 2007	2	+++ Makefile 2007-09-21 22:13:25.000000000 +0400
3	@@ -135,8 +135,8 @@	3	@@ -135,8 +135,8 @@
4		4
5	# CFLAGS and LDFLAGS are for the users to override from the command line.	5	# CFLAGS and LDFLAGS are for the users to override from the command line.
Lines 11-30 Link Here
11	ALL_CFLAGS = $(CFLAGS)	11	ALL_CFLAGS = $(CFLAGS)
12	ALL_LDFLAGS = $(LDFLAGS)	12	ALL_LDFLAGS = $(LDFLAGS)
13	STRIP ?= strip	13	STRIP ?= strip
14	@@ -172,13 +172,13 @@	14	@@ -173,15 +173,15 @@
15		15
16	export prefix bindir gitexecdir sharedir template_dir sysconfdir	16	export prefix bindir gitexecdir sharedir template_dir sysconfdir
17		17
18	-CC = gcc	18	-CC = gcc
19	-AR = ar	19	-AR = ar
		20	-RM = rm -f
20	-TAR = tar	21	-TAR = tar
		22	-FIND = find
21	-INSTALL = install	23	-INSTALL = install
22	-RPMBUILD = rpmbuild	24	-RPMBUILD = rpmbuild
23	-TCL_PATH = tclsh	25	-TCL_PATH = tclsh
24	-TCLTK_PATH = wish	26	-TCLTK_PATH = wish
25	+CC ?= gcc	27	+CC ?= gcc
26	+AR ?= ar	28	+AR ?= ar
		29	+RM ?= rm -f
27	+TAR ?= tar	30	+TAR ?= tar
		31	+FIND ?= find
28	+INSTALL ?= install	32	+INSTALL ?= install
29	+RPMBUILD ?= rpmbuild	33	+RPMBUILD ?= rpmbuild
30	+TCL_PATH ?= tclsh	34	+TCL_PATH ?= tclsh

Lines 4-11 Link Here

(-)../git/pkg-plist (-2 / +15 lines)
4	bin/git-am	4	bin/git-am
5	bin/git-annotate	5	bin/git-annotate
6	bin/git-apply	6	bin/git-apply
7	bin/git-applymbox
8	bin/git-applypatch
9	bin/git-archimport	7	bin/git-archimport
10	bin/git-archive	8	bin/git-archive
11	bin/git-bisect	9	bin/git-bisect
Lines 40-45 Link Here
40	bin/git-fetch	38	bin/git-fetch
41	bin/git-fetch-pack	39	bin/git-fetch-pack
42	bin/git-fetch--tool	40	bin/git-fetch--tool
		41	bin/git-filter-branch
43	bin/git-fmt-merge-msg	42	bin/git-fmt-merge-msg
44	bin/git-for-each-ref	43	bin/git-for-each-ref
45	bin/git-format-patch	44	bin/git-format-patch
Lines 82-87 Link Here
82	bin/git-mktree	81	bin/git-mktree
83	bin/git-mv	82	bin/git-mv
84	bin/git-name-rev	83	bin/git-name-rev
		84	bin/git-p4
85	bin/git-p4import	85	bin/git-p4import
86	bin/git-pack-objects	86	bin/git-pack-objects
87	bin/git-pack-redundant	87	bin/git-pack-redundant
Lines 96-101 Link Here
96	bin/git-quiltimport	96	bin/git-quiltimport
97	bin/git-read-tree	97	bin/git-read-tree
98	bin/git-rebase	98	bin/git-rebase
		99	bin/git-rebase--interactive
99	bin/git-receive-pack	100	bin/git-receive-pack
100	bin/git-reflog	101	bin/git-reflog
101	bin/git-relink	102	bin/git-relink
Lines 124-130 Link Here
124	bin/git-ssh-push	125	bin/git-ssh-push
125	bin/git-ssh-upload	126	bin/git-ssh-upload
126	bin/git-status	127	bin/git-status
		128	bin/git-stash
127	bin/git-stripspace	129	bin/git-stripspace
		130	bin/git-submodule
128	bin/git-svn	131	bin/git-svn
129	bin/git-svnimport	132	bin/git-svnimport
130	bin/git-symbolic-ref	133	bin/git-symbolic-ref
Lines 163-180 Link Here
163	%%GUI%%share/git-gui/lib/tclIndex	166	%%GUI%%share/git-gui/lib/tclIndex
164	%%GUI%%share/git-gui/lib/blame.tcl	167	%%GUI%%share/git-gui/lib/blame.tcl
165	%%GUI%%share/git-gui/lib/branch.tcl	168	%%GUI%%share/git-gui/lib/branch.tcl
		169	%%GUI%%share/git-gui/lib/branch_checkout.tcl
		170	%%GUI%%share/git-gui/lib/branch_create.tcl
		171	%%GUI%%share/git-gui/lib/branch_delete.tcl
		172	%%GUI%%share/git-gui/lib/branch_rename.tcl
166	%%GUI%%share/git-gui/lib/browser.tcl	173	%%GUI%%share/git-gui/lib/browser.tcl
		174	%%GUI%%share/git-gui/lib/checkout_op.tcl
		175	%%GUI%%share/git-gui/lib/choose_font.tcl
		176	%%GUI%%share/git-gui/lib/choose_rev.tcl
167	%%GUI%%share/git-gui/lib/class.tcl	177	%%GUI%%share/git-gui/lib/class.tcl
168	%%GUI%%share/git-gui/lib/commit.tcl	178	%%GUI%%share/git-gui/lib/commit.tcl
169	%%GUI%%share/git-gui/lib/console.tcl	179	%%GUI%%share/git-gui/lib/console.tcl
170	%%GUI%%share/git-gui/lib/database.tcl	180	%%GUI%%share/git-gui/lib/database.tcl
171	%%GUI%%share/git-gui/lib/diff.tcl	181	%%GUI%%share/git-gui/lib/diff.tcl
		182	%%GUI%%share/git-gui/lib/encoding.tcl
172	%%GUI%%share/git-gui/lib/error.tcl	183	%%GUI%%share/git-gui/lib/error.tcl
173	%%GUI%%share/git-gui/lib/index.tcl	184	%%GUI%%share/git-gui/lib/index.tcl
174	%%GUI%%share/git-gui/lib/merge.tcl	185	%%GUI%%share/git-gui/lib/merge.tcl
175	%%GUI%%share/git-gui/lib/option.tcl	186	%%GUI%%share/git-gui/lib/option.tcl
176	%%GUI%%share/git-gui/lib/remote.tcl	187	%%GUI%%share/git-gui/lib/remote.tcl
		188	%%GUI%%share/git-gui/lib/remote_branch_delete.tcl
177	%%GUI%%share/git-gui/lib/shortcut.tcl	189	%%GUI%%share/git-gui/lib/shortcut.tcl
		190	%%GUI%%share/git-gui/lib/status_bar.tcl
178	%%GUI%%share/git-gui/lib/transport.tcl	191	%%GUI%%share/git-gui/lib/transport.tcl
179	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git	192	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
180	@dirrm lib/xemacs/site-lisp/git	193	@dirrm lib/xemacs/site-lisp/git