Attachment #81173 for bug #116269

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




#

PORTNAME=	git
PORTVERSION=	1.5.3.1
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-checkout.1 \
		git-cherry-pick.1 \
		git-cherry.1 \
		git-citool.1 \
		git-clean.1 \
		git-clone.1 \
		git-commit-tree.1 \

		git-fast-import.1 \
		git-fetch-pack.1 \
		git-fetch.1 \
		git-filter-branch.1 \
		git-fmt-merge-msg.1 \
		git-format-patch.1 \
		git-for-each-ref.1 \
		git-format-patch.1 \
		git-fsck-objects.1 \
		git-fsck.1 \
		git-gc.1 \
		git-get-tar-commit-id.1 \
		git-grep.1 \
		git-gui.1 \
		git-hash-object.1 \
		git-http-fetch.1 \
		git-http-push.1 \
		git-imap-send.1 \
		git-index-pack.1 \
		git-init.1 \
		git-init-db.1 \
		git-init.1 \
		git-instaweb.1 \
		git-local-fetch.1 \
		git-log.1 \

		git-ls-tree.1 \
		git-mailinfo.1 \
		git-mailsplit.1 \
		git-merge.1 \
		git-merge-base.1 \
		git-merge-file.1 \
		git-merge-index.1 \
		git-merge-one-file.1 \
		git-merge-tree.1 \
		git-merge.1 \
		git-mergetool.1 \
		git-mktag.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-show.1 \
		git-ssh-fetch.1 \
		git-ssh-upload.1 \
		git-stash.1 \
		git-status.1 \
		git-stripspace.1 \
		git-submodule.1 \
		git-svn.1 \
		git-svnimport.1 \
		git-symbolic-ref.1 \
		git-tag.1 \
		git-tar-tree.1 \

		gitk.1
MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3=		Git.3
MAN5=		gitignore.5 \
		gitmodules.5 \
		gitattributes.5
MAN7=		git.7

USE_BZIP2=	yes

		WITH_P4IMPORT=yes \
		LDFLAGS="-L${LOCALBASE}/lib" \
		PYTHON_PATH=${LOCALBASE}/bin/python \
		PERL_PATH=${PERL} \
		LIBMD_SHA1=yes
MAKE_ARGS+=	prefix="${PREFIX}"

.ifndef WITHOUT_GUI

Lines 1-6 Link Here

(-)distinfo (-6 / +6 lines)
1	MD5 (git-1.5.2.1.tar.bz2) = 0a39e786a12974cbe7b14f2fe92dc163	1	MD5 (git-1.5.3.1.tar.bz2) = 3213bc24c86e3741bae3607192f3ee7d
2	SHA256 (git-1.5.2.1.tar.bz2) = 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37	2	SHA256 (git-1.5.3.1.tar.bz2) = c089f5007a4766b147679c16f0b92508a7d30799034c586e1d86192165c52959
3	SIZE (git-1.5.2.1.tar.bz2) = 1184392	3	SIZE (git-1.5.3.1.tar.bz2) = 1344764
4	MD5 (git-manpages-1.5.2.1.tar.bz2) = e9da37e899167a4f36a71c8fee46e6a0	4	MD5 (git-manpages-1.5.3.1.tar.bz2) = d56d08094cda979ed61d9a8322c5db4a
5	SHA256 (git-manpages-1.5.2.1.tar.bz2) = f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f	5	SHA256 (git-manpages-1.5.3.1.tar.bz2) = dd732f0ab3babc6438dbd69f7315e9240bf34b69e521baeceff5d09b4843c236
6	SIZE (git-manpages-1.5.2.1.tar.bz2) = 139651	6	SIZE (git-manpages-1.5.3.1.tar.bz2) = 152406

Lines 4-11 Link Here

