cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update git to 1.5.3.2.

Browse Source 
This update brings in OPTIONS for GUI tools (on) and dependencies to make
the SVN tools work (off).  It also should handle the openssl dependency
correctly now.  Both of these changes are variations I made on the PR
submissions for those changes.

PR:		[1] ports/116521 (1.5.3.2)
		[2] ports/114472 (openssl issues)
Submitted by:	[1] Eygene Ryabinkin <rea-fbsd@codelabs.ru>
		[2] Ed Schouten <ed@fxq.nl>
This commit is contained in:
Eric Anholt 2007-10-09 21:18:06 +00:00
parent 71ca55e7d9
commit 6e0e3c8f91
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=201216
5 changed files with 357 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
devel/git/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= git
PORTVERSION= 1.5.2.1
PORTVERSION= 1.5.3.2
CATEGORIES= devel
MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@ -28,8 +28,6 @@ MAN1= git-add.1 \
git-am.1 \
git-annotate.1 \
git-apply.1 \
git-applymbox.1 \
git-applypatch.1 \
git-archimport.1 \
git-archive.1 \
git-bisect.1 \
@ -97,7 +95,6 @@ MAN1= git-add.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 \
@ -156,7 +153,7 @@ MAN1= git-add.1 \
git-whatchanged.1 \
git-write-tree.1 \
gitk.1
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3PREFIX= ${PREFIX}/share
MAN3= Git.3
MAN5= gitattributes.5 gitignore.5
MAN7= git.7
@ -169,13 +166,19 @@ USE_GMAKE= yes
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}
PERL_PATH=${PERL} \
LIBMD_SHA1=yes
MAKE_ARGS+= prefix="${PREFIX}"
USE_OPENSSL= yes
.ifndef WITHOUT_GUI
OPTIONS= GUI "Enable building of GUI tools" on \
SVN "Enable required dependencies for SVN tools" off
.include <bsd.port.pre.mk>
.ifdef WITH_GUI
PLIST_SUB+= GUI=""
RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
MAKE_ENV+= TCL_PATH=tclsh8.4 TCLTK_PATH=wish8.4
@ -184,6 +187,19 @@ PLIST_SUB+= GUI="@comment "
MAKE_ENV+= NO_TCLTK=yes
.endif
.ifdef WITH_SVN
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
svn:${PORTSDIR}/devel/subversion
.endif
pre-patch:
${REINPLACE_CMD} -e 's|OPENSSLDIR|OPENSSLBASE|g' ${WRKSRC}/Makefile
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/
@ -207,4 +223,9 @@ post-install:
${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \
${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el
.include <bsd.port.mk>
${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import \
${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
${PREFIX}/bin/
.include <bsd.port.post.mk>

12
devel/git/distinfo
View File

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

10
devel/git/files/patch-Makefile
View File

@ -1,5 +1,5 @@
--- Makefile Sun May 20 10:40:55 2007
+++ Makefile Sat May 26 20:43:02 2007
--- 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.
@ -11,20 +11,24 @@
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
@@ -172,13 +172,13 @@
@@ -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

298
devel/git/files/patch-while-case Normal file
View File

@ -0,0 +1,298 @@
Option parsing in the Git shell scripts uses the construct 'while
case "$#" in 0) break ;; esac; do ... done'. This is neat, because
it needs no external commands invocation. But for the FreeBSD's
original Bourne shell (that is not fully IEEE 1003.2-compliant) the
'case' construct that has not matched patterns does not modify the
exit value. As per IEEE 1003.2, it should return zero: see
http://opengroup.org/onlinepubs/000095399, Shell and Utilities
Volume (XCU), Case Conditional Construct.
The fix is to add the case branch '*) : ;;'. It also needs no
external commands invocation and it does its work, because ':'
always returns zero.
FreeBSD has the PR 116559,
http://www.freebsd.org/cgi/query-pr.cgi?pr=116559
that fixes the shell issue. If it will be committed, this patch
will not be needed anymore for systems that will have the fixed
/bin/sh.
Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
---
contrib/examples/git-gc.sh | 2 +-
contrib/examples/git-tag.sh | 2 +-
contrib/examples/git-verify-tag.sh | 2 +-
git-am.sh | 2 +-
git-clean.sh | 2 +-
git-commit.sh | 2 +-
git-fetch.sh | 2 +-
git-filter-branch.sh | 2 +-
git-instaweb.sh | 2 +-
git-ls-remote.sh | 2 +-
git-merge.sh | 2 +-
git-mergetool.sh | 2 +-
git-pull.sh | 2 +-
git-quiltimport.sh | 2 +-
git-rebase--interactive.sh | 2 +-
git-rebase.sh | 4 ++--
git-repack.sh | 2 +-
git-reset.sh | 2 +-
git-submodule.sh | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
diff --git contrib/examples/git-gc.sh b/contrib/examples/git-gc.sh
index 2ae235b..60cb348 100755
--- contrib/examples/git-gc.sh
+++ contrib/examples/git-gc.sh
@@ -9,7 +9,7 @@ SUBDIRECTORY_OK=Yes
. git-sh-setup
no_prune=:
-while case $# in 0) break ;; esac
+while case $# in 0) break ;; *) : ;; esac
do
case "$1" in
--prune)
diff --git contrib/examples/git-tag.sh b/contrib/examples/git-tag.sh
index 5ee3f50..26aab69 100755
--- contrib/examples/git-tag.sh
+++ contrib/examples/git-tag.sh
@@ -14,7 +14,7 @@ username=
list=
verify=
LINES=0
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
-a)
diff --git contrib/examples/git-verify-tag.sh b/contrib/examples/git-verify-tag.sh
index 37b0023..9a0f011 100755
--- contrib/examples/git-verify-tag.sh
+++ contrib/examples/git-verify-tag.sh
@@ -5,7 +5,7 @@ SUBDIRECTORY_OK='Yes'
. git-sh-setup
verbose=
-while case $# in 0) break;; esac
+while case $# in 0) break;; *) : ;; esac
do
case "$1" in
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
diff --git git-am.sh b/git-am.sh
index 6809aa0..0bd8d34 100755
--- git-am.sh
+++ git-am.sh
@@ -109,7 +109,7 @@ dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
resolvemsg= resume=
git_apply_opt=
-while case "$#" in 0) break;; esac
+while case "$#" in 0) break;; *) : ;; esac
do
case "$1" in
-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
diff --git git-clean.sh b/git-clean.sh
index a5cfd9f..1fac731 100755
--- git-clean.sh
+++ git-clean.sh
@@ -26,7 +26,7 @@ rmrf="rm -rf --"
rm_refuse="echo Not removing"
echo1="echo"
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
-d)
diff --git git-commit.sh b/git-commit.sh
index bb113e8..5f298c1 100755
--- git-commit.sh
+++ git-commit.sh
@@ -89,7 +89,7 @@ force_author=
only_include_assumed=
untracked_files=
templatefile="`git config commit.template`"
-while case "$#" in 0) break;; esac
+while case "$#" in 0) break;; *) : ;; esac
do
case "$1" in
-F|--F|-f|--f|--fi|--fil|--file)
diff --git git-fetch.sh b/git-fetch.sh
index c3a2001..dac2d72 100755
--- git-fetch.sh
+++ git-fetch.sh
@@ -27,7 +27,7 @@ shallow_depth=
no_progress=
test -t 1 || no_progress=--no-progress
quiet=
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
-a|--a|--ap|--app|--appe|--appen|--append)
diff --git git-filter-branch.sh b/git-filter-branch.sh
index a4b6577..02b567b 100755
--- git-filter-branch.sh
+++ git-filter-branch.sh
@@ -105,7 +105,7 @@ filter_tag_name=
filter_subdir=
orig_namespace=refs/original/
force=
-while case "$#" in 0) usage;; esac
+while case "$#" in 0) usage;; *) : ;; esac
do
case "$1" in
--)
diff --git git-instaweb.sh b/git-instaweb.sh
index b79c6b6..c85f8c0 100755
--- git-instaweb.sh
+++ git-instaweb.sh
@@ -61,7 +61,7 @@ stop_httpd () {
test -f "$fqgitdir/pid" && kill `cat "$fqgitdir/pid"`
}
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
--stop|stop)
diff --git git-ls-remote.sh b/git-ls-remote.sh
index b7e5d04..4ef4341 100755
--- git-ls-remote.sh
+++ git-ls-remote.sh
@@ -13,7 +13,7 @@ die () {
}
exec=
-while case "$#" in 0) break;; esac
+while case "$#" in 0) break;; *) : ;; esac
do
case "$1" in
-h|--h|--he|--hea|--head|--heads)
diff --git git-merge.sh b/git-merge.sh
index 3a01db0..94a50aa 100755
--- git-merge.sh
+++ git-merge.sh
@@ -122,7 +122,7 @@ merge_name () {
case "$#" in 0) usage ;; esac
have_message=
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
diff --git git-mergetool.sh b/git-mergetool.sh
index 47a8055..0e286dd 100755
--- git-mergetool.sh
+++ git-mergetool.sh
@@ -268,7 +268,7 @@ merge_file () {
cleanup_temp_files
}
-while case $# in 0) break ;; esac
+while case $# in 0) break ;; *) : ;; esac
do
case "$1" in
-t|--tool*)
diff --git git-pull.sh b/git-pull.sh
index 5e96d1f..722ed4e 100755
--- git-pull.sh
+++ git-pull.sh
@@ -16,7 +16,7 @@ test -z "$(git ls-files -u)" ||
die "You are in the middle of a conflicted merge."
strategy_args= no_summary= no_commit= squash=
-while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
+while case "$#,$1" in 0) break ;; *,-*) : ;; *) break ;; esac
do
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
diff --git git-quiltimport.sh b/git-quiltimport.sh
index 9de54d1..4039617 100755
--- git-quiltimport.sh
+++ git-quiltimport.sh
@@ -5,7 +5,7 @@ SUBDIRECTORY_ON=Yes
dry_run=""
quilt_author=""
-while case "$#" in 0) break;; esac
+while case "$#" in 0) break;; *) : ;; esac
do
case "$1" in
--au=*|--aut=*|--auth=*|--autho=*|--author=*)
diff --git git-rebase--interactive.sh b/git-rebase--interactive.sh
index abc2b1c..54e4299 100755
--- git-rebase--interactive.sh
+++ git-rebase--interactive.sh
@@ -317,7 +317,7 @@ do_rest () {
done
}
-while case $# in 0) break ;; esac
+while case $# in 0) break ;; *) : ;; esac
do
case "$1" in
--continue)
diff --git git-rebase.sh b/git-rebase.sh
index 3bd66b0..29cfab2 100755
--- git-rebase.sh
+++ git-rebase.sh
@@ -122,7 +122,7 @@ finish_rb_merge () {
is_interactive () {
test -f "$dotest"/interactive ||
- while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
+ while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; *) : ;; esac
do
shift
done && test -n "$1"
@@ -130,7 +130,7 @@ is_interactive () {
is_interactive "$@" && exec git-rebase--interactive "$@"
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
--continue)
diff --git git-repack.sh b/git-repack.sh
index 156c5e8..aac771e 100755
--- git-repack.sh
+++ git-repack.sh
@@ -9,7 +9,7 @@ SUBDIRECTORY_OK='Yes'
no_update_info= all_into_one= remove_redundant=
local= quiet= no_reuse= extra=
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
-n) no_update_info=t ;;
diff --git git-reset.sh b/git-reset.sh
index 1dc606f..eb92610 100755
--- git-reset.sh
+++ git-reset.sh
@@ -11,7 +11,7 @@ require_work_tree
update= reset_type=--mixed
unset rev
-while case $# in 0) break ;; esac
+while case $# in 0) break ;; *) : ;; esac
do
case "$1" in
--mixed | --soft | --hard)
diff --git git-submodule.sh b/git-submodule.sh
index 3320998..78a25ad 100755
--- git-submodule.sh
+++ git-submodule.sh
@@ -251,7 +251,7 @@ modules_list()
done
}
-while case "$#" in 0) break ;; esac
+while case "$#" in 0) break ;; *) : ;; esac
do
case "$1" in
add)

