[Midnightbsd-cvs] mports [16085] trunk/devel/git: git 1.9.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Mar 22 18:10:33 EDT 2014
Revision: 16085
http://svnweb.midnightbsd.org/mports/?rev=16085
Author: laffer1
Date: 2014-03-22 18:10:33 -0400 (Sat, 22 Mar 2014)
Log Message:
-----------
git 1.9.0
Modified Paths:
--------------
trunk/devel/git/Makefile
trunk/devel/git/distinfo
trunk/devel/git/files/patch-Documentation__Makefile
trunk/devel/git/files/patch-Makefile
trunk/devel/git/pkg-plist
Removed Paths:
-------------
trunk/devel/git/files/patch-wrapper.c
Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile 2014-03-22 14:24:55 UTC (rev 16084)
+++ trunk/devel/git/Makefile 2014-03-22 22:10:33 UTC (rev 16085)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= git
-PORTVERSION= 1.8.5
+PORTVERSION= 1.9.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -16,169 +16,6 @@
PROJECTHOST= git-core
-MAN1= git.1 \
- git-add.1 \
- git-am.1 \
- git-annotate.1 \
- git-apply.1 \
- git-archimport.1 \
- git-archive.1 \
- git-bisect.1 \
- git-blame.1 \
- git-branch.1 \
- git-bundle.1 \
- git-cat-file.1 \
- git-check-attr.1 \
- git-check-ignore.1 \
- git-check-mailmap.1 \
- git-check-ref-format.1 \
- git-checkout-index.1 \
- git-checkout.1 \
- git-cherry-pick.1 \
- git-cherry.1 \
- git-clean.1 \
- git-clone.1 \
- git-column.1 \
- git-commit-tree.1 \
- git-commit.1 \
- git-config.1 \
- git-count-objects.1 \
- git-credential.1 \
- git-credential-cache--daemon.1 \
- git-credential-cache.1 \
- git-credential-store.1 \
- git-daemon.1 \
- git-describe.1 \
- git-diff-files.1 \
- git-diff-index.1 \
- git-difftool.1 \
- git-diff-tree.1 \
- git-diff.1 \
- git-fast-export.1 \
- git-fast-import.1 \
- git-fetch-pack.1 \
- git-fetch.1 \
- git-filter-branch.1 \
- git-fmt-merge-msg.1 \
- git-for-each-ref.1 \
- git-format-patch.1 \
- git-fsck-objects.1 \
- git-fsck.1 \
- git-gc.1 \
- git-get-tar-commit-id.1 \
- git-grep.1 \
- git-hash-object.1 \
- git-help.1 \
- git-http-backend.1 \
- git-http-fetch.1 \
- git-http-push.1 \
- git-imap-send.1 \
- git-index-pack.1 \
- git-init-db.1 \
- git-init.1 \
- git-instaweb.1 \
- git-log.1 \
- git-lost-found.1 \
- git-ls-files.1 \
- git-ls-remote.1 \
- git-ls-tree.1 \
- git-mailinfo.1 \
- git-mailsplit.1 \
- git-merge-base.1 \
- git-merge-file.1 \
- git-merge-index.1 \
- git-merge-one-file.1 \
- git-mergetool.1 \
- git-merge-tree.1 \
- git-merge.1 \
- git-mergetool--lib.1 \
- git-mktag.1 \
- git-mktree.1 \
- git-mv.1 \
- git-name-rev.1 \
- git-notes.1 \
- git-p4.1 \
- git-pack-objects.1 \
- git-pack-redundant.1 \
- git-pack-refs.1 \
- git-parse-remote.1 \
- git-patch-id.1 \
- git-peek-remote.1 \
- git-prune-packed.1 \
- git-prune.1 \
- git-pull.1 \
- git-push.1 \
- git-quiltimport.1 \
- git-read-tree.1 \
- git-rebase.1 \
- git-receive-pack.1 \
- git-reflog.1 \
- git-relink.1 \
- git-remote-ext.1 \
- git-remote-fd.1 \
- git-remote-testgit.1 \
- git-remote.1 \
- git-repack.1 \
- git-replace.1 \
- git-repo-config.1 \
- git-request-pull.1 \
- git-rerere.1 \
- git-reset.1 \
- git-rev-list.1 \
- git-rev-parse.1 \
- git-revert.1 \
- git-rm.1 \
- git-send-email.1 \
- git-send-pack.1 \
- git-sh-setup.1 \
- git-sh-i18n.1 \
- git-sh-i18n--envsubst.1 \
- git-shell.1 \
- git-shortlog.1 \
- git-show-branch.1 \
- git-show-index.1 \
- git-show-ref.1 \
- git-show.1 \
- git-stage.1 \
- git-stash.1 \
- git-status.1 \
- git-stripspace.1 \
- git-submodule.1 \
- git-symbolic-ref.1 \
- git-tag.1 \
- git-tar-tree.1 \
- git-unpack-file.1 \
- git-unpack-objects.1 \
- git-update-index.1 \
- git-update-ref.1 \
- git-update-server-info.1 \
- git-upload-archive.1 \
- git-upload-pack.1 \
- git-var.1 \
- git-verify-pack.1 \
- git-verify-tag.1 \
- git-web--browse.1 \
- git-whatchanged.1 \
- git-write-tree.1 \
- gitremote-helpers.1 \
- gitweb.1
-MAN5= gitattributes.5 \
- githooks.5 \
- gitignore.5 \
- gitmodules.5 \
- gitrepository-layout.5 \
- gitweb.conf.5
-MAN7= gitcli.7 \
- gitcredentials.7 \
- gitglossary.7 \
- gittutorial.7 \
- gitcore-tutorial.7 \
- gitdiffcore.7 \
- gittutorial-2.7 \
- gitworkflows.7 \
- gitrevisions.7 \
- gitnamespaces.7
-
CONFLICTS?= git-subversion-[0-9]*
USERS= git_daemon
@@ -188,15 +25,13 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
GNU_CONFIGURE= yes
-USES+= gmake
-EXTENSIONS+= python
-CFLAGS+= -I${LOCALBASE}/include
+USES= gmake shebangfix
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= V=1
MAKE_ARGS+= prefix="${PREFIX}"
USE_OPENSSL= yes
USE_RC_SUBR= git_daemon
-WANT_PERL= yes
CONFIGURE_ARGS= --enable-pthreads=-pthread
@@ -240,27 +75,16 @@
BUILD_DEPENDS+= p5-Error>=0:${PORTSDIR}/lang/p5-Error
RUN_DEPENDS+= p5-Error>=0:${PORTSDIR}/lang/p5-Error \
p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL
-MAN3= Git.3 \
- Git::I18N.3 \
- Git::SVN::Editor.3 \
- Git::SVN::Fetcher.3 \
- Git::SVN::Memoize::YAML.3 \
- Git::SVN::Prompt.3 \
- Git::SVN::Ra.3 \
- Git::SVN::Utils.3
PLIST_SUB+= PERLSUB=""
.else
-MAKE_ENV+= NO_PERL=1
+MAKE_ARGS+= NO_PERL=1
PLIST_SUB+= PERLSUB="@comment "
.endif
.if ${PORT_OPTIONS:MICONV}
USES+= iconv
-MAKE_ENV+= NEEDS_LIBICONV=yes \
- ICONVDIR=${ICONV_PREFIX}
-CONFIGURE_ARGS+= --with-iconv=${ICONV_PREFIX}
.else
-MAKE_ENV+= NO_ICONV=1
+MAKE_ARGS+= NO_ICONV=1
.endif
.if ${PORT_OPTIONS:MCURL}
@@ -270,7 +94,7 @@
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
PLIST_SUB+= CURL=""
.else
-MAKE_ENV+= NO_CURL=1 \
+MAKE_ARGS+= NO_CURL=1 \
NO_EXPAT=1
PLIST_SUB+= CURL="@comment "
.endif
@@ -285,11 +109,7 @@
.endif
.if ${PORT_OPTIONS:MGUI}
-USE_TK= 84+
-EXTENSIONS+= tcl
-MAN1+= git-citool.1 \
- git-gui.1 \
- gitk.1
+USES+= tk
PLIST_SUB+= GUI=""
MAKE_ARGS+= TCL_PATH=${TCLSH} TCLTK_PATH=${WISH}
.else
@@ -309,7 +129,6 @@
RUN_DEPENDS+= p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
PLIST_SUB+= SVN=""
-MAN1+= git-svn.1
.else
PLIST_SUB+= SVN="@comment "
RMMAN1+= git-svn.1
@@ -329,7 +148,7 @@
PLIST_SUB+= CONTRIB=""
BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
asciidoc:${PORTSDIR}/textproc/asciidoc \
- ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml
.else
PLIST_SUB+= CONTRIB="@comment "
.endif
@@ -341,13 +160,13 @@
.endif
.if ${PORT_OPTIONS:MCVS}
-MAN1+= git-cvsimport.1 git-cvsexportcommit.1 git-cvsserver.1
-MAN7+= gitcvs-migration.7
PLIST_SUB+= CVS=""
RUN_DEPENDS+= cvsps:${PORTSDIR}/devel/cvsps
.else
PLIST_SUB+= CVS="@comment "
-RMMAN1+= git-cvsimport.1 git-cvsexportcommit.1 git-cvsserver.1
+RMMAN1+= git-cvsimport.1 \
+ git-cvsexportcommit.1 \
+ git-cvsserver.1
RMMAN7+= gitcvs-migration.7
.endif
@@ -389,17 +208,13 @@
post-build:
.if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
- @${REINPLACE_CMD} -e '1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
- ${WRKSRC}/contrib/p4import/git-p4import.py
- @${CP} ${WRKSRC}/contrib/p4import/git-p4import.py \
- ${WRKSRC}/contrib/p4import/git-p4import
@${FIND} ${WRKSRC} -name "*.bak" -delete
.endif
post-install:
- (cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man1)
- (cd ${WRKDIR}/man5/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man5)
- (cd ${WRKDIR}/man7/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man7)
+ (cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1)
+ (cd ${WRKDIR}/man5/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5)
+ (cd ${WRKDIR}/man7/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man7)
.if ${PORT_OPTIONS:MHTMLDOCS}
# Manually remove the index.html symlink before installing, and then
# recreate it after. This is necessary because the distfile is
@@ -406,30 +221,31 @@
# extracted with --no-same-owner. If the distfile is extracted as a
# non-root user then the symlink will have the incorrect owner.
${RM} -f ${WRKDIR}/htmldocs/index.html
- ${MKDIR} ${DOCSDIR}
- (cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
- ${LN} -s ${DOCSDIR}/git.html ${DOCSDIR}/index.html
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ (cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+ ${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
.endif
- -${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
- ${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
- ${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
+ -${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git
${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
- ${PREFIX}/share/emacs/site-lisp/git/
+ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git-blame.el \
- ${PREFIX}/share/emacs/site-lisp/git/
+ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git.el \
- ${PREFIX}/lib/xemacs/site-lisp/git/git.el
+ ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git/git.el
${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git-blame.el \
- ${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
+ ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
.if ${PORT_OPTIONS:MCONTRIB}
@${ECHO_MSG} "===> Installing contributed scripts"
${MKDIR} ${PREFIX}/share/git-core/contrib
${CP} -R ${WRKSRC}/contrib/* ${PREFIX}/share/git-core/contrib
- cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
- ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
+ cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} ${FAKE_MAKEENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${FAKE_MAKEFLAGS} Makefile ${MAKE_ARGS} ${FAKE_MAKEARGS} install install-doc
+ ${MKDIR} ${PREFIX}/libexec/git-core
+ ${CP} ${FAKE_DESTDIR}${PREFIX}/libexec/git-core/git-subtree ${PREFIX}/libexec/git-core/
.endif
.if ${PORT_OPTIONS:MP4}
- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import ${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${PREFIX}/bin/
.endif
Modified: trunk/devel/git/distinfo
===================================================================
--- trunk/devel/git/distinfo 2014-03-22 14:24:55 UTC (rev 16084)
+++ trunk/devel/git/distinfo 2014-03-22 22:10:33 UTC (rev 16085)
@@ -1,6 +1,6 @@
-SHA256 (git-1.8.5.tar.gz) = 870f52e19bb599b2835455e62db10e4c693fdbcc154f7802512d74393cc26b23
-SIZE (git-1.8.5.tar.gz) = 4754382
-SHA256 (git-manpages-1.8.5.tar.gz) = 5e8dfb2cc26c84e8dd3156232e104e71424f86ca35b741e7d163afe8b242b256
-SIZE (git-manpages-1.8.5.tar.gz) = 569012
-SHA256 (git-htmldocs-1.8.5.tar.gz) = 7c62416f22fc6f5b82b8b3f088ebffeb6b2bb1886dfd8925291cde2842fbc6bc
-SIZE (git-htmldocs-1.8.5.tar.gz) = 2235835
+SHA256 (git-1.9.0.tar.gz) = de3097fdc36d624ea6cf4bb853402fde781acdb860f12152c5eb879777389882
+SIZE (git-1.9.0.tar.gz) = 4839724
+SHA256 (git-manpages-1.9.0.tar.gz) = a51e2b64a8adde39e774f052843e0f513b5d3318492b515e752e339b0d3a85c7
+SIZE (git-manpages-1.9.0.tar.gz) = 571616
+SHA256 (git-htmldocs-1.9.0.tar.gz) = e4e619b7dd5b24ab4ef17e598803497704aa5b0a7821bb544940f2cdd7cac60e
+SIZE (git-htmldocs-1.9.0.tar.gz) = 2240600
Modified: trunk/devel/git/files/patch-Documentation__Makefile
===================================================================
--- trunk/devel/git/files/patch-Documentation__Makefile 2014-03-22 14:24:55 UTC (rev 16084)
+++ trunk/devel/git/files/patch-Documentation__Makefile 2014-03-22 22:10:33 UTC (rev 16085)
@@ -1,6 +1,6 @@
---- ./Documentation/Makefile.orig 2013-08-27 12:08:25.000000000 -0400
-+++ ./Documentation/Makefile 2013-08-27 12:09:18.000000000 -0400
-@@ -78,11 +78,11 @@
+--- Documentation/Makefile.orig 2014-02-14 16:57:09.000000000 -0500
++++ Documentation/Makefile 2014-03-22 17:36:54.629401598 -0400
+@@ -83,11 +83,11 @@
DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
@@ -15,7 +15,7 @@
mandir ?= $(prefix)/share/man
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
-@@ -196,7 +196,7 @@
+@@ -202,7 +202,7 @@
endif
endif
@@ -24,3 +24,12 @@
html: $(DOC_HTML)
+@@ -318,7 +318,7 @@
+
+ %.1 %.5 %.7 : %.xml manpage-base-url.xsl
+ $(QUIET_XMLTO)$(RM) $@ && \
+- $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
++ $(XMLTO) --skip-validation -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+
+ %.xml : %.txt asciidoc.conf
+ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
Modified: trunk/devel/git/files/patch-Makefile
===================================================================
--- trunk/devel/git/files/patch-Makefile 2014-03-22 14:24:55 UTC (rev 16084)
+++ trunk/devel/git/files/patch-Makefile 2014-03-22 22:10:33 UTC (rev 16085)
@@ -68,7 +68,7 @@
export TCL_PATH TCLTK_PATH
-@@ -1136,9 +1136,9 @@
+@@ -1154,9 +1154,9 @@
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
Deleted: trunk/devel/git/files/patch-wrapper.c
===================================================================
--- trunk/devel/git/files/patch-wrapper.c 2014-03-22 14:24:55 UTC (rev 16084)
+++ trunk/devel/git/files/patch-wrapper.c 2014-03-22 22:10:33 UTC (rev 16085)
@@ -1,28 +0,0 @@
---- wrapper.c.orig 2013-03-13 15:15:22.000000000 -0400
-+++ wrapper.c 2013-03-17 20:55:29.000000000 -0400
-@@ -1,6 +1,7 @@
- /*
- * Various trivial helper wrappers around standard functions
- */
-+#include <sys/param.h>
- #include "cache.h"
-
- static void do_nothing(size_t size)
-@@ -139,7 +140,7 @@
- {
- ssize_t nr;
- while (1) {
-- nr = read(fd, buf, len);
-+ nr = read(fd, buf, MIN(INT_MAX, len));
- if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
- continue;
- return nr;
-@@ -155,7 +156,7 @@
- {
- ssize_t nr;
- while (1) {
-- nr = write(fd, buf, len);
-+ nr = write(fd, buf, MIN(INT_MAX, len));
- if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
- continue;
- return nr;
Modified: trunk/devel/git/pkg-plist
===================================================================
--- trunk/devel/git/pkg-plist 2014-03-22 14:24:55 UTC (rev 16084)
+++ trunk/devel/git/pkg-plist 2014-03-22 22:10:33 UTC (rev 16085)
@@ -1,11 +1,185 @@
bin/git
%%P4%%bin/git-p4.py
-%%P4%%bin/git-p4import
bin/git-upload-pack
bin/git-receive-pack
bin/git-upload-archive
%%CVS%%bin/git-cvsserver
bin/git-shell
+man/man1/git.1.gz
+man/man1/git-add.1.gz
+man/man1/git-am.1.gz
+man/man1/git-annotate.1.gz
+man/man1/git-apply.1.gz
+man/man1/git-archimport.1.gz
+man/man1/git-archive.1.gz
+man/man1/git-bisect.1.gz
+man/man1/git-blame.1.gz
+man/man1/git-branch.1.gz
+man/man1/git-bundle.1.gz
+man/man1/git-cat-file.1.gz
+man/man1/git-check-attr.1.gz
+man/man1/git-check-ignore.1.gz
+man/man1/git-check-mailmap.1.gz
+man/man1/git-check-ref-format.1.gz
+man/man1/git-checkout-index.1.gz
+man/man1/git-checkout.1.gz
+man/man1/git-cherry-pick.1.gz
+man/man1/git-cherry.1.gz
+%%GUI%%man/man1/git-citool.1.gz
+man/man1/git-clean.1.gz
+man/man1/git-clone.1.gz
+man/man1/git-column.1.gz
+man/man1/git-commit-tree.1.gz
+man/man1/git-commit.1.gz
+man/man1/git-config.1.gz
+man/man1/git-count-objects.1.gz
+man/man1/git-credential.1.gz
+man/man1/git-credential-cache--daemon.1.gz
+man/man1/git-credential-cache.1.gz
+man/man1/git-credential-store.1.gz
+%%CVS%%man/man1/git-cvsexportcommit.1.gz
+%%CVS%%man/man1/git-cvsimport.1.gz
+%%CVS%%man/man1/git-cvsserver.1.gz
+man/man1/git-daemon.1.gz
+man/man1/git-describe.1.gz
+man/man1/git-diff-files.1.gz
+man/man1/git-diff-index.1.gz
+man/man1/git-difftool.1.gz
+man/man1/git-diff-tree.1.gz
+man/man1/git-diff.1.gz
+man/man1/git-fast-export.1.gz
+man/man1/git-fast-import.1.gz
+man/man1/git-fetch-pack.1.gz
+man/man1/git-fetch.1.gz
+man/man1/git-filter-branch.1.gz
+man/man1/git-fmt-merge-msg.1.gz
+man/man1/git-for-each-ref.1.gz
+man/man1/git-format-patch.1.gz
+man/man1/git-fsck-objects.1.gz
+man/man1/git-fsck.1.gz
+man/man1/git-gc.1.gz
+man/man1/git-get-tar-commit-id.1.gz
+man/man1/git-grep.1.gz
+%%GUI%%man/man1/git-gui.1.gz
+man/man1/git-hash-object.1.gz
+man/man1/git-help.1.gz
+man/man1/git-http-backend.1.gz
+man/man1/git-http-fetch.1.gz
+man/man1/git-http-push.1.gz
+man/man1/git-imap-send.1.gz
+man/man1/git-index-pack.1.gz
+man/man1/git-init-db.1.gz
+man/man1/git-init.1.gz
+man/man1/git-instaweb.1.gz
+man/man1/git-log.1.gz
+man/man1/git-ls-files.1.gz
+man/man1/git-ls-remote.1.gz
+man/man1/git-ls-tree.1.gz
+man/man1/git-mailinfo.1.gz
+man/man1/git-mailsplit.1.gz
+man/man1/git-merge-base.1.gz
+man/man1/git-merge-file.1.gz
+man/man1/git-merge-index.1.gz
+man/man1/git-merge-one-file.1.gz
+man/man1/git-mergetool.1.gz
+man/man1/git-merge-tree.1.gz
+man/man1/git-merge.1.gz
+man/man1/git-mergetool--lib.1.gz
+man/man1/git-mktag.1.gz
+man/man1/git-mktree.1.gz
+man/man1/git-mv.1.gz
+man/man1/git-name-rev.1.gz
+man/man1/git-notes.1.gz
+man/man1/git-p4.1.gz
+man/man1/git-pack-objects.1.gz
+man/man1/git-pack-redundant.1.gz
+man/man1/git-pack-refs.1.gz
+man/man1/git-parse-remote.1.gz
+man/man1/git-patch-id.1.gz
+man/man1/git-prune-packed.1.gz
+man/man1/git-prune.1.gz
+man/man1/git-pull.1.gz
+man/man1/git-push.1.gz
+man/man1/git-quiltimport.1.gz
+man/man1/git-read-tree.1.gz
+man/man1/git-rebase.1.gz
+man/man1/git-receive-pack.1.gz
+man/man1/git-reflog.1.gz
+man/man1/git-relink.1.gz
+man/man1/git-remote-ext.1.gz
+man/man1/git-remote-fd.1.gz
+man/man1/git-remote-testgit.1.gz
+man/man1/git-remote.1.gz
+man/man1/git-repack.1.gz
+man/man1/git-replace.1.gz
+man/man1/git-request-pull.1.gz
+man/man1/git-rerere.1.gz
+man/man1/git-reset.1.gz
+man/man1/git-rev-list.1.gz
+man/man1/git-rev-parse.1.gz
+man/man1/git-revert.1.gz
+man/man1/git-rm.1.gz
+man/man1/git-send-email.1.gz
+man/man1/git-send-pack.1.gz
+man/man1/git-sh-setup.1.gz
+man/man1/git-sh-i18n.1.gz
+man/man1/git-sh-i18n--envsubst.1.gz
+man/man1/git-shell.1.gz
+man/man1/git-shortlog.1.gz
+man/man1/git-show-branch.1.gz
+man/man1/git-show-index.1.gz
+man/man1/git-show-ref.1.gz
+man/man1/git-show.1.gz
+man/man1/git-stage.1.gz
+man/man1/git-stash.1.gz
+man/man1/git-status.1.gz
+man/man1/git-stripspace.1.gz
+man/man1/git-submodule.1.gz
+%%CONTRIB%%man/man1/git-subtree.1.gz
+%%SVN%%man/man1/git-svn.1.gz
+man/man1/git-symbolic-ref.1.gz
+man/man1/git-tag.1.gz
+man/man1/git-unpack-file.1.gz
+man/man1/git-unpack-objects.1.gz
+man/man1/git-update-index.1.gz
+man/man1/git-update-ref.1.gz
+man/man1/git-update-server-info.1.gz
+man/man1/git-upload-archive.1.gz
+man/man1/git-upload-pack.1.gz
+man/man1/git-var.1.gz
+man/man1/git-verify-pack.1.gz
+man/man1/git-verify-tag.1.gz
+man/man1/git-web--browse.1.gz
+man/man1/git-whatchanged.1.gz
+man/man1/git-write-tree.1.gz
+%%GUI%%man/man1/gitk.1.gz
+man/man1/gitremote-helpers.1.gz
+man/man1/gitweb.1.gz
+%%PERLSUB%%man/man3/Git.3.gz
+%%PERLSUB%%man/man3/Git::I18N.3.gz
+%%PERLSUB%%man/man3/Git::SVN::Editor.3.gz
+%%PERLSUB%%man/man3/Git::SVN::Fetcher.3.gz
+%%PERLSUB%%man/man3/Git::SVN::Memoize::YAML.3.gz
+%%PERLSUB%%man/man3/Git::SVN::Prompt.3.gz
+%%PERLSUB%%man/man3/Git::SVN::Ra.3.gz
+%%PERLSUB%%man/man3/Git::SVN::Utils.3.gz
+man/man5/gitattributes.5.gz
+man/man5/githooks.5.gz
+man/man5/gitignore.5.gz
+man/man5/gitmodules.5.gz
+man/man5/gitrepository-layout.5.gz
+man/man5/gitweb.conf.5.gz
+man/man7/gitcli.7.gz
+man/man7/gitcredentials.7.gz
+%%CVS%%man/man7/gitcvs-migration.7.gz
+man/man7/gitglossary.7.gz
+man/man7/gittutorial.7.gz
+man/man7/gitcore-tutorial.7.gz
+man/man7/gitdiffcore.7.gz
+man/man7/gittutorial-2.7.gz
+man/man7/gitworkflows.7.gz
+man/man7/gitrevisions.7.gz
+man/man7/gitnamespaces.7.gz
libexec/git-core/git
libexec/git-core/git-add
libexec/git-core/git-add--interactive
@@ -77,7 +251,6 @@
libexec/git-core/git-init-db
libexec/git-core/git-instaweb
libexec/git-core/git-log
-libexec/git-core/git-lost-found
libexec/git-core/git-ls-files
libexec/git-core/git-ls-remote
libexec/git-core/git-ls-tree
@@ -107,7 +280,6 @@
libexec/git-core/git-pack-refs
libexec/git-core/git-parse-remote
libexec/git-core/git-patch-id
-libexec/git-core/git-peek-remote
libexec/git-core/git-prune
libexec/git-core/git-prune-packed
libexec/git-core/git-pull
@@ -130,7 +302,6 @@
%%CURL%%libexec/git-core/git-remote-ftp
%%CURL%%libexec/git-core/git-remote-ftps
libexec/git-core/git-repack
-libexec/git-core/git-repo-config
libexec/git-core/git-replace
libexec/git-core/git-request-pull
libexec/git-core/git-rerere
@@ -159,7 +330,6 @@
%%SVN%%libexec/git-core/git-svn
libexec/git-core/git-symbolic-ref
libexec/git-core/git-tag
-libexec/git-core/git-tar-tree
libexec/git-core/git-unpack-file
libexec/git-core/git-unpack-objects
libexec/git-core/git-update-index
@@ -175,6 +345,7 @@
libexec/git-core/git-write-tree
libexec/git-core/mergetools/codecompare
libexec/git-core/mergetools/deltawalker
+libexec/git-core/mergetools/diffmerge
libexec/git-core/mergetools/xxdiff
libexec/git-core/mergetools/tortoisemerge
libexec/git-core/mergetools/tkdiff
@@ -208,12 +379,11 @@
%%PERLSUB%%%%SITE_PERL%%/Git/SVN/Fetcher.pm
lib/xemacs/site-lisp/git/git.el
lib/xemacs/site-lisp/git/git-blame.el
-%%NLS%%share/locale/da/LC_MESSAGES/git.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/git.mo
%%NLS%%share/locale/de/LC_MESSAGES/git.mo
%%NLS%%share/locale/fr/LC_MESSAGES/git.mo
%%NLS%%share/locale/is/LC_MESSAGES/git.mo
%%NLS%%share/locale/it/LC_MESSAGES/git.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/git.mo
%%NLS%%share/locale/pt_PT/LC_MESSAGES/git.mo
%%NLS%%share/locale/sv/LC_MESSAGES/git.mo
%%NLS%%share/locale/vi/LC_MESSAGES/git.mo
@@ -273,6 +443,7 @@
%%GUI%%share/git-gui/lib/transport.tcl
%%GUI%%share/git-gui/lib/win32.tcl
%%GUI%%share/git-gui/lib/win32_shortcut.js
+%%GUI%%share/git-gui/lib/msgs/bg.msg
%%GUI%%share/git-gui/lib/msgs/de.msg
%%GUI%%share/git-gui/lib/msgs/el.msg
%%GUI%%share/git-gui/lib/msgs/fr.msg
@@ -284,6 +455,7 @@
%%GUI%%share/git-gui/lib/msgs/ru.msg
%%GUI%%share/git-gui/lib/msgs/sv.msg
%%GUI%%share/git-gui/lib/msgs/zh_cn.msg
+%%GUI%%share/gitk/lib/msgs/bg.msg
%%GUI%%share/gitk/lib/msgs/es.msg
%%GUI%%share/gitk/lib/msgs/de.msg
%%GUI%%share/gitk/lib/msgs/fr.msg
@@ -357,7 +529,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-init.html
%%HTMLDOCS%%%%DOCSDIR%%/git-instaweb.html
%%HTMLDOCS%%%%DOCSDIR%%/git-log.html
-%%HTMLDOCS%%%%DOCSDIR%%/git-lost-found.html
%%HTMLDOCS%%%%DOCSDIR%%/git-ls-files.html
%%HTMLDOCS%%%%DOCSDIR%%/git-ls-remote.html
%%HTMLDOCS%%%%DOCSDIR%%/git-ls-tree.html
@@ -382,7 +553,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-pack-refs.html
%%HTMLDOCS%%%%DOCSDIR%%/git-parse-remote.html
%%HTMLDOCS%%%%DOCSDIR%%/git-patch-id.html
-%%HTMLDOCS%%%%DOCSDIR%%/git-peek-remote.html
%%HTMLDOCS%%%%DOCSDIR%%/git-prune-packed.html
%%HTMLDOCS%%%%DOCSDIR%%/git-prune.html
%%HTMLDOCS%%%%DOCSDIR%%/git-pull.html
@@ -406,7 +576,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-repack.html
%%HTMLDOCS%%%%DOCSDIR%%/git-replace.html
%%HTMLDOCS%%%%DOCSDIR%%/git-replace.txt
-%%HTMLDOCS%%%%DOCSDIR%%/git-repo-config.html
%%HTMLDOCS%%%%DOCSDIR%%/git-request-pull.html
%%HTMLDOCS%%%%DOCSDIR%%/git-rerere.html
%%HTMLDOCS%%%%DOCSDIR%%/git-reset.html
@@ -433,7 +602,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-svn.html
%%HTMLDOCS%%%%DOCSDIR%%/git-symbolic-ref.html
%%HTMLDOCS%%%%DOCSDIR%%/git-tag.html
-%%HTMLDOCS%%%%DOCSDIR%%/git-tar-tree.html
%%HTMLDOCS%%%%DOCSDIR%%/git-unpack-file.html
%%HTMLDOCS%%%%DOCSDIR%%/git-unpack-objects.html
%%HTMLDOCS%%%%DOCSDIR%%/git-var.html
@@ -479,7 +647,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/mailmap.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-citool.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-hash-object.txt
-%%HTMLDOCS%%%%DOCSDIR%%/git-lost-found.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-commit-tree.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-count-objects.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-quiltimport.txt
@@ -524,6 +691,8 @@
%%HTMLDOCS%%%%DOCSDIR%%/howto/maintain-git.txt
%%HTMLDOCS%%%%DOCSDIR%%/howto/maintain-git.html
%%HTMLDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/recover-corrupted-object-harder.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/recover-corrupted-object-harder.html
%%HTMLDOCS%%%%DOCSDIR%%/howto/recover-corrupted-blob-object.txt
%%HTMLDOCS%%%%DOCSDIR%%/howto/recover-corrupted-blob-object.html
%%HTMLDOCS%%%%DOCSDIR%%/howto/setup-git-server-over-http.txt
@@ -571,6 +740,8 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
%%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-argv-array.html
@@ -691,7 +862,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/diff-format.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-pack-objects.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-add.txt
-%%HTMLDOCS%%%%DOCSDIR%%/git-repo-config.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-diff-files.txt
%%HTMLDOCS%%%%DOCSDIR%%/pretty-options.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-show.txt
@@ -719,7 +889,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/git-init.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitk.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitrepository-layout.txt
-%%HTMLDOCS%%%%DOCSDIR%%/git-tar-tree.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitglossary.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-relink.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-update-ref.txt
@@ -765,7 +934,6 @@
%%HTMLDOCS%%%%DOCSDIR%%/gitmodules.txt
%%HTMLDOCS%%%%DOCSDIR%%/pull-fetch-param.txt
%%HTMLDOCS%%%%DOCSDIR%%/urls.txt
-%%HTMLDOCS%%%%DOCSDIR%%/git-peek-remote.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-bisect.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-tools.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-show-ref.txt
@@ -993,6 +1161,15 @@
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.4.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.4.2.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.4.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.4.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.4.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.0.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1043,10 +1220,12 @@
%%CONTRIB%%share/git-core/contrib/examples/git-fetch.sh
%%CONTRIB%%share/git-core/contrib/examples/git-gc.sh
%%CONTRIB%%share/git-core/contrib/examples/git-ls-remote.sh
+%%CONTRIB%%share/git-core/contrib/examples/git-log.sh
%%CONTRIB%%share/git-core/contrib/examples/git-merge-ours.sh
%%CONTRIB%%share/git-core/contrib/examples/git-merge.sh
%%CONTRIB%%share/git-core/contrib/examples/git-notes.sh
%%CONTRIB%%share/git-core/contrib/examples/git-remote.perl
+%%CONTRIB%%share/git-core/contrib/examples/git-repack.sh
%%CONTRIB%%share/git-core/contrib/examples/git-rerere.perl
%%CONTRIB%%share/git-core/contrib/examples/git-reset.sh
%%CONTRIB%%share/git-core/contrib/examples/git-resolve.sh
@@ -1055,6 +1234,7 @@
%%CONTRIB%%share/git-core/contrib/examples/git-svnimport.txt
%%CONTRIB%%share/git-core/contrib/examples/git-tag.sh
%%CONTRIB%%share/git-core/contrib/examples/git-verify-tag.sh
+%%CONTRIB%%share/git-core/contrib/examples/git-whatchanged.sh
%%CONTRIB%%share/git-core/contrib/fast-import/git-p4.README
%%CONTRIB%%share/git-core/contrib/fast-import/git-import.perl
%%CONTRIB%%share/git-core/contrib/fast-import/git-import.sh
@@ -1106,10 +1286,6 @@
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw.pl
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/.gitignore
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test.config
-%%CONTRIB%%share/git-core/contrib/p4import/README
-%%CONTRIB%%share/git-core/contrib/p4import/git-p4import.py
-%%CONTRIB%%share/git-core/contrib/p4import/git-p4import.txt
-%%CONTRIB%%share/git-core/contrib/p4import/git-p4import
%%CONTRIB%%share/git-core/contrib/remotes2config.sh
%%CONTRIB%%share/git-core/contrib/rerere-train.sh
%%CONTRIB%%share/git-core/contrib/persistent-https/client.go
@@ -1177,7 +1353,6 @@
@dirrmtry share/git-core/templates
%%CONTRIB%%@dirrm share/git-core/contrib/buildsystems/Generators
%%CONTRIB%%@dirrm share/git-core/contrib/buildsystems
-%%CONTRIB%%@dirrm share/git-core/contrib/ciabot
%%CONTRIB%%@dirrm share/git-core/contrib/completion
%%CONTRIB%%@dirrm share/git-core/contrib/contacts
%%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
@@ -1202,7 +1377,6 @@
%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/t/install-wiki
%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/t/
%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/
-%%CONTRIB%%@dirrm share/git-core/contrib/p4import
%%CONTRIB%%@dirrm share/git-core/contrib/persistent-https
%%CONTRIB%%@dirrm share/git-core/contrib/remote-helpers
%%CONTRIB%%@dirrm share/git-core/contrib/subtree/t
@@ -1214,5 +1388,3 @@
%%CONTRIB%%@dirrm share/git-core/contrib/workdir
%%CONTRIB%%@dirrm share/git-core/contrib
@dirrm share/git-core
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/git_remote_helpers/git
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/git_remote_helpers
More information about the Midnightbsd-cvs
mailing list