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

(-)Makefile (-12 / +28 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	git
8
PORTNAME=	git
9
PORTVERSION=	1.5.3.2
9
PORTVERSION=	1.5.3.8
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 60-70 Link Here
60
		git-fast-import.1 \
60
		git-fast-import.1 \
61
		git-fetch-pack.1 \
61
		git-fetch-pack.1 \
62
		git-fetch.1 \
62
		git-fetch.1 \
63
		git-filter-branch.1 \
63
		git-fmt-merge-msg.1 \
64
		git-fmt-merge-msg.1 \
64
		git-format-patch.1 \
65
		git-for-each-ref.1 \
65
		git-for-each-ref.1 \
66
		git-fsck.1 \
66
		git-format-patch.1 \
67
		git-fsck-objects.1 \
67
		git-fsck-objects.1 \
68
		git-fsck.1 \
68
		git-gc.1 \
69
		git-gc.1 \
69
		git-get-tar-commit-id.1 \
70
		git-get-tar-commit-id.1 \
70
		git-grep.1 \
71
		git-grep.1 \
Lines 73-80 Link Here
73
		git-http-push.1 \
74
		git-http-push.1 \
74
		git-imap-send.1 \
75
		git-imap-send.1 \
75
		git-index-pack.1 \
76
		git-index-pack.1 \
76
		git-init.1 \
77
		git-init-db.1 \
77
		git-init-db.1 \
78
		git-init.1 \
78
		git-instaweb.1 \
79
		git-instaweb.1 \
79
		git-local-fetch.1 \
80
		git-local-fetch.1 \
80
		git-log.1 \
81
		git-log.1 \
Lines 84-95 Link Here
84
		git-ls-tree.1 \
85
		git-ls-tree.1 \
85
		git-mailinfo.1 \
86
		git-mailinfo.1 \
86
		git-mailsplit.1 \
87
		git-mailsplit.1 \
87
		git-merge.1 \
88
		git-merge-base.1 \
88
		git-merge-base.1 \
89
		git-merge-file.1 \
89
		git-merge-file.1 \
90
		git-merge-index.1 \
90
		git-merge-index.1 \
91
		git-merge-one-file.1 \
91
		git-merge-one-file.1 \
92
		git-merge-tree.1 \
92
		git-merge-tree.1 \
93
		git-merge.1 \
93
		git-mergetool.1 \
94
		git-mergetool.1 \
94
		git-mktag.1 \
95
		git-mktag.1 \
95
		git-mktree.1 \
96
		git-mktree.1 \
Lines 133-142 Link Here
133
		git-show.1 \
134
		git-show.1 \
134
		git-ssh-fetch.1 \
135
		git-ssh-fetch.1 \
135
		git-ssh-upload.1 \
136
		git-ssh-upload.1 \
137
		git-stash.1 \
136
		git-status.1 \
138
		git-status.1 \
137
		git-stripspace.1 \
139
		git-stripspace.1 \
138
		git-svnimport.1 \
140
		git-submodule.1 \
139
		git-svn.1 \
141
		git-svn.1 \
142
		git-svnimport.1 \
140
		git-symbolic-ref.1 \
143
		git-symbolic-ref.1 \
141
		git-tag.1 \
144
		git-tag.1 \
142
		git-tar-tree.1 \
145
		git-tar-tree.1 \
Lines 151-160 Link Here
151
		git-verify-pack.1 \
154
		git-verify-pack.1 \
152
		git-verify-tag.1 \
155
		git-verify-tag.1 \
153
		git-whatchanged.1 \
156
		git-whatchanged.1 \
154
		git-write-tree.1 \
157
		git-write-tree.1
155
		gitk.1
156
MAN3=		Git.3
158
MAN3=		Git.3
157
MAN5=		gitattributes.5 gitignore.5
159
MAN5=		gitattributes.5 \
160
		gitignore.5 \
161
		gitmodules.5
158
MAN7=		git.7
162
MAN7=		git.7
159
163
160
USE_BZIP2=	yes
164
USE_BZIP2=	yes
Lines 171-183 Link Here
171
		LIBMD_SHA1=yes
175
		LIBMD_SHA1=yes
172
MAKE_ARGS+=	prefix="${PREFIX}"
176
MAKE_ARGS+=	prefix="${PREFIX}"
173
USE_OPENSSL=	yes
177
USE_OPENSSL=	yes
178
USE_RC_SUBR=	git-daemon
179
180
SHELLS=		/etc/shells
174
181
175
OPTIONS=	GUI "Enable building of GUI tools" on \
182
OPTIONS=	GUI "Enable building of GUI tools" on \
176
		SVN "Enable required dependencies for SVN tools" off
183
		SVN "Enable required dependencies for SVN tools" off
177
184
178
.include <bsd.port.pre.mk>
185
.include <bsd.port.pre.mk>
179
186
180
.ifdef WITH_GUI
187
.ifndef WITHOUT_GUI
188
MAN1+=		git-citool.1 \
189
		git-gui.1 \
190
		gitk.1
181
PLIST_SUB+=	GUI=""
191
PLIST_SUB+=	GUI=""
182
RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
192
RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
183
MAKE_ENV+=	TCL_PATH=tclsh8.4 TCLTK_PATH=wish8.4
193
MAKE_ENV+=	TCL_PATH=tclsh8.4 TCLTK_PATH=wish8.4
Lines 192-204 Link Here
192
.endif
202
.endif
193
203
194
pre-patch:
204
pre-patch:
195
	${REINPLACE_CMD} -e 's|OPENSSLDIR|OPENSSLBASE|g' ${WRKSRC}/Makefile
205
	@${REINPLACE_CMD} -e 's|OPENSSLDIR|OPENSSLBASE|g' ${WRKSRC}/Makefile
196
206
197
post-patch:
207
post-patch:
198
	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
208
	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
199
209
200
post-build:
210
post-build:
201
	${SED} -e'1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
211
	@${SED} -e'1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
202
		${WRKSRC}/contrib/p4import/git-p4import.py > \
212
		${WRKSRC}/contrib/p4import/git-p4import.py > \
203
		${WRKSRC}/contrib/p4import/git-p4import
213
		${WRKSRC}/contrib/p4import/git-p4import
204
214
Lines 230-233 Link Here
230
	${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
240
	${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
231
		${PREFIX}/bin/
241
		${PREFIX}/bin/
232
242
243
	@${ECHO_MSG} "===> Updating ${SHELLS}"
244
	@${CP} ${SHELLS} ${SHELLS}.bak
245
	@(${GREP} -v ${PREFIX}/bin/git-shell ${SHELLS}.bak; \
246
	  ${ECHO_CMD} ${PREFIX}/bin/git-shell) > ${SHELLS}
247
	@${RM} ${SHELLS}.bak
248
233
.include <bsd.port.post.mk>
249
.include <bsd.port.post.mk>
(-)distinfo (-6 / +6 lines)
Lines 1-6 Link Here
1
MD5 (git-1.5.3.2.tar.bz2) = 2113337dd27141a6890ff84f25164901
1
MD5 (git-1.5.3.8.tar.bz2) = bb2477df09d4af52b05f0ee64d6ccc54
2
SHA256 (git-1.5.3.2.tar.bz2) = e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45
2
SHA256 (git-1.5.3.8.tar.bz2) = f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77
3
SIZE (git-1.5.3.2.tar.bz2) = 1344171 
3
SIZE (git-1.5.3.8.tar.bz2) = 1363259
4
MD5 (git-manpages-1.5.3.2.tar.bz2) = 375183e7370877f752674063e4336dfa
4
MD5 (git-manpages-1.5.3.8.tar.bz2) = 6aebdb18ab71309d6404f5be3cd7f09d
5
SHA256 (git-manpages-1.5.3.2.tar.bz2) = b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f
5
SHA256 (git-manpages-1.5.3.8.tar.bz2) = 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f
6
SIZE (git-manpages-1.5.3.2.tar.bz2) = 147283 
6
SIZE (git-manpages-1.5.3.8.tar.bz2) = 147875
(-)pkg-plist (+2 lines)
Lines 115-120 Link Here
115
bin/git-send-pack
115
bin/git-send-pack
116
bin/git-sh-setup
116
bin/git-sh-setup
117
bin/git-shell
117
bin/git-shell
118
@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
119
@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
118
bin/git-shortlog
120
bin/git-shortlog
119
bin/git-show
121
bin/git-show
120
bin/git-show-branch
122
bin/git-show-branch
(-)files/git-daemon.in (+29 lines)
Added Link Here
1
#! /bin/sh
2
#
3
# $FreeBSD$
4
#
5
6
# PROVIDE: git_daemon
7
# REQUIRE: DAEMON
8
# KEYWORD: shutdown
9
10
#
11
# Add the following lines to /etc/rc.conf to enable git_daemon:
12
#
13
#git_daemon_enable="YES"
14
15
. %%RC_SUBR%%
16
17
name="git_daemon"
18
rcvar=`set_rcvar`
19
20
load_rc_config $name
21
22
: ${git_daemon_enable:=NO}
23
: ${git_daemon_directory:=%%PREFIX%%/git}
24
: ${git_daemon_flags:="--syslog"}
25
26
command="%%PREFIX%%/bin/git-daemon"
27
command_args="${git_daemon_directory} &"
28
29
run_rc_command "$1"
(-)files/patch-while-case (-298 lines)
Removed Link Here
1
Option parsing in the Git shell scripts uses the construct 'while
2
case "$#" in 0) break ;; esac; do ... done'.  This is neat, because
3
it needs no external commands invocation.  But for the FreeBSD's
4
original Bourne shell (that is not fully IEEE 1003.2-compliant) the
5
'case' construct that has not matched patterns does not modify the
6
exit value.  As per IEEE 1003.2, it should return zero: see
7
http://opengroup.org/onlinepubs/000095399, Shell and Utilities
8
Volume (XCU), Case Conditional Construct.
9
10
The fix is to add the case branch '*) : ;;'.  It also needs no
11
external commands invocation and it does its work, because ':'
12
always returns zero.
13
14
FreeBSD has the PR 116559,
15
  http://www.freebsd.org/cgi/query-pr.cgi?pr=116559
16
that fixes the shell issue.  If it will be committed, this patch
17
will not be needed anymore for systems that will have the fixed
18
/bin/sh.
19
20
Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
21
---
22
 contrib/examples/git-gc.sh         |    2 +-
23
 contrib/examples/git-tag.sh        |    2 +-
24
 contrib/examples/git-verify-tag.sh |    2 +-
25
 git-am.sh                          |    2 +-
26
 git-clean.sh                       |    2 +-
27
 git-commit.sh                      |    2 +-
28
 git-fetch.sh                       |    2 +-
29
 git-filter-branch.sh               |    2 +-
30
 git-instaweb.sh                    |    2 +-
31
 git-ls-remote.sh                   |    2 +-
32
 git-merge.sh                       |    2 +-
33
 git-mergetool.sh                   |    2 +-
34
 git-pull.sh                        |    2 +-
35
 git-quiltimport.sh                 |    2 +-
36
 git-rebase--interactive.sh         |    2 +-
37
 git-rebase.sh                      |    4 ++--
38
 git-repack.sh                      |    2 +-
39
 git-reset.sh                       |    2 +-
40
 git-submodule.sh                   |    2 +-
41
 19 files changed, 20 insertions(+), 20 deletions(-)
42
43
diff --git contrib/examples/git-gc.sh b/contrib/examples/git-gc.sh
44
index 2ae235b..60cb348 100755
45
--- contrib/examples/git-gc.sh
46
+++ contrib/examples/git-gc.sh
47
@@ -9,7 +9,7 @@ SUBDIRECTORY_OK=Yes
48
 . git-sh-setup
49
 
50
 no_prune=:
51
-while case $# in 0) break ;; esac
52
+while case $# in 0) break ;; *) : ;; esac
53
 do
54
 	case "$1" in
55
 	--prune)
56
diff --git contrib/examples/git-tag.sh b/contrib/examples/git-tag.sh
57
index 5ee3f50..26aab69 100755
58
--- contrib/examples/git-tag.sh
59
+++ contrib/examples/git-tag.sh
60
@@ -14,7 +14,7 @@ username=
61
 list=
62
 verify=
63
 LINES=0
64
-while case "$#" in 0) break ;; esac
65
+while case "$#" in 0) break ;; *) : ;; esac
66
 do
