svn commit: r411551 - in head/devel/git: . files

[Renato Botelho]

Author: garga
Date: Mon Mar 21 10:50:29 2016
New Revision: 411551
URL: https://svnweb.freebsd.org/changeset/ports/411551

Log:
  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
  MFH:		2016Q1

Added:
  head/devel/git/files/patch-git-compat-util.h   (contents, props changed)
Modified:
  head/devel/git/Makefile

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Mon Mar 21 10:46:10 2016	(r411550)
+++ head/devel/git/Makefile	Mon Mar 21 10:50:29 2016	(r411551)
@@ -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} \
@@ -97,10 +98,6 @@ CVS_RUN_DEPENDS=	cvsps:${PORTSDIR}/devel
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000000
-USE_GCC=	4.8+
-.endif
-
 # This is intentionally not exposed as an option.
 .ifndef (WITH_DEBUG)
 ALL_TARGET=	all strip

Added: head/devel/git/files/patch-git-compat-util.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/git/files/patch-git-compat-util.h	Mon Mar 21 10:50:29 2016	(r411551)
@@ -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)
+ {