Update devel/git to 2.6.3

5 files changed, 17 insertions, 14 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index db1fd6fb32d9..56a77092df6c 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.6.2
+DISTVERSION=	2.6.3
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index e77208b951fb..f7381dc3d31e 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-SHA256 (git-2.6.2.tar.xz) = 646e37abbc69d5c1b153e30c82ec3346d176e2b499b44281d08565ad8e00a670
-SIZE (git-2.6.2.tar.xz) = 3812636
-SHA256 (git-manpages-2.6.2.tar.xz) = 1041b6f32eed0a04255bec22ada3bad3c212bee9986a99f3782248780d32fc3a
-SIZE (git-manpages-2.6.2.tar.xz) = 381332
-SHA256 (git-htmldocs-2.6.2.tar.xz) = 7cd13ccbe397dc742920b403957a7c769728dfe3eacc7bb91aa230ca8ab1e1c8
-SIZE (git-htmldocs-2.6.2.tar.xz) = 1017776
+SHA256 (git-2.6.3.tar.xz) = d697e4d3d76830996c05bfc2a1d88aa726415b276a884a40d137575e5d597da3
+SIZE (git-2.6.3.tar.xz) = 3819080
+SHA256 (git-manpages-2.6.3.tar.xz) = ae23f90a097437c896d6ab7becf597faa96ca8f0d1cd7efbcb1758ea2f59f2b4
+SIZE (git-manpages-2.6.3.tar.xz) = 381588
+SHA256 (git-htmldocs-2.6.3.tar.xz) = 1e08dac903f06f9739e22ae700ff811c79bd7742775060d630c1e53236bbd9a0
+SIZE (git-htmldocs-2.6.3.tar.xz) = 1020504
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 5624bc4293a4..3a153cbd0278 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,4 +1,4 @@
---- Documentation/Makefile.orig	2015-08-28 19:37:13 UTC
+--- Documentation/Makefile.orig	2015-11-05 21:31:55 UTC
 +++ Documentation/Makefile
 @@ -86,11 +86,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_T
  DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 941dba3a294b..990cfc4e8601 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2015-08-28 19:37:13 UTC
+--- Makefile.orig	2015-11-05 21:31:55 UTC
 +++ Makefile
-@@ -369,8 +369,8 @@ GIT-VERSION-FILE: FORCE
+@@ -372,8 +372,8 @@ GIT-VERSION-FILE: FORCE
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,7 +11,7 @@
  ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -392,15 +392,15 @@ STRIP ?= strip
+@@ -398,15 +398,15 @@ ARFLAGS = rcs
  prefix = $(HOME)
  bindir_relative = bin
  bindir = $(prefix)/$(bindir_relative)
@@ -31,7 +31,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -413,21 +413,21 @@ htmldir_relative = $(patsubst $(prefix)/
+@@ -419,22 +419,22 @@ htmldir_relative = $(patsubst $(prefix)/
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -47,6 +47,7 @@
 -TCLTK_PATH = wish
 -XGETTEXT = xgettext
 -MSGFMT = msgfmt
+-CURL_CONFIG = curl-config
 -PTHREAD_LIBS = -lpthread
 -PTHREAD_CFLAGS =
 -GCOV = gcov
@@ -62,13 +63,14 @@
 +TCLTK_PATH ?= wish
 +XGETTEXT ?= xgettext
 +MSGFMT ?= msgfmt
++CURL_CONFIG ?= curl-config
 +PTHREAD_LIBS ?= -lpthread
 +PTHREAD_CFLAGS ?=
 +GCOV ?= gcov
  
  export TCL_PATH TCLTK_PATH
  
-@@ -1095,9 +1095,9 @@ EXTLIBS += -lz
+@@ -1107,9 +1107,9 @@ EXTLIBS += -lz
  
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@ -81,7 +83,7 @@
  	else
  		OPENSSL_LINK =
  	endif
-@@ -1791,7 +1791,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT
+@@ -1803,7 +1803,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index e8c27f1f24d1..739e411e1c5e 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -1253,6 +1253,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.3.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css