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

Update to git-1.6.0.2.

Browse Source 
An earlier diff got tested by landry@. Thanks!
This commit is contained in:
bernd 2008-09-27 21:47:20 +00:00
parent 5fc221343d
commit 1ff015f807
13 changed files with 260 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/git/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.33 2008/07/21 07:48:54 bernd Exp $
# $OpenBSD: Makefile,v 1.34 2008/09/27 21:47:20 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
COMMENT-x11= GIT - graphical tools
V= 1.5.6.4
V= 1.6.0.2
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
@ -88,7 +88,8 @@ post-install:
pax -rw *.html howto/*.html *.txt howto/*.txt \
${PREFIX}/share/doc/git
${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \
${PREFIX}/share/git-core/templates/hooks
${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample
chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git
do-regress:
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.5.6.4.tar.gz) = yYl1PL9Moxvq8RGSRTsHLw==
MD5 (git-htmldocs-1.5.6.4.tar.gz) = +agZf2bo7aMR6cOczTXH/A==
MD5 (git-manpages-1.5.6.4.tar.gz) = EzeSr+oxnwAybbcKxL2INg==
RMD160 (git-1.5.6.4.tar.gz) = In9sheWrnXAKIoZlQZ2lcn/SQ2Q=
RMD160 (git-htmldocs-1.5.6.4.tar.gz) = figM5l7nNq7jytshcWtzDaxnYkE=
RMD160 (git-manpages-1.5.6.4.tar.gz) = OjbBMHHjMblBUhng09BkWhhiZgY=
SHA1 (git-1.5.6.4.tar.gz) = hdexCa83RvR4QMoK0Bj6QG9wGFQ=
SHA1 (git-htmldocs-1.5.6.4.tar.gz) = saZaGeKPOGXsz4/fFaEmr7xbMcY=
SHA1 (git-manpages-1.5.6.4.tar.gz) = TuxfihcaL2brkyFRsvvC4mPQw3M=
SHA256 (git-1.5.6.4.tar.gz) = 5my9bmL3gYw0jRU/N9axjW5/vtAWPRIrV/K3CQWUsiA=
SHA256 (git-htmldocs-1.5.6.4.tar.gz) = 3j8Skk8s+onHYo5tKYKJXI8Z6ZiGKKwvmhzmugvJ3r0=
SHA256 (git-manpages-1.5.6.4.tar.gz) = lLRocbhrtocejy0YM05mHqxPRqRaP3lUKJfn7hL7Vno=
SIZE (git-1.5.6.4.tar.gz) = 2100615
SIZE (git-htmldocs-1.5.6.4.tar.gz) = 985330
SIZE (git-manpages-1.5.6.4.tar.gz) = 312161
MD5 (git-1.6.0.2.tar.gz) = zGmu5TY+Q+cH1reB42pGIA==
MD5 (git-htmldocs-1.6.0.2.tar.gz) = ubEMguawNr8lVvOGvvqrEg==
MD5 (git-manpages-1.6.0.2.tar.gz) = C/mO9tyyRij6Q1ONMKlz1w==
RMD160 (git-1.6.0.2.tar.gz) = UPyoEDlDKSGUZzCC1wuM5tIayjk=
RMD160 (git-htmldocs-1.6.0.2.tar.gz) = /giJlRjygRJ1XMxvYb9261OmNJE=
RMD160 (git-manpages-1.6.0.2.tar.gz) = +lXgWcuxCZIy8PZx/W8ICXv5HpE=
SHA1 (git-1.6.0.2.tar.gz) = ewgUN0qXNLKVVxjJOQpAIdoxEP8=
SHA1 (git-htmldocs-1.6.0.2.tar.gz) = 1F84hUnliJDFSV25yBHucecTQJA=
SHA1 (git-manpages-1.6.0.2.tar.gz) = 1vjb7YqDa9V+xnVRMNAWEKCaMXM=
SHA256 (git-1.6.0.2.tar.gz) = pNbiQlMPBIGTfN94mULXnAE8vWoh57Uuzp6diz/6Kxg=
SHA256 (git-htmldocs-1.6.0.2.tar.gz) = EzED3UJ3UC/TeD4W+jTlwyaJQ80OTM4xuKmzfJiTTZ8=
SHA256 (git-manpages-1.6.0.2.tar.gz) = cgpXH3tFNmLnyKJam2X6g79eOO1/xmsJOftqL20/nOw=
SIZE (git-1.6.0.2.tar.gz) = 2237730
SIZE (git-htmldocs-1.6.0.2.tar.gz) = 1011895
SIZE (git-manpages-1.6.0.2.tar.gz) = 321707

42
devel/git/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
--- Makefile.orig Thu Jun 19 00:49:49 2008
+++ Makefile Thu Jun 19 08:59:54 2008
@@ -164,15 +164,15 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
--- Makefile.orig Sat Sep 13 04:29:50 2008
+++ Makefile Sat Sep 13 16:03:31 2008
@@ -164,7 +164,7 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -9,7 +9,9 @@
LDFLAGS =
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
@@ -180,11 +180,11 @@ STRIP ?= strip
# runtime figures out where they are based on the path to the executable.
# This can help installing the suite in a relocatable way.
-prefix = $(HOME)
+#prefix = $(HOME)
@ -17,9 +19,12 @@
-mandir = $(prefix)/share/man
+mandir = $(prefix)/man
infodir = $(prefix)/share/info
gitexecdir = $(bindir)
-gitexecdir = $(prefix)/libexec/git-core
+gitexecdir = $(prefix)/libexec/git
sharedir = $(prefix)/share
@@ -184,7 +184,7 @@ else
template_dir = $(sharedir)/git-core/templates
htmldir=$(sharedir)/doc/git-doc
@@ -194,7 +194,7 @@ else
sysconfdir = $(prefix)/etc
endif
lib = lib
@ -28,9 +33,9 @@
# DESTDIR=
# default configuration for gitweb
@@ -207,15 +207,15 @@ GITWEB_SITE_FOOTER =
@@ -217,15 +217,15 @@ GITWEB_SITE_FOOTER =
export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
export prefix bindir sharedir htmldir sysconfdir
-CC = gcc
+CC ?= gcc
@ -47,8 +52,8 @@
export TCL_PATH TCLTK_PATH
@@ -662,11 +662,10 @@ ifeq ($(uname_S),FreeBSD)
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
@@ -681,11 +681,10 @@ ifeq ($(uname_S),FreeBSD)
COMPAT_OBJS += compat/regex/regex.o
endif
ifeq ($(uname_S),OpenBSD)
- NO_STRCASESTR = YesPlease
@ -61,16 +66,25 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -774,7 +773,7 @@ endif
EXTLIBS += -lz
@@ -762,7 +761,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
EXTLIBS += -lws2_32
X = .exe
- gitexecdir = ../libexec/git-core
+ gitexecdir = ../libexec/git
template_dir = ../share/git-core/templates/
ETC_GITCONFIG = ../etc/gitconfig
endif
@@ -832,7 +831,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAMS += git-shell$X
endif
ifndef NO_OPENSSL
- OPENSSL_LIBSSL = -lssl
+ OPENSSL_LIBSSL = -lssl -lcrypto
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -1239,7 +1238,7 @@ all:: $(TEST_PROGRAMS)
@@ -1311,7 +1310,7 @@ all:: $(TEST_PROGRAMS)
export NO_SVN_TESTS

8
devel/git/patches/patch-git-gui_git-gui_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-git-gui_git-gui_sh,v 1.4 2008/06/24 20:28:01 bernd Exp $
--- git-gui/git-gui.sh.orig Thu Jun 19 00:49:49 2008
+++ git-gui/git-gui.sh Thu Jun 19 08:59:54 2008
@@ -2931,7 +2931,9 @@ if {[winfo exists $ui_comm]} {
$OpenBSD: patch-git-gui_git-gui_sh,v 1.5 2008/09/27 21:47:20 bernd Exp $
--- git-gui/git-gui.sh.orig Sun Aug 17 22:43:06 2008
+++ git-gui/git-gui.sh Mon Aug 25 09:30:04 2008
@@ -2997,7 +2997,9 @@ if {[winfo exists $ui_comm]} {
# in pipe mode to spellcheck the commit message.
#
set spell_cmd [list |]

14
devel/git/patches/patch-gitweb_gitweb_perl
View File

@ -1,24 +1,24 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.4 2008/06/24 20:28:01 bernd Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.5 2008/09/27 21:47:20 bernd Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Thu Jun 19 00:49:49 2008
+++ gitweb/gitweb.perl Thu Jun 19 11:13:49 2008
@@ -4361,7 +4361,7 @@ sub git_blob_plain {
--- gitweb/gitweb.perl.orig Mon Aug 25 09:34:18 2008
+++ gitweb/gitweb.perl Mon Aug 25 09:35:15 2008
@@ -4291,7 +4291,7 @@ sub git_blob_plain {
$expires = "+1d";
}
- open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+ open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
or die_error(undef, "Open git-cat-file blob '$hash' failed");
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
@@ -4404,7 +4404,7 @@ sub git_blob {
@@ -4334,7 +4334,7 @@ sub git_blob {
}
my ($have_blame) = gitweb_check_feature('blame');
- open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
+ open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
or die_error(undef, "Couldn't cat $file_name, $hash");
or die_error(500, "Couldn't cat $file_name, $hash");
my $mimetype = blob_mimetype($fd, $file_name);
if ($mimetype !~ m!^(?:text/|image/(?:gif|png|jpeg)$)! && -B $fd) {

12
devel/git/patches/patch-t_t3200-branch_sh
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-t_t3200-branch_sh,v 1.1 2008/04/26 09:24:04 bernd Exp $
--- t/t3200-branch.sh.orig Thu Apr 10 10:37:30 2008
+++ t/t3200-branch.sh Thu Apr 10 10:37:30 2008
@@ -200,7 +200,7 @@ test_expect_success \
test_expect_success \
'branch from non-branch HEAD w/--track causes failure' \
- '!(git branch --track my10 HEAD^)'
+ 'git branch --track my10 HEAD^ || true'
# Keep this test last, as it changes the current branch
cat >expect <<EOF

20
devel/git/patches/patch-t_t4018-diff-funcname_sh Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-t_t4018-diff-funcname_sh,v 1.1 2008/09/27 21:47:20 bernd Exp $
--- t/t4018-diff-funcname.sh.orig Tue Sep 16 11:36:03 2008
+++ t/t4018-diff-funcname.sh Tue Sep 16 11:36:37 2008
@@ -57,10 +57,11 @@ test_expect_success 'last regexp must not be negated'
test_must_fail git diff --no-index Beer.java Beer-correct.java
'
-test_expect_success 'alternation in pattern' '
- git config diff.java.funcname "^[ ]*\\(\\(public\\|static\\).*\\)$"
- git diff --no-index Beer.java Beer-correct.java |
- grep "^@@.*@@ public static void main("
-'
+# No regex alternation support in OpenBSD libc
+#test_expect_success 'alternation in pattern' '
+# git config diff.java.funcname "^[ ]*\\(\\(public\\|static\\).*\\)$"
+# git diff --no-index Beer.java Beer-correct.java |
+# grep "^@@.*@@ public static void main("
+#'
test_done

24
devel/git/patches/patch-t_t4019-diff-wserror_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
--- t/t4019-diff-wserror.sh.orig Tue Apr 8 09:10:01 2008
+++ t/t4019-diff-wserror.sh Thu Apr 10 10:42:58 2008
@@ -22,8 +22,8 @@ blue_grep='7;34m' ;# ESC [ 7 ; 3 4 m
$OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.3 2008/09/27 21:47:20 bernd Exp $
--- t/t4019-diff-wserror.sh.orig Sun Aug 17 22:43:06 2008
+++ t/t4019-diff-wserror.sh Mon Aug 25 09:30:05 2008
@@ -23,8 +23,8 @@ blue_grep='7;34m' ;# ESC [ 7 ; 3 4 m
test_expect_success default '
git diff --color >output
@ -12,7 +12,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -37,8 +37,8 @@ test_expect_success 'without -trail' '
@@ -38,8 +38,8 @@ test_expect_success 'without -trail' '
git config core.whitespace -trail
git diff --color >output
@ -23,7 +23,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -53,8 +53,8 @@ test_expect_success 'without -trail (attribute)' '
@@ -54,8 +54,8 @@ test_expect_success 'without -trail (attribute)' '
git config --unset core.whitespace
echo "F whitespace=-trail" >.gitattributes
git diff --color >output
@ -34,7 +34,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -69,8 +69,8 @@ test_expect_success 'without -space' '
@@ -70,8 +70,8 @@ test_expect_success 'without -space' '
rm -f .gitattributes
git config core.whitespace -space
git diff --color >output
@ -45,7 +45,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight normal >/dev/null &&
grep HT normal >/dev/null &&
@@ -85,8 +85,8 @@ test_expect_success 'without -space (attribute)' '
@@ -86,8 +86,8 @@ test_expect_success 'without -space (attribute)' '
git config --unset core.whitespace
echo "F whitespace=-space" >.gitattributes
git diff --color >output
@ -56,7 +56,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight normal >/dev/null &&
grep HT normal >/dev/null &&
@@ -101,8 +101,8 @@ test_expect_success 'with indent-non-tab only' '
@@ -102,8 +102,8 @@ test_expect_success 'with indent-non-tab only' '
rm -f .gitattributes
git config core.whitespace indent,-trailing,-space
git diff --color >output
@ -67,7 +67,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight error >/dev/null &&
grep HT normal >/dev/null &&
@@ -117,8 +117,8 @@ test_expect_success 'with indent-non-tab only (attribu
@@ -118,8 +118,8 @@ test_expect_success 'with indent-non-tab only (attribu
git config --unset core.whitespace
echo "F whitespace=indent,-trailing,-space" >.gitattributes
git diff --color >output
@ -78,7 +78,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight error >/dev/null &&
grep HT normal >/dev/null &&
@@ -133,8 +133,8 @@ test_expect_success 'with cr-at-eol' '
@@ -134,8 +134,8 @@ test_expect_success 'with cr-at-eol' '
rm -f .gitattributes
git config core.whitespace cr-at-eol
git diff --color >output
@ -89,7 +89,7 @@ $OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.2 2008/04/26 09:24:04 bernd Exp $
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -149,8 +149,8 @@ test_expect_success 'with cr-at-eol (attribute)' '
@@ -150,8 +150,8 @@ test_expect_success 'with cr-at-eol (attribute)' '
git config --unset core.whitespace
echo "F whitespace=trailing,cr-at-eol" >.gitattributes
git diff --color >output

11
devel/git/patches/patch-t_t7201-co_sh
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-t_t7201-co_sh,v 1.1 2008/04/26 09:24:04 bernd Exp $
--- t/t7201-co.sh.orig Thu Apr 10 10:57:30 2008
+++ t/t7201-co.sh Thu Apr 10 10:57:55 2008
@@ -335,6 +335,6 @@ test_expect_success \
git checkout -b delete-me master &&
rm .git/refs/heads/delete-me &&
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
- !(git checkout --track -b track)'
+ (git checkout --track -b track || true)'
test_done

14
devel/git/patches/patch-t_t9400-git-cvsserver-server_sh Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-t_t9400-git-cvsserver-server_sh,v 1.1 2008/09/27 21:47:20 bernd Exp $
--- t/t9400-git-cvsserver-server.sh.orig Sat Sep 13 04:29:50 2008
+++ t/t9400-git-cvsserver-server.sh Sat Sep 13 16:03:31 2008
@@ -484,8 +484,8 @@ test_expect_success 'cvs status (no subdirs in header)
cd "$WORKDIR"
test_expect_success 'cvs co -c (shows module database)' '
GIT_CONFIG="$git_config" cvs co -c > out &&
- grep "^master[ ]\+master$" < out &&
- ! grep -v "^master[ ]\+master$" < out
+ grep "^master[ ]\{1,\}master$" < out &&
+ ! grep -v "^master[ ]\{1,\}master$" < out
'
#------------

295
devel/git/pkg/PLIST-main
View File

@ -1,144 +1,147 @@
@comment $OpenBSD: PLIST-main,v 1.18 2008/07/21 07:48:54 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.19 2008/09/27 21:47:20 bernd Exp $
@pkgpath devel/git
@bin bin/git
@bin bin/git-add
bin/git-add--interactive
bin/git-am
@bin bin/git-annotate
@bin bin/git-apply
bin/git-archimport
@bin bin/git-archive
bin/git-bisect
@bin bin/git-blame
@bin bin/git-branch
@bin bin/git-bundle
@bin bin/git-cat-file
@bin bin/git-check-attr
@bin bin/git-check-ref-format
@bin bin/git-checkout
@bin bin/git-checkout-index
@bin bin/git-cherry
@bin bin/git-cherry-pick
@bin bin/git-clean
@bin bin/git-clone
@bin bin/git-commit
@bin bin/git-commit-tree
@bin bin/git-config
@bin bin/git-count-objects
bin/git-cvsexportcommit
bin/git-cvsimport
bin/git-cvsserver
@bin bin/git-daemon
@bin bin/git-describe
@bin bin/git-diff
@bin bin/git-diff-files
@bin bin/git-diff-index
@bin bin/git-diff-tree
@bin bin/git-fast-export
@bin bin/git-fast-import
@bin bin/git-fetch
@bin bin/git-fetch--tool
@bin bin/git-fetch-pack
bin/git-filter-branch
@bin bin/git-fmt-merge-msg
@bin bin/git-for-each-ref
@bin bin/git-format-patch
@bin bin/git-fsck
@bin bin/git-fsck-objects
@bin bin/git-gc
@bin bin/git-get-tar-commit-id
@bin bin/git-grep
@bin bin/git-hash-object
@bin bin/git-http-fetch
@bin bin/git-http-push
@bin bin/git-imap-send
@bin bin/git-index-pack
@bin bin/git-init
@bin bin/git-init-db
bin/git-instaweb
@bin bin/git-log
bin/git-lost-found
@bin bin/git-ls-files
@bin bin/git-ls-remote
@bin bin/git-ls-tree
@bin bin/git-mailinfo
@bin bin/git-mailsplit
bin/git-merge
@bin bin/git-merge-base
@bin bin/git-merge-file
@bin bin/git-merge-index
bin/git-merge-octopus
bin/git-merge-one-file
@bin bin/git-merge-ours
@bin bin/git-merge-recursive
bin/git-merge-resolve
bin/git-merge-stupid
@bin bin/git-merge-subtree
@bin bin/git-merge-tree
bin/git-mergetool
@bin bin/git-mktag
@bin bin/git-mktree
@bin bin/git-mv
@bin bin/git-name-rev
@bin bin/git-pack-objects
@bin bin/git-pack-redundant
@bin bin/git-pack-refs
bin/git-parse-remote
@bin bin/git-patch-id
@bin bin/git-peek-remote
@bin bin/git-prune
@bin bin/git-prune-packed
bin/git-pull
@bin bin/git-push
bin/git-quiltimport
@bin bin/git-read-tree
bin/git-rebase
bin/git-rebase--interactive
@bin bin/git-receive-pack
@bin bin/git-reflog
bin/git-relink
@bin bin/git-remote
bin/git-repack
@bin bin/git-repo-config
bin/git-request-pull
@bin bin/git-rerere
@bin bin/git-reset
@bin bin/git-rev-list
@bin bin/git-rev-parse
@bin bin/git-revert
@bin bin/git-rm
bin/git-send-email
@bin bin/git-send-pack
bin/git-sh-setup
@bin bin/git-shell
@bin bin/git-shortlog
@bin bin/git-show
@bin bin/git-show-branch
@bin bin/git-show-index
@bin bin/git-show-ref
bin/git-stash
@bin bin/git-status
@bin bin/git-stripspace
bin/git-submodule
@bin bin/git-symbolic-ref
@bin bin/git-tag
@bin bin/git-tar-tree
@bin bin/git-unpack-file
@bin bin/git-unpack-objects
@bin bin/git-update-index
@bin bin/git-update-ref
@bin bin/git-update-server-info
@bin bin/git-upload-archive
@bin bin/git-upload-pack
@bin bin/git-var
@bin bin/git-verify-pack
@bin bin/git-verify-tag
bin/git-web--browse
@bin bin/git-whatchanged
@bin bin/git-write-tree
lib/libgit.a
libdata/perl5/site_perl/Git.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libexec/git/
@bin libexec/git/git-add
libexec/git/git-add--interactive
libexec/git/git-am
@bin libexec/git/git-annotate
@bin libexec/git/git-apply
libexec/git/git-archimport
@bin libexec/git/git-archive
libexec/git/git-bisect
@bin libexec/git/git-blame
@bin libexec/git/git-branch
@bin libexec/git/git-bundle
@bin libexec/git/git-cat-file
@bin libexec/git/git-check-attr
@bin libexec/git/git-check-ref-format
@bin libexec/git/git-checkout
@bin libexec/git/git-checkout-index
@bin libexec/git/git-cherry
@bin libexec/git/git-cherry-pick
@bin libexec/git/git-clean
@bin libexec/git/git-clone
@bin libexec/git/git-commit
@bin libexec/git/git-commit-tree
@bin libexec/git/git-config
@bin libexec/git/git-count-objects
libexec/git/git-cvsexportcommit
libexec/git/git-cvsimport
libexec/git/git-cvsserver
@bin libexec/git/git-daemon
@bin libexec/git/git-describe
@bin libexec/git/git-diff
@bin libexec/git/git-diff-files
@bin libexec/git/git-diff-index
@bin libexec/git/git-diff-tree
@bin libexec/git/git-fast-export
@bin libexec/git/git-fast-import
@bin libexec/git/git-fetch
@bin libexec/git/git-fetch--tool
@bin libexec/git/git-fetch-pack
libexec/git/git-filter-branch
@bin libexec/git/git-fmt-merge-msg
@bin libexec/git/git-for-each-ref
@bin libexec/git/git-format-patch
@bin libexec/git/git-fsck
@bin libexec/git/git-fsck-objects
@bin libexec/git/git-gc
@bin libexec/git/git-get-tar-commit-id
@bin libexec/git/git-grep
@bin libexec/git/git-hash-object
@bin libexec/git/git-http-fetch
@bin libexec/git/git-http-push
@bin libexec/git/git-imap-send
@bin libexec/git/git-index-pack
@bin libexec/git/git-init
@bin libexec/git/git-init-db
libexec/git/git-instaweb
@bin libexec/git/git-log
libexec/git/git-lost-found
@bin libexec/git/git-ls-files
@bin libexec/git/git-ls-remote
@bin libexec/git/git-ls-tree
@bin libexec/git/git-mailinfo
@bin libexec/git/git-mailsplit
@bin libexec/git/git-merge
@bin libexec/git/git-merge-base
@bin libexec/git/git-merge-file
@bin libexec/git/git-merge-index
libexec/git/git-merge-octopus
libexec/git/git-merge-one-file
@bin libexec/git/git-merge-ours
@bin libexec/git/git-merge-recursive
libexec/git/git-merge-resolve
@bin libexec/git/git-merge-subtree
@bin libexec/git/git-merge-tree
libexec/git/git-mergetool
@bin libexec/git/git-mktag
@bin libexec/git/git-mktree
@bin libexec/git/git-mv
@bin libexec/git/git-name-rev
@bin libexec/git/git-pack-objects
@bin libexec/git/git-pack-redundant
@bin libexec/git/git-pack-refs
libexec/git/git-parse-remote
@bin libexec/git/git-patch-id
@bin libexec/git/git-peek-remote
@bin libexec/git/git-prune
@bin libexec/git/git-prune-packed
libexec/git/git-pull
@bin libexec/git/git-push
libexec/git/git-quiltimport
@bin libexec/git/git-read-tree
libexec/git/git-rebase
libexec/git/git-rebase--interactive
@bin libexec/git/git-receive-pack
@bin libexec/git/git-reflog
libexec/git/git-relink
@bin libexec/git/git-remote
libexec/git/git-repack
@bin libexec/git/git-repo-config
libexec/git/git-request-pull
@bin libexec/git/git-rerere
@bin libexec/git/git-reset
@bin libexec/git/git-rev-list
@bin libexec/git/git-rev-parse
@bin libexec/git/git-revert
@bin libexec/git/git-rm
libexec/git/git-send-email
@bin libexec/git/git-send-pack
libexec/git/git-sh-setup
@bin libexec/git/git-shell
@bin libexec/git/git-shortlog
@bin libexec/git/git-show
@bin libexec/git/git-show-branch
@bin libexec/git/git-show-index
@bin libexec/git/git-show-ref
libexec/git/git-stash
@bin libexec/git/git-status
@bin libexec/git/git-stripspace
libexec/git/git-submodule
@bin libexec/git/git-symbolic-ref
@bin libexec/git/git-tag
@bin libexec/git/git-tar-tree
@bin libexec/git/git-unpack-file
@bin libexec/git/git-unpack-objects
@bin libexec/git/git-update-index
@bin libexec/git/git-update-ref
@bin libexec/git/git-update-server-info
@bin libexec/git/git-upload-archive
@bin libexec/git/git-upload-pack
@bin libexec/git/git-var
@bin libexec/git/git-verify-pack
@bin libexec/git/git-verify-tag
libexec/git/git-web--browse
@bin libexec/git/git-whatchanged
@bin libexec/git/git-write-tree
@man man/man1/git-add.1
@man man/man1/git-am.1
@man man/man1/git-annotate.1
@ -328,7 +331,11 @@ share/doc/git/RelNotes-1.5.6.1.txt
share/doc/git/RelNotes-1.5.6.2.txt
share/doc/git/RelNotes-1.5.6.3.txt
share/doc/git/RelNotes-1.5.6.4.txt
share/doc/git/RelNotes-1.5.6.5.txt
share/doc/git/RelNotes-1.5.6.txt
share/doc/git/RelNotes-1.6.0.1.txt
share/doc/git/RelNotes-1.6.0.2.txt
share/doc/git/RelNotes-1.6.0.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
@ -670,16 +677,16 @@ share/git-core/templates/
share/git-core/templates/branches/
share/git-core/templates/description
share/git-core/templates/hooks/
share/git-core/templates/hooks/applypatch-msg
share/git-core/templates/hooks/commit-msg
share/git-core/templates/hooks/post-commit
share/git-core/templates/hooks/post-receive
share/git-core/templates/hooks/post-receive-email
share/git-core/templates/hooks/post-update
share/git-core/templates/hooks/pre-applypatch
share/git-core/templates/hooks/pre-commit
share/git-core/templates/hooks/pre-rebase
share/git-core/templates/hooks/prepare-commit-msg
share/git-core/templates/hooks/update
share/git-core/templates/hooks/applypatch-msg.sample
share/git-core/templates/hooks/commit-msg.sample
share/git-core/templates/hooks/post-commit.sample
share/git-core/templates/hooks/post-receive-email.sample
share/git-core/templates/hooks/post-receive.sample
share/git-core/templates/hooks/post-update.sample
share/git-core/templates/hooks/pre-applypatch.sample
share/git-core/templates/hooks/pre-commit.sample
share/git-core/templates/hooks/pre-rebase.sample
share/git-core/templates/hooks/prepare-commit-msg.sample
share/git-core/templates/hooks/update.sample
share/git-core/templates/info/
share/git-core/templates/info/exclude

4
devel/git/pkg/PLIST-svn
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-svn,v 1.2 2008/02/08 17:56:01 bernd Exp $
bin/git-svn
@comment $OpenBSD: PLIST-svn,v 1.3 2008/09/27 21:47:20 bernd Exp $
libexec/git/git-svn
@man man/man1/git-svn.1

6
devel/git/pkg/PLIST-x11
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-x11,v 1.3 2008/06/24 20:28:01 bernd Exp $
@comment $OpenBSD: PLIST-x11,v 1.4 2008/09/27 21:47:20 bernd Exp $
@conflict git-<=1.5.4.2p0
bin/git-citool
bin/git-gui
bin/gitk
libexec/git/git-citool
libexec/git/git-gui
@man man/man1/git-citool.1
@man man/man1/git-gui.1
@man man/man1/gitk.1