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

(-)./Makefile (-3 / +21 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	git
8
PORTNAME=	git
9
PORTVERSION=	1.4.4.4
9
PORTVERSION=	1.5.0.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
12
Lines 19-26 Link Here
19
		xmlto:${PORTSDIR}/textproc/xmlto
19
		xmlto:${PORTSDIR}/textproc/xmlto
20
RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
20
RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
21
		cvsps:${PORTSDIR}/devel/cvsps-devel \
21
		cvsps:${PORTSDIR}/devel/cvsps-devel \
22
		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
22
		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
23
		wish8.4:${PORTSDIR}/x11-toolkits/tk84
24
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
23
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
25
24
26
CONFLICTS=	cogito-0.1[012] git-4.*
25
CONFLICTS=	cogito-0.1[012] git-4.*
Lines 47-52 Link Here
47
		git-clone.1 \
46
		git-clone.1 \
48
		git-commit-tree.1 \
47
		git-commit-tree.1 \
49
		git-commit.1 \
48
		git-commit.1 \
49
		git-config.1 \
50
		git-convert-objects.1 \
50
		git-convert-objects.1 \
51
		git-count-objects.1 \
51
		git-count-objects.1 \
52
		git-cvsexportcommit.1 \
52
		git-cvsexportcommit.1 \
Lines 59-70 Link Here
59
		git-diff-stages.1 \
59
		git-diff-stages.1 \
60
		git-diff-tree.1 \
60
		git-diff-tree.1 \
61
		git-diff.1 \
61
		git-diff.1 \
62
		git-fast-import.1 \
62
		git-fetch-pack.1 \
63
		git-fetch-pack.1 \
63
		git-fetch.1 \
64
		git-fetch.1 \
64
		git-fmt-merge-msg.1 \
65
		git-fmt-merge-msg.1 \
65
		git-format-patch.1 \
66
		git-format-patch.1 \
66
		git-for-each-ref.1 \
67
		git-for-each-ref.1 \
68
		git-fsck.1 \
67
		git-fsck-objects.1 \
69
		git-fsck-objects.1 \
70
		git-gc.1 \
68
		git-get-tar-commit-id.1 \
71
		git-get-tar-commit-id.1 \
69
		git-grep.1 \
72
		git-grep.1 \
70
		git-hash-object.1 \
73
		git-hash-object.1 \
Lines 72-77 Link Here
72
		git-http-push.1 \
75
		git-http-push.1 \
73
		git-imap-send.1 \
76
		git-imap-send.1 \
74
		git-index-pack.1 \
77
		git-index-pack.1 \
78
		git-init.1 \
75
		git-init-db.1 \
79
		git-init-db.1 \
76
		git-instaweb.1 \
80
		git-instaweb.1 \
77
		git-local-fetch.1 \
81
		git-local-fetch.1 \
Lines 84-89 Link Here
84
		git-mailsplit.1 \
88
		git-mailsplit.1 \
85
		git-merge.1 \
89
		git-merge.1 \
86
		git-merge-base.1 \
90
		git-merge-base.1 \
91
		git-merge-file.1 \
87
		git-merge-index.1 \
92
		git-merge-index.1 \
88
		git-merge-one-file.1 \
93
		git-merge-one-file.1 \
89
		git-merge-tree.1 \
94
		git-merge-tree.1 \
Lines 106-112 Link Here
106
		git-read-tree.1 \
111
		git-read-tree.1 \
107
		git-rebase.1 \
112
		git-rebase.1 \
108
		git-receive-pack.1 \
113
		git-receive-pack.1 \
114
		git-reflog.1 \
109
		git-relink.1 \
115
		git-relink.1 \
116
		git-remote.1 \
110
		git-repack.1 \
117
		git-repack.1 \
111
		git-repo-config.1 \
118
		git-repo-config.1 \
112
		git-request-pull.1 \
119
		git-request-pull.1 \
Lines 152-157 Link Here
152
MAN3=		Git.3
159
MAN3=		Git.3
153
MAN7=		git.7
160
MAN7=		git.7
154
161
162
USE_BZIP2=	yes
155
USE_PERL5=	yes
163
USE_PERL5=	yes
156
USE_PYTHON=	yes
164
USE_PYTHON=	yes
157
USE_ICONV=	yes
165
USE_ICONV=	yes
Lines 161-172 Link Here
161
CFLAGS+=	-I${LOCALBASE}/include
169
CFLAGS+=	-I${LOCALBASE}/include
162
MAKE_ENV+=	CURLDIR=${LOCALBASE} \
170
MAKE_ENV+=	CURLDIR=${LOCALBASE} \
163
		NEEDS_LIBICONV=yes \
171
		NEEDS_LIBICONV=yes \
172
		WITH_P4IMPORT=yes \
164
		LDFLAGS="-L${LOCALBASE}/lib" \
173
		LDFLAGS="-L${LOCALBASE}/lib" \
165
		PYTHON_PATH=${LOCALBASE}/bin/python \
174
		PYTHON_PATH=${LOCALBASE}/bin/python \
166
		PERL_PATH=${PERL}
175
		PERL_PATH=${PERL}
167
MAKE_ARGS+=	prefix="${PREFIX}"
176
MAKE_ARGS+=	prefix="${PREFIX}"
168
177
178
.ifndef WITHOUT_GUI
179
PLIST_SUB+=	GUI=""
180
RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
181
.else
182
PLIST_SUB+=	GUI="@comment "
183
MAKE_ENV+=	NO_GUI=yes
184
.endif
185
169
post-install:
186
post-install:
187
	${TEST} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod && ${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
170
	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
188
	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
171
	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
189
	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
172
	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
190
	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
(-)./distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (git-1.4.4.4.tar.gz) = 99bc7ea441226f792b6f796a838e7ef0
1
MD5 (git-1.5.0.1.tar.bz2) = 7bcc47e3a7b79229e897c9242b7e33e6
2
SHA256 (git-1.4.4.4.tar.gz) = 53478949d178df1363c23008876b6791e28df8dcbd9851ddadb7cf10adf66a65
2
SHA256 (git-1.5.0.1.tar.bz2) = 3999dc3c1011646a44f277977013cf9cebd875e569c46a1b4ade72ae849c8c96
3
SIZE (git-1.4.4.4.tar.gz) = 1054130
3
SIZE (git-1.5.0.1.tar.bz2) = 1042226
(-)./files/patch-Makefile (-14 / +110 lines)
Lines 1-21 Link Here
1
--- Makefile.orig	Tue Nov  7 20:47:34 2006
1
--- Makefile.orig	Mon Feb 19 01:58:30 2007
2
+++ Makefile	Tue Nov  7 20:47:55 2006
2
+++ Makefile	Sat Feb 24 18:20:08 2007
3
@@ -178,7 +178,8 @@
3
@@ -101,6 +101,10 @@
4
 	git-send-email.perl git-svn.perl
4
 # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
5
 # MakeMaker (e.g. using ActiveState under Cygwin).
6
 #
7
+# Define NO_GUI if you do not want Tcl/Tk GUI.
8
+#
9
+# Define WITH_P4IMPORT to build and install Python git-p4import script.
10
+#
5
 
11
 
6
 SCRIPT_PYTHON = \
12
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
7
-	git-merge-recursive-old.py
13
 	@$(SHELL_PATH) ./GIT-VERSION-GEN
8
+	git-merge-recursive-old.py \
14
@@ -186,9 +190,19 @@
9
+	git-p4import.py
15
 	git-svnimport.perl git-cvsexportcommit.perl \
16
 	git-send-email.perl git-svn.perl
10
 
17
 
18
+SCRIPT_PYTHON = \
19
+	  git-p4import.py
20
+
21
+ifdef WITH_P4IMPORT
22
+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
23
+	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
24
+	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
25
+	  git-cherry-pick git-status git-instaweb
26
+else
11
 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
27
 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
12
 	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
28
 	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
13
@@ -823,7 +824,7 @@
29
 	  git-cherry-pick git-status git-instaweb
14
 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
30
+endif
31
 
32
 # ... and all the rest that could be moved out of bindir to gitexecdir
33
 PROGRAMS = \
34
@@ -231,6 +245,9 @@
35
 ifndef PERL_PATH
36
 	PERL_PATH = /usr/bin/perl
37
 endif
38
+ifndef PYTHON_PATH
39
+	PYTHON_PATH = /usr/local/bin/python
40
+endif
41
 
42
 export PERL_PATH
43
 
44
@@ -593,6 +610,7 @@
45
 
46
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
47
 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
48
+PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
49
 
50
 LIBS = $(GITLIBS) $(EXTLIBS)
51
 
52
@@ -613,7 +631,9 @@
53
 endif
54
 
55
 all::
56
+ifndef NO_GUI
57
 	$(MAKE) -C git-gui all
58
+endif
59
 	$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
60
 	$(MAKE) -C templates
61
 
62
@@ -646,6 +666,15 @@
63
 
64
 $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
65
 
66
+$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
67
+	rm -f $@ $@+
68
+	sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \
69
+	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
70
+	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
71
+	    $@.py >$@+
72
+	chmod +x $@+
73
+	mv $@+ $@
74
+
75
 perl/perl.mak: GIT-CFLAGS
76
 	$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
77
 
78
@@ -844,7 +873,9 @@
15
 	$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
79
 	$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
16
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
80
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
17
-	$(MAKE) -C perl install
81
 	$(MAKE) -C perl prefix='$(prefix_SQ)' install
18
+	$(MAKE) -C perl pure_install
82
+ifndef NO_GUI
19
 	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
83
 	$(MAKE) -C git-gui install
20
 	$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
84
+endif
21
 	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
85
 	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
86
 	then \
87
 		ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
88
@@ -878,11 +909,19 @@
89
 	@mkdir -p $(GIT_TARNAME)
90
 	@cp git.spec $(GIT_TARNAME)
91
 	@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
92
+ifndef NO_GUI
93
 	@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
94
+endif
95
+ifndef NO_GUI
96
 	$(TAR) rf $(GIT_TARNAME).tar \
97
 		$(GIT_TARNAME)/git.spec \
98
 		$(GIT_TARNAME)/version \
99
 		$(GIT_TARNAME)/git-gui/version
100
+else
101
+	$(TAR) rf $(GIT_TARNAME).tar \
102
+		$(GIT_TARNAME)/git.spec \
103
+		$(GIT_TARNAME)/version
104
+endif
105
 	@rm -rf $(GIT_TARNAME)
106
 	gzip -f -9 $(GIT_TARNAME).tar
107
 
108
@@ -923,7 +962,9 @@
109
 	rm -f gitweb/gitweb.cgi
110
 	$(MAKE) -C Documentation/ clean
111
 	$(MAKE) -C perl clean
112
+ifndef NO_GUI
113
 	$(MAKE) -C git-gui clean
114
+endif
115
 	$(MAKE) -C templates/ clean
116
 	$(MAKE) -C t/ clean
117
 	rm -f GIT-VERSION-FILE GIT-CFLAGS
(-)./pkg-plist (-5 / +11 lines)
Lines 1-5 Link Here
1
bin/git
1
bin/git
2
bin/git-add
2
bin/git-add
3
bin/git-add--interactive
3
bin/git-am
4
bin/git-am
4
bin/git-annotate
5
bin/git-annotate
5
bin/git-apply
6
bin/git-apply
Lines 16-25 Link Here
16
bin/git-checkout-index
17
bin/git-checkout-index
17
bin/git-cherry
18
bin/git-cherry
18
bin/git-cherry-pick
19
bin/git-cherry-pick
20
%%GUI%%bin/git-citool
19
bin/git-clean
21
bin/git-clean
20
bin/git-clone
22
bin/git-clone
21
bin/git-commit
23
bin/git-commit
22
bin/git-commit-tree
24
bin/git-commit-tree
25
bin/git-config
23
bin/git-convert-objects
26
bin/git-convert-objects
24
bin/git-count-objects
27
bin/git-count-objects
25
bin/git-cvsexportcommit
28
bin/git-cvsexportcommit
Lines 32-50 Link Here
32
bin/git-diff-index
35
bin/git-diff-index
33
bin/git-diff-stages
36
bin/git-diff-stages
34
bin/git-diff-tree
37
bin/git-diff-tree
38
bin/git-fast-import
35
bin/git-fetch
39
bin/git-fetch
36
bin/git-fetch-pack
40
bin/git-fetch-pack
37
bin/git-fmt-merge-msg
41
bin/git-fmt-merge-msg
38
bin/git-for-each-ref
42
bin/git-for-each-ref
39
bin/git-format-patch
43
bin/git-format-patch
44
bin/git-fsck
40
bin/git-fsck-objects
45
bin/git-fsck-objects
46
bin/git-gc
41
bin/git-get-tar-commit-id
47
bin/git-get-tar-commit-id
42
bin/git-grep
48
bin/git-grep
49
%%GUI%%bin/git-gui
43
bin/git-hash-object
50
bin/git-hash-object
44
bin/git-http-fetch
51
bin/git-http-fetch
45
bin/git-http-push
52
bin/git-http-push
46
bin/git-imap-send
53
bin/git-imap-send
47
bin/git-index-pack
54
bin/git-index-pack
55
bin/git-init
48
bin/git-init-db
56
bin/git-init-db
49
bin/git-instaweb
57
bin/git-instaweb
50
bin/git-local-fetch
58
bin/git-local-fetch
Lines 57-69 Link Here
57
bin/git-mailsplit
65
bin/git-mailsplit
58
bin/git-merge
66
bin/git-merge
59
bin/git-merge-base
67
bin/git-merge-base
68
bin/git-merge-file
60
bin/git-merge-index
69
bin/git-merge-index
61
bin/git-merge-octopus
70
bin/git-merge-octopus
62
bin/git-merge-one-file
71
bin/git-merge-one-file
63
bin/git-merge-ours
72
bin/git-merge-ours
64
bin/git-merge-recur
65
bin/git-merge-recursive
73
bin/git-merge-recursive
66
bin/git-merge-recursive-old
67
bin/git-merge-resolve
74
bin/git-merge-resolve
68
bin/git-merge-stupid
75
bin/git-merge-stupid
69
bin/git-merge-tree
76
bin/git-merge-tree
Lines 86-92 Link Here
86
bin/git-read-tree
93
bin/git-read-tree
87
bin/git-rebase
94
bin/git-rebase
88
bin/git-receive-pack
95
bin/git-receive-pack
96
bin/git-reflog
89
bin/git-relink
97
bin/git-relink
98
bin/git-remote
90
bin/git-repack
99
bin/git-repack
91
bin/git-repo-config
100
bin/git-repo-config
92
bin/git-request-pull
101
bin/git-request-pull
Lines 137-143 Link Here
137
lib/xemacs/site-lisp/git/vc-git.el
146
lib/xemacs/site-lisp/git/vc-git.el
138
share/emacs/site-lisp/git/git.el
147
share/emacs/site-lisp/git/git.el
139
share/emacs/site-lisp/git/vc-git.el
148
share/emacs/site-lisp/git/vc-git.el
140
share/git-core/python/gitMergeCommon.py
141
share/git-core/templates/description
149
share/git-core/templates/description
142
share/git-core/templates/hooks/applypatch-msg
150
share/git-core/templates/hooks/applypatch-msg
143
share/git-core/templates/hooks/commit-msg
151
share/git-core/templates/hooks/commit-msg
Lines 158-164 Link Here
158
@dirrm share/git-core/templates/branches
166
@dirrm share/git-core/templates/branches
159
@dirrm share/git-core/templates/hooks
167
@dirrm share/git-core/templates/hooks
160
@dirrm share/git-core/templates/info
168
@dirrm share/git-core/templates/info
161
@dirrm share/git-core/templates/remotes
162
@dirrm share/git-core/templates
169
@dirrm share/git-core/templates
163
@dirrm share/git-core/python
164
@dirrm share/git-core
170
@dirrm share/git-core

Return to bug 109495