(-)pkg-plist (-10 / +20 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 38-45 Link Here
38	bin/git-diff-tree	36	bin/git-diff-tree
39	bin/git-fast-import	37	bin/git-fast-import
40	bin/git-fetch	38	bin/git-fetch
41	bin/git-fetch-pack
42	bin/git-fetch--tool	39	bin/git-fetch--tool
		40	bin/git-fetch-pack
		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-88 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
85	bin/git-p4import
86	bin/git-pack-objects	84	bin/git-pack-objects
87	bin/git-pack-redundant	85	bin/git-pack-redundant
88	bin/git-pack-refs	86	bin/git-pack-refs
Lines 96-101 Link Here
96	bin/git-quiltimport	94	bin/git-quiltimport
97	bin/git-read-tree	95	bin/git-read-tree
98	bin/git-rebase	96	bin/git-rebase
		97	bin/git-rebase--interactive
99	bin/git-receive-pack	98	bin/git-receive-pack
100	bin/git-reflog	99	bin/git-reflog
101	bin/git-relink	100	bin/git-relink
Lines 123-130 Link Here
123	bin/git-ssh-pull	122	bin/git-ssh-pull
124	bin/git-ssh-push	123	bin/git-ssh-push
125	bin/git-ssh-upload	124	bin/git-ssh-upload
		125	bin/git-stash
126	bin/git-status	126	bin/git-status
127	bin/git-stripspace	127	bin/git-stripspace
		128	bin/git-submodule
128	bin/git-svn	129	bin/git-svn
129	bin/git-svnimport	130	bin/git-svnimport
130	bin/git-symbolic-ref	131	bin/git-symbolic-ref
Lines 153-181 Link Here
153	share/git-core/templates/hooks/applypatch-msg	154	share/git-core/templates/hooks/applypatch-msg
154	share/git-core/templates/hooks/commit-msg	155	share/git-core/templates/hooks/commit-msg
155	share/git-core/templates/hooks/post-commit	156	share/git-core/templates/hooks/post-commit
156	share/git-core/templates/hooks/post-update
157	share/git-core/templates/hooks/post-receive	157	share/git-core/templates/hooks/post-receive
		158	share/git-core/templates/hooks/post-update
158	share/git-core/templates/hooks/pre-applypatch	159	share/git-core/templates/hooks/pre-applypatch
159	share/git-core/templates/hooks/pre-commit	160	share/git-core/templates/hooks/pre-commit
160	share/git-core/templates/hooks/pre-rebase	161	share/git-core/templates/hooks/pre-rebase
161	share/git-core/templates/hooks/update	162	share/git-core/templates/hooks/update
162	share/git-core/templates/info/exclude	163	share/git-core/templates/info/exclude
163	%%GUI%%share/git-gui/lib/tclIndex
164	%%GUI%%share/git-gui/lib/blame.tcl	164	%%GUI%%share/git-gui/lib/blame.tcl
165	%%GUI%%share/git-gui/lib/branch.tcl	165	%%GUI%%share/git-gui/lib/branch.tcl
		166	%%GUI%%share/git-gui/lib/branch_checkout.tcl
		167	%%GUI%%share/git-gui/lib/branch_create.tcl
		168	%%GUI%%share/git-gui/lib/branch_delete.tcl
		169	%%GUI%%share/git-gui/lib/branch_rename.tcl
166	%%GUI%%share/git-gui/lib/browser.tcl	170	%%GUI%%share/git-gui/lib/browser.tcl
		171	%%GUI%%share/git-gui/lib/checkout_op.tcl
		172	%%GUI%%share/git-gui/lib/choose_rev.tcl
167	%%GUI%%share/git-gui/lib/class.tcl	173	%%GUI%%share/git-gui/lib/class.tcl
168	%%GUI%%share/git-gui/lib/commit.tcl	174	%%GUI%%share/git-gui/lib/commit.tcl
169	%%GUI%%share/git-gui/lib/console.tcl	175	%%GUI%%share/git-gui/lib/console.tcl
170	%%GUI%%share/git-gui/lib/database.tcl	176	%%GUI%%share/git-gui/lib/database.tcl
171	%%GUI%%share/git-gui/lib/diff.tcl	177	%%GUI%%share/git-gui/lib/diff.tcl
		178	%%GUI%%share/git-gui/lib/encoding.tcl
172	%%GUI%%share/git-gui/lib/error.tcl	179	%%GUI%%share/git-gui/lib/error.tcl
173	%%GUI%%share/git-gui/lib/index.tcl	180	%%GUI%%share/git-gui/lib/index.tcl
174	%%GUI%%share/git-gui/lib/merge.tcl	181	%%GUI%%share/git-gui/lib/merge.tcl
175	%%GUI%%share/git-gui/lib/option.tcl	182	%%GUI%%share/git-gui/lib/option.tcl
176	%%GUI%%share/git-gui/lib/remote.tcl	183	%%GUI%%share/git-gui/lib/remote.tcl
		184	%%GUI%%share/git-gui/lib/remote_branch_delete.tcl
177	%%GUI%%share/git-gui/lib/shortcut.tcl	185	%%GUI%%share/git-gui/lib/shortcut.tcl
		186	%%GUI%%share/git-gui/lib/status_bar.tcl
		187	%%GUI%%share/git-gui/lib/tclIndex
178	%%GUI%%share/git-gui/lib/transport.tcl	188	%%GUI%%share/git-gui/lib/transport.tcl
		189	%%GUI%%@dirrm share/git-gui/lib
		190	%%GUI%%@dirrm share/git-gui
179	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git	191	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
180	@dirrm lib/xemacs/site-lisp/git	192	@dirrm lib/xemacs/site-lisp/git
181	@dirrmtry lib/xemacs/site-lisp	193	@dirrmtry lib/xemacs/site-lisp
Lines 183-192 Link Here
183	@dirrm share/emacs/site-lisp/git	195	@dirrm share/emacs/site-lisp/git
184	@dirrmtry share/emacs/site-lisp	196	@dirrmtry share/emacs/site-lisp
185	@dirrmtry share/emacs	197	@dirrmtry share/emacs
186	%%GUI%%@dirrm share/git-gui/lib
187	%%GUI%%@dirrm share/git-gui
188	@dirrm share/git-core/templates/branches
189	@dirrm share/git-core/templates/hooks
190	@dirrm share/git-core/templates/info	198	@dirrm share/git-core/templates/info
		199	@dirrm share/git-core/templates/hooks
		200	@dirrm share/git-core/templates/branches
191	@dirrm share/git-core/templates	201	@dirrm share/git-core/templates
192	@dirrm share/git-core	202	@dirrm share/git-core




--- Makefile	2007-09-03 18:00:41.000000000 +0930
+++ Makefile	2007-09-10 13:48:32.541604245 +0930
@@ -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

 
 export TCL_PATH TCLTK_PATH
 
@@ -637,6 +637,10 @@
 	BASIC_CFLAGS += -DOLD_ICONV
 endif
 
+ifdef LIBMD_SHA1
+	SHA1_HEADER = "sha.h"
+	EXTLIBS += -lmd
+else
 ifdef PPC_SHA1
 	SHA1_HEADER = "ppc/sha1.h"
 	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
@@ -654,6 +658,7 @@
 endif
 endif
 endif
+endif
 ifdef NO_PERL_MAKEMAKER
 	export NO_PERL_MAKEMAKER
 endif




--- perl/Makefile.PL.orig	2007-09-03 18:00:41.000000000 +0930
+++ perl/Makefile.PL	2007-09-10 17:03:56.253543541 +0930
@@ -1,4 +1,5 @@
 use ExtUtils::MakeMaker;
+use Config;
 
 sub MY::postamble {
 	return <<'MAKE_FRAG';
@@ -24,11 +25,12 @@
 # disrupts the output for the target 'instlibdir'
 open STDOUT, ">&STDERR";
 
+
 WriteMakefile(
 	NAME            => 'Git',
 	VERSION_FROM    => 'Git.pm',
 	PM		=> \%pm,
 	MAKEFILE	=> 'perl.mak',
-	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
+	INSTALLSITEMAN3DIR => "\$(SITEPREFIX)/lib/perl5/$Config{version}/man/man3",
 	%extra
 );

Return to bug 116269

Lines 6-12 Link Here

(-)Makefile (-11 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= git	8	PORTNAME= git
9	PORTVERSION= 1.5.2.1	9	PORTVERSION= 1.5.3.1
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 43-48 Link Here
43	git-checkout.1 \	41	git-checkout.1 \
44	git-cherry-pick.1 \	42	git-cherry-pick.1 \
45	git-cherry.1 \	43	git-cherry.1 \
		44	git-citool.1 \
46	git-clean.1 \	45	git-clean.1 \
47	git-clone.1 \	46	git-clone.1 \
48	git-commit-tree.1 \	47	git-commit-tree.1 \
Lines 62-82 Link Here
62	git-fast-import.1 \	61	git-fast-import.1 \
63	git-fetch-pack.1 \	62	git-fetch-pack.1 \
64	git-fetch.1 \	63	git-fetch.1 \
		64	git-filter-branch.1 \
65	git-fmt-merge-msg.1 \	65	git-fmt-merge-msg.1 \
66	git-format-patch.1 \
67	git-for-each-ref.1 \	66	git-for-each-ref.1 \
68	git-fsck.1 \	67	git-format-patch.1 \
69	git-fsck-objects.1 \	68	git-fsck-objects.1 \
		69	git-fsck.1 \
70	git-gc.1 \	70	git-gc.1 \
71	git-get-tar-commit-id.1 \	71	git-get-tar-commit-id.1 \
72	git-grep.1 \	72	git-grep.1 \
		73	git-gui.1 \
73	git-hash-object.1 \	74	git-hash-object.1 \
74	git-http-fetch.1 \	75	git-http-fetch.1 \
75	git-http-push.1 \	76	git-http-push.1 \
76	git-imap-send.1 \	77	git-imap-send.1 \
77	git-index-pack.1 \	78	git-index-pack.1 \
78	git-init.1 \
79	git-init-db.1 \	79	git-init-db.1 \
		80	git-init.1 \
80	git-instaweb.1 \	81	git-instaweb.1 \
81	git-local-fetch.1 \	82	git-local-fetch.1 \
82	git-log.1 \	83	git-log.1 \
Lines 86-103 Link Here
86	git-ls-tree.1 \	87	git-ls-tree.1 \
87	git-mailinfo.1 \	88	git-mailinfo.1 \
88	git-mailsplit.1 \	89	git-mailsplit.1 \
89	git-merge.1 \
90	git-merge-base.1 \	90	git-merge-base.1 \
91	git-merge-file.1 \	91	git-merge-file.1 \
92	git-merge-index.1 \	92	git-merge-index.1 \
93	git-merge-one-file.1 \	93	git-merge-one-file.1 \
94	git-merge-tree.1 \	94	git-merge-tree.1 \
		95	git-merge.1 \
95	git-mergetool.1 \	96	git-mergetool.1 \
96	git-mktag.1 \	97	git-mktag.1 \
97	git-mktree.1 \	98	git-mktree.1 \
98	git-mv.1 \	99	git-mv.1 \
99	git-name-rev.1 \	100	git-name-rev.1 \
100	git-p4import.1 \
101	git-pack-objects.1 \	101	git-pack-objects.1 \
102	git-pack-redundant.1 \	102	git-pack-redundant.1 \
103	git-pack-refs.1 \	103	git-pack-refs.1 \
Lines 136-145 Link Here
136	git-show.1 \	136	git-show.1 \
137	git-ssh-fetch.1 \	137	git-ssh-fetch.1 \
138	git-ssh-upload.1 \	138	git-ssh-upload.1 \
		139	git-stash.1 \
139	git-status.1 \	140	git-status.1 \
140	git-stripspace.1 \	141	git-stripspace.1 \
141	git-svnimport.1 \	142	git-submodule.1 \
142	git-svn.1 \	143	git-svn.1 \
		144	git-svnimport.1 \
143	git-symbolic-ref.1 \	145	git-symbolic-ref.1 \
144	git-tag.1 \	146	git-tag.1 \
145	git-tar-tree.1 \	147	git-tar-tree.1 \
Lines 158-164 Link Here
158	gitk.1	160	gitk.1
159	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}	161	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
160	MAN3= Git.3	162	MAN3= Git.3
161	MAN5= gitattributes.5 gitignore.5	163	MAN5= gitignore.5 \
		164	gitmodules.5 \
		165	gitattributes.5
162	MAN7= git.7	166	MAN7= git.7
163		167
164	USE_BZIP2= yes	168	USE_BZIP2= yes
Lines 172-178 Link Here
172	WITH_P4IMPORT=yes \	176	WITH_P4IMPORT=yes \
173	LDFLAGS="-L${LOCALBASE}/lib" \	177	LDFLAGS="-L${LOCALBASE}/lib" \
174	PYTHON_PATH=${LOCALBASE}/bin/python \	178	PYTHON_PATH=${LOCALBASE}/bin/python \
175	PERL_PATH=${PERL}	179	PERL_PATH=${PERL} \
		180	LIBMD_SHA1=yes
176	MAKE_ARGS+= prefix="${PREFIX}"	181	MAKE_ARGS+= prefix="${PREFIX}"
177		182
178	.ifndef WITHOUT_GUI	183	.ifndef WITHOUT_GUI

Lines 1-5 Link Here

(-)files/patch-Makefile (-3 / +26 lines)
1	--- Makefile Sun May 20 10:40:55 2007	1	--- Makefile 2007-09-03 18:00:41.000000000 +0930
2	+++ Makefile Sat May 26 20:43:02 2007	2	+++ Makefile 2007-09-10 13:48:32.541604245 +0930
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 32-34 Link Here
32		36
33	export TCL_PATH TCLTK_PATH	37	export TCL_PATH TCLTK_PATH
34		38
		39	@@ -637,6 +637,10 @@
		40	BASIC_CFLAGS += -DOLD_ICONV
		41	endif
		42
		43	+ifdef LIBMD_SHA1
		44	+ SHA1_HEADER = "sha.h"
		45	+ EXTLIBS += -lmd
		46	+else
		47	ifdef PPC_SHA1
		48	SHA1_HEADER = "ppc/sha1.h"
		49	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
		50	@@ -654,6 +658,7 @@
		51	endif
		52	endif
		53	endif
		54	+endif
		55	ifdef NO_PERL_MAKEMAKER
		56	export NO_PERL_MAKEMAKER
		57	endif

Added Link Here

(-)files/patch-perl-Makefile.PL (+22 lines)
1	--- perl/Makefile.PL.orig 2007-09-03 18:00:41.000000000 +0930
2	+++ perl/Makefile.PL 2007-09-10 17:03:56.253543541 +0930
3	@@ -1,4 +1,5 @@
4	use ExtUtils::MakeMaker;
5	+use Config;
6
7	sub MY::postamble {
8	return <<'MAKE_FRAG';
9	@@ -24,11 +25,12 @@
10	# disrupts the output for the target 'instlibdir'
11	open STDOUT, ">&STDERR";
12
13	+
14	WriteMakefile(
15	NAME => 'Git',
16	VERSION_FROM => 'Git.pm',
17	PM => \%pm,
18	MAKEFILE => 'perl.mak',
19	- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
20	+ INSTALLSITEMAN3DIR => "\$(SITEPREFIX)/lib/perl5/$Config{version}/man/man3",
21	%extra
22	);