- Update devel/git to 2.8.1

- Remove ETCSHELLS option and use @shell in pkg-plist [1]

Submitted by:	bapt [1]
Sponsored by:	Rubicon Communications (Netgate)
Differential Revision:	https://reviews.freebsd.org/D5899 [1]

4 files changed, 13 insertions, 27 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 15998b487237..1e67fb7dccc6 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.7.4
-PORTREVISION=	1
+DISTVERSION=	2.8.1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -42,8 +41,8 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
 CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
 
 OPTIONS_DEFINE=	GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
-		ETCSHELLS SEND_EMAIL NLS
-OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL ICONV CURL ETCSHELLS SEND_EMAIL NLS
+		SEND_EMAIL NLS
+OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL ICONV CURL SEND_EMAIL NLS
 OPTIONS_SUB=	yes
 
 GITWEB_DESC=	Install gitweb
@@ -51,7 +50,6 @@ CONTRIB_DESC=	Install contributed scripts
 P4_DESC=	Enable Perforce support
 CVS_DESC=	Enable CVS support
 HTMLDOCS_DESC=	Install additional documentation
-ETCSHELLS_DESC=	Modify /etc/shells
 SEND_EMAIL_DESC=Enable the git-send-email(1) script
 
 NLS_USES=		gettext
diff --git a/devel/git/distinfo b/devel/git/distinfo
index f44355b9d5f6..0c056eb669c3 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-SHA256 (git-2.7.4.tar.xz) = dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b
-SIZE (git-2.7.4.tar.xz) = 3909636
-SHA256 (git-manpages-2.7.4.tar.xz) = d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25
-SIZE (git-manpages-2.7.4.tar.xz) = 384460
-SHA256 (git-htmldocs-2.7.4.tar.xz) = 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad
-SIZE (git-htmldocs-2.7.4.tar.xz) = 1032428
+SHA256 (git-2.8.1.tar.xz) = e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
+SIZE (git-2.8.1.tar.xz) = 3970056
+SHA256 (git-manpages-2.8.1.tar.xz) = e7a02f82971f6c0242ce66c9d4708a3ed2449a5b8ecc72fc39d9bad10b4e359d
+SIZE (git-manpages-2.8.1.tar.xz) = 386748
+SHA256 (git-htmldocs-2.8.1.tar.xz) = 0ef312091a6bc8938d3742be4e95510483a1700ccaeda6e85615f3d7c88d89a8
+SIZE (git-htmldocs-2.8.1.tar.xz) = 1039208
diff --git a/devel/git/files/patch-git-compat-util.h b/devel/git/files/patch-git-compat-util.h
deleted file mode 100644
index 92a9417304bc..000000000000
--- a/devel/git/files/patch-git-compat-util.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- git-compat-util.h.orig	2016-03-21 10:34:43 UTC
-+++ git-compat-util.h
-@@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, si
- 		    (uintmax_t)a, (uintmax_t)b);
- 	return a + b;
- }
--#define st_add3(a,b,c)   st_add((a),st_add((b),(c)))
--#define st_add4(a,b,c,d) st_add((a),st_add3((b),(c),(d)))
-+#define st_add3(a,b,c)   st_add(st_add((a),(b)),(c))
-+#define st_add4(a,b,c,d) st_add(st_add3((a),(b),(c)),(d))
- 
- static inline size_t st_mult(size_t a, size_t b)
- {
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 19b28688ce87..38281ef3c8f5 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -320,9 +320,7 @@ libexec/git-core/git-send-pack
 libexec/git-core/git-sh-i18n
 libexec/git-core/git-sh-i18n--envsubst
 libexec/git-core/git-sh-setup
-libexec/git-core/git-shell
-%%ETCSHELLS%%@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-%%ETCSHELLS%%@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+@shell libexec/git-core/git-shell
 libexec/git-core/git-stage
 libexec/git-core/git-shortlog
 libexec/git-core/git-show
@@ -1266,6 +1264,9 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.1.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css