Update to 2.5.2

5 files changed, 11 insertions, 73 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index fdce2e0cba62..a0aba6808cec 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 22dc1c6bdd7d..76e9ade3f4e2 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-SHA256 (git-2.5.1.tar.xz) = b3ceb7b118221b8c74d0abdc62ab035a58360dbbd28ca17c53e301e517d4220f
-SIZE (git-2.5.1.tar.xz) = 3741764
-SHA256 (git-manpages-2.5.1.tar.xz) = 6e403070ee71678acad0b7f53bc5327e13b42cebccc6769177fe0b4a11f042e3
-SIZE (git-manpages-2.5.1.tar.xz) = 378028
-SHA256 (git-htmldocs-2.5.1.tar.xz) = 2ebf4761a793d4c8bdf49ff04937c08408c8903160d910eba5714786535d0c83
-SIZE (git-htmldocs-2.5.1.tar.xz) = 1008284
+SHA256 (git-2.5.2.tar.xz) = 4b4760a90ede51accee703bd6815f1f79afef68670acdcf3ea31dcc846a40c9b
+SIZE (git-2.5.2.tar.xz) = 3744080
+SHA256 (git-manpages-2.5.2.tar.xz) = 76512caa7044710f9954079828218cd94ab17da34effd3bdd9db2434d18720c2
+SIZE (git-manpages-2.5.2.tar.xz) = 378032
+SHA256 (git-htmldocs-2.5.2.tar.xz) = 87e416455a293552c2bab46fb3ec75424e2143e6f98f5ce7bcb6d4e50c4020eb
+SIZE (git-htmldocs-2.5.2.tar.xz) = 1008940
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 917b4ec0fcb4..9616a5666fd1 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -81,19 +81,6 @@
  	else
  		OPENSSL_LINK =
  	endif
-@@ -1696,10 +1696,10 @@ $(BUILT_INS): git$X
- 	ln -s $< $@ 2>/dev/null || \
- 	cp $< $@
- 
--common-cmds.h: generate-cmdlist.perl command-list.txt
-+common-cmds.h: generate-cmdlist.sh command-list.txt
- 
- common-cmds.h: $(wildcard Documentation/git-*.txt)
--	$(QUIET_GEN)$(PERL_PATH) generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@
-+	$(QUIET_GEN)$(SHELL_PATH) generate-cmdlist.sh command-list.txt > $@+ && mv $@+ $@
- 
- SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
- 	$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
 @@ -1791,7 +1791,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT
  	chmod +x $@+ && \
  	mv $@+ $@
diff --git a/devel/git/files/patch-generate-cmdlist.sh b/devel/git/files/patch-generate-cmdlist.sh
deleted file mode 100644
index d449121bec8d..000000000000
--- a/devel/git/files/patch-generate-cmdlist.sh
+++ /dev/null
@@ -1,53 +0,0 @@
---- generate-cmdlist.sh.orig	2015-09-03 20:25:24 UTC
-+++ generate-cmdlist.sh
-@@ -0,0 +1,50 @@
-+#!/bin/sh
-+
-+echo "/* Automatically generated by $0 */
-+struct cmdname_help {
-+	char name[16];
-+	char help[80];
-+	unsigned char group;
-+};
-+
-+static const char *common_cmd_groups[] = {"
-+
-+grps=grps$$.tmp
-+match=match$$.tmp
-+trap "rm -f '$grps' '$match'" 0 1 2 3 15
-+
-+sed -n '
-+	1,/^### common groups/b
-+	/^### command list/q
-+	/^#/b
-+	/^[ 	]*$/b
-+	h;s/^[^ 	][^ 	]*[ 	][ 	]*\(.*\)/	N_("\1"),/p
-+	g;s/^\([^ 	][^ 	]*\)[ 	].*/\1/w '$grps'
-+	' "$1"
-+printf '};\n\n'
-+
-+n=0
-+substnum=
-+while read grp
-+do
-+	echo "^git-..*[ 	]$grp"
-+	substnum="$substnum${substnum:+;}s/[ 	]$grp/$n/"
-+	n=$(($n+1))
-+done <"$grps" >"$match"
-+
-+printf 'static struct cmdname_help common_cmds[] = {\n'
-+grep -f "$match" "$1" |
-+sed 's/^git-//' |
-+sort |
-+while read cmd tags
-+do
-+	tag=$(echo "$tags" | sed "$substnum; s/[^0-9]//g")
-+	sed -n '
-+		/^NAME/,/git-'"$cmd"'/H
-+		${
-+			x
-+			s/.*git-'"$cmd"' - \(.*\)/	{"'"$cmd"'", N_("\1"), '$tag'},/
-+			p
-+		}' "Documentation/git-$cmd.txt"
-+done
-+echo "};"
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 729e044cdc1b..5891af67fa67 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -1222,6 +1222,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.2.txt
@@ -1231,6 +1232,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.6.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.7.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.9.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.2.txt
@@ -1240,8 +1242,10 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.6.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.7.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.9.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.2.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css