From owner-svn-ports-all@freebsd.org Mon Dec 14 02:18:54 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 122124AA776; Mon, 14 Dec 2020 02:18:54 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CvQ7200DLz3nDs; Mon, 14 Dec 2020 02:18:54 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6A4C19A7F; Mon, 14 Dec 2020 02:18:53 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BE2Irvq097497; Mon, 14 Dec 2020 02:18:53 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BE2IrBY097496; Mon, 14 Dec 2020 02:18:53 GMT (envelope-from romain@FreeBSD.org) Message-Id: <202012140218.0BE2IrBY097496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Mon, 14 Dec 2020 02:18:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558072 - head/ports-mgmt/portshaker X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: head/ports-mgmt/portshaker X-SVN-Commit-Revision: 558072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 02:18:54 -0000 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