From 58fd9078161b3393bfa151a1fcc5e33506d5f575 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Wed, 13 Apr 2016 02:02:43 +0000 Subject: [PATCH] Try harder to find svn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't assume svn is installed, but use it if it's available, falling back to svnlite if not (or using svn from base in the case where WITH_SVN was set in base). This matches the logic in base for finding svn. PR: 207479 Discussed with: gjb Reported by: Torsten Zühlsdorff --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5ea40e5cb77f..d89e2daed479 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,15 @@ print-index: ${INDEXDIR}/${INDEXFILE} @awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${INDEXDIR}/${INDEXFILE} GIT?= git -SVN?= svn +.if !defined(SVN) || empty(SVN) +. for _P in /usr/bin /usr/local/bin +. for _S in svn svnlite +. if exists(${_P}/${_S}) +SVN= ${_P}/${_S} +. endif +. endfor +. endfor +.endif RSYNC?= rsync PORTSNAP?= portsnap PORTSNAP_FLAGS?= -p ${.CURDIR}