1 files changed, 12 insertions, 24 deletions

diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 683456cd1ff7..8823d4f04f0f 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -6,23 +6,6 @@ bin/git-receive-pack
 bin/git-upload-archive
 %%CVS%%bin/git-cvsserver
 bin/git-shell
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/util.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/util.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/git.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/git.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/repo.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/repo.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/non_local.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/non_local.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/importer.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/importer.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/exporter.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/exporter.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers-0.1.0-py%%PYTHON_VER%%.egg-info
 libexec/git-core/git
 libexec/git-core/git-add
 libexec/git-core/git-add--interactive
@@ -194,6 +177,7 @@ libexec/git-core/git-whatchanged
 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
@@ -544,6 +528,8 @@ share/git-core/templates/info/exclude
 %%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
@@ -591,6 +577,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
 %%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-argv-array.html
@@ -1013,6 +1000,11 @@ share/git-core/templates/info/exclude
 %%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
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1029,10 +1021,6 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/buildsystems/engine.pl
 %%CONTRIB%%share/git-core/contrib/buildsystems/generate
 %%CONTRIB%%share/git-core/contrib/buildsystems/parse.pl
-%%CONTRIB%%share/git-core/contrib/ciabot/README
-%%CONTRIB%%share/git-core/contrib/ciabot/INSTALL
-%%CONTRIB%%share/git-core/contrib/ciabot/ciabot.py
-%%CONTRIB%%share/git-core/contrib/ciabot/ciabot.sh
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
@@ -1067,10 +1055,12 @@ share/git-core/templates/info/exclude
 %%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
@@ -1079,6 +1069,7 @@ share/git-core/templates/info/exclude
 %%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
@@ -1201,7 +1192,6 @@ share/git-core/templates/info/exclude
 @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
@@ -1238,5 +1228,3 @@ share/git-core/templates/info/exclude
 %%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