From e1b036d886883a31b917c8d824f1dfd65915f939 Mon Sep 17 00:00:00 2001
From: mmacy <mmacy@FreeBSD.org>
Date: Sun, 22 Jul 2018 23:20:24 +0000
Subject: [PATCH] Correctly reference SRCTOP, avoid multiple invocations of svn

Reported by:	sjg
---
 release/Makefile.ec2 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 1a18229a7b0..041e7765110 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -15,9 +15,15 @@ SVN_CMD=   ${_P}/${_S}
 .  endfor
 . endfor
 .endif
-.if exists($SRCTOP/.svn)
-EC2_SVNBRANCH!=	${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
-EC2_SVNREV!=	${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
+.if exists(${SRCTOP}/.svn)
+.  if empty(${EC2_SVNBRANCH})
+   EC2_SVNBRANCH!=	${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
+.  export EC2_SVNBRANCH
+.  endif
+.  if empty(${EC2_SVNREV})
+   EC2_SVNREV!=	${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
+.  export EC2_SVNREV
+.  endif
 .else
 EC2_SVNBRANCH=	unknown
 EC2_SVNREV=	unknown
-- 
2.45.0