Hey!
Here's an update to git-1.6.0. Please test and comment.
Thanks!
Regards,
Bernd
Makefile | 4
distinfo | 30 -
patches/patch-Makefile | 40 +-
patches/patch-git-gui_git-gui_sh | 6
patches/patch-gitweb_gitweb_perl | 12
patches/patch-t_t3200-branch_sh | 12
patches/patch-t_t4019-diff-wserror_sh | 22 -
patches/patch-t_t7201-co_sh | 11
patches/patch-t_t9400-git-cvsserver-server_sh | 14
pkg/PLIST-main | 291 ++++++++--------
pkg/PLIST-svn | 2
pkg/PLIST-x11 | 4
12 files changed, 229 insertions(+), 219 deletions(-)
Index: Makefile
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 21 Jul 2008 07:48:54 -0000 1.33
+++ Makefile 25 Aug 2008 08:07:19 -0000
@@ -4,7 +4,7 @@ COMMENT-main= GIT - Tree History Storag
COMMENT-svn= GIT - subversion interoperability tools
COMMENT-x11= GIT - graphical tools
-V= 1.5.6.4
+V= 1.6.0
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
@@ -88,7 +88,7 @@ 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
do-regress:
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
Index: distinfo
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo 21 Jul 2008 07:48:54 -0000 1.28
+++ distinfo 25 Aug 2008 07:28:57 -0000
@@ -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.tar.gz) = CWBYwG8wL1DMImOJKNJk3Q==
+MD5 (git-htmldocs-1.6.0.tar.gz) = 39RDvP5s3t9lJoi1RnnSXQ==
+MD5 (git-manpages-1.6.0.tar.gz) = steL3fs1ZbtJA5fG6iWLEw==
+RMD160 (git-1.6.0.tar.gz) = sqOccKVBZ4KuWja8P4uTUknkx6E=
+RMD160 (git-htmldocs-1.6.0.tar.gz) = nq4PBchtrEG2nvVg3UuAHGEM/WQ=
+RMD160 (git-manpages-1.6.0.tar.gz) = eqYQmlrdHv5rm6CRYPAj7OluM2Q=
+SHA1 (git-1.6.0.tar.gz) = dm+8PglkzezRlVNnRngYUWePEoU=
+SHA1 (git-htmldocs-1.6.0.tar.gz) = mQeZdAXkah7GOwl5FYlQBtQ4vQc=
+SHA1 (git-manpages-1.6.0.tar.gz) = uPWls7WxM7QozUUSFn55iM6QRZ4=
+SHA256 (git-1.6.0.tar.gz) = PLUZh1WBU0fz85UbCIkrcAF2+OCiYBIlSaGK6R/8f2U=
+SHA256 (git-htmldocs-1.6.0.tar.gz) =
f9bDvdwwL1380Ufe0XN45cwoC/ko1MLXF5OBKyeII88=
+SHA256 (git-manpages-1.6.0.tar.gz) =
/ccYSTBLUthBa8/D9DBjHadoffOm4m0jnN7/ZiWwJSo=
+SIZE (git-1.6.0.tar.gz) = 2229997
+SIZE (git-htmldocs-1.6.0.tar.gz) = 1007407
+SIZE (git-manpages-1.6.0.tar.gz) = 320598
Index: patches/patch-Makefile
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile
--- patches/patch-Makefile 24 Jun 2008 20:28:01 -0000 1.15
+++ patches/patch-Makefile 25 Aug 2008 07:52:50 -0000
@@ -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 Sun Aug 17 22:43:06 2008
++++ Makefile Mon Aug 25 09:52:37 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,7 +52,7 @@
export TCL_PATH TCLTK_PATH
-@@ -662,11 +662,10 @@ ifeq ($(uname_S),FreeBSD)
+@@ -677,11 +677,10 @@ ifeq ($(uname_S),FreeBSD)
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
@@ -61,16 +66,25 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
-@@ -774,7 +773,7 @@ endif
- EXTLIBS += -lz
-
+@@ -755,7 +754,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
+ COMPAT_OBJS += compat/mingw.o compat/fnmatch.o compat/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
+@@ -825,7 +824,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)
+@@ -1307,7 +1306,7 @@ all:: $(TEST_PROGRAMS)
export NO_SVN_TESTS
Index: patches/patch-git-gui_git-gui_sh
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/patches/patch-git-gui_git-gui_sh,v
retrieving revision 1.4
diff -u -p -r1.4 patch-git-gui_git-gui_sh
--- patches/patch-git-gui_git-gui_sh 24 Jun 2008 20:28:01 -0000 1.4
+++ patches/patch-git-gui_git-gui_sh 25 Aug 2008 07:32:40 -0000
@@ -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]} {
+--- 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 |]
Index: patches/patch-gitweb_gitweb_perl
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v
retrieving revision 1.4
diff -u -p -r1.4 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl 24 Jun 2008 20:28:01 -0000 1.4
+++ patches/patch-gitweb_gitweb_perl 25 Aug 2008 07:35:30 -0000
@@ -2,23 +2,23 @@ $OpenBSD: patch-gitweb_gitweb_perl,v 1.4
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) {
Index: patches/patch-t_t3200-branch_sh
===================================================================
RCS file: patches/patch-t_t3200-branch_sh
diff -N patches/patch-t_t3200-branch_sh
--- patches/patch-t_t3200-branch_sh 26 Apr 2008 09:24:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: patches/patch-t_t4019-diff-wserror_sh
===================================================================
RCS file:
/home/OpenBSD/cvs/ports/devel/git/patches/patch-t_t4019-diff-wserror_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-t_t4019-diff-wserror_sh
--- patches/patch-t_t4019-diff-wserror_sh 26 Apr 2008 09:24:04 -0000
1.2
+++ patches/patch-t_t4019-diff-wserror_sh 25 Aug 2008 07:32:40 -0000
@@ -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
+--- 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,
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,
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,
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,
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,
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,
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,
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,
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
Index: patches/patch-t_t7201-co_sh
===================================================================
RCS file: patches/patch-t_t7201-co_sh
diff -N patches/patch-t_t7201-co_sh
--- patches/patch-t_t7201-co_sh 26 Apr 2008 09:24:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: patches/patch-t_t9400-git-cvsserver-server_sh
===================================================================
RCS file: patches/patch-t_t9400-git-cvsserver-server_sh
diff -N patches/patch-t_t9400-git-cvsserver-server_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-t_t9400-git-cvsserver-server_sh 25 Aug 2008 09:44:07
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- t/t9400-git-cvsserver-server.sh.orig Mon Aug 25 11:09:47 2008
++++ t/t9400-git-cvsserver-server.sh Mon Aug 25 11:42:50 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
+ '
+
+ test_done
Index: pkg/PLIST-main
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST-main
--- pkg/PLIST-main 21 Jul 2008 07:48:54 -0000 1.18
+++ pkg/PLIST-main 25 Aug 2008 08:09:23 -0000
@@ -1,144 +1,147 @@
@comment $OpenBSD: PLIST-main,v 1.18 2008/07/21 07:48:54 bernd Exp $
@pkgpath devel/git
@bin bin/git
[EMAIL PROTECTED] bin/git-add
-bin/git-add--interactive
-bin/git-am
[EMAIL PROTECTED] bin/git-annotate
[EMAIL PROTECTED] bin/git-apply
-bin/git-archimport
[EMAIL PROTECTED] bin/git-archive
-bin/git-bisect
[EMAIL PROTECTED] bin/git-blame
[EMAIL PROTECTED] bin/git-branch
[EMAIL PROTECTED] bin/git-bundle
[EMAIL PROTECTED] bin/git-cat-file
[EMAIL PROTECTED] bin/git-check-attr
[EMAIL PROTECTED] bin/git-check-ref-format
[EMAIL PROTECTED] bin/git-checkout
[EMAIL PROTECTED] bin/git-checkout-index
[EMAIL PROTECTED] bin/git-cherry
[EMAIL PROTECTED] bin/git-cherry-pick
[EMAIL PROTECTED] bin/git-clean
[EMAIL PROTECTED] bin/git-clone
[EMAIL PROTECTED] bin/git-commit
[EMAIL PROTECTED] bin/git-commit-tree
[EMAIL PROTECTED] bin/git-config
[EMAIL PROTECTED] bin/git-count-objects
-bin/git-cvsexportcommit
-bin/git-cvsimport
-bin/git-cvsserver
[EMAIL PROTECTED] bin/git-daemon
[EMAIL PROTECTED] bin/git-describe
[EMAIL PROTECTED] bin/git-diff
[EMAIL PROTECTED] bin/git-diff-files
[EMAIL PROTECTED] bin/git-diff-index
[EMAIL PROTECTED] bin/git-diff-tree
[EMAIL PROTECTED] bin/git-fast-export
[EMAIL PROTECTED] bin/git-fast-import
[EMAIL PROTECTED] bin/git-fetch
[EMAIL PROTECTED] bin/git-fetch--tool
[EMAIL PROTECTED] bin/git-fetch-pack
-bin/git-filter-branch
[EMAIL PROTECTED] bin/git-fmt-merge-msg
[EMAIL PROTECTED] bin/git-for-each-ref
[EMAIL PROTECTED] bin/git-format-patch
[EMAIL PROTECTED] bin/git-fsck
[EMAIL PROTECTED] bin/git-fsck-objects
[EMAIL PROTECTED] bin/git-gc
[EMAIL PROTECTED] bin/git-get-tar-commit-id
[EMAIL PROTECTED] bin/git-grep
[EMAIL PROTECTED] bin/git-hash-object
[EMAIL PROTECTED] bin/git-http-fetch
[EMAIL PROTECTED] bin/git-http-push
[EMAIL PROTECTED] bin/git-imap-send
[EMAIL PROTECTED] bin/git-index-pack
[EMAIL PROTECTED] bin/git-init
[EMAIL PROTECTED] bin/git-init-db
-bin/git-instaweb
[EMAIL PROTECTED] bin/git-log
-bin/git-lost-found
[EMAIL PROTECTED] bin/git-ls-files
[EMAIL PROTECTED] bin/git-ls-remote
[EMAIL PROTECTED] bin/git-ls-tree
[EMAIL PROTECTED] bin/git-mailinfo
[EMAIL PROTECTED] bin/git-mailsplit
-bin/git-merge
[EMAIL PROTECTED] bin/git-merge-base
[EMAIL PROTECTED] bin/git-merge-file
[EMAIL PROTECTED] bin/git-merge-index
-bin/git-merge-octopus
-bin/git-merge-one-file
[EMAIL PROTECTED] bin/git-merge-ours
[EMAIL PROTECTED] bin/git-merge-recursive
-bin/git-merge-resolve
-bin/git-merge-stupid
[EMAIL PROTECTED] bin/git-merge-subtree
[EMAIL PROTECTED] bin/git-merge-tree
-bin/git-mergetool
[EMAIL PROTECTED] bin/git-mktag
[EMAIL PROTECTED] bin/git-mktree
[EMAIL PROTECTED] bin/git-mv
[EMAIL PROTECTED] bin/git-name-rev
[EMAIL PROTECTED] bin/git-pack-objects
[EMAIL PROTECTED] bin/git-pack-redundant
[EMAIL PROTECTED] bin/git-pack-refs
-bin/git-parse-remote
[EMAIL PROTECTED] bin/git-patch-id
[EMAIL PROTECTED] bin/git-peek-remote
[EMAIL PROTECTED] bin/git-prune
[EMAIL PROTECTED] bin/git-prune-packed
-bin/git-pull
[EMAIL PROTECTED] bin/git-push
-bin/git-quiltimport
[EMAIL PROTECTED] bin/git-read-tree
-bin/git-rebase
-bin/git-rebase--interactive
@bin bin/git-receive-pack
[EMAIL PROTECTED] bin/git-reflog
-bin/git-relink
[EMAIL PROTECTED] bin/git-remote
-bin/git-repack
[EMAIL PROTECTED] bin/git-repo-config
-bin/git-request-pull
[EMAIL PROTECTED] bin/git-rerere
[EMAIL PROTECTED] bin/git-reset
[EMAIL PROTECTED] bin/git-rev-list
[EMAIL PROTECTED] bin/git-rev-parse
[EMAIL PROTECTED] bin/git-revert
[EMAIL PROTECTED] bin/git-rm
-bin/git-send-email
[EMAIL PROTECTED] bin/git-send-pack
-bin/git-sh-setup
[EMAIL PROTECTED] bin/git-shell
[EMAIL PROTECTED] bin/git-shortlog
[EMAIL PROTECTED] bin/git-show
[EMAIL PROTECTED] bin/git-show-branch
[EMAIL PROTECTED] bin/git-show-index
[EMAIL PROTECTED] bin/git-show-ref
-bin/git-stash
[EMAIL PROTECTED] bin/git-status
[EMAIL PROTECTED] bin/git-stripspace
-bin/git-submodule
[EMAIL PROTECTED] bin/git-symbolic-ref
[EMAIL PROTECTED] bin/git-tag
[EMAIL PROTECTED] bin/git-tar-tree
[EMAIL PROTECTED] bin/git-unpack-file
[EMAIL PROTECTED] bin/git-unpack-objects
[EMAIL PROTECTED] bin/git-update-index
[EMAIL PROTECTED] bin/git-update-ref
[EMAIL PROTECTED] bin/git-update-server-info
@bin bin/git-upload-archive
@bin bin/git-upload-pack
[EMAIL PROTECTED] bin/git-var
[EMAIL PROTECTED] bin/git-verify-pack
[EMAIL PROTECTED] bin/git-verify-tag
-bin/git-web--browse
[EMAIL PROTECTED] bin/git-whatchanged
[EMAIL PROTECTED] bin/git-write-tree
lib/libgit.a
libdata/perl5/site_perl/Git.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
+libexec/git/
[EMAIL PROTECTED] libexec/git/git-add
+libexec/git/git-add--interactive
+libexec/git/git-am
[EMAIL PROTECTED] libexec/git/git-annotate
[EMAIL PROTECTED] libexec/git/git-apply
+libexec/git/git-archimport
[EMAIL PROTECTED] libexec/git/git-archive
+libexec/git/git-bisect
[EMAIL PROTECTED] libexec/git/git-blame
[EMAIL PROTECTED] libexec/git/git-branch
[EMAIL PROTECTED] libexec/git/git-bundle
[EMAIL PROTECTED] libexec/git/git-cat-file
[EMAIL PROTECTED] libexec/git/git-check-attr
[EMAIL PROTECTED] libexec/git/git-check-ref-format
[EMAIL PROTECTED] libexec/git/git-checkout
[EMAIL PROTECTED] libexec/git/git-checkout-index
[EMAIL PROTECTED] libexec/git/git-cherry
[EMAIL PROTECTED] libexec/git/git-cherry-pick
[EMAIL PROTECTED] libexec/git/git-clean
[EMAIL PROTECTED] libexec/git/git-clone
[EMAIL PROTECTED] libexec/git/git-commit
[EMAIL PROTECTED] libexec/git/git-commit-tree
[EMAIL PROTECTED] libexec/git/git-config
[EMAIL PROTECTED] libexec/git/git-count-objects
+libexec/git/git-cvsexportcommit
+libexec/git/git-cvsimport
+libexec/git/git-cvsserver
[EMAIL PROTECTED] libexec/git/git-daemon
[EMAIL PROTECTED] libexec/git/git-describe
[EMAIL PROTECTED] libexec/git/git-diff
[EMAIL PROTECTED] libexec/git/git-diff-files
[EMAIL PROTECTED] libexec/git/git-diff-index
[EMAIL PROTECTED] libexec/git/git-diff-tree
[EMAIL PROTECTED] libexec/git/git-fast-export
[EMAIL PROTECTED] libexec/git/git-fast-import
[EMAIL PROTECTED] libexec/git/git-fetch
[EMAIL PROTECTED] libexec/git/git-fetch--tool
[EMAIL PROTECTED] libexec/git/git-fetch-pack
+libexec/git/git-filter-branch
[EMAIL PROTECTED] libexec/git/git-fmt-merge-msg
[EMAIL PROTECTED] libexec/git/git-for-each-ref
[EMAIL PROTECTED] libexec/git/git-format-patch
[EMAIL PROTECTED] libexec/git/git-fsck
[EMAIL PROTECTED] libexec/git/git-fsck-objects
[EMAIL PROTECTED] libexec/git/git-gc
[EMAIL PROTECTED] libexec/git/git-get-tar-commit-id
[EMAIL PROTECTED] libexec/git/git-grep
[EMAIL PROTECTED] libexec/git/git-hash-object
[EMAIL PROTECTED] libexec/git/git-http-fetch
[EMAIL PROTECTED] libexec/git/git-http-push
[EMAIL PROTECTED] libexec/git/git-imap-send
[EMAIL PROTECTED] libexec/git/git-index-pack
[EMAIL PROTECTED] libexec/git/git-init
[EMAIL PROTECTED] libexec/git/git-init-db
+libexec/git/git-instaweb
[EMAIL PROTECTED] libexec/git/git-log
+libexec/git/git-lost-found
[EMAIL PROTECTED] libexec/git/git-ls-files
[EMAIL PROTECTED] libexec/git/git-ls-remote
[EMAIL PROTECTED] libexec/git/git-ls-tree
[EMAIL PROTECTED] libexec/git/git-mailinfo
[EMAIL PROTECTED] libexec/git/git-mailsplit
[EMAIL PROTECTED] libexec/git/git-merge
[EMAIL PROTECTED] libexec/git/git-merge-base
[EMAIL PROTECTED] libexec/git/git-merge-file
[EMAIL PROTECTED] libexec/git/git-merge-index
+libexec/git/git-merge-octopus
+libexec/git/git-merge-one-file
[EMAIL PROTECTED] libexec/git/git-merge-ours
[EMAIL PROTECTED] libexec/git/git-merge-recursive
+libexec/git/git-merge-resolve
[EMAIL PROTECTED] libexec/git/git-merge-subtree
[EMAIL PROTECTED] libexec/git/git-merge-tree
+libexec/git/git-mergetool
[EMAIL PROTECTED] libexec/git/git-mktag
[EMAIL PROTECTED] libexec/git/git-mktree
[EMAIL PROTECTED] libexec/git/git-mv
[EMAIL PROTECTED] libexec/git/git-name-rev
[EMAIL PROTECTED] libexec/git/git-pack-objects
[EMAIL PROTECTED] libexec/git/git-pack-redundant
[EMAIL PROTECTED] libexec/git/git-pack-refs
+libexec/git/git-parse-remote
[EMAIL PROTECTED] libexec/git/git-patch-id
[EMAIL PROTECTED] libexec/git/git-peek-remote
[EMAIL PROTECTED] libexec/git/git-prune
[EMAIL PROTECTED] libexec/git/git-prune-packed
+libexec/git/git-pull
[EMAIL PROTECTED] libexec/git/git-push
+libexec/git/git-quiltimport
[EMAIL PROTECTED] libexec/git/git-read-tree
+libexec/git/git-rebase
+libexec/git/git-rebase--interactive
[EMAIL PROTECTED] libexec/git/git-receive-pack
[EMAIL PROTECTED] libexec/git/git-reflog
+libexec/git/git-relink
[EMAIL PROTECTED] libexec/git/git-remote
+libexec/git/git-repack
[EMAIL PROTECTED] libexec/git/git-repo-config
+libexec/git/git-request-pull
[EMAIL PROTECTED] libexec/git/git-rerere
[EMAIL PROTECTED] libexec/git/git-reset
[EMAIL PROTECTED] libexec/git/git-rev-list
[EMAIL PROTECTED] libexec/git/git-rev-parse
[EMAIL PROTECTED] libexec/git/git-revert
[EMAIL PROTECTED] libexec/git/git-rm
+libexec/git/git-send-email
[EMAIL PROTECTED] libexec/git/git-send-pack
+libexec/git/git-sh-setup
[EMAIL PROTECTED] libexec/git/git-shell
[EMAIL PROTECTED] libexec/git/git-shortlog
[EMAIL PROTECTED] libexec/git/git-show
[EMAIL PROTECTED] libexec/git/git-show-branch
[EMAIL PROTECTED] libexec/git/git-show-index
[EMAIL PROTECTED] libexec/git/git-show-ref
+libexec/git/git-stash
[EMAIL PROTECTED] libexec/git/git-status
[EMAIL PROTECTED] libexec/git/git-stripspace
+libexec/git/git-submodule
[EMAIL PROTECTED] libexec/git/git-symbolic-ref
[EMAIL PROTECTED] libexec/git/git-tag
[EMAIL PROTECTED] libexec/git/git-tar-tree
[EMAIL PROTECTED] libexec/git/git-unpack-file
[EMAIL PROTECTED] libexec/git/git-unpack-objects
[EMAIL PROTECTED] libexec/git/git-update-index
[EMAIL PROTECTED] libexec/git/git-update-ref
[EMAIL PROTECTED] libexec/git/git-update-server-info
[EMAIL PROTECTED] libexec/git/git-upload-archive
[EMAIL PROTECTED] libexec/git/git-upload-pack
[EMAIL PROTECTED] libexec/git/git-var
[EMAIL PROTECTED] libexec/git/git-verify-pack
[EMAIL PROTECTED] libexec/git/git-verify-tag
+libexec/git/git-web--browse
[EMAIL PROTECTED] libexec/git/git-whatchanged
[EMAIL PROTECTED] 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,9 @@ 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.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
@@ -670,16 +675,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
Index: pkg/PLIST-svn
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/pkg/PLIST-svn,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-svn
--- pkg/PLIST-svn 8 Feb 2008 17:56:01 -0000 1.2
+++ pkg/PLIST-svn 25 Aug 2008 08:04:01 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-svn,v 1.2 2008/02/08 17:56:01 bernd Exp $
-bin/git-svn
+libexec/git/git-svn
@man man/man1/git-svn.1
Index: pkg/PLIST-x11
===================================================================
RCS file: /home/OpenBSD/cvs/ports/devel/git/pkg/PLIST-x11,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-x11
--- pkg/PLIST-x11 24 Jun 2008 20:28:01 -0000 1.3
+++ pkg/PLIST-x11 25 Aug 2008 08:04:52 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-x11,v 1.3 2008/06/24 20:28:01 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
