Page MenuHomeFreeBSD
Files F156806458

D43864.id134255.diff
No OneTemporary
Actions

D43864.id134255.diff
View Options

diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile
--- 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 @@
.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
--- 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 @@
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
--- 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 @@
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
--- 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 @@
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
--- 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 @@
.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
--- 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 @@
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
--- 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_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
--- 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 @@
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
--- 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_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
--- 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 @@
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
--- 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 @@
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
--- 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_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
--- 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 @@
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
--- 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 @@
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
--- 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_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
--- 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 @@
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
--- 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_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
--- 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_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
--- 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 @@
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
--- 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 @@
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
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -7,8 +7,8 @@
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
--- 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 @@
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
--- 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 @@
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
--- 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 @@
${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
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -12,8 +12,8 @@
# 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
--- 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 @@
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
--- 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 @@
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
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -6,8 +6,8 @@
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
--- 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 @@
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
--- 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
--- 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
--- 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
--- 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 @@
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
--- 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 @@
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
--- 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 @@
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
--- 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
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -1,6 +1,6 @@
PORTNAME= thunar-vcs-plugin
PORTVERSION= 0.2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
@@ -33,7 +33,11 @@
NLS_USES= gettext-runtime
SUBVERSION_CONFIGURE_ENABLE= subversion
-SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion \
- libapr-1.so:devel/apr1
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion-lts
+.else
+SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion
+.endif
+SUBVERSION_LIB_DEPENDS+= libapr-1.so:devel/apr1
.include <bsd.port.mk>
diff --git a/devel/viewvc-devel/Makefile b/devel/viewvc-devel/Makefile
--- a/devel/viewvc-devel/Makefile
+++ b/devel/viewvc-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= viewvc
DISTVERSION= 1.3.0-20231018
+PORTREVISION= 1
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= -devel
@@ -34,7 +35,11 @@
LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd
MODWSGI_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi4@${PY_FLAVOR}
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
+.else
SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
+.endif
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.1:textproc/py-pygments@${PY_FLAVOR}
diff --git a/devel/websvn/Makefile b/devel/websvn/Makefile
--- a/devel/websvn/Makefile
+++ b/devel/websvn/Makefile
@@ -1,5 +1,6 @@
PORTNAME= websvn
PORTVERSION= 2.8.3
+PORTREVISION= 1
CATEGORIES= devel www
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
@@ -10,8 +11,12 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/license.txt
-RUN_DEPENDS= ${LOCALBASE}/bin/svn:devel/subversion \
- ${LOCALBASE}/bin/composer:devel/php-composer@${PHP_FLAVOR}
+.if ${WITH_SUBVERSION_VER:U} == LTS
+RUN_DEPENDS= subversion-lts>0:devel/subversion-lts
+.else
+RUN_DEPENDS= subversion>0:devel/subversion
+.endif
+RUN_DEPENDS+= ${LOCALBASE}/bin/composer:devel/php-composer@${PHP_FLAVOR}
USES= php:web,flavors cpe
USE_GITHUB= yes
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= netpbm
DISTVERSION= 11.04.02
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= LOCAL/leres/netpbm
@@ -64,7 +65,11 @@
#
#.if defined(BOOTSTRAP) && !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
.if defined(BOOTSTRAP)
+.if ${WITH_SUBVERSION_VER:U} == LTS
+FETCH_DEPENDS+= svn:devel/subversion-lts
+.else
FETCH_DEPENDS+= svn:devel/subversion
+.endif
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work/.bootstrap
do-fetch:
diff --git a/graphics/seom/Makefile b/graphics/seom/Makefile
--- a/graphics/seom/Makefile
+++ b/graphics/seom/Makefile
@@ -1,6 +1,6 @@
PORTNAME= seom
PORTVERSION= 2010011201
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= LOCAL/bms
@@ -39,7 +39,11 @@
# To roll snapshot: as bms: make BOOTSTRAP=defined fetch
#
.if defined(BOOTSTRAP)
+.if ${WITH_SUBVERSION_VER:U} == LTS
+FETCH_DEPENDS+= svn:devel/subversion-lts
+.else
FETCH_DEPENDS+= svn:devel/subversion
+.endif
SVN_REV= 196 # svn tip at epoch 2009120801
SVNROOT_URI= https://devel.neopsis.com/svn/seom
diff --git a/graphics/yukon/Makefile b/graphics/yukon/Makefile
--- a/graphics/yukon/Makefile
+++ b/graphics/yukon/Makefile
@@ -1,6 +1,6 @@
PORTNAME= yukon
PORTVERSION= 2010011201
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= LOCAL/bms
@@ -29,7 +29,11 @@
# To roll snapshot: as bms: make BOOTSTRAP=defined fetch
#
.if defined(BOOTSTRAP)
+.if ${WITH_SUBVERSION_VER:U} == LTS
+FETCH_DEPENDS+= svn:devel/subversion-lts
+.else
FETCH_DEPENDS+= svn:devel/subversion
+.endif
SVN_REV= 158 # svn tip at epoch 2009120801
SVNROOT_URI= https://devel.neopsis.com/svn/yukon
diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile
--- a/java/java-subversion/Makefile
+++ b/java/java-subversion/Makefile
@@ -12,8 +12,8 @@
JAVA_BUILD= yes
JAVA_RUN= yes
-PORTREVISION_114= 0
-PORTREVISION_LTS= 0
+PORTREVISION_LATEST= 1
+PORTREVISION_LTS= 1
SVN_BUILD_BINDINGS= yes
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -2,7 +2,7 @@
PORTNAME= observium
PORTVERSION= 0.19.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= http://www.observium.org/
DISTNAME= ${PORTNAME}-community-latest
@@ -56,7 +56,11 @@
NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
NMAP_RUN_DEPENDS= nmap:security/nmap
PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_RUN_DEPENDS= svn:devel/subversion-lts
+.else
SUBVERSION_RUN_DEPENDS= svn:devel/subversion
+.endif
WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client
.include <bsd.port.options.mk>
diff --git a/net-mgmt/rancid3/Makefile b/net-mgmt/rancid3/Makefile
--- a/net-mgmt/rancid3/Makefile
+++ b/net-mgmt/rancid3/Makefile
@@ -1,6 +1,6 @@
PORTNAME= rancid
PORTVERSION= 3.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/
PKGNAMESUFFIX= 3
@@ -46,7 +46,11 @@
CVS_RUN_DEPENDS= cvs:devel/cvs
CVS_CONFIGURE_ON= --without-svn
-SUBVERSION_RUN_DEPENDS= svn:devel/subversion
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_RUN_DEPENDS= svn:devel/subversion-lts
+.else
+SUBVERSION_RUN_DEPENDS= svn:devel/subversion
+.endif
SUBVERSION_CONFIGURE_ON= --with-svn
GIT_RUN_DEPENDS= git:devel/git
diff --git a/ports-mgmt/port-authoring-tools/Makefile b/ports-mgmt/port-authoring-tools/Makefile
--- a/ports-mgmt/port-authoring-tools/Makefile
+++ b/ports-mgmt/port-authoring-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= port-authoring-tools
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ports-mgmt
MAINTAINER= jgh@FreeBSD.org
@@ -8,8 +8,12 @@
USES= metaport
# note: portlint is brought in by porttools
-RUN_DEPENDS= \
- ${LOCALBASE}/bin/svn:devel/subversion \
+.if ${WITH_SUBVERSION_VER:U} == LTS
+RUN_DEPENDS= svn:devel/subversion-lts
+.else
+RUN_DEPENDS= svn:devel/subversion
+.endif
+RUN_DEPENDS+= \
${LOCALBASE}/sbin/libchk:sysutils/libchk \
${LOCALBASE}/bin/port:ports-mgmt/porttools
diff --git a/ports-mgmt/port-maintenance-tools/Makefile b/ports-mgmt/port-maintenance-tools/Makefile
--- a/ports-mgmt/port-maintenance-tools/Makefile
+++ b/ports-mgmt/port-maintenance-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= port-maintenance-tools
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= ports-mgmt
MAINTAINER= jgh@FreeBSD.org
@@ -8,9 +8,13 @@
USES= metaport
-RUN_DEPENDS= \
+.if ${WITH_SUBVERSION_VER:U} == LTS
+RUN_DEPENDS= svn:devel/subversion-lts
+.else
+RUN_DEPENDS= svn:devel/subversion
+.endif
+RUN_DEPENDS+= \
${LOCALBASE}/sbin/portupgrade:ports-mgmt/portupgrade \
- ${LOCALBASE}/bin/svn:devel/subversion \
${LOCALBASE}/sbin/pkg_cutleaves:ports-mgmt/pkg_cutleaves \
${LOCALBASE}/bin/pkg_tree:ports-mgmt/pkg_tree \
${LOCALBASE}/sbin/portdowngrade:ports-mgmt/portdowngrade
diff --git a/ports-mgmt/portshaker/Makefile b/ports-mgmt/portshaker/Makefile
--- a/ports-mgmt/portshaker/Makefile
+++ b/ports-mgmt/portshaker/Makefile
@@ -1,7 +1,7 @@
PORTNAME?= portshaker
PORTVERSION= 1.0.19
DISTVERSIONPREFIX= v
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES?= ports-mgmt
MAINTAINER?= romain@FreeBSD.org
@@ -21,11 +21,10 @@
OPTIONS_DEFAULT= RSYNC SUBVERSION
RSYNC_DESC= rsync support
RSYNC_RUN_DEPENDS= rsync:net/rsync
-WITH_SUBVERSION_VER?= 114
-.if ${WITH_SUBVERSION_VER} == 114
-SUBVERSION_RUN_DEPENDS= svn:devel/subversion
-.elif ${WITH_SUBVERSION_VER} == LTS
+.if ${WITH_SUBVERSION_VER:U} == LTS
SUBVERSION_RUN_DEPENDS= svn:devel/subversion-lts
+.else
+SUBVERSION_RUN_DEPENDS= svn:devel/subversion
.endif
GIT_RUN_DEPENDS= git:devel/git
MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL}
diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile
--- a/ports-mgmt/porttree/Makefile
+++ b/ports-mgmt/porttree/Makefile
@@ -1,6 +1,6 @@
PORTNAME= porttree
PORTVERSION= 1.1.r${SVN_REV}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ports-mgmt python
MASTER_SITES= SF/${PORTNAME}
@@ -31,7 +31,7 @@
LC_ALL="en_US.UTF-8" ${WRKSRC}/tests/tests.sh
# maintainer section:
-# require: devel/subversion
+# require: devel/subversion-lts or devel/subversion
SVNROOT?= https://svn.code.sf.net/p/porttree/code/trunk
gen-dist:
${MKDIR} ${WRKDIR}
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,6 +1,7 @@
PORTNAME= hydra
DISTVERSIONPREFIX=v
DISTVERSION= 9.5
+PORTREVISION= 1
CATEGORIES= security
MAINTAINER= rm@FreeBSD.org
@@ -30,7 +31,11 @@
OPTIONS_DEFAULT=SSH
OPTIONS_EXCLUDE=NLS DOCS
FIREBIRD_USES= firebird
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion-lts
+.else
SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion
+.endif
SSH_LIB_DEPENDS= libssh.so.4:security/libssh
X11_USES= gettext gnome pkgconfig
X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
diff --git a/security/medusa/Makefile b/security/medusa/Makefile
--- a/security/medusa/Makefile
+++ b/security/medusa/Makefile
@@ -1,6 +1,6 @@
PORTNAME= medusa
PORTVERSION= 2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.foofus.net/~jmk/tools/
@@ -22,7 +22,11 @@
OPTIONS_DEFINE= DOCS PGSQL SUBVERSION
OPTIONS_SUB= yes
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion-lts
+.else
SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion
+.endif
SUBVERSION_CFLAGS= -I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1
SUBVERSION_CONFIGURE_OFF= --enable-module-svn=no
diff --git a/security/subversion-gnome-keyring/Makefile b/security/subversion-gnome-keyring/Makefile
--- a/security/subversion-gnome-keyring/Makefile
+++ b/security/subversion-gnome-keyring/Makefile
@@ -5,8 +5,8 @@
COMMENT= Gnome Keyring integration for Version control system
WWW= https://subversion.apache.org/
-PORTREVISION_114= 0
-PORTREVISION_LTS= 0
+PORTREVISION_LATEST= 1
+PORTREVISION_LTS= 1
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,6 +1,6 @@
PORTNAME= scponly
PORTVERSION= 4.8.20110526
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= shells security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-snapshots
DISTNAME= ${PORTNAME}-20110526
@@ -46,10 +46,17 @@
RSYNC_CONFIGURE_ENABLE= rsync-compat
SCP_CONFIGURE_ENABLE= scp-compat
SUBVERSION_CONFIGURE_ENABLE= svn-compat
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_BUILD_DEPENDS= svn:devel/subversion-lts
+SUBVERSION_RUN_DEPENDS= svn:devel/subversion-lts
+SVNSERVE_BUILD_DEPENDS= svn:devel/subversion-lts
+SVNSERVE_RUN_DEPENDS= svn:devel/subversion-lts
+.else
SUBVERSION_BUILD_DEPENDS= svn:devel/subversion
SUBVERSION_RUN_DEPENDS= svn:devel/subversion
SVNSERVE_BUILD_DEPENDS= svn:devel/subversion
SVNSERVE_RUN_DEPENDS= svn:devel/subversion
+.endif
SVNSERVE_CONFIGURE_ENABLE= svnserv-compat
UNISON_BUILD_DEPENDS= unison:net/unison
UNISON_RUN_DEPENDS= unison:net/unison
diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile
--- a/sysutils/apache-mesos/Makefile
+++ b/sysutils/apache-mesos/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mesos
PORTVERSION= 1.11.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= sysutils
MASTER_SITES= APACHE/mesos/${PORTVERSION}:mesos
PKGNAMEPREFIX= apache-
@@ -33,9 +33,14 @@
libleveldb.so:databases/leveldb \
libprotobuf.so:devel/protobuf \
libsasl2.so:security/cyrus-sasl2 \
- libsvn_delta-1.so:devel/subversion \
- libsvn_subr-1.so:devel/subversion \
libzookeeper_mt.so:devel/libzookeeper
+.if ${WITH_SUBVERSION_VER:U} == LTS
+LIB_DEPENDS+= libsvn_delta-1.so:devel/subversion-lts
+LIB_DEPENDS+= libsvn_subr-1.so:devel/subversion-lts
+.else
+LIB_DEPENDS+= libsvn_delta-1.so:devel/subversion
+LIB_DEPENDS+= libsvn_subr-1.so:devel/subversion
+.endif
USES= cpe gmake libarchive libtool python:run shebangfix
CPE_VENDOR= apache
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -1,6 +1,6 @@
PORTNAME= Plagger
PORTVERSION= 0.7.17
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MIYAGAWA
@@ -151,8 +151,13 @@
CUSFEEDMIXI_RUN_DEPENDS= \
p5-WWW-Mixi>=0:www/p5-WWW-Mixi
+.if ${WITH_SUBVERSION_VER:U} == LTS
+CUSTOMSVNLOG_RUN_DEPENDS= \
+ p5-subversion-lts>=0:devel/p5-subversion
+.else
CUSTOMSVNLOG_RUN_DEPENDS= \
p5-subversion>=0:devel/p5-subversion
+.endif
EMOTICON_RUN_DEPENDS= \
p5-Text-Emoticon>=0:textproc/p5-Text-Emoticon
diff --git a/textproc/svn2cl/Makefile b/textproc/svn2cl/Makefile
--- a/textproc/svn2cl/Makefile
+++ b/textproc/svn2cl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= svn2cl
PORTVERSION= 0.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://arthurdejong.org/svn2cl/
@@ -8,8 +8,12 @@
COMMENT= Subversion ChangeLog generator
WWW= https://arthurdejong.org/svn2cl/
-RUN_DEPENDS= xsltproc:textproc/libxslt \
- svn:devel/subversion
+RUN_DEPENDS= xsltproc:textproc/libxslt
+.if ${WITH_SUBVERSION_VER:U} == LTS
+RUN_DEPENDS+= svn:devel/subversion-lts
+.else
+RUN_DEPENDS+= svn:devel/subversion
+.endif
NO_BUILD= yes
PORTDOCS= ChangeLog NEWS README TODO
diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile
--- a/www/mod_dav_svn/Makefile
+++ b/www/mod_dav_svn/Makefile
@@ -9,8 +9,8 @@
USES= apache
-PORTREVISION_114= 0
-PORTREVISION_LTS= 0
+PORTREVISION_LATEST= 1
+PORTREVISION_LTS= 1
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
diff --git a/www/repos-style/Makefile b/www/repos-style/Makefile
--- a/www/repos-style/Makefile
+++ b/www/repos-style/Makefile
@@ -1,6 +1,6 @@
PORTNAME= repos-style
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
@@ -8,7 +8,11 @@
COMMENT= Stylesheet for the Subversion index web page
WWW= http://www.reposstyle.com/
-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
USES= dos2unix php:web zip
DOS2UNIX_GLOB= *.xsl *.php
diff --git a/www/trac/Makefile b/www/trac/Makefile
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,6 +1,6 @@
PORTNAME= trac
DISTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www devel python
MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \
ftp://ftp.edgewall.com/pub/trac/
@@ -47,7 +47,11 @@
PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR}
-SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR}
+.if ${WITH_SUBVERSION_VER:U} == LTS
+SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
+.else
+SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
+.endif
GIT_RUN_DEPENDS= git:devel/git
TEXTILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile@${PY_FLAVOR}
FCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${PY_FLAVOR}
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -1,5 +1,6 @@
PORTNAME= qimageblitz
PORTVERSION= 0.1.0.${SVN_REVISION} # a made-up version also used in some linux distros, otherwise we need to add PORTEPOCH
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= yuri@FreeBSD.org
@@ -9,7 +10,11 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
+.if ${WITH_SUBVERSION_VER:U} == LTS
+FETCH_DEPENDS= svn:devel/subversion-lts
+.else
FETCH_DEPENDS= svn:devel/subversion
+.endif
USES= cmake compiler:c++11-lang qt:5
USE_LDCONFIG= yes

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 1:26 PM (16 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33194498
Default Alt Text
D43864.id134255.diff (40 KB)

Event Timeline