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

Update to git-1.7.0.4.

Browse Source 
Based on a diff by Daniel Dickman. Thanks!
This commit is contained in:
bernd 2010-04-02 16:08:09 +00:00
parent a941ac7fd4
commit bee120fd75
11 changed files with 101 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/git/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.64 2009/12/17 10:15:12 bernd Exp $
# $OpenBSD: Makefile,v 1.65 2010/04/02 16:08:09 bernd Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 1.6.5.7
V = 1.7.0.4
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@ -63,17 +63,22 @@ PKG_ARCH-x11 = *
MAKE_ENV = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
SYSCONFDIR=${SYSCONFDIR} \
TCLTK_PATH=${MODTK_BIN} \
TCL_PATH=${MODTCL_BIN}
TCL_PATH=${MODTCL_BIN} \
REGRESS_SHELL=${LOCALBASE}/bin/bash
USE_GMAKE = Yes
REGRESS_DEPENDS = :zip-*:archivers/zip \
:cvsps-*:devel/cvsps \
::devel/subversion,-perl
::devel/subversion,-perl \
::shells/bash
GITWEB = README INSTALL git-favicon.png git-logo.png \
gitweb.cgi gitweb.css
# Skipt tests I have to fix.
SKIP_TESTS = t9502-gitweb-standalone-parse-output.sh
post-extract:
@mkdir -p ${WRKSRC}/doc
.for distfile in ${DOC_DISTFILES}
@ -104,6 +109,7 @@ post-install:
${INSTALL_DATA} ${GITWEB} ${PREFIX}/share/gitweb
do-regress:
cd ${WRKSRC}/t && rm -f ${SKIP_TESTS}
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
HOME=${WRKDIST}/t/trash TAR=${TAR} test

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.6.5.7.tar.gz) = +MM8qDx6gH3QFaKjRC4aYA==
MD5 (git-htmldocs-1.6.5.7.tar.gz) = 0vXWuwgKaL2uX2ZWxk65lA==
MD5 (git-manpages-1.6.5.7.tar.gz) = M/CwiuNfyvxH3CmCin6FuQ==
RMD160 (git-1.6.5.7.tar.gz) = p/Jc7otooXMvpr7aNuhOkSd2pDw=
RMD160 (git-htmldocs-1.6.5.7.tar.gz) = iwfbOOCOII9y5CBgtfKn36EPKYc=
RMD160 (git-manpages-1.6.5.7.tar.gz) = gwZ10Mz+lQ6zwelN5aMm/VwtdGo=
SHA1 (git-1.6.5.7.tar.gz) = 4XL86xYdI4rXd/VTT05G7A3SLVQ=
SHA1 (git-htmldocs-1.6.5.7.tar.gz) = RyXynmgTQDhWwupfBTJr6GP5zOI=
SHA1 (git-manpages-1.6.5.7.tar.gz) = +3ggyn3yKSlKSgxXkA05v79R23M=
SHA256 (git-1.6.5.7.tar.gz) = qfVCRspsUorD962+fNFkl2dZ9GNkZ0dUqoePdNx/h7E=
SHA256 (git-htmldocs-1.6.5.7.tar.gz) = 0djPkkp4onnYVZkI+x61rNS9ca4XzgEsSz3fFdD981o=
SHA256 (git-manpages-1.6.5.7.tar.gz) = bDu8aTLO2q38BwWNcEVtc+q2qINWj0gOBbyWKBaiDjo=
SIZE (git-1.6.5.7.tar.gz) = 2714029
SIZE (git-htmldocs-1.6.5.7.tar.gz) = 1093867
SIZE (git-manpages-1.6.5.7.tar.gz) = 369020
MD5 (git-1.7.0.4.tar.gz) = Vc324eTkWRaqyL/cQbpNwQ==
MD5 (git-htmldocs-1.7.0.4.tar.gz) = KfXOanAeeooXAXv+pbqegQ==
MD5 (git-manpages-1.7.0.4.tar.gz) = OH5gKMLKJMn6qn838ovrDw==
RMD160 (git-1.7.0.4.tar.gz) = A8DQC/b5zf3L5shXjKGRs72Oa5s=
RMD160 (git-htmldocs-1.7.0.4.tar.gz) = PcL0xHcOFM6JlYn69bs0WIIQroo=
RMD160 (git-manpages-1.7.0.4.tar.gz) = jqUJL+HRK+brbuY57q95qWGZ26o=
SHA1 (git-1.7.0.4.tar.gz) = cVwJm5l3w1kQRGUSEQHVHFt0K80=
SHA1 (git-htmldocs-1.7.0.4.tar.gz) = xmvDfQFANM5lICbvXJEo8v+viDQ=
SHA1 (git-manpages-1.7.0.4.tar.gz) = Kc1gfuXdvPeRk5U8324AsKxJGF0=
SHA256 (git-1.7.0.4.tar.gz) = 0zIIRrOrBV+h6e+kbgfGAJeGzcuuNcmtbHoJh7PrxWw=
SHA256 (git-htmldocs-1.7.0.4.tar.gz) = lIKOROtS7CoulFTWvfq81cJxn7jkuV4RqzWeni0Mf9I=
SHA256 (git-manpages-1.7.0.4.tar.gz) = clIJOLp+F9qIxxmqcAezjIKlXLSJiGoP0MwVfQHRQ8U=
SIZE (git-1.7.0.4.tar.gz) = 2950516
SIZE (git-htmldocs-1.7.0.4.tar.gz) = 1193502
SIZE (git-manpages-1.7.0.4.tar.gz) = 388913

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