67
     case "$1" in
68
     -a)
69
diff --git contrib/examples/git-verify-tag.sh b/contrib/examples/git-verify-tag.sh
70
index 37b0023..9a0f011 100755
71
--- contrib/examples/git-verify-tag.sh
72
+++ contrib/examples/git-verify-tag.sh
73
@@ -5,7 +5,7 @@ SUBDIRECTORY_OK='Yes'
74
 . git-sh-setup
75
 
76
 verbose=
77
-while case $# in 0) break;; esac
78
+while case $# in 0) break;; *) : ;; esac
79
 do
80
 	case "$1" in
81
 	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
82
diff --git git-am.sh b/git-am.sh
83
index 6809aa0..0bd8d34 100755
84
--- git-am.sh
85
+++ git-am.sh
86
@@ -109,7 +109,7 @@ dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
87
 resolvemsg= resume=
88
 git_apply_opt=
89
 
90
-while case "$#" in 0) break;; esac
91
+while case "$#" in 0) break;; *) : ;; esac
92
 do
93
 	case "$1" in
94
 	-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
95
diff --git git-clean.sh b/git-clean.sh
96
index a5cfd9f..1fac731 100755
97
--- git-clean.sh
98
+++ git-clean.sh
99
@@ -26,7 +26,7 @@ rmrf="rm -rf --"
100
 rm_refuse="echo Not removing"
