[Midnightbsd-cvs] mports [22252] trunk/Makefile: teach makefile how to find svn binary

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Jan 28 17:59:06 EST 2017


Revision: 22252
          http://svnweb.midnightbsd.org/mports/?rev=22252
Author:   laffer1
Date:     2017-01-28 17:59:06 -0500 (Sat, 28 Jan 2017)
Log Message:
-----------
teach makefile how to find svn binary

Modified Paths:
--------------
    trunk/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2017-01-28 22:52:44 UTC (rev 22251)
+++ trunk/Makefile	2017-01-28 22:59:06 UTC (rev 22252)
@@ -55,7 +55,7 @@
 
 index:
 	@rm -f ${INDEXDIR}/${INDEXFILE}
-	@cd ${.CURDIR} && make ${INDEXDIR}/${INDEXFILE}
+	@cd ${.CURDIR} && ${MAKE} ${INDEXDIR}/${INDEXFILE}
 
 indexbz2: index
 	@rm -f ${INDEXDIR}/${INDEXFILE}.bz2
@@ -145,7 +145,15 @@
 	@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
 .if !target(update)
 update:



More information about the Midnightbsd-cvs mailing list