@ -1,6 +1,6 @@
--- Makefile.orig Sun Dec 6 04:51:25 2009
+++ Makefile Sun Dec 6 10:39:37 2009
@@ -218,7 +218,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
--- Makefile.orig Thu Apr 1 06:29:23 2010
+++ Makefile Fri Apr 2 11:36:32 2010
@@ -234,7 +234,7 @@ endif
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -9,7 +9,7 @@
LDFLAGS =
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -236,22 +236,16 @@ STRIP ?= strip
@@ -252,22 +252,16 @@ 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.
@ -36,7 +36,7 @@
lib = lib
# DESTDIR=
pathsep = :
@@ -276,16 +270,16 @@ GITWEB_SITE_FOOTER =
@@ -277,16 +271,16 @@ JSMIN =
export prefix bindir sharedir sysconfdir
@ -57,7 +57,7 @@
export TCL_PATH TCLTK_PATH
@@ -806,13 +800,12 @@ ifeq ($(uname_S),FreeBSD)
@@ -833,12 +827,13 @@ ifeq ($(uname_S),FreeBSD)
endif
endif
ifeq ($(uname_S),OpenBSD)
@ -67,15 +67,15 @@
NEEDS_LIBICONV = YesPlease
- BASIC_CFLAGS += -I/usr/local/include
- BASIC_LDFLAGS += -L/usr/local/lib
- THREADED_DELTA_SEARCH = YesPlease
+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
+ NO_PTHREADS = YesPlease
+ NO_PYTHON = YesPlease
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -1082,7 +1075,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAMS += git-imap-send$X
@@ -1110,7 +1105,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAMS += git-daemon$X
endif
ifndef NO_OPENSSL
- OPENSSL_LIBSSL = -lssl
@ -83,7 +83,7 @@
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -1671,7 +1664,7 @@ all:: $(TEST_PROGRAMS)
@@ -1753,7 +1748,7 @@ bin-wrappers/%: wrap-for-bin.sh
export NO_SVN_TESTS