101
 echo1="echo"
102
 
103
-while case "$#" in 0) break ;; esac
104
+while case "$#" in 0) break ;; *) : ;; esac
105
 do
106
 	case "$1" in
107
 	-d)
108
diff --git git-commit.sh b/git-commit.sh
109
index bb113e8..5f298c1 100755
110
--- git-commit.sh
111
+++ git-commit.sh
112
@@ -89,7 +89,7 @@ force_author=
113
 only_include_assumed=
114
 untracked_files=
115
 templatefile="`git config commit.template`"
116
-while case "$#" in 0) break;; esac
117
+while case "$#" in 0) break;; *) : ;; esac
118
 do
119
 	case "$1" in
120
 	-F|--F|-f|--f|--fi|--fil|--file)
121
diff --git git-fetch.sh b/git-fetch.sh
122
index c3a2001..dac2d72 100755
123
--- git-fetch.sh
124
+++ git-fetch.sh
125
@@ -27,7 +27,7 @@ shallow_depth=
126
 no_progress=
127
 test -t 1 || no_progress=--no-progress
128
 quiet=
129
-while case "$#" in 0) break ;; esac
130
+while case "$#" in 0) break ;; *) : ;; esac
131
 do
132
 	case "$1" in
133
 	-a|--a|--ap|--app|--appe|--appen|--append)
