svn commit: r558072 - head/ports-mgmt/portshaker

Romain Tartière romain at FreeBSD.org
Mon Dec 14 02:18:54 UTC 2020


Author: romain
Date: Mon Dec 14 02:18:53 2020
New Revision: 558072
URL: https://svnweb.freebsd.org/changeset/ports/558072

Log:
  Fix usage of WITH_SUBVERSION_VER
  
  devel/subversion used to be available in different versions from which the
  end-user could choose by setting WITH_SUBVERSION_VER to the expected version.
  This has been reworked at some point and broke that feature in portshaker.
  
  Adjust the WITH_SUBVERSION_VER handling to cope with it again.
  
  PR:		250849
  Submitted by:	nork at ninth-nine.com

Modified:
  head/ports-mgmt/portshaker/Makefile

Modified: head/ports-mgmt/portshaker/Makefile
==============================================================================
--- head/ports-mgmt/portshaker/Makefile	Mon Dec 14 02:18:10 2020	(r558071)
+++ head/ports-mgmt/portshaker/Makefile	Mon Dec 14 02:18:53 2020	(r558072)
@@ -25,7 +25,12 @@ RSYNC_DESC=	rsync support
 GIT_DESC=	git support
 HG_DESC=	mercurial support
 RSYNC_RUN_DEPENDS=	rsync:net/rsync
-SVN_RUN_DEPENDS=	svn:devel/subversion${WITH_SUBVERSION_VER}
+WITH_SUBVERSION_VER?=   114
+.if ${WITH_SUBVERSION_VER} == 114
+SVN_RUN_DEPENDS=	svn:devel/subversion
+.elif ${WITH_SUBVERSION_VER} == LTS
+SVN_RUN_DEPENDS=	svn:devel/subversion-lts
+.endif
 GIT_RUN_DEPENDS=	git:devel/git
 HG_RUN_DEPENDS=		${PY_MERCURIAL}
 .else


More information about the svn-ports-head mailing list