diff --git a/devel/git/Makefile b/devel/git/Makefile index ca7095b32915..a605fc991637 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= git -PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG MASTER_SITE_SUBDIR= software/scm/git diff --git a/devel/git/distinfo b/devel/git/distinfo index f14caab5d015..276989c15a98 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,6 +1,6 @@ -SHA256 (git-2.0.2.tar.gz) = 0f0a3b438ae1dde5b21c93c33173c8edd2c6dc4f3e4c396ce936784c5c97bdee -SIZE (git-2.0.2.tar.gz) = 4904754 -SHA256 (git-manpages-2.0.2.tar.gz) = e90bfa54fbb5ff4cf75f9d0272aaecc2d4bf5aae1eaddc85f2dbc02a98c61dd0 -SIZE (git-manpages-2.0.2.tar.gz) = 575491 -SHA256 (git-htmldocs-2.0.2.tar.gz) = e74adf2adaf01883af64f3f6d84f4821521da56918358efd3b2149042bb15b4d -SIZE (git-htmldocs-2.0.2.tar.gz) = 2278282 +SHA256 (git-2.1.0.tar.gz) = d5b035717f62130cbf154d6c1403c6850b486223bd6f87e208296be8aca476eb +SIZE (git-2.1.0.tar.gz) = 4975916 +SHA256 (git-manpages-2.1.0.tar.gz) = 3a9ea5bf9c369b56459c4dd76463adb94e4298f679f2fffdcadc447c89e8bb7c +SIZE (git-manpages-2.1.0.tar.gz) = 577429 +SHA256 (git-htmldocs-2.1.0.tar.gz) = 5b395b4fbee6364f368fa7e012ae18a10d2533e837f68dcde3c6ee7744a8a323 +SIZE (git-htmldocs-2.1.0.tar.gz) = 2306356 diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 9e593a8a7664..d6cd3d70d4f0 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -147,6 +147,7 @@ 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-commit.1.gz man/man1/git-verify-pack.1.gz man/man1/git-verify-tag.1.gz man/man1/git-web--browse.1.gz @@ -340,6 +341,7 @@ libexec/git-core/git-update-server-info libexec/git-core/git-upload-archive libexec/git-core/git-upload-pack libexec/git-core/git-var +libexec/git-core/git-verify-commit libexec/git-core/git-verify-pack libexec/git-core/git-verify-tag libexec/git-core/git-web--browse @@ -355,8 +357,10 @@ libexec/git-core/mergetools/bc3 libexec/git-core/mergetools/kdiff3 libexec/git-core/mergetools/gvimdiff libexec/git-core/mergetools/gvimdiff2 +libexec/git-core/mergetools/gvimdiff3 libexec/git-core/mergetools/vimdiff libexec/git-core/mergetools/vimdiff2 +libexec/git-core/mergetools/vimdiff3 libexec/git-core/mergetools/meld libexec/git-core/mergetools/ecmerge libexec/git-core/mergetools/diffuse @@ -607,12 +611,13 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/git-tag.html %%HTMLDOCS%%%%DOCSDIR%%/git-unpack-file.html %%HTMLDOCS%%%%DOCSDIR%%/git-unpack-objects.html -%%HTMLDOCS%%%%DOCSDIR%%/git-var.html %%HTMLDOCS%%%%DOCSDIR%%/git-update-index.html %%HTMLDOCS%%%%DOCSDIR%%/git-update-ref.html %%HTMLDOCS%%%%DOCSDIR%%/git-update-server-info.html %%HTMLDOCS%%%%DOCSDIR%%/git-upload-archive.html %%HTMLDOCS%%%%DOCSDIR%%/git-upload-pack.html +%%HTMLDOCS%%%%DOCSDIR%%/git-var.html +%%HTMLDOCS%%%%DOCSDIR%%/git-verify-commit.html %%HTMLDOCS%%%%DOCSDIR%%/git-verify-pack.html %%HTMLDOCS%%%%DOCSDIR%%/git-verify-tag.html %%HTMLDOCS%%%%DOCSDIR%%/git-web--browse.html @@ -680,6 +685,7 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/git-mergetool.txt %%HTMLDOCS%%%%DOCSDIR%%/git-mergetool--lib.txt %%HTMLDOCS%%%%DOCSDIR%%/git-archive.txt +%%HTMLDOCS%%%%DOCSDIR%%/git-verify-commit.txt %%HTMLDOCS%%%%DOCSDIR%%/git-verify-pack.txt %%HTMLDOCS%%%%DOCSDIR%%/git-ls-tree.txt %%HTMLDOCS%%%%DOCSDIR%%/howto-index.txt @@ -689,6 +695,8 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/git-grep.txt %%HTMLDOCS%%%%DOCSDIR%%/git-ls-remote.txt %%HTMLDOCS%%%%DOCSDIR%%/git-receive-pack.txt +%%HTMLDOCS%%%%DOCSDIR%%/howto/keep-canonical-history-correct.txt +%%HTMLDOCS%%%%DOCSDIR%%/howto/keep-canonical-history-correct.html %%HTMLDOCS%%%%DOCSDIR%%/howto/new-command.txt %%HTMLDOCS%%%%DOCSDIR%%/howto/new-command.html %%HTMLDOCS%%%%DOCSDIR%%/howto/maintain-git.txt @@ -754,6 +762,8 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.txt +%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.html +%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt @@ -1181,6 +1191,9 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.3.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.4.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.0.txt %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css @@ -1188,9 +1201,8 @@ share/git-core/templates/info/exclude %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png %%CONTRIB%%share/git-core/contrib/contacts/git-contacts %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt -%%CONTRIB%%share/git-core/contrib/diffall/README -%%CONTRIB%%share/git-core/contrib/diffall/git-diffall %%CONTRIB%%share/git-core/contrib/README +%%CONTRIB%%share/git-core/contrib/convert-grafts-to-replace-refs.sh %%CONTRIB%%share/git-core/contrib/buildsystems/Generators.pm %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/QMake.pm %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcproj.pm @@ -1330,7 +1342,6 @@ share/git-core/templates/info/exclude %%CONTRIB%%share/git-core/contrib/svn-fe/Makefile %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh -%%CONTRIB%%share/git-core/contrib/vim/README %%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir %%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb/static %%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb @@ -1369,7 +1380,6 @@ share/git-core/templates/info/exclude %%CONTRIB%%@dirrm share/git-core/contrib/credential/netrc %%CONTRIB%%@dirrm share/git-core/contrib/credential/wincred %%CONTRIB%%@dirrm share/git-core/contrib/credential -%%CONTRIB%%@dirrm share/git-core/contrib/diffall %%CONTRIB%%@dirrm share/git-core/contrib/diff-highlight %%CONTRIB%%@dirrm share/git-core/contrib/emacs %%CONTRIB%%@dirrm share/git-core/contrib/examples @@ -1392,7 +1402,6 @@ share/git-core/templates/info/exclude %%CONTRIB%%@dirrm share/git-core/contrib/stats %%CONTRIB%%@dirrm share/git-core/contrib/svn-fe %%CONTRIB%%@dirrm share/git-core/contrib/thunderbird-patch-inline -%%CONTRIB%%@dirrm share/git-core/contrib/vim %%CONTRIB%%@dirrm share/git-core/contrib/workdir %%CONTRIB%%@dirrm share/git-core/contrib @dirrm share/git-core