19
devel/git/pkg-plist
View File

@ -4,8 +4,6 @@ bin/git-add--interactive
bin/git-am
bin/git-annotate
bin/git-apply
bin/git-applymbox
bin/git-applypatch
bin/git-archimport
bin/git-archive
bin/git-bisect
@ -38,8 +36,9 @@ bin/git-diff-index
bin/git-diff-tree
bin/git-fast-import
bin/git-fetch
bin/git-fetch-pack
bin/git-fetch--tool
bin/git-fetch-pack
bin/git-filter-branch
bin/git-fmt-merge-msg
bin/git-for-each-ref
bin/git-format-patch
@ -82,6 +81,7 @@ bin/git-mktag
bin/git-mktree
bin/git-mv
bin/git-name-rev
bin/git-p4
bin/git-p4import
bin/git-pack-objects
bin/git-pack-redundant
@ -96,6 +96,7 @@ bin/git-push
bin/git-quiltimport
bin/git-read-tree
bin/git-rebase
bin/git-rebase--interactive
bin/git-receive-pack
bin/git-reflog
bin/git-relink
@ -123,8 +124,10 @@ bin/git-ssh-fetch
bin/git-ssh-pull
bin/git-ssh-push
bin/git-ssh-upload
bin/git-stash
bin/git-status
bin/git-stripspace
bin/git-submodule
bin/git-svn
bin/git-svnimport
bin/git-symbolic-ref
@ -163,18 +166,28 @@ share/git-core/templates/info/exclude
%%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