svn commit: r411561 - in branches/2016Q1/devel/git: . files

[Renato Botelho]

Author: garga
Date: Mon Mar 21 13:47:51 2016
New Revision: 411561
URL: https://svnweb.freebsd.org/changeset/ports/411561

Log:
  MFH: r411551
  
  Import a patch from git mailing list to fix build with gcc 4.2.1 and
  remove dependency of newer gcc to build it on 9.x
  
  Obtained from:	http://thread.gmane.org/gmane.comp.version-control.git/289397
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2016Q1/devel/git/files/patch-git-compat-util.h
     - copied unchanged from r411551, head/devel/git/files/patch-git-compat-util.h
Modified:
  branches/2016Q1/devel/git/Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/devel/git/Makefile
==============================================================================
--- branches/2016Q1/devel/git/Makefile	Mon Mar 21 13:27:33 2016	(r411560)
+++ branches/2016Q1/devel/git/Makefile	Mon Mar 21 13:47:51 2016	(r411561)
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 DISTVERSION=	2.7.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \

Copied: branches/2016Q1/devel/git/files/patch-git-compat-util.h (from r411551, head/devel/git/files/patch-git-compat-util.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/devel/git/files/patch-git-compat-util.h	Mon Mar 21 13:47:51 2016	(r411561, copy of r411551, head/devel/git/files/patch-git-compat-util.h)
@@ -0,0 +1,13 @@
+--- 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)
+ {