Update to 2.1.2.

Cleanup plist to remove @dirrm.

3 files changed, 10 insertions, 69 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index a605fc991637..3a76e760f131 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.2
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG
 MASTER_SITE_SUBDIR=	software/scm/git
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 276989c15a98..89faa74897f1 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-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
+SHA256 (git-2.1.2.tar.gz) = fc0af850ef82e6e9ed2940397e65fb45034fba676999eb8404ff31d8d1e388ec
+SIZE (git-2.1.2.tar.gz) = 5086801
+SHA256 (git-manpages-2.1.2.tar.gz) = f5c553d346894452adc67ce69e20e83b01c272c0003dd4cf5f80fad2b9a61d7c
+SIZE (git-manpages-2.1.2.tar.gz) = 577641
+SHA256 (git-htmldocs-2.1.2.tar.gz) = dfd2684676e9b35885fe689e8edae7cba2dcedb813e21a4a80786378adbd4a6b
+SIZE (git-htmldocs-2.1.2.tar.gz) = 2322269
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index d6cd3d70d4f0..6166cf73bcec 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -387,6 +387,7 @@ libexec/git-core/mergetools/araxis
 lib/xemacs/site-lisp/git/git.el
 lib/xemacs/site-lisp/git/git-blame.el
 %%NLS%%share/locale/bg/LC_MESSAGES/git.mo
+%%NLS%%share/locale/ca/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
@@ -1194,6 +1195,8 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.2.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1343,65 +1346,3 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README
 %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh
 %%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb/static
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%
-%%PERLSUB%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
-%%PERLSUB%%@dirrmtry %%SITE_PERL%%/Git/SVN/Memoize
-%%PERLSUB%%@dirrmtry %%SITE_PERL%%/Git/SVN
-%%PERLSUB%%@dirrmtry %%SITE_PERL%%/Git
-@dirrm lib/xemacs/site-lisp/git
-@dirrmtry lib/xemacs/site-lisp
-@dirrmtry lib/xemacs
-@dirrm share/emacs/site-lisp/git
-%%GUI%%@dirrm share/gitk/lib/msgs
-%%GUI%%@dirrm share/gitk/lib
-%%GUI%%@dirrm share/gitk
-%%GUI%%@dirrm share/git-gui/lib/msgs
-%%GUI%%@dirrm share/git-gui/lib
-%%GUI%%@dirrm share/git-gui
-%%HTMLDOCS%%@dirrm %%DOCSDIR%%/technical
-%%HTMLDOCS%%@dirrm %%DOCSDIR%%/RelNotes
-%%HTMLDOCS%%@dirrm %%DOCSDIR%%/howto
-%%HTMLDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/git-core/mergetools
-@dirrm libexec/git-core
-@dirrmtry share/git-core/templates/branches
-@dirrmtry share/git-core/templates/hooks
-@dirrm share/git-core/templates/info
-@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/completion
-%%CONTRIB%%@dirrm share/git-core/contrib/contacts
-%%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
-%%CONTRIB%%@dirrm share/git-core/contrib/credential/gnome-keyring
-%%CONTRIB%%@dirrm share/git-core/contrib/credential/osxkeychain
-%%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/diff-highlight
-%%CONTRIB%%@dirrm share/git-core/contrib/emacs
-%%CONTRIB%%@dirrm share/git-core/contrib/examples
-%%CONTRIB%%@dirrm share/git-core/contrib/fast-import
-%%CONTRIB%%@dirrm share/git-core/contrib/git-jump
-%%CONTRIB%%@dirrm share/git-core/contrib/git-shell-commands
-%%CONTRIB%%@dirrm share/git-core/contrib/gitview
-%%CONTRIB%%@dirrm share/git-core/contrib/hg-to-git
-%%CONTRIB%%@dirrm share/git-core/contrib/hooks/multimail
-%%CONTRIB%%@dirrm share/git-core/contrib/hooks
-%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/bin-wrapper
-%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/Git
-%%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/persistent-https
-%%CONTRIB%%@dirrm share/git-core/contrib/remote-helpers
-%%CONTRIB%%@dirrm share/git-core/contrib/subtree/t
-%%CONTRIB%%@dirrm share/git-core/contrib/subtree
-%%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/workdir
-%%CONTRIB%%@dirrm share/git-core/contrib
-@dirrm share/git-core