Date: Mon, 14 Dec 2020 02:18:53 +0000 (UTC) From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558072 - head/ports-mgmt/portshaker Message-ID: <202012140218.0BE2IrBY097496@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012140218.0BE2IrBY097496>