From nobody Wed Feb 28 15:54:52 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TlJp44wx3z5BprN; Wed, 28 Feb 2024 15:54:52 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlJp44MF0z4vw1; Wed, 28 Feb 2024 15:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709135692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBv5/MIKBh4AmfmBkrHydy2t9pJa6X1Fq1ZiP6k8DIA=; b=vZkMdkdssQ+lf6XakMx+FNYRUphP16mLcPg2963ylBP7C3hW0SumOVaxZz6kjfj28FZn8j 3b8S7m3gxLtyw7YKH3ar/isV09uJh+I3OmBylIbzhpekMjaNZNVV6IDB1WIxlxAUxIfBh5 FPPj/HfUHERtzYK7NuCPVygbt+wq+tLFjNl55kKlEArnR1LLysEsIS6EgClYI4RZiuL43I FA7Q2cYR2HAdrEhKuLsWMGof/4bxkEHG0FRD4aFlXWslZjlvqrV4LBz2aBeH/QKpaNqNhG 8Jx86ayrm5Syy+GzyN4QLZEY6km7FjVhGCrW+3e2vQ0i+zLQKPgAvUCSsB7vow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709135692; a=rsa-sha256; cv=none; b=X4+ZlfllMw05Dt1kldQEA7WEf7nFNfDP0AzjlvJPniWjIzMCMy/DWOh74BzH2eYKzjln9P hKFBSmD+BmIyHjTvY+mC9ywWwIgITK/hlLXEYTfiF6IDX/kNci2yH5GjDqm1I/TVS4wN9g vi6L+zBbiLX29Ty1i34D2Z5TaFN7d/BoopZopyCMA4PsbW9TRJSEJxBkiJWG9z2wIw2ujY Uc8IZa2tc0ppp1AXdEGWP+C5hoh+qHshFGVi77FG7Pd5w0NKqA3dcwT8jaUzocXowDEaWr dIk5uS44CmBymAQUmljjD7sOlrnEMu5gCPXph+5eI7lFhl3lY0sK8KLkgawtmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709135692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBv5/MIKBh4AmfmBkrHydy2t9pJa6X1Fq1ZiP6k8DIA=; b=jVSAIVQGcip7hMtj/4NaCOuveu6fdNN4YSRv7C5jkMPeaPC1f0kqNYwDFZF8/HDE1J9oQb EBoSI6nCz+IZT8pqb+1bMkbHxBpVT9dfrAXldEZYR/aGF/GmA2OvEgJPzokyyZjT+26VQP xk0G0zXPVWJ1J/MGiCOrIGkCymLVoMz9q/cRUuPWhoHWpYeGOwnbEqwCGbV6Sm/17104Cb P0kcaLLsvaA4XFeQPuB+tLOuUOwxJIHzYZSYFyB0u71QkQDgM0yuKj0dv+XT3mubGzeA/L KSKsevJh9Ezk2XD9A7JOpl6pCGt0PdHLN8Tp2dmhaF/SrkaSoE1FXwF5KzEXMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TlJp43Q1Nz12pf; Wed, 28 Feb 2024 15:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SFsqWb034095; Wed, 28 Feb 2024 15:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SFsqUq034092; Wed, 28 Feb 2024 15:54:52 GMT (envelope-from git) Date: Wed, 28 Feb 2024 15:54:52 GMT Message-Id: <202402281554.41SFsqUq034092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Osipov Subject: git: e83f0a9c84ea - main - */*: Properly depend on Subversion LTS or latest with WITH_SUBVERSION_VER List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e83f0a9c84eabcc1307440925cc8d2d6b3dc4566 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e83f0a9c84eabcc1307440925cc8d2d6b3dc4566 commit e83f0a9c84eabcc1307440925cc8d2d6b3dc4566 Author: Michael Osipov AuthorDate: 2024-02-12 14:31:19 +0000 Commit: Michael Osipov CommitDate: 2024-02-28 15:53:37 +0000 */*: Properly depend on Subversion LTS or latest with WITH_SUBVERSION_VER When LTS version of Subversion is set in make.conf (WITH_SUBVERSION_VER) depending ports will still depend on latest version (devel/subversion) instead of LTS one (devel/subversion-lts). This will cause dependency conflicts when packages are distributed with Poudriere, namely pkg(8) will report them and fail to install. Make all affected ports properly depend on the right port based on the value set in WITH_SUBVERSION_VER. Approved by: jrm (mentor), otis (mentor), lev (maintainer timeout) Differential Revision: https://reviews.freebsd.org/D43864 --- devel/compiler-rt/Makefile | 5 +++++ devel/hgsvn/Makefile | 10 +++++++--- devel/kdesvn/Makefile | 10 +++++++--- devel/kdevelop/Makefile | 8 ++++++-- devel/libopenbsd/Makefile | 5 +++++ devel/p5-App-SVN-Bisect/Makefile | 10 +++++++--- devel/p5-Log-Accounting-SVN/Makefile | 10 +++++++--- devel/p5-SVN-ACL/Makefile | 10 +++++++--- devel/p5-SVN-Access/Makefile | 9 +++++++-- devel/p5-SVN-Agent/Makefile | 10 +++++++--- devel/p5-SVN-Hooks/Makefile | 9 +++++++-- devel/p5-SVN-Log/Makefile | 10 +++++++--- devel/p5-SVN-Look/Makefile | 9 +++++++-- devel/p5-SVN-Mirror/Makefile | 10 +++++++--- devel/p5-SVN-Notify-Config/Makefile | 10 +++++++--- devel/p5-SVN-S4/Makefile | 9 +++++++-- devel/p5-SVN-Simple/Makefile | 6 +++++- devel/p5-SVN-Statistics/Makefile | 10 +++++++--- devel/p5-SVN-Web/Makefile | 10 +++++++--- devel/p5-VCP-Dest-svk/Makefile | 8 ++++++-- devel/p5-subversion/Makefile | 4 ++-- devel/psvn/Makefile | 6 +++++- devel/pushmi/Makefile | 10 +++++++--- devel/py-pip/Makefile | 9 +++++++-- devel/py-subversion/Makefile | 4 ++-- devel/pysvn/Makefile | 9 +++++++-- devel/rsvndump/Makefile | 10 +++++++--- devel/ruby-subversion/Makefile | 4 ++-- devel/statsvn/Makefile | 6 +++++- devel/subversion-lts/Makefile | 2 +- devel/subversion/Makefile | 2 +- devel/subversion/Makefile.addons | 20 ++++++++------------ devel/svk/Makefile | 10 +++++++--- devel/svn2git/Makefile | 17 +++++++++++++---- devel/svn_load_dirs/Makefile | 9 +++++++-- devel/svntrac/Makefile | 8 ++++++-- devel/thunar-vcs-plugin/Makefile | 10 +++++++--- devel/viewvc-devel/Makefile | 5 +++++ devel/websvn/Makefile | 9 +++++++-- graphics/netpbm/Makefile | 5 +++++ graphics/seom/Makefile | 6 +++++- graphics/yukon/Makefile | 6 +++++- java/java-subversion/Makefile | 4 ++-- net-mgmt/observium/Makefile | 6 +++++- net-mgmt/rancid3/Makefile | 8 ++++++-- ports-mgmt/port-authoring-tools/Makefile | 10 +++++++--- ports-mgmt/port-maintenance-tools/Makefile | 10 +++++++--- ports-mgmt/portshaker/Makefile | 9 ++++----- ports-mgmt/porttree/Makefile | 4 ++-- security/hydra/Makefile | 5 +++++ security/medusa/Makefile | 6 +++++- security/subversion-gnome-keyring/Makefile | 4 ++-- shells/scponly/Makefile | 9 ++++++++- sysutils/apache-mesos/Makefile | 11 ++++++++--- textproc/p5-Plagger/Makefile | 7 ++++++- textproc/svn2cl/Makefile | 10 +++++++--- www/mod_dav_svn/Makefile | 4 ++-- www/repos-style/Makefile | 8 ++++++-- www/trac/Makefile | 8 ++++++-- x11/qimageblitz/Makefile | 5 +++++ 60 files changed, 346 insertions(+), 131 deletions(-) diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile index 885c41d20ed3..6db5a7a0edf5 100644 --- a/devel/compiler-rt/Makefile +++ b/devel/compiler-rt/Makefile @@ -1,5 +1,6 @@ PORTNAME= compiler-rt DISTVERSION= 0.r${SVN_REV} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= LOCAL/brooks @@ -52,7 +53,11 @@ SVN_REV!= svn info ${LLVM_SVN}/ | ${GREP} Revision | cut -d' ' -f2 .endif .if defined(BOOTSTRAP) +.if ${WITH_SUBVERSION_VER:U} == LTS +FETCH_DEPENDS+= svn:devel/subversion-lts +.else FETCH_DEPENDS+= svn:devel/subversion +.endif do-fetch: ${MKDIR} ${WRKDIR} diff --git a/devel/hgsvn/Makefile b/devel/hgsvn/Makefile index 53d5868e5147..cf45bb731ce1 100644 --- a/devel/hgsvn/Makefile +++ b/devel/hgsvn/Makefile @@ -1,6 +1,6 @@ PORTNAME= hgsvn PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,8 +11,12 @@ WWW= https://pypi.org/project/hgsvn/ LICENSE= GPLv3 -RUN_DEPENDS= svn:devel/subversion \ - ${PY_MERCURIAL} \ +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= svn:devel/subversion-lts +.else +RUN_DEPENDS= svn:devel/subversion +.endif +RUN_DEPENDS+= ${PY_MERCURIAL} \ ${PYTHON_PKGNAMEPREFIX}hglib>0:devel/py-hglib@${PY_FLAVOR} USES= python diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile index 54c07934b5f8..c4e2a9d7b9c8 100644 --- a/devel/kdesvn/Makefile +++ b/devel/kdesvn/Makefile @@ -1,6 +1,6 @@ PORTNAME= kdesvn DISTVERSION= 2.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/ @@ -13,8 +13,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libapr-1.so:devel/apr1 \ libexpat.so:textproc/expat2 \ - libgdbm.so:databases/gdbm \ - libsvn_client-1.so:devel/subversion + libgdbm.so:databases/gdbm +.if ${WITH_SUBVERSION_VER:U} == LTS +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts +.else +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion +.endif CONFLICTS_INSTALL= qsvn diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 1e0a49ffb388..cb3686bdf228 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -3,7 +3,7 @@ # devel/kdev-python PORTNAME= kdevelop DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -16,9 +16,13 @@ LICENSE_COMB= multi BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt LIB_DEPENDS= libKasten4Controllers.so:devel/okteta \ libapr-1.so:devel/apr1 \ - libsvn_client-1.so:devel/subversion \ libboost_thread.so:devel/boost-libs \ libkomparediff2.so:textproc/libkomparediff2 +.if ${WITH_SUBVERSION_VER:U} == LTS +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts +.else +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion +.endif RUN_DEPENDS= gmake:devel/gmake USES= cmake compiler:c++11-lib desktop-file-utils gettext grantlee:5 \ diff --git a/devel/libopenbsd/Makefile b/devel/libopenbsd/Makefile index 7120a77daa85..87068f08a791 100644 --- a/devel/libopenbsd/Makefile +++ b/devel/libopenbsd/Makefile @@ -1,5 +1,6 @@ PORTNAME= libopenbsd PORTVERSION= r298107 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= LOCAL/jbeich \ https://svn.freebsd.org/base/head/lib/${PORTNAME}/:svn @@ -30,7 +31,11 @@ SVN_REV?= ${PORTVERSION:S/r//} .endif .if defined(BOOTSTRAP) || defined(SVN_FETCH) +.if ${WITH_SUBVERSION_VER:U} == LTS +FETCH_DEPENDS+= svn:devel/subversion-lts +.else FETCH_DEPENDS+= svn:devel/subversion +.endif NO_CHECKSUM= yes diff --git a/devel/p5-App-SVN-Bisect/Makefile b/devel/p5-App-SVN-Bisect/Makefile index 4732d62e0eed..8d30dce4e01a 100644 --- a/devel/p5-App-SVN-Bisect/Makefile +++ b/devel/p5-App-SVN-Bisect/Makefile @@ -1,6 +1,6 @@ PORTNAME= App-SVN-Bisect PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,8 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-IO-All>0:devel/p5-IO-All \ - p5-YAML-Syck>0:textproc/p5-YAML-Syck \ - ${LOCALBASE}/bin/svn:devel/subversion + p5-YAML-Syck>0:textproc/p5-YAML-Syck +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= svn:devel/subversion-lts +.else +RUN_DEPENDS+= svn:devel/subversion +.endif TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \ p5-Test-Output>=0:devel/p5-Test-Output diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile index c87ad82e2aeb..13901f61fc73 100644 --- a/devel/p5-Log-Accounting-SVN/Makefile +++ b/devel/p5-Log-Accounting-SVN/Makefile @@ -1,6 +1,6 @@ PORTNAME= Log-Accounting-SVN PORTVERSION= 0.01 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,8 +13,12 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \ - p5-SVN-Log>=0:devel/p5-SVN-Log \ +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif +RUN_DEPENDS+= p5-SVN-Log>=0:devel/p5-SVN-Log \ p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting \ p5-Test-Simple>=0:devel/p5-Test-Simple diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile index f12639508033..4e99d09cc7cc 100644 --- a/devel/p5-SVN-ACL/Makefile +++ b/devel/p5-SVN-ACL/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-ACL PORTVERSION= 0.02 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -10,8 +10,12 @@ COMMENT= Simple ACL frontend for subversion WWW= https://metacpan.org/release/SVN-ACL BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \ - p5-YAML>=0:textproc/p5-YAML +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif +RUN_DEPENDS+= p5-YAML>=0:textproc/p5-YAML USES= perl5 tar:tgz USE_PERL5= configure diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile index 450ce7b90273..123fdcb34a3f 100644 --- a/devel/p5-SVN-Access/Makefile +++ b/devel/p5-SVN-Access/Makefile @@ -1,5 +1,6 @@ PORTNAME= SVN-Access PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,8 +13,12 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash \ - p5-subversion>=0:devel/p5-subversion +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif +RUN_DEPENDS+= p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash USES= perl5 USE_PERL5= configure diff --git a/devel/p5-SVN-Agent/Makefile b/devel/p5-SVN-Agent/Makefile index 383fcb2504e2..f100e9c7cfdd 100644 --- a/devel/p5-SVN-Agent/Makefile +++ b/devel/p5-SVN-Agent/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-Agent PORTVERSION= 0.04 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -10,8 +10,12 @@ COMMENT= Simple svn manipulation WWW= https://metacpan.org/release/SVN-Agent BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \ - p5-Class-Accessor>=0:devel/p5-Class-Accessor \ +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif +RUN_DEPENDS+= p5-Class-Accessor>=0:devel/p5-Class-Accessor \ p5-File-Slurp>=0:devel/p5-File-Slurp USES= perl5 diff --git a/devel/p5-SVN-Hooks/Makefile b/devel/p5-SVN-Hooks/Makefile index 30dc1637e998..ebaed293d592 100644 --- a/devel/p5-SVN-Hooks/Makefile +++ b/devel/p5-SVN-Hooks/Makefile @@ -1,5 +1,6 @@ PORTNAME= SVN-Hooks PORTVERSION= 1.36 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,8 +17,12 @@ RUN_DEPENDS= p5-Data-Util>=0:devel/p5-Data-Util \ p5-JIRA-REST>0:devel/p5-JIRA-REST \ p5-SVN-Look>=0:devel/p5-SVN-Look \ p5-SVN-Notify>=0:devel/p5-SVN-Notify \ - p5-XMLRPC-Lite>0:net/p5-XMLRPC-Lite \ - subversion>0:devel/subversion + p5-XMLRPC-Lite>0:net/p5-XMLRPC-Lite +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= subversion-lts>0:devel/subversion-lts +.else +RUN_DEPENDS+= subversion>0:devel/subversion +.endif TEST_DEPENDS= p5-URI>=0:net/p5-URI USES= perl5 diff --git a/devel/p5-SVN-Log/Makefile b/devel/p5-SVN-Log/Makefile index ff653d5b7005..59708273b7d1 100644 --- a/devel/p5-SVN-Log/Makefile +++ b/devel/p5-SVN-Log/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-Log PORTVERSION= 0.03 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,8 +13,12 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \ - p5-Test-Simple>=0:devel/p5-Test-Simple +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif +RUN_DEPENDS+= p5-Test-Simple>=0:devel/p5-Test-Simple NO_ARCH= yes USES= perl5 diff --git a/devel/p5-SVN-Look/Makefile b/devel/p5-SVN-Look/Makefile index d31e14f960b2..1b5d96c5ca5b 100644 --- a/devel/p5-SVN-Look/Makefile +++ b/devel/p5-SVN-Look/Makefile @@ -1,5 +1,6 @@ PORTNAME= SVN-Look PORTVERSION= 0.43 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,8 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \ - p5-XML-Simple>=0:textproc/p5-XML-Simple \ - subversion>0:devel/subversion + p5-XML-Simple>=0:textproc/p5-XML-Simple +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= subversion-lts>0:devel/subversion-lts +.else +RUN_DEPENDS+= subversion>0:devel/subversion +.endif USES= perl5 USE_PERL5= configure diff --git a/devel/p5-SVN-Mirror/Makefile b/devel/p5-SVN-Mirror/Makefile index e09d11327a67..345a41a3162d 100644 --- a/devel/p5-SVN-Mirror/Makefile +++ b/devel/p5-SVN-Mirror/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-Mirror PORTVERSION= 0.75 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,8 +20,12 @@ RUN_DEPENDS= p5-Class-Accessor>=0:devel/p5-Class-Accessor \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ p5-TimeDate>=0:devel/p5-TimeDate \ p5-URI>=0:net/p5-URI \ - p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \ - p5-subversion>=0:devel/p5-subversion + p5-VCP-autrijus>=0:devel/p5-VCP-autrijus +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion +.endif USES= perl5 USE_PERL5= configure diff --git a/devel/p5-SVN-Notify-Config/Makefile b/devel/p5-SVN-Notify-Config/Makefile index 3351b4594bef..630787c007d5 100644 --- a/devel/p5-SVN-Notify-Config/Makefile +++ b/devel/p5-SVN-Notify-Config/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-Notify-Config PORTVERSION= 0.0911 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN @@ -14,9 +14,13 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ${LOCALBASE}/bin/svnlook:devel/subversion \ - p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \ +RUN_DEPENDS= p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \ p5-YAML>=0.62:textproc/p5-YAML +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= svnlook:devel/subversion-lts +.else +RUN_DEPENDS+= svnlook:devel/subversion +.endif TEST_DEPENDS= p5-Test-Deep>=0.1:devel/p5-Test-Deep USES= perl5 diff --git a/devel/p5-SVN-S4/Makefile b/devel/p5-SVN-S4/Makefile index 48a003c776d6..0fb8e134c041 100644 --- a/devel/p5-SVN-S4/Makefile +++ b/devel/p5-SVN-S4/Makefile @@ -1,5 +1,6 @@ PORTNAME= SVN-S4 PORTVERSION= 1.062 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,8 +15,12 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Config-Tiny>=0:devel/p5-Config-Tiny \ p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \ - p5-IO-AIO>=0:devel/p5-IO-AIO \ - p5-subversion>=0:devel/p5-subversion + p5-IO-AIO>=0:devel/p5-IO-AIO +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion +.endif NO_ARCH= yes USES= perl5 diff --git a/devel/p5-SVN-Simple/Makefile b/devel/p5-SVN-Simple/Makefile index 474bfe5bb698..01675e08a83a 100644 --- a/devel/p5-SVN-Simple/Makefile +++ b/devel/p5-SVN-Simple/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-Simple PORTVERSION= 0.28 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,7 +13,11 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif USES= perl5 USE_PERL5= configure diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile index 82ff09adf495..de32d7426444 100644 --- a/devel/p5-SVN-Statistics/Makefile +++ b/devel/p5-SVN-Statistics/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-Statistics PORTVERSION= 0.041 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:LINMAR @@ -14,8 +14,12 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \ - p5-RRDTool-OO>=0:devel/p5-RRDTool-OO \ +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif +RUN_DEPENDS+= p5-RRDTool-OO>=0:devel/p5-RRDTool-OO \ p5-Data-Dumper-Simple>=0:devel/p5-Data-Dumper-Simple \ p5-IO-Toolkit>=0:devel/p5-IO-Toolkit diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile index eae35bdd670b..a68dbe2f115b 100644 --- a/devel/p5-SVN-Web/Makefile +++ b/devel/p5-SVN-Web/Makefile @@ -1,6 +1,6 @@ PORTNAME= SVN-Web PORTVERSION= 0.63 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -30,8 +30,12 @@ RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \ p5-URI>=0:net/p5-URI \ p5-XML-RSS-Parser>=0:textproc/p5-XML-RSS-Parser \ p5-XML-RSS>=0:textproc/p5-XML-RSS \ - p5-YAML>=0:textproc/p5-YAML \ - p5-subversion>=0:devel/p5-subversion + p5-YAML>=0:textproc/p5-YAML +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion +.endif TEST_DEPENDS= p5-Test-Benchmark>=0:devel/p5-Test-Benchmark \ p5-Test-HTML-Tidy>=0:devel/p5-Test-HTML-Tidy \ p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile index 33a41499e1a6..ad7f5df54a2d 100644 --- a/devel/p5-VCP-Dest-svk/Makefile +++ b/devel/p5-VCP-Dest-svk/Makefile @@ -1,6 +1,6 @@ PORTNAME= VCP-Dest-svk PORTVERSION= 0.29 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CLKAO @@ -16,8 +16,12 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \ p5-YAML>=0:textproc/p5-YAML \ - p5-subversion>=0:devel/p5-subversion \ svk>=0:devel/svk +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion +.endif USES= perl5 USE_PERL5= configure diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index f7d513fbb368..bc8b5e846f55 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -7,8 +7,8 @@ WWW= https://subversion.apache.org/ USES= perl5 USE_PERL5= build run -PORTREVISION_114= 0 -PORTREVISION_LTS= 0 +PORTREVISION_LATEST= 1 +PORTREVISION_LTS= 1 SVN_BUILD_BINDINGS= yes diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile index d1c1bf8e8d4f..1c8ede90de5e 100644 --- a/devel/psvn/Makefile +++ b/devel/psvn/Makefile @@ -1,6 +1,6 @@ PORTNAME= psvn PORTVERSION= 20150720.214200 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel elisp MASTER_SITES= http://www.xsteve.at/prg/emacs/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -13,7 +13,11 @@ WWW= http://www.xsteve.at/prg/emacs/ LICENSE= GPLv2+ +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= svn:devel/subversion-lts +.else RUN_DEPENDS= svn:devel/subversion +.endif USES= emacs diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile index 0a6ae19342fa..2eb8cf33e76e 100644 --- a/devel/pushmi/Makefile +++ b/devel/pushmi/Makefile @@ -1,6 +1,6 @@ PORTNAME= pushmi PORTVERSION= 1.0.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CLKAO @@ -17,8 +17,12 @@ BUILD_DEPENDS= ${RUN_DEPENDS} \ p5-RunApp>=0.13:devel/p5-RunApp \ p5-Test-Output>=0:devel/p5-Test-Output \ ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 -RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \ - p5-App-CLI>=0.06:devel/p5-App-CLI \ +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion +.endif +RUN_DEPENDS+= p5-App-CLI>=0.06:devel/p5-App-CLI \ p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \ p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ p5-YAML-Syck>=0:textproc/p5-YAML-Syck \ diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index caf1a75a9adf..0d1953f104ec 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -1,5 +1,6 @@ PORTNAME= pip PORTVERSION= 23.3.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= https://files.pythonhosted.org/packages/c3/9e/8a7ba2c9984a060daa6c6f9fff4d576b7ace3936239d6b771541eab972ed/:test_setuptools \ https://files.pythonhosted.org/packages/61/86/cc8d1ff2ca31a312a25a708c891cf9facbad4eae493b3872638db6785eb5/:test_wheel @@ -29,8 +30,12 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ hg:devel/mercurial \ - git:devel/git \ - svn:devel/subversion + git:devel/git +.if ${WITH_SUBVERSION_VER:U} == LTS +TEST_DEPENDS+= svn:devel/subversion-lts +.else +TEST_DEPENDS+= svn:devel/subversion +.endif USES= cpe python shebangfix CPE_VENDOR= pypa diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 1bfaa2340d31..6c99882bd8ca 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -12,8 +12,8 @@ USE_PYTHON= flavors py3kplist # There is bug in python bindings Makefile MAKE_JOBS_UNSAFE=yes -PORTREVISION_114= 2 -PORTREVISION_LTS= 0 +PORTREVISION_LATEST= 3 +PORTREVISION_LTS= 1 SVN_BUILD_BINDINGS= yes diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile index dfc6f0a6a599..bc9d9eab71a2 100644 --- a/devel/pysvn/Makefile +++ b/devel/pysvn/Makefile @@ -1,5 +1,6 @@ PORTNAME= pysvn PORTVERSION= 1.9.12 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pysvn.barrys-emacs.org/source_kits/ @@ -10,8 +11,12 @@ WWW= http://pysvn.tigris.org/ LICENSE= APACHE11 LICENSE_FILE= ${WRKSRC}/../LICENSE.txt -LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ - libneon.so:www/neon \ +.if ${WITH_SUBVERSION_VER:U} == LTS +LIB_DEPENDS= libsvn_client-1.so:devel/subversion-lts +.else +LIB_DEPENDS= libsvn_client-1.so:devel/subversion +.endif +LIB_DEPENDS+= libneon.so:www/neon \ libexpat.so:textproc/expat2 USES= python diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile index 72f7e040d079..36b513ad9f4e 100644 --- a/devel/rsvndump/Makefile +++ b/devel/rsvndump/Makefile @@ -1,6 +1,6 @@ PORTNAME= rsvndump DISTVERSION= 0.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DISTVERSION} @@ -13,8 +13,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libapr-1.so:devel/apr1 \ libexpat.so:textproc/expat2 \ - libgdbm.so:databases/gdbm \ - libsvn_client-1.so:devel/subversion + libgdbm.so:databases/gdbm +.if ${WITH_SUBVERSION_VER:U} == LTS +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts +.else +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion +.endif USES= bdb:18 gmake diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index 0a26a981871b..3ff8953a6728 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -6,8 +6,8 @@ WWW= https://subversion.apache.org/ USES+= compiler:c11 ruby -PORTREVISION_114= 0 -PORTREVISION_LTS= 0 +PORTREVISION_LATEST= 1 +PORTREVISION_LTS= 1 SVN_BUILD_BINDINGS= yes diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile index 0ac7f3f5f476..9a240c9f0432 100644 --- a/devel/statsvn/Makefile +++ b/devel/statsvn/Makefile @@ -1,6 +1,6 @@ PORTNAME= statsvn PORTVERSION= 0.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel java MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -11,7 +11,11 @@ WWW= https://www.statsvn.org/ LICENSE= LGPL21+ +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= subversion-lts>0:devel/subversion-lts +.else RUN_DEPENDS= subversion>0:devel/subversion +.endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index 0b887b6a517c..287d6869becc 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -lts MAINTAINER= lev@FreeBSD.org diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 7851917c2121..4e2427ac0eee 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 5 +PORTREVISION= 6 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system diff --git a/devel/subversion/Makefile.addons b/devel/subversion/Makefile.addons index db809d746610..09d12ccf3a01 100644 --- a/devel/subversion/Makefile.addons +++ b/devel/subversion/Makefile.addons @@ -1,30 +1,26 @@ -WITH_SUBVERSION_VER?= 114 +WITH_SUBVERSION_VER?= latest PKGDIR= ${.CURDIR} SVN_BUILD_ADDONS= yes -.if ${WITH_SUBVERSION_VER} == 114 -CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ - ${PORTNAME}-1.[^1][0-9].[0-9]* \ - ${PORTNAME}-1.1[0-1].[0-9]* \ - ${PORTNAME}-lts-1.[0-9][0-9].[0-9]* -PORTREVISION= ${PORTREVISION_114:U0} -PLIST_SUB+= SVN114="" SVNLTS="@comment " +.if ${WITH_SUBVERSION_VER} == latest +CONFLICTS_BUILD+= ${PORTNAME}-lts-1.[0-9][0-9].[0-9]* +PORTREVISION= ${PORTREVISION_LATEST:U0} +PLIST_SUB+= SVN="" SVNLTS="@comment " LIB_DEPENDS+= libsvn_client-1.so:devel/subversion OPTIONS_NAME= devel_subversion MASTERDIR= ${.CURDIR}/../../devel/subversion .include "${MASTERDIR}/Makefile.common" .elif ${WITH_SUBVERSION_VER} == LTS PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-lts -CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ - ${PORTNAME}-1.[0-9][0-9].[0-9]* +CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9][0-9].[0-9]* PORTREVISION= ${PORTREVISION_LTS:U0} -PLIST_SUB+= SVN114="@comment " SVNLTS="" +PLIST_SUB+= SVN="@comment " SVNLTS="" LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts OPTIONS_NAME= devel_subversion-lts MASTERDIR= ${.CURDIR}/../../devel/subversion-lts .include "${MASTERDIR}/Makefile.common" .else -BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 114 (default) and LTS are supported +BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only latest (default) and LTS are supported .endif diff --git a/devel/svk/Makefile b/devel/svk/Makefile index ea1e676ac46f..c44bf52f318f 100644 --- a/devel/svk/Makefile +++ b/devel/svk/Makefile @@ -1,6 +1,6 @@ PORTNAME= svk PORTVERSION= 2.2.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CLKAO @@ -43,8 +43,12 @@ RUN_DEPENDS= p5-Algorithm-Annotate>=0:devel/p5-Algorithm-Annotate \ p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \ p5-URI>=0:net/p5-URI \ p5-YAML-Syck>=0.60:textproc/p5-YAML-Syck \ - p5-libwww>=0:www/p5-libwww \ - p5-subversion>=0:devel/p5-subversion + p5-libwww>=0:www/p5-libwww +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion +.endif USES= perl5 USE_PERL5= configure diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile index 06360913553b..4a3ddf78c004 100644 --- a/devel/svn2git/Makefile +++ b/devel/svn2git/Makefile @@ -1,5 +1,6 @@ PORTNAME= svn2git PORTVERSION= 1.0.18 +PORTREVISION= 1 CATEGORIES= devel kde MAINTAINER= ports@FreeBSD.org @@ -9,11 +10,19 @@ WWW= http://gitorious.org/svn2git/svn2git LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libapr-1.so:devel/apr1 \ - libsvn_client-1.so:devel/subversion +LIB_DEPENDS= libapr-1.so:devel/apr1 +.if ${WITH_SUBVERSION_VER:U} == LTS +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts +.else +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion +.endif RUN_DEPENDS= git:devel/git \ - p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ - p5-subversion>=0:devel/p5-subversion + p5-Term-ReadKey>=0:devel/p5-Term-ReadKey +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion +.else +RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion +.endif USES= compiler:c++11-lang qmake qt:5 USE_GITHUB= yes diff --git a/devel/svn_load_dirs/Makefile b/devel/svn_load_dirs/Makefile index e2bd9dfa13aa..bf1bacacd8cb 100644 --- a/devel/svn_load_dirs/Makefile +++ b/devel/svn_load_dirs/Makefile @@ -1,5 +1,6 @@ PORTNAME= svn_load_dirs PORTVERSION= 1.8.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://svn.apache.org/repos/asf/subversion/tags/${PORTVERSION}/contrib/client-side/svn_load_dirs/ DISTFILES= LICENSE_AFL3.txt \ @@ -14,8 +15,12 @@ WWW= https://svn.apache.org/repos/asf/subversion/branches/scons-build-system/ww OPTIONS_DEFINE= DOCS EXAMPLES -RUN_DEPENDS= p5-URI>=0:net/p5-URI \ - ${LOCALBASE}/bin/svn:devel/subversion +RUN_DEPENDS= p5-URI>=0:net/p5-URI +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS+= svn:devel/subversion-lts +.else +RUN_DEPENDS+= svn:devel/subversion +.endif USES= perl5 diff --git a/devel/svntrac/Makefile b/devel/svntrac/Makefile index 4dea6d17d94c..56a324b41058 100644 --- a/devel/svntrac/Makefile +++ b/devel/svntrac/Makefile @@ -1,9 +1,13 @@ PORTNAME= svntrac -PORTREVISION= 4 +PORTREVISION= 5 COMMENT= Web-Based Bug And Patch-Set Tracking System For Subversion -RUN_DEPENDS= subversion>=0:devel/subversion +.if ${WITH_SUBVERSION_VER:U} == LTS +RUN_DEPENDS= subversion-lts>0:devel/subversion-lts +.else +RUN_DEPENDS= subversion>0:devel/subversion +.endif MASTERDIR= ${.CURDIR}/../cvstrac MAKE_ARGS= APPNAME=svntrac diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile index 73abb8e2de6a..ac970e9ba244 100644 --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -1,6 +1,6 @@ *** 573 LINES SKIPPED ***