134
diff --git git-filter-branch.sh b/git-filter-branch.sh
135
index a4b6577..02b567b 100755
136
--- git-filter-branch.sh
137
+++ git-filter-branch.sh
138
@@ -105,7 +105,7 @@ filter_tag_name=
139
 filter_subdir=
140
 orig_namespace=refs/original/
141
 force=
142
-while case "$#" in 0) usage;; esac
143
+while case "$#" in 0) usage;; *) : ;; esac
144
 do
145
 	case "$1" in
146
 	--)
147
diff --git git-instaweb.sh b/git-instaweb.sh
148
index b79c6b6..c85f8c0 100755
149
--- git-instaweb.sh
150
+++ git-instaweb.sh
151
@@ -61,7 +61,7 @@ stop_httpd () {
152
 	test -f "$fqgitdir/pid" && kill `cat "$fqgitdir/pid"`
153
 }
154
 
155
-while case "$#" in 0) break ;; esac
156
+while case "$#" in 0) break ;; *) : ;; esac
157
 do
158
 	case "$1" in
159
 	--stop|stop)
160
diff --git git-ls-remote.sh b/git-ls-remote.sh
161
index b7e5d04..4ef4341 100755
162
--- git-ls-remote.sh
163
+++ git-ls-remote.sh
164
@@ -13,7 +13,7 @@ die () {
165
 }
166
 
167
 exec=
168
-while case "$#" in 0) break;; esac
169
+while case "$#" in 0) break;; *) : ;; esac
170
 do
171
   case "$1" in
172
   -h|--h|--he|--hea|--head|--heads)
173
diff --git git-merge.sh b/git-merge.sh
174
index 3a01db0..94a50aa 100755
175
--- git-merge.sh
176
+++ git-merge.sh
177
@@ -122,7 +122,7 @@ merge_name () {
178
 case "$#" in 0) usage ;; esac
179
 
180
 have_message=
181
-while case "$#" in 0) break ;; esac
182
+while case "$#" in 0) break ;; *) : ;; esac
183
 do
184
 	case "$1" in
185
 	-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
