From 40056899f641d741d8c0c71161ffa665f4502af3 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 16 Jul 2020 20:44:04 +0000
Subject: [PATCH] Move GIT_CMD a few lines down, so it is not in between SVN_*
 lines.

Sponsored by:	Rubicon Communications, LLC (netgate.com)
---
 Makefile.inc1 | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 6b3e7c849f64..b604465c272a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -478,14 +478,6 @@ SVN_CMD=   ${_P}/${_S}
 . endfor
 .export SVN_CMD
 .endif
-.if !defined(GIT_CMD) || empty(GIT_CMD)
-. for _P in /usr/bin /usr/local/bin
-.  if exists(${_P}/git)
-GIT_CMD=   ${_P}/git
-.  endif
-. endfor
-.export GIT_CMD
-.endif
 SVNFLAGS?=	-r HEAD
 .if !defined(VCS_REVISION) || empty(VCS_REVISION)
 .if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD)
@@ -505,6 +497,15 @@ VCS_REVISION=	$$(echo r${_VCS_REVISION})
 .export VCS_REVISION
 .endif
 
+.if !defined(GIT_CMD) || empty(GIT_CMD)
+. for _P in /usr/bin /usr/local/bin
+.  if exists(${_P}/git)
+GIT_CMD=   ${_P}/git
+.  endif
+. endfor
+.export GIT_CMD
+.endif
+
 .if !defined(OSRELDATE)
 .if exists(/usr/include/osreldate.h)
 OSRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \