- Update to 1.6.2.2.

5 files changed, 43 insertions, 36 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 42c7e5d15913..8504c2299a35 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.6.1.3
+PORTVERSION=	1.6.2.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -295,12 +295,12 @@ post-install:
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
 		${PREFIX}/share/emacs/site-lisp/git/
-	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/vc-git.el \
+	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git-blame.el \
 		${PREFIX}/share/emacs/site-lisp/git/
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git.el    \
 		${PREFIX}/lib/xemacs/site-lisp/git/git.el
-	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \
-		${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el
+	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git-blame.el \
+		${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
 
 .ifdef (WITH_P4)
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index b0e06620ded9..638822d7b508 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.1.3.tar.bz2) = e31ea5ce9b076f5745056f01465e9602
-SHA256 (git-1.6.1.3.tar.bz2) = aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682
-SIZE (git-1.6.1.3.tar.bz2) = 1973574
-MD5 (git-manpages-1.6.1.3.tar.bz2) = 8eb57492278ef4d471a899dbe9c30fcf
-SHA256 (git-manpages-1.6.1.3.tar.bz2) = ac3daa67b5f0a5bdf9c45dbf148c7f3c51e673f3a5460e00c55594a3cd51f1a4
-SIZE (git-manpages-1.6.1.3.tar.bz2) = 231623
-MD5 (git-1.6.1.3.tar.bz2.sign) = afbb0db39a03457bdc36574961303252
-SHA256 (git-1.6.1.3.tar.bz2.sign) = 5c67761af8792ccf05908506c438219578449b647ae633384bfd0a92bf47313b
-SIZE (git-1.6.1.3.tar.bz2.sign) = 248
+MD5 (git-1.6.2.2.tar.bz2) = d219aa5480ed6396f8ab968f3f7eb0f9
+SHA256 (git-1.6.2.2.tar.bz2) = 7b440c1589de36e94b751cfb3b9d60d9a3131eeab8229e759a1fd0328ea36166
+SIZE (git-1.6.2.2.tar.bz2) = 2016513
+MD5 (git-manpages-1.6.2.2.tar.bz2) = 88f9c5c6d092173ac47be23c82ab5e46
+SHA256 (git-manpages-1.6.2.2.tar.bz2) = e6dc1cf2e2e2748314300c825a36ff808158d5d288b7d75009c40972a338f6f5
+SIZE (git-manpages-1.6.2.2.tar.bz2) = 236466
+MD5 (git-1.6.2.2.tar.bz2.sign) = a60bdcbef8b0611f5327cf549d00da79
+SHA256 (git-1.6.2.2.tar.bz2.sign) = a54a7b0c474d8b6216b5fecb0387d8ebd39499f98c19c6d2c970e55b0c539f30
+SIZE (git-1.6.2.2.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 3e4d7c410a04..263741266c86 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,5 +1,5 @@
---- ./Documentation/Makefile.orig	2008-10-22 00:19:18.000000000 -0400
-+++ ./Documentation/Makefile	2008-10-24 10:06:25.561498942 -0400
+--- Documentation/Makefile.orig	2009-04-10 23:21:10.776122378 -0400
++++ Documentation/Makefile	2009-04-10 23:22:01.915148428 -0400
 @@ -12,8 +12,6 @@
  MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
  MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
@@ -9,7 +9,7 @@
  ARTICLES = howto-index
  ARTICLES += everyday
  ARTICLES += git-tools
-@@ -29,9 +27,9 @@
+@@ -29,10 +27,10 @@
  DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
  DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
  
@@ -17,11 +17,13 @@
 +prefix?=$(PREFIX)
  bindir?=$(prefix)/bin
 -htmldir?=$(prefix)/share/doc/git-doc
+-pdfdir?=$(prefix)/share/doc/git-doc
 +htmldir?=$(prefix)/share/doc/git
++pdfdir?=$(prefix)/share/doc/git
  mandir?=$(prefix)/share/man
  man1dir=$(mandir)/man1
  man5dir=$(mandir)/man5
-@@ -73,7 +71,7 @@
+@@ -76,7 +74,7 @@
  # yourself - yes, all 6 characters of it!
  #
  
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index fa5d155bc0d4..541ee2e466ec 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2008-12-25 00:33:25.000000000 -0500
-+++ Makefile	2009-01-14 09:37:39.152324285 -0500
-@@ -170,8 +170,8 @@
+--- Makefile.orig	2009-04-10 23:26:19.911276986 -0400
++++ Makefile	2009-04-10 23:26:23.213278777 -0400
+@@ -173,8 +173,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,25 +11,25 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -188,12 +188,12 @@
- 
+@@ -194,12 +194,12 @@
  prefix = $(HOME)
- bindir = $(prefix)/bin
--mandir = $(prefix)/share/man
--infodir = $(prefix)/share/info
+ bindir_relative = bin
+ bindir = $(prefix)/$(bindir_relative)
+-mandir = share/man
+-infodir = share/info
 +mandir = $(prefix)/man
 +infodir = $(prefix)/info
- gitexecdir = $(prefix)/libexec/git-core
+ gitexecdir = libexec/git-core
  sharedir = $(prefix)/share
- template_dir = $(sharedir)/git-core/templates
--htmldir=$(sharedir)/doc/git-doc
-+htmldir=$(sharedir)/doc/git
+ template_dir = share/git-core/templates
+-htmldir = share/doc/git-doc
++htmldir = share/doc/git
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
- else
-@@ -223,16 +223,16 @@
+ ETC_GITCONFIG = $(sysconfdir)/gitconfig
+@@ -230,16 +230,16 @@
  
- export prefix bindir sharedir htmldir sysconfdir
+ export prefix bindir sharedir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -54,14 +54,14 @@
  
  export TCL_PATH TCLTK_PATH
  
-@@ -865,9 +865,9 @@
+@@ -880,9 +880,9 @@
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
 -	ifdef OPENSSLDIR
 -		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
 -		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
-+	ifdef OPENSSLBASE 
++	ifdef OPENSSLBASE
 +		BASIC_CFLAGS += -I$(OPENSSLBASE)/include
 +		OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib)
  	else
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index d6a76794593a..74765edf7e51 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -152,9 +152,9 @@ libexec/git-core/git-write-tree
 %%SITE_PERL%%/Git.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist
 lib/xemacs/site-lisp/git/git.el
-lib/xemacs/site-lisp/git/vc-git.el
+lib/xemacs/site-lisp/git/git-blame.el
 share/emacs/site-lisp/git/git.el
-share/emacs/site-lisp/git/vc-git.el
+share/emacs/site-lisp/git/git-blame.el
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg.sample
 share/git-core/templates/hooks/commit-msg.sample
@@ -220,6 +220,7 @@ share/git-core/templates/info/exclude
 %%GUI%%share/gitk/lib/msgs/de.msg
 %%GUI%%share/gitk/lib/msgs/it.msg
 %%GUI%%share/gitk/lib/msgs/sv.msg
+%%HTMLDOCS%%%%DOCSDIR%%/mailmap.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-citool.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-hash-object.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-lost-found.txt
@@ -523,6 +524,10 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.2.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png