186
diff --git git-mergetool.sh b/git-mergetool.sh
187
index 47a8055..0e286dd 100755
188
--- git-mergetool.sh
189
+++ git-mergetool.sh
190
@@ -268,7 +268,7 @@ merge_file () {
191
     cleanup_temp_files
192
 }
193
 
194
-while case $# in 0) break ;; esac
195
+while case $# in 0) break ;; *) : ;; esac
196
 do
197
     case "$1" in
198
 	-t|--tool*)
199
diff --git git-pull.sh b/git-pull.sh
200
index 5e96d1f..722ed4e 100755
201
--- git-pull.sh
202
+++ git-pull.sh
203
@@ -16,7 +16,7 @@ test -z "$(git ls-files -u)" ||
204
 	die "You are in the middle of a conflicted merge."
205
 
206
 strategy_args= no_summary= no_commit= squash=
207
-while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
208
+while case "$#,$1" in 0) break ;; *,-*) : ;; *) break ;; esac
209
 do
210
 	case "$1" in
211
 	-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
212
diff --git git-quiltimport.sh b/git-quiltimport.sh
213
index 9de54d1..4039617 100755
214
--- git-quiltimport.sh
215
+++ git-quiltimport.sh
216
@@ -5,7 +5,7 @@ SUBDIRECTORY_ON=Yes
217
 
218
 dry_run=""
219
 quilt_author=""
220
-while case "$#" in 0) break;; esac
221
+while case "$#" in 0) break;; *) : ;; esac
222
 do
223
 	case "$1" in
224
 	--au=*|--aut=*|--auth=*|--autho=*|--author=*)
225
diff --git git-rebase--interactive.sh b/git-rebase--interactive.sh
226
index abc2b1c..54e4299 100755
227
--- git-rebase--interactive.sh
228
+++ git-rebase--interactive.sh
229
@@ -317,7 +317,7 @@ do_rest () {
230
 	done
231
 }
232
 
233
-while case $# in 0) break ;; esac
234
+while case $# in 0) break ;; *) : ;; esac
235
 do
236
 	case "$1" in
237
 	--continue)
238
diff --git git-rebase.sh b/git-rebase.sh
239
index 3bd66b0..29cfab2 100755
240
--- git-rebase.sh
241
+++ git-rebase.sh
242
@@ -122,7 +122,7 @@ finish_rb_merge () {
243
 
244
 is_interactive () {
245
 	test -f "$dotest"/interactive ||
246
-	while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
247
+	while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; *) : ;; esac
248
 	do
249
 		shift
250
 	done && test -n "$1"
251
@@ -130,7 +130,7 @@ is_interactive () {
252
 
253
 is_interactive "$@" && exec git-rebase--interactive "$@"
254
 
255
-while case "$#" in 0) break ;; esac
256
+while case "$#" in 0) break ;; *) : ;; esac
257
 do
258
 	case "$1" in
259
 	--continue)
260
diff --git git-repack.sh b/git-repack.sh
261
index 156c5e8..aac771e 100755
262
--- git-repack.sh
263
+++ git-repack.sh
264
@@ -9,7 +9,7 @@ SUBDIRECTORY_OK='Yes'
265
 
266
 no_update_info= all_into_one= remove_redundant=
267
 local= quiet= no_reuse= extra=
268
-while case "$#" in 0) break ;; esac
269
+while case "$#" in 0) break ;; *) : ;; esac
270
 do
271
 	case "$1" in
272
 	-n)	no_update_info=t ;;
273
diff --git git-reset.sh b/git-reset.sh
274
index 1dc606f..eb92610 100755
275
--- git-reset.sh
276
+++ git-reset.sh
277
@@ -11,7 +11,7 @@ require_work_tree
278
 update= reset_type=--mixed
279
 unset rev
280
 
281
-while case $# in 0) break ;; esac
282
+while case $# in 0) break ;; *) : ;; esac
283
 do
284
 	case "$1" in
285
 	--mixed | --soft | --hard)
286
diff --git git-submodule.sh b/git-submodule.sh
287
index 3320998..78a25ad 100755
288
--- git-submodule.sh
289
+++ git-submodule.sh
290
@@ -251,7 +251,7 @@ modules_list()
291
 	done
292
 }
293
 
294
-while case "$#" in 0) break ;; esac
295
+while case "$#" in 0) break ;; *) : ;; esac
296
 do
297
 	case "$1" in
298
 	add)

Return to bug 119728