16
devel/git/patches/patch-builtin-help_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-builtin-help_c,v 1.5 2009/11/17 16:29:42 bernd Exp $
$OpenBSD: patch-builtin-help_c,v 1.6 2010/04/02 16:08:09 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- builtin-help.c.orig Mon Nov 16 23:14:46 2009
+++ builtin-help.c Tue Nov 17 14:31:50 2009
@@ -119,7 +119,7 @@ static void exec_woman_emacs(const char *path, const c
--- builtin-help.c.orig Fri Feb 12 19:44:43 2010
+++ builtin-help.c Mon Mar 1 19:57:35 2010
@@ -120,7 +120,7 @@ static void exec_woman_emacs(const char *path, const c
if (!path)
path = "emacsclient";
strbuf_addf(&man_page, "(woman \"%s\")", page);
@ -13,7 +13,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
}
@@ -147,7 +147,7 @@ static void exec_man_konqueror(const char *path, const
@@ -148,7 +148,7 @@ static void exec_man_konqueror(const char *path, const
} else
path = "kfmclient";
strbuf_addf(&man_page, "man:%s(1)", page);
@ -22,7 +22,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
}
@@ -156,7 +156,7 @@ static void exec_man_man(const char *path, const char
@@ -157,7 +157,7 @@ static void exec_man_man(const char *path, const char
{
if (!path)
path = "man";
@ -31,7 +31,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
@@ -164,7 +164,7 @@ static void exec_man_cmd(const char *cmd, const char *
@@ -165,7 +165,7 @@ static void exec_man_cmd(const char *cmd, const char *
{
struct strbuf shell_cmd = STRBUF_INIT;
strbuf_addf(&shell_cmd, "%s %s", cmd, page);
@ -40,7 +40,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", cmd, strerror(errno));
}
@@ -371,7 +371,7 @@ static void show_info_page(const char *git_cmd)
@@ -372,7 +372,7 @@ static void show_info_page(const char *git_cmd)
{
const char *page = cmd_to_page(git_cmd);
setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);

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

@ -1,14 +0,0 @@
$OpenBSD: patch-git-gui_git-gui_sh,v 1.7 2009/05/18 19:23:58 bernd Exp $
--- git-gui/git-gui.sh.orig Thu May 7 06:29:04 2009
+++ git-gui/git-gui.sh Fri May 8 09:52:09 2009
@@ -3456,7 +3456,9 @@ if {[winfo exists $ui_comm]} {
# in pipe mode to spellcheck the commit message.
#
set spell_cmd [list |]
- set spell_dict [get_config gui.spellingdictionary]
+ # Disable the spellchecker for now.
+ # There are issues with aspell-0.50.x.
+ set spell_dict none
lappend spell_cmd aspell
if {$spell_dict ne {}} {
lappend spell_cmd --master=$spell_dict

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

@ -1,10 +1,10 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.14 2009/11/17 16:29:42 bernd Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.15 2010/04/02 16:08:09 bernd Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Mon Nov 16 23:14:46 2009
+++ gitweb/gitweb.perl Tue Nov 17 14:30:56 2009
@@ -4952,7 +4952,7 @@ sub git_blob_plain {
--- gitweb/gitweb.perl.orig Thu Apr 1 06:29:23 2010
+++ gitweb/gitweb.perl Fri Apr 2 11:36:32 2010
@@ -5283,7 +5283,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@ -13,7 +13,7 @@ This prevents the following error: '-T and -B not implemented on filehandles'
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
@@ -5005,7 +5005,7 @@ sub git_blob {
@@ -5336,7 +5336,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');

32
devel/git/patches/patch-imap-send_c
View File

@ -1,24 +1,12 @@
$OpenBSD: patch-imap-send_c,v 1.6 2009/11/17 16:29:42 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- imap-send.c.orig Mon Nov 16 23:14:46 2009
+++ imap-send.c Tue Nov 17 14:30:56 2009
@@ -502,7 +502,7 @@ static void arc4_init(void)
int i, fd;
unsigned char j, si, dat[128];
$OpenBSD: patch-imap-send_c,v 1.7 2010/04/02 16:08:09 bernd Exp $
--- imap-send.c.orig Sun Mar 7 17:13:40 2010
+++ imap-send.c Sun Mar 7 19:49:44 2010
@@ -964,7 +964,7 @@ static struct store *imap_open_store(struct imap_serve
/* open connection to IMAP server */
- if ((fd = open("/dev/urandom", O_RDONLY)) < 0 && (fd = open("/dev/random", O_RDONLY)) < 0) {
+ if ((fd = open("/dev/arandom", O_RDONLY)) < 0 && (fd = open("/dev/random", O_RDONLY)) < 0) {
fprintf(stderr, "Fatal: no random number source available.\n");
exit(3);
}
@@ -1013,7 +1013,7 @@ static struct store *imap_open_store(struct imap_serve
_exit(127);
close(a[0]);
close(a[1]);
- execl("/bin/sh", "sh", "-c", srvc->tunnel, NULL);
+ execl("/bin/sh", "sh", "-c", srvc->tunnel, (void *)NULL);
_exit(127);
}
if (srvc->tunnel) {
- const char *argv[] = { srvc->tunnel, NULL };
+ const char *argv[] = { srvc->tunnel, (void *)NULL };
struct child_process tunnel = {0};
imap_info("Starting tunnel '%s'... ", srvc->tunnel);

12
devel/git/patches/patch-t_Makefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-t_Makefile,v 1.1 2010/04/02 16:08:09 bernd Exp $
--- t/Makefile.orig Fri Apr 2 13:36:30 2010
+++ t/Makefile Fri Apr 2 13:36:40 2010
@@ -6,7 +6,7 @@
-include ../config.mak
#GIT_TEST_OPTS=--verbose --debug
-SHELL_PATH ?= $(SHELL)
+SHELL_PATH = $(REGRESS_SHELL)
TAR ?= $(TAR)
RM ?= rm -f

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

@ -1,111 +0,0 @@
$OpenBSD: patch-t_t4019-diff-wserror_sh,v 1.4 2009/11/17 16:29:42 bernd Exp $
--- t/t4019-diff-wserror.sh.orig Mon Nov 16 23:14:46 2009
+++ t/t4019-diff-wserror.sh Tue Nov 17 14:55:54 2009
@@ -23,8 +23,8 @@ blue_grep='7;34m' ;# ESC [ 7 ; 3 4 m
test_expect_success default '
git diff --color >output
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -38,8 +38,8 @@ test_expect_success 'without -trail' '
git config core.whitespace -trail
git diff --color >output
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -54,8 +54,8 @@ test_expect_success 'without -trail (attribute)' '
git config --unset core.whitespace
echo "F whitespace=-trail" >.gitattributes
git diff --color >output
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -70,8 +70,8 @@ test_expect_success 'without -space' '
rm -f .gitattributes
git config core.whitespace -space
git diff --color >output
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight normal >/dev/null &&
grep HT normal >/dev/null &&
@@ -86,8 +86,8 @@ test_expect_success 'without -space (attribute)' '
git config --unset core.whitespace
echo "F whitespace=-space" >.gitattributes
git diff --color >output
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight normal >/dev/null &&
grep HT normal >/dev/null &&
@@ -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
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight error >/dev/null &&
grep HT normal >/dev/null &&
@@ -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
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight error >/dev/null &&
grep HT normal >/dev/null &&
@@ -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
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -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
- grep "$blue_grep" output >error
- grep -v "$blue_grep" output >normal
+ grep -a "$blue_grep" output >error
+ grep -a -v "$blue_grep" output >normal
grep Eight normal >/dev/null &&
grep HT error >/dev/null &&
@@ -195,7 +195,7 @@ test_expect_success 'color new trailing blank lines' '
git add x &&
{ echo a; echo; echo; echo; echo c; echo; echo; echo; echo; } >x &&
git diff --color x >output &&
- cnt=$(grep "${blue_grep}" output | wc -l) &&
+ cnt=$(grep -a "${blue_grep}" output | wc -l) &&
test $cnt = 2
'

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.43 2009/12/17 10:15:12 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.44 2010/04/02 16:08:09 bernd Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -50,7 +50,6 @@ libexec/git/git-difftool--helper
@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
@ -63,6 +62,7 @@ libexec/git/git-filter-branch
@bin libexec/git/git-grep
@bin libexec/git/git-hash-object
@bin libexec/git/git-help
@bin libexec/git/git-http-backend
@bin libexec/git/git-http-fetch
@bin libexec/git/git-http-push
@bin libexec/git/git-imap-send
@ -94,6 +94,7 @@ libexec/git/git-mergetool--lib
@bin libexec/git/git-mktree
@bin libexec/git/git-mv
@bin libexec/git/git-name-rev
libexec/git/git-notes
@bin libexec/git/git-pack-objects
@bin libexec/git/git-pack-redundant
@bin libexec/git/git-pack-refs
@ -112,7 +113,10 @@ libexec/git/git-rebase--interactive
@bin libexec/git/git-reflog
libexec/git/git-relink
@bin libexec/git/git-remote
@bin libexec/git/git-remote-curl
@bin libexec/git/git-remote-ftp
@bin libexec/git/git-remote-ftps
@bin libexec/git/git-remote-http
@bin libexec/git/git-remote-https
libexec/git/git-repack
@bin libexec/git/git-replace
@bin libexec/git/git-repo-config
@ -201,6 +205,7 @@ libexec/git/git-web--browse
@man man/man1/git-grep.1
@man man/man1/git-hash-object.1
@man man/man1/git-help.1
@man man/man1/git-http-backend.1
@man man/man1/git-http-fetch.1
@man man/man1/git-http-push.1
@man man/man1/git-imap-send.1
@ -227,6 +232,7 @@ libexec/git/git-web--browse
@man man/man1/git-mktree.1
@man man/man1/git-mv.1
@man man/man1/git-name-rev.1
@man man/man1/git-notes.1
@man man/man1/git-pack-objects.1
@man man/man1/git-pack-redundant.1
@man man/man1/git-pack-refs.1
@ -388,7 +394,16 @@ share/doc/git/RelNotes-1.6.5.4.txt
share/doc/git/RelNotes-1.6.5.5.txt
share/doc/git/RelNotes-1.6.5.6.txt
share/doc/git/RelNotes-1.6.5.7.txt
share/doc/git/RelNotes-1.6.5.8.txt
share/doc/git/RelNotes-1.6.5.txt
share/doc/git/RelNotes-1.6.6.1.txt
share/doc/git/RelNotes-1.6.6.2.txt
share/doc/git/RelNotes-1.6.6.txt
share/doc/git/RelNotes-1.7.0.1.txt
share/doc/git/RelNotes-1.7.0.2.txt
share/doc/git/RelNotes-1.7.0.3.txt
share/doc/git/RelNotes-1.7.0.4.txt
share/doc/git/RelNotes-1.7.0.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
@ -400,6 +415,7 @@ share/doc/git/cmds-purehelpers.txt
share/doc/git/cmds-synchelpers.txt
share/doc/git/cmds-synchingrepositories.txt
share/doc/git/config.txt
share/doc/git/date-formats.txt
share/doc/git/diff-format.txt
share/doc/git/diff-generate-patch.txt
share/doc/git/diff-options.txt
@ -418,6 +434,8 @@ share/doc/git/git-archimport.html
share/doc/git/git-archimport.txt
share/doc/git/git-archive.html
share/doc/git/git-archive.txt
share/doc/git/git-bisect-lk2009.html
share/doc/git/git-bisect-lk2009.txt
share/doc/git/git-bisect.html
share/doc/git/git-bisect.txt
share/doc/git/git-blame.html
@ -502,6 +520,8 @@ share/doc/git/git-hash-object.html
share/doc/git/git-hash-object.txt
share/doc/git/git-help.html
share/doc/git/git-help.txt
share/doc/git/git-http-backend.html
share/doc/git/git-http-backend.txt
share/doc/git/git-http-fetch.html
share/doc/git/git-http-fetch.txt
share/doc/git/git-http-push.html
@ -554,6 +574,8 @@ share/doc/git/git-mv.html
share/doc/git/git-mv.txt
share/doc/git/git-name-rev.html
share/doc/git/git-name-rev.txt
share/doc/git/git-notes.html
share/doc/git/git-notes.txt
share/doc/git/git-pack-objects.html
share/doc/git/git-pack-objects.txt
share/doc/git/git-pack-redundant.html

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-x11,v 1.7 2009/11/19 21:38:48 bernd Exp $
@comment $OpenBSD: PLIST-x11,v 1.8 2010/04/02 16:08:09 bernd Exp $
@conflict git-<1.6.5.3p0
bin/gitk
libexec/git/git-citool
@ -42,6 +42,7 @@ share/git-gui/lib/merge.tcl
share/git-gui/lib/mergetool.tcl
share/git-gui/lib/msgs/
share/git-gui/lib/msgs/de.msg
share/git-gui/lib/msgs/el.msg
share/git-gui/lib/msgs/fr.msg
share/git-gui/lib/msgs/hu.msg
share/git-gui/lib/msgs/it.msg
@ -60,6 +61,7 @@ share/git-gui/lib/spellcheck.tcl
share/git-gui/lib/sshkey.tcl
share/git-gui/lib/status_bar.tcl
share/git-gui/lib/tclIndex
share/git-gui/lib/themed.tcl
share/git-gui/lib/tools.tcl
share/git-gui/lib/tools_dlg.tcl
share/git-gui/lib/transport.tcl
@ -70,6 +72,9 @@ share/gitk/lib/
share/gitk/lib/msgs/
share/gitk/lib/msgs/de.msg
share/gitk/lib/msgs/es.msg
share/gitk/lib/msgs/fr.msg
share/gitk/lib/msgs/hu.msg
share/gitk/lib/msgs/it.msg
share/gitk/lib/msgs/ja.msg
share/gitk/lib/msgs/ru.msg
share/gitk/lib/msgs/sv.msg