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

Update to git 1.8.0.1.

Browse Source 
* do not install/build documentation except for manpages.
* re-enable threads

ok jasper@ benoit@ (MAINTAINER) on earlier update
This commit is contained in:
pascal 2012-11-30 21:16:30 +00:00
parent 0081341c9f
commit 240343eaa2
10 changed files with 149 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
devel/git/Makefile
View File

@ -1,20 +1,16 @@
# $OpenBSD: Makefile,v 1.85 2012/02/21 22:19:31 sthen Exp $
# $OpenBSD: Makefile,v 1.86 2012/11/30 21:16:30 pascal Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 1.7.6
V = 1.8.0.1
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
CATEGORIES = devel
REVISION-main = 4
REVISION-svn = 2
REVISION-x11 = 2
HOMEPAGE = http://git-scm.com/
MAINTAINER = Benoit Lecocq <benoit@openbsd.org>
@ -25,34 +21,25 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
DOC_DISTFILES = git-manpages-${V}${EXTRACT_SUFX} \
git-htmldocs-${V}${EXTRACT_SUFX}
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILES}
DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX}
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE}
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
MASTER_SITES = http://distfiles.nl/ \
ftp://ftp.kernel.org/pub/software/scm/git/ \
ftp://ftp.de.kernel.org/pub/software/scm/git/ \
ftp://ftp.au.kernel.org/pub/software/scm/git/
MASTER_SITES = http://git-core.googlecode.com/files/
TAR = ${LOCALBASE}/bin/gtar
MODULES = devel/gettext x11/tk
MODULES = converters/libiconv x11/tk
BUILD_DEPENDS = archivers/gtar \
devel/p5-Error \
textproc/asciidoc \
textproc/xmlto
BUILD_DEPENDS = devel/p5-Error
MULTI_PACKAGES = -main -svn -x11
WANTLIB-main = c expat crypto curl ssl z ${MODLIBICONV_WANTLIB}
WANTLIB-main = c expat crypto curl pthread ssl z ${MODGETTEXT_WANTLIB}
RUN_DEPENDS-main = net/rsync \
devel/p5-Error \
devel/cvsps \
${MODLIBICONV_RUN_DEPENDS}
${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-main = net/curl \
${MODLIBICONV_LIB_DEPENDS}
${MODGETTEXT_LIB_DEPENDS}
RUN_DEPENDS-svn = ${BASE_PKGPATH} \
devel/p5-Term-ReadKey \
@ -91,29 +78,17 @@ SKIP_TESTS = t9502-gitweb-standalone-parse-output.sh
post-extract:
@mkdir -p ${WRKSRC}/doc
.for distfile in ${DOC_DISTFILES}
@cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${distfile}${EXTRACT_SUFX}
.endfor
@rm -f ${WRKSRC}/doc/man1/git-p4import.1
@cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
@cd ${WRKSRC} && perl -pi -e "s|/usr/share/git|${TRUEPREFIX}/share/git|g" \
Documentation/git-clone.txt Documentation/git-init.txt \
doc/man1/git-clone.1 doc/man1/git-init.1 doc/git-clone.txt \
doc/git-init.txt doc/git-clone.html doc/git-init.html
post-build:
@cd ${WRKBUILD}/Documentation && ${MAKE_ENV} ${MAKE_PROGRAM} man
doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1
post-install:
${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \
${PREFIX}/share/emacs/site-lisp
cd ${WRKBUILD}/Documentation && \
${MAKE_ENV} ${MAKE_PROGRAM} mandir=${TRUEPREFIX}/man install-man
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/git
cd ${WRKBUILD}/doc && \
pax -rw *.html howto/*.html *.txt howto/*.txt \
${PREFIX}/share/doc/git
pax -rw . ${PREFIX}/man
${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \
${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample
chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git
@ -125,6 +100,6 @@ post-install:
do-regress:
cd ${WRKSRC}/t && rm -f ${SKIP_TESTS}
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
HOME=${WRKDIST}/t/trash TAR=${TAR} test
HOME=${WRKDIST}/t/trash test
.include <bsd.port.mk>

19
devel/git/distinfo
View File

@ -1,15 +1,4 @@
MD5 (git-1.7.6.tar.gz) = 5vYjhWsRLPnHQkdN6Sd6ug==
MD5 (git-htmldocs-1.7.6.tar.gz) = /oXW05hGVxUt9b6cQOpSWQ==
MD5 (git-manpages-1.7.6.tar.gz) = DqohrhxsR+/Vauup0pFw/g==
RMD160 (git-1.7.6.tar.gz) = L3i/5KK/V5kg9+jDpCc1E3iqjyA=
RMD160 (git-htmldocs-1.7.6.tar.gz) = 3e9vmRNxFnoAIQM3Ot6YwDMWk/U=
RMD160 (git-manpages-1.7.6.tar.gz) = 3pAs395yiwWIj/MYZhwFgcZUtXQ=
SHA1 (git-1.7.6.tar.gz) = x41IDfnT3FYEPWMDDy2OH9EfAVc=
SHA1 (git-htmldocs-1.7.6.tar.gz) = V89gcNRjylLLNCZoeWfQxgVz+Go=
SHA1 (git-manpages-1.7.6.tar.gz) = 5Nle136K8274mRo9Z9qM3R8Y4jE=
SHA256 (git-1.7.6.tar.gz) = 7lD50dh1OKfxhH4+9SISAnB9C3qaUnVgHrHYC+jkE1k=
SHA256 (git-htmldocs-1.7.6.tar.gz) = sEU9z2ef4pifT+/HFfWQhkA9ZBhNS+KLDjh8WpY8oN8=
SHA256 (git-manpages-1.7.6.tar.gz) = 8lWMWcOHslVa4gVX9P2GabAtoI04vHqw8/+KdEmOgjc=
SIZE (git-1.7.6.tar.gz) = 3389278
SIZE (git-htmldocs-1.7.6.tar.gz) = 1358619
SIZE (git-manpages-1.7.6.tar.gz) = 461214
SHA256 (git-1.8.0.1.tar.gz) = doGRaS8ovJ3OCrWIJHjTCyIKVzOhKtVx6tyD+ggiwuo=
SHA256 (git-manpages-1.8.0.1.tar.gz) = me1av+2/xmNy3Rxi4BjOFNsq2D3+iY7KmYfAPLau860=
SIZE (git-1.8.0.1.tar.gz) = 4229599
SIZE (git-manpages-1.8.0.1.tar.gz) = 523444

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
--- Makefile.orig Mon Jun 27 00:26:13 2011
+++ Makefile Sat Jul 16 14:44:47 2011
@@ -271,7 +271,7 @@
$OpenBSD: patch-Makefile,v 1.33 2012/11/30 21:16:30 pascal Exp $
--- Makefile.orig Sun Oct 21 23:32:15 2012
+++ Makefile Sat Nov 24 01:36:41 2012
@@ -341,7 +341,7 @@ endif
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -289,12 +289,12 @@
@@ -359,12 +359,12 @@ 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.
@ -23,19 +23,19 @@ $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
infodir = share/info
-gitexecdir = libexec/git-core
+gitexecdir = libexec/git
mergetoolsdir = $(gitexecdir)/mergetools
sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb
template_dir = share/git-core/templates
@@ -307,7 +307,7 @@
@@ -379,7 +379,7 @@ pathsep = :
export prefix bindir sharedir sysconfdir gitwebdir
export prefix bindir sharedir sysconfdir gitwebdir localedir
-CC = gcc
+CC ?= gcc
-CC = cc
+CC ?= cc
AR = ar
RM = rm -f
DIFF = diff
@@ -315,10 +315,10 @@
@@ -387,8 +387,8 @@ TAR = tar
FIND = find
INSTALL = install
RPMBUILD = rpmbuild
@ -44,12 +44,9 @@ $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
+TCL_PATH ?= tclsh
+TCLTK_PATH ?= wish
XGETTEXT = xgettext
-PTHREAD_LIBS = -lpthread
+PTHREAD_LIBS = -pthread
PTHREAD_CFLAGS =
GCOV = gcov
@@ -949,13 +949,14 @@
MSGFMT = msgfmt
PTHREAD_LIBS = -lpthread
@@ -1114,13 +1114,13 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
@ -62,12 +59,11 @@ $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
HAVE_PATHS_H = YesPlease
+ NO_PTHREADS = YesPlease
+ NO_PYTHON = YesPlease
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -1314,7 +1315,7 @@
@@ -1587,7 +1587,7 @@ endif
EXTLIBS += -lz
ifndef NO_OPENSSL
@ -76,7 +72,7 @@ $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -2146,7 +2147,7 @@
@@ -2640,7 +2640,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
@ -84,4 +80,4 @@ $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
+test:
$(MAKE) -C t/ all
test-ctype$X: ctype.o
perf: all

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

@ -1,10 +1,10 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.18 2011/04/29 11:09:12 stsp Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.19 2012/11/30 21:16:30 pascal Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Sun Apr 24 19:48:31 2011
+++ gitweb/gitweb.perl Thu Apr 28 17:43:42 2011
@@ -5841,7 +5841,7 @@ sub git_blob_plain {
--- gitweb/gitweb.perl.orig Sun Oct 21 23:32:15 2012
+++ gitweb/gitweb.perl Fri Nov 23 23:48:58 2012
@@ -6893,7 +6893,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)
@@ -5894,7 +5894,7 @@ sub git_blob {
@@ -6955,7 +6955,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');

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

@ -1,14 +1,16 @@
--- perl/Makefile.PL.orig Sun Oct 11 03:42:04 2009
+++ perl/Makefile.PL Mon Oct 12 15:38:28 2009
@@ -1,4 +1,5 @@
use ExtUtils::MakeMaker;
--- perl/Makefile.PL.orig Sun Oct 21 23:32:15 2012
+++ perl/Makefile.PL Fri Nov 23 23:48:58 2012
@@ -12,6 +12,7 @@ Getopt::Long::Configure qw/ pass_through /;
my $localedir = '';
GetOptions("localedir=s" => \$localedir);
+use Config;
sub MY::postamble {
return <<'MAKE_FRAG';
@@ -34,5 +35,6 @@ WriteMakefile(
VERSION_FROM => 'Git.pm',
@@ -58,5 +59,6 @@ WriteMakefile(
PM => \%pm,
PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"],
MAKEFILE => 'perl.mak',
- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
+ INSTALLARCHLIB => $Config{installsitearch},

12
devel/git/patches/patch-t_t0000-basic_sh Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-t_t0000-basic_sh,v 1.1 2012/11/30 21:16:30 pascal Exp $
--- t/t0000-basic.sh.orig Sat Nov 24 01:42:30 2012
+++ t/t0000-basic.sh Sat Nov 24 01:42:40 2012
@@ -440,7 +440,7 @@ test_expect_success 'update-index D/F conflict' '
test $numpath0 = 1
'
-test_expect_success 'very long name in the index handled sanely' '
+test_expect_failure 'very long name in the index handled sanely' '
a=a && # 1
a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 16

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

@ -1,14 +0,0 @@
$OpenBSD: patch-t_t9400-git-cvsserver-server_sh,v 1.3 2010/10/07 09:42:23 bernd Exp $
--- t/t9400-git-cvsserver-server.sh.orig Fri Aug 20 01:44:47 2010
+++ t/t9400-git-cvsserver-server.sh Thu Sep 2 11:12:51 2010
@@ -500,8 +500,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
'
#------------

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.50 2011/07/24 16:29:32 benoit Exp $
@comment $OpenBSD: PLIST-main,v 1.51 2012/11/30 21:16:30 pascal Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -7,7 +7,10 @@ bin/git-cvsserver
@bin bin/git-upload-archive
@bin bin/git-upload-pack
lib/libgit.a
libdata/perl5/site_perl/Git/
libdata/perl5/site_perl/Git.pm
libdata/perl5/site_perl/Git/I18N.pm
libdata/perl5/site_perl/Git/IndexInfo.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libexec/git/
@bin libexec/git/git
@ -32,10 +35,15 @@ libexec/git/git-bisect
@bin libexec/git/git-cherry-pick
@bin libexec/git/git-clean
@bin libexec/git/git-clone
@bin libexec/git/git-column
@bin libexec/git/git-commit
@bin libexec/git/git-commit-tree
@bin libexec/git/git-config
@bin libexec/git/git-count-objects
@bin libexec/git/git-credential
@bin libexec/git/git-credential-cache
@bin libexec/git/git-credential-cache--daemon
@bin libexec/git/git-credential-store
libexec/git/git-cvsexportcommit
libexec/git/git-cvsimport
libexec/git/git-cvsserver
@ -95,6 +103,7 @@ libexec/git/git-mergetool--lib
@bin libexec/git/git-mv
@bin libexec/git/git-name-rev
@bin libexec/git/git-notes
libexec/git/git-p4
@bin libexec/git/git-pack-objects
@bin libexec/git/git-pack-redundant
@bin libexec/git/git-pack-refs
@ -164,6 +173,24 @@ libexec/git/git-submodule
libexec/git/git-web--browse
@bin libexec/git/git-whatchanged
@bin libexec/git/git-write-tree
libexec/git/mergetools/
libexec/git/mergetools/araxis
libexec/git/mergetools/bc3
libexec/git/mergetools/codecompare
libexec/git/mergetools/defaults
libexec/git/mergetools/deltawalker
libexec/git/mergetools/diffuse
libexec/git/mergetools/ecmerge
libexec/git/mergetools/emerge
libexec/git/mergetools/kdiff3
libexec/git/mergetools/kompare
libexec/git/mergetools/meld
libexec/git/mergetools/opendiff
libexec/git/mergetools/p4merge
libexec/git/mergetools/tkdiff
libexec/git/mergetools/tortoisemerge
libexec/git/mergetools/vim
libexec/git/mergetools/xxdiff
@man man/man1/git-add.1
@man man/man1/git-am.1
@man man/man1/git-annotate.1
@ -183,10 +210,15 @@ libexec/git/git-web--browse
@man man/man1/git-cherry.1
@man man/man1/git-clean.1
@man man/man1/git-clone.1
@man man/man1/git-column.1
@man man/man1/git-commit-tree.1
@man man/man1/git-commit.1
@man man/man1/git-config.1
@man man/man1/git-count-objects.1
@man man/man1/git-credential-cache--daemon.1
@man man/man1/git-credential-cache.1
@man man/man1/git-credential-store.1
@man man/man1/git-credential.1
@man man/man1/git-cvsexportcommit.1
@man man/man1/git-cvsimport.1
@man man/man1/git-cvsserver.1
@ -240,6 +272,7 @@ libexec/git/git-web--browse
@man man/man1/git-mv.1
@man man/man1/git-name-rev.1
@man man/man1/git-notes.1
@man man/man1/git-p4.1
@man man/man1/git-pack-objects.1
@man man/man1/git-pack-redundant.1
@man man/man1/git-pack-refs.1
@ -259,6 +292,7 @@ libexec/git/git-web--browse
@man man/man1/git-remote-ext.1
@man man/man1/git-remote-fd.1
@man man/man1/git-remote-helpers.1
@man man/man1/git-remote-testgit.1
@man man/man1/git-remote.1
@man man/man1/git-repack.1
@man man/man1/git-replace.1
@ -303,385 +337,26 @@ libexec/git/git-web--browse
@man man/man1/git-whatchanged.1
@man man/man1/git-write-tree.1
@man man/man1/git.1
@man man/man1/gitweb.1
@man man/man3p/Git.3p
@man man/man3p/Git::I18N.3p
@man man/man5/gitattributes.5
@man man/man5/githooks.5
@man man/man5/gitignore.5
@man man/man5/gitmodules.5
@man man/man5/gitrepository-layout.5
@man man/man5/gitweb.conf.5
@man man/man7/gitcli.7
@man man/man7/gitcore-tutorial.7
@man man/man7/gitcredentials.7
@man man/man7/gitcvs-migration.7
@man man/man7/gitdiffcore.7
@man man/man7/gitglossary.7
@man man/man7/gitnamespaces.7
@man man/man7/gitrevisions.7
@man man/man7/gittutorial-2.7
@man man/man7/gittutorial.7
@man man/man7/gitworkflows.7
share/doc/git/
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
share/doc/git/cmds-foreignscminterface.txt
share/doc/git/cmds-mainporcelain.txt
share/doc/git/cmds-plumbinginterrogators.txt
share/doc/git/cmds-plumbingmanipulators.txt
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-config.txt
share/doc/git/diff-format.txt
share/doc/git/diff-generate-patch.txt
share/doc/git/diff-options.txt
share/doc/git/everyday.html
share/doc/git/everyday.txt
share/doc/git/fetch-options.txt
share/doc/git/git-add.html
share/doc/git/git-add.txt
share/doc/git/git-am.html
share/doc/git/git-am.txt
share/doc/git/git-annotate.html
share/doc/git/git-annotate.txt
share/doc/git/git-apply.html
share/doc/git/git-apply.txt
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
share/doc/git/git-blame.txt
share/doc/git/git-branch.html
share/doc/git/git-branch.txt
share/doc/git/git-bundle.html
share/doc/git/git-bundle.txt
share/doc/git/git-cat-file.html
share/doc/git/git-cat-file.txt
share/doc/git/git-check-attr.html
share/doc/git/git-check-attr.txt
share/doc/git/git-check-ref-format.html
share/doc/git/git-check-ref-format.txt
share/doc/git/git-checkout-index.html
share/doc/git/git-checkout-index.txt
share/doc/git/git-checkout.html
share/doc/git/git-checkout.txt
share/doc/git/git-cherry-pick.html
share/doc/git/git-cherry-pick.txt
share/doc/git/git-cherry.html
share/doc/git/git-cherry.txt
share/doc/git/git-clean.html
share/doc/git/git-clean.txt
share/doc/git/git-clone.html
share/doc/git/git-clone.txt
share/doc/git/git-commit-tree.html
share/doc/git/git-commit-tree.txt
share/doc/git/git-commit.html
share/doc/git/git-commit.txt
share/doc/git/git-config.html
share/doc/git/git-config.txt
share/doc/git/git-count-objects.html
share/doc/git/git-count-objects.txt
share/doc/git/git-cvsexportcommit.html
share/doc/git/git-cvsexportcommit.txt
share/doc/git/git-cvsimport.html
share/doc/git/git-cvsimport.txt
share/doc/git/git-cvsserver.html
share/doc/git/git-cvsserver.txt
share/doc/git/git-daemon.html
share/doc/git/git-daemon.txt
share/doc/git/git-describe.html
share/doc/git/git-describe.txt
share/doc/git/git-diff-files.html
share/doc/git/git-diff-files.txt
share/doc/git/git-diff-index.html
share/doc/git/git-diff-index.txt
share/doc/git/git-diff-tree.html
share/doc/git/git-diff-tree.txt
share/doc/git/git-diff.html
share/doc/git/git-diff.txt
share/doc/git/git-difftool.html
share/doc/git/git-difftool.txt
share/doc/git/git-fast-export.html
share/doc/git/git-fast-export.txt
share/doc/git/git-fast-import.html
share/doc/git/git-fast-import.txt
share/doc/git/git-fetch-pack.html
share/doc/git/git-fetch-pack.txt
share/doc/git/git-fetch.html
share/doc/git/git-fetch.txt
share/doc/git/git-filter-branch.html
share/doc/git/git-filter-branch.txt
share/doc/git/git-fmt-merge-msg.html
share/doc/git/git-fmt-merge-msg.txt
share/doc/git/git-for-each-ref.html
share/doc/git/git-for-each-ref.txt
share/doc/git/git-format-patch.html
share/doc/git/git-format-patch.txt
share/doc/git/git-fsck-objects.html
share/doc/git/git-fsck-objects.txt
share/doc/git/git-fsck.html
share/doc/git/git-fsck.txt
share/doc/git/git-gc.html
share/doc/git/git-gc.txt
share/doc/git/git-get-tar-commit-id.html
share/doc/git/git-get-tar-commit-id.txt
share/doc/git/git-grep.html
share/doc/git/git-grep.txt
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
share/doc/git/git-http-push.txt
share/doc/git/git-imap-send.html
share/doc/git/git-imap-send.txt
share/doc/git/git-index-pack.html
share/doc/git/git-index-pack.txt
share/doc/git/git-init-db.html
share/doc/git/git-init-db.txt
share/doc/git/git-init.html
share/doc/git/git-init.txt
share/doc/git/git-instaweb.html
share/doc/git/git-instaweb.txt
share/doc/git/git-log.html
share/doc/git/git-log.txt
share/doc/git/git-lost-found.html
share/doc/git/git-lost-found.txt
share/doc/git/git-ls-files.html
share/doc/git/git-ls-files.txt
share/doc/git/git-ls-remote.html
share/doc/git/git-ls-remote.txt
share/doc/git/git-ls-tree.html
share/doc/git/git-ls-tree.txt
share/doc/git/git-mailinfo.html
share/doc/git/git-mailinfo.txt
share/doc/git/git-mailsplit.html
share/doc/git/git-mailsplit.txt
share/doc/git/git-merge-base.html
share/doc/git/git-merge-base.txt
share/doc/git/git-merge-file.html
share/doc/git/git-merge-file.txt
share/doc/git/git-merge-index.html
share/doc/git/git-merge-index.txt
share/doc/git/git-merge-one-file.html
share/doc/git/git-merge-one-file.txt
share/doc/git/git-merge-tree.html
share/doc/git/git-merge-tree.txt
share/doc/git/git-merge.html
share/doc/git/git-merge.txt
share/doc/git/git-mergetool--lib.html
share/doc/git/git-mergetool--lib.txt
share/doc/git/git-mergetool.html
share/doc/git/git-mergetool.txt
share/doc/git/git-mktag.html
share/doc/git/git-mktag.txt
share/doc/git/git-mktree.html
share/doc/git/git-mktree.txt
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
share/doc/git/git-pack-redundant.txt
share/doc/git/git-pack-refs.html
share/doc/git/git-pack-refs.txt
share/doc/git/git-parse-remote.html
share/doc/git/git-parse-remote.txt
share/doc/git/git-patch-id.html
share/doc/git/git-patch-id.txt
share/doc/git/git-peek-remote.html
share/doc/git/git-peek-remote.txt
share/doc/git/git-prune-packed.html
share/doc/git/git-prune-packed.txt
share/doc/git/git-prune.html
share/doc/git/git-prune.txt
share/doc/git/git-pull.html
share/doc/git/git-pull.txt
share/doc/git/git-push.html
share/doc/git/git-push.txt
share/doc/git/git-quiltimport.html
share/doc/git/git-quiltimport.txt
share/doc/git/git-read-tree.html
share/doc/git/git-read-tree.txt
share/doc/git/git-rebase.html
share/doc/git/git-rebase.txt
share/doc/git/git-receive-pack.html
share/doc/git/git-receive-pack.txt
share/doc/git/git-reflog.html
share/doc/git/git-reflog.txt
share/doc/git/git-relink.html
share/doc/git/git-relink.txt
share/doc/git/git-remote-ext.html
share/doc/git/git-remote-ext.txt
share/doc/git/git-remote-fd.html
share/doc/git/git-remote-fd.txt
share/doc/git/git-remote-helpers.html
share/doc/git/git-remote-helpers.txt
share/doc/git/git-remote.html
share/doc/git/git-remote.txt
share/doc/git/git-repack.html
share/doc/git/git-repack.txt
share/doc/git/git-replace.html
share/doc/git/git-replace.txt
share/doc/git/git-repo-config.html
share/doc/git/git-repo-config.txt
share/doc/git/git-request-pull.html
share/doc/git/git-request-pull.txt
share/doc/git/git-rerere.html
share/doc/git/git-rerere.txt
share/doc/git/git-reset.html
share/doc/git/git-reset.txt
share/doc/git/git-rev-list.html
share/doc/git/git-rev-list.txt
share/doc/git/git-rev-parse.html
share/doc/git/git-rev-parse.txt
share/doc/git/git-revert.html
share/doc/git/git-revert.txt
share/doc/git/git-rm.html
share/doc/git/git-rm.txt
share/doc/git/git-send-email.html
share/doc/git/git-send-email.txt
share/doc/git/git-send-pack.html
share/doc/git/git-send-pack.txt
share/doc/git/git-sh-i18n--envsubst.html
share/doc/git/git-sh-i18n--envsubst.txt
share/doc/git/git-sh-i18n.html
share/doc/git/git-sh-i18n.txt
share/doc/git/git-sh-setup.html
share/doc/git/git-sh-setup.txt
share/doc/git/git-shell.html
share/doc/git/git-shell.txt
share/doc/git/git-shortlog.html
share/doc/git/git-shortlog.txt
share/doc/git/git-show-branch.html
share/doc/git/git-show-branch.txt
share/doc/git/git-show-index.html
share/doc/git/git-show-index.txt
share/doc/git/git-show-ref.html
share/doc/git/git-show-ref.txt
share/doc/git/git-show.html
share/doc/git/git-show.txt
share/doc/git/git-stage.html
share/doc/git/git-stage.txt
share/doc/git/git-stash.html
share/doc/git/git-stash.txt
share/doc/git/git-status.html
share/doc/git/git-status.txt
share/doc/git/git-stripspace.html
share/doc/git/git-stripspace.txt
share/doc/git/git-submodule.html
share/doc/git/git-submodule.txt
share/doc/git/git-svn.html
share/doc/git/git-svn.txt
share/doc/git/git-symbolic-ref.html
share/doc/git/git-symbolic-ref.txt
share/doc/git/git-tag.html
share/doc/git/git-tag.txt
share/doc/git/git-tar-tree.html
share/doc/git/git-tar-tree.txt
share/doc/git/git-tools.html
share/doc/git/git-tools.txt
share/doc/git/git-unpack-file.html
share/doc/git/git-unpack-file.txt
share/doc/git/git-unpack-objects.html
share/doc/git/git-unpack-objects.txt
share/doc/git/git-update-index.html
share/doc/git/git-update-index.txt
share/doc/git/git-update-ref.html
share/doc/git/git-update-ref.txt
share/doc/git/git-update-server-info.html
share/doc/git/git-update-server-info.txt
share/doc/git/git-upload-archive.html
share/doc/git/git-upload-archive.txt
share/doc/git/git-upload-pack.html
share/doc/git/git-upload-pack.txt
share/doc/git/git-var.html
share/doc/git/git-var.txt
share/doc/git/git-verify-pack.html
share/doc/git/git-verify-pack.txt
share/doc/git/git-verify-tag.html
share/doc/git/git-verify-tag.txt
share/doc/git/git-web--browse.html
share/doc/git/git-web--browse.txt
share/doc/git/git-whatchanged.html
share/doc/git/git-whatchanged.txt
share/doc/git/git-write-tree.html
share/doc/git/git-write-tree.txt
share/doc/git/git.html
share/doc/git/git.txt
share/doc/git/gitattributes.html
share/doc/git/gitattributes.txt
share/doc/git/gitcli.html
share/doc/git/gitcli.txt
share/doc/git/gitcore-tutorial.html
share/doc/git/gitcore-tutorial.txt
share/doc/git/gitcvs-migration.html
share/doc/git/gitcvs-migration.txt
share/doc/git/gitdiffcore.html
share/doc/git/gitdiffcore.txt
share/doc/git/gitglossary.html
share/doc/git/gitglossary.txt
share/doc/git/githooks.html
share/doc/git/githooks.txt
share/doc/git/gitignore.html
share/doc/git/gitignore.txt
share/doc/git/gitmodules.html
share/doc/git/gitmodules.txt
share/doc/git/gitrepository-layout.html
share/doc/git/gitrepository-layout.txt
share/doc/git/gitrevisions.html
share/doc/git/gitrevisions.txt
share/doc/git/gittutorial-2.html
share/doc/git/gittutorial-2.txt
share/doc/git/gittutorial.html
share/doc/git/gittutorial.txt
share/doc/git/gitworkflows.html
share/doc/git/gitworkflows.txt
share/doc/git/glossary-content.txt
share/doc/git/howto/
share/doc/git/howto-index.html
share/doc/git/howto-index.txt
share/doc/git/howto/maintain-git.txt
share/doc/git/howto/rebase-from-internal-branch.txt
share/doc/git/howto/rebuild-from-update-hook.txt
share/doc/git/howto/recover-corrupted-blob-object.txt
share/doc/git/howto/revert-a-faulty-merge.txt
share/doc/git/howto/revert-branch-rebase.html
share/doc/git/howto/revert-branch-rebase.txt
share/doc/git/howto/separating-topic-branches.txt
share/doc/git/howto/setup-git-server-over-http.txt
share/doc/git/howto/update-hook-example.txt
share/doc/git/howto/use-git-daemon.txt
share/doc/git/howto/using-merge-subtree.html
share/doc/git/howto/using-merge-subtree.txt
share/doc/git/i18n.txt
share/doc/git/index.html
share/doc/git/mailmap.txt
share/doc/git/merge-config.txt
share/doc/git/merge-options.txt
share/doc/git/merge-strategies.txt
share/doc/git/pretty-formats.txt
share/doc/git/pretty-options.txt
share/doc/git/pull-fetch-param.txt
share/doc/git/rev-list-options.txt
share/doc/git/revisions.txt
share/doc/git/urls-remotes.txt
share/doc/git/urls.txt
share/doc/git/user-manual.html
share/doc/git/user-manual.txt
share/doc/pkg-readmes/${FULLPKGNAME}
share/emacs/
share/emacs/site-lisp/
@ -694,9 +369,7 @@ share/git-core/templates/description
share/git-core/templates/hooks/
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
@ -713,3 +386,31 @@ share/gitweb/static/git-favicon.png
share/gitweb/static/git-logo.png
share/gitweb/static/gitweb.css
share/gitweb/static/gitweb.js
share/locale/
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/git.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/git.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/git.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/git.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/git.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/git.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/git.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/git.mo
share/locale/zh_CN/
share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/git.mo

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

@ -1,3 +1,21 @@
@comment $OpenBSD: PLIST-svn,v 1.3 2008/09/27 21:47:20 bernd Exp $
@comment $OpenBSD: PLIST-svn,v 1.4 2012/11/30 21:16:30 pascal Exp $
libdata/perl5/site_perl/Git/SVN/
libdata/perl5/site_perl/Git/SVN.pm
libdata/perl5/site_perl/Git/SVN/Editor.pm
libdata/perl5/site_perl/Git/SVN/Fetcher.pm
libdata/perl5/site_perl/Git/SVN/GlobSpec.pm
libdata/perl5/site_perl/Git/SVN/Log.pm
libdata/perl5/site_perl/Git/SVN/Memoize/
libdata/perl5/site_perl/Git/SVN/Memoize/YAML.pm
libdata/perl5/site_perl/Git/SVN/Migration.pm
libdata/perl5/site_perl/Git/SVN/Prompt.pm
libdata/perl5/site_perl/Git/SVN/Ra.pm
libdata/perl5/site_perl/Git/SVN/Utils.pm
libexec/git/git-svn
@man man/man1/git-svn.1
@man man/man3p/Git::SVN::Editor.3p
@man man/man3p/Git::SVN::Fetcher.3p
@man man/man3p/Git::SVN::Memoize::YAML.3p
@man man/man3p/Git::SVN::Prompt.3p
@man man/man3p/Git::SVN::Ra.3p
@man man/man3p/Git::SVN::Utils.3p

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-x11,v 1.9 2011/04/29 11:09:12 stsp Exp $
@comment $OpenBSD: PLIST-x11,v 1.10 2012/11/30 21:16:30 pascal Exp $
@conflict git-<1.6.5.3p0
bin/gitk
libexec/git/git-citool
@ -7,12 +7,6 @@ libexec/git/git-gui--askpass
@man man/man1/git-citool.1
@man man/man1/git-gui.1
@man man/man1/gitk.1
share/doc/git/git-citool.html
share/doc/git/git-citool.txt
share/doc/git/git-gui.html
share/doc/git/git-gui.txt
share/doc/git/gitk.html
share/doc/git/gitk.txt
share/git-gui/
share/git-gui/lib/
share/git-gui/lib/about.tcl
@ -37,6 +31,7 @@ share/git-gui/lib/encoding.tcl
share/git-gui/lib/error.tcl
share/git-gui/lib/git-gui.ico
share/git-gui/lib/index.tcl
share/git-gui/lib/line.tcl
share/git-gui/lib/logo.tcl
share/git-gui/lib/merge.tcl
share/git-gui/lib/mergetool.tcl