Date: Wed, 13 Apr 2016 02:02:44 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413169 - head Message-ID: <201604130202.u3D22i3s041455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Apr 13 02:02:43 2016 New Revision: 413169 URL: https://svnweb.freebsd.org/changeset/ports/413169 Log: Try harder to find svn 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 <ports@toco-domains.de> Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Wed Apr 13 01:49:24 2016 (r413168) +++ head/Makefile Wed Apr 13 02:02:43 2016 (r413169) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604130202.u3D22i3s041455>