Skip to content

Commit e83f0a9

Browse files
michael-omichael-o
committed
*/*: 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
1 parent a1b345c commit e83f0a9

File tree

60 files changed

+346
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+346
-131
lines changed

‎devel/compiler-rt/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
PORTNAME= compiler-rt
22
DISTVERSION= 0.r${SVN_REV}
3+
PORTREVISION= 1
34
CATEGORIES= devel
45
MASTER_SITES= LOCAL/brooks
56

@@ -52,7 +53,11 @@ SVN_REV!= svn info ${LLVM_SVN}/ | ${GREP} Revision | cut -d' ' -f2
5253
.endif
5354

5455
.if defined(BOOTSTRAP)
56+
.if ${WITH_SUBVERSION_VER:U} == LTS
57+
FETCH_DEPENDS+= svn:devel/subversion-lts
58+
.else
5559
FETCH_DEPENDS+= svn:devel/subversion
60+
.endif
5661

5762
do-fetch:
5863
${MKDIR} ${WRKDIR}

‎devel/hgsvn/Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= hgsvn
22
PORTVERSION= 0.6.0
3-
PORTREVISION= 1
3+
PORTREVISION= 2
44
CATEGORIES= devel python
55
MASTER_SITES= PYPI
66
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,8 +11,12 @@ WWW= https://pypi.org/project/hgsvn/
1111

1212
LICENSE= GPLv3
1313

14-
RUN_DEPENDS= svn:devel/subversion \
15-
${PY_MERCURIAL} \
14+
.if ${WITH_SUBVERSION_VER:U} == LTS
15+
RUN_DEPENDS= svn:devel/subversion-lts
16+
.else
17+
RUN_DEPENDS= svn:devel/subversion
18+
.endif
19+
RUN_DEPENDS+= ${PY_MERCURIAL} \
1620
${PYTHON_PKGNAMEPREFIX}hglib>0:devel/py-hglib@${PY_FLAVOR}
1721

1822
USES= python

‎devel/kdesvn/Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= kdesvn
22
DISTVERSION= 2.1.0
3-
PORTREVISION= 6
3+
PORTREVISION= 7
44
CATEGORIES= devel kde
55
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/
66

@@ -13,8 +13,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING
1313

1414
LIB_DEPENDS= libapr-1.so:devel/apr1 \
1515
libexpat.so:textproc/expat2 \
16-
libgdbm.so:databases/gdbm \
17-
libsvn_client-1.so:devel/subversion
16+
libgdbm.so:databases/gdbm
17+
.if ${WITH_SUBVERSION_VER:U} == LTS
18+
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts
19+
.else
20+
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion
21+
.endif
1822

1923
CONFLICTS_INSTALL= qsvn
2024

‎devel/kdevelop/Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# devel/kdev-python
44
PORTNAME= kdevelop
55
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
6-
PORTREVISION= 1
6+
PORTREVISION= 2
77
CATEGORIES= devel kde kde-applications
88

99
MAINTAINER= [email protected]
@@ -16,9 +16,13 @@ LICENSE_COMB= multi
1616
BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt
1717
LIB_DEPENDS= libKasten4Controllers.so:devel/okteta \
1818
libapr-1.so:devel/apr1 \
19-
libsvn_client-1.so:devel/subversion \
2019
libboost_thread.so:devel/boost-libs \
2120
libkomparediff2.so:textproc/libkomparediff2
21+
.if ${WITH_SUBVERSION_VER:U} == LTS
22+
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts
23+
.else
24+
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion
25+
.endif
2226
RUN_DEPENDS= gmake:devel/gmake
2327

2428
USES= cmake compiler:c++11-lib desktop-file-utils gettext grantlee:5 \

‎devel/libopenbsd/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
PORTNAME= libopenbsd
22
PORTVERSION= r298107
3+
PORTREVISION= 1
34
CATEGORIES= devel
45
MASTER_SITES= LOCAL/jbeich \
56
https://svn.freebsd.org/base/head/lib/${PORTNAME}/:svn
@@ -30,7 +31,11 @@ SVN_REV?= ${PORTVERSION:S/r//}
3031
.endif
3132

3233
.if defined(BOOTSTRAP) || defined(SVN_FETCH)
34+
.if ${WITH_SUBVERSION_VER:U} == LTS
35+
FETCH_DEPENDS+= svn:devel/subversion-lts
36+
.else
3337
FETCH_DEPENDS+= svn:devel/subversion
38+
.endif
3439

3540
NO_CHECKSUM= yes
3641

‎devel/p5-App-SVN-Bisect/Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= App-SVN-Bisect
22
PORTVERSION= 1.1
3-
PORTREVISION= 3
3+
PORTREVISION= 4
44
CATEGORIES= devel perl5
55
MASTER_SITES= CPAN
66
PKGNAMEPREFIX= p5-
@@ -14,8 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
1414

1515
BUILD_DEPENDS= ${RUN_DEPENDS}
1616
RUN_DEPENDS= p5-IO-All>0:devel/p5-IO-All \
17-
p5-YAML-Syck>0:textproc/p5-YAML-Syck \
18-
${LOCALBASE}/bin/svn:devel/subversion
17+
p5-YAML-Syck>0:textproc/p5-YAML-Syck
18+
.if ${WITH_SUBVERSION_VER:U} == LTS
19+
RUN_DEPENDS+= svn:devel/subversion-lts
20+
.else
21+
RUN_DEPENDS+= svn:devel/subversion
22+
.endif
1923
TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
2024
p5-Test-Output>=0:devel/p5-Test-Output
2125

‎devel/p5-Log-Accounting-SVN/Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= Log-Accounting-SVN
22
PORTVERSION= 0.01
3-
PORTREVISION= 11
3+
PORTREVISION= 12
44
CATEGORIES= devel perl5
55
MASTER_SITES= CPAN
66
PKGNAMEPREFIX= p5-
@@ -13,8 +13,12 @@ LICENSE= ART10 GPLv1+
1313
LICENSE_COMB= dual
1414

1515
BUILD_DEPENDS= ${RUN_DEPENDS}
16-
RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
17-
p5-SVN-Log>=0:devel/p5-SVN-Log \
16+
.if ${WITH_SUBVERSION_VER:U} == LTS
17+
RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion
18+
.else
19+
RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion
20+
.endif
21+
RUN_DEPENDS+= p5-SVN-Log>=0:devel/p5-SVN-Log \
1822
p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting \
1923
p5-Test-Simple>=0:devel/p5-Test-Simple
2024

‎devel/p5-SVN-ACL/Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= SVN-ACL
22
PORTVERSION= 0.02
3-
PORTREVISION= 6
3+
PORTREVISION= 7
44
CATEGORIES= devel perl5
55
MASTER_SITES= CPAN
66
PKGNAMEPREFIX= p5-
@@ -10,8 +10,12 @@ COMMENT= Simple ACL frontend for subversion
1010
WWW= https://metacpan.org/release/SVN-ACL
1111

1212
BUILD_DEPENDS= ${RUN_DEPENDS}
13-
RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
14-
p5-YAML>=0:textproc/p5-YAML
13+
.if ${WITH_SUBVERSION_VER:U} == LTS
14+
RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion
15+
.else
16+
RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion
17+
.endif
18+
RUN_DEPENDS+= p5-YAML>=0:textproc/p5-YAML
1519

1620
USES= perl5 tar:tgz
1721
USE_PERL5= configure

‎devel/p5-SVN-Access/Makefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
PORTNAME= SVN-Access
22
PORTVERSION= 0.11
3+
PORTREVISION= 1
34
CATEGORIES= devel perl5
45
MASTER_SITES= CPAN
56
PKGNAMEPREFIX= p5-
@@ -12,8 +13,12 @@ LICENSE= ART10 GPLv1+
1213
LICENSE_COMB= dual
1314

1415
BUILD_DEPENDS= ${RUN_DEPENDS}
15-
RUN_DEPENDS= p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash \
16-
p5-subversion>=0:devel/p5-subversion
16+
.if ${WITH_SUBVERSION_VER:U} == LTS
17+
RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion
18+
.else
19+
RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion
20+
.endif
21+
RUN_DEPENDS+= p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash
1722

1823
USES= perl5
1924
USE_PERL5= configure

‎devel/p5-SVN-Agent/Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= SVN-Agent
22
PORTVERSION= 0.04
3-
PORTREVISION= 3
3+
PORTREVISION= 4
44
CATEGORIES= devel perl5
55
MASTER_SITES= CPAN
66
PKGNAMEPREFIX= p5-
@@ -10,8 +10,12 @@ COMMENT= Simple svn manipulation
1010
WWW= https://metacpan.org/release/SVN-Agent
1111

1212
BUILD_DEPENDS= ${RUN_DEPENDS}
13-
RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion \
14-
p5-Class-Accessor>=0:devel/p5-Class-Accessor \
13+
.if ${WITH_SUBVERSION_VER:U} == LTS
14+
RUN_DEPENDS= p5-subversion-lts>=0:devel/p5-subversion
15+
.else
16+
RUN_DEPENDS= p5-subversion>=0:devel/p5-subversion
17+
.endif
18+
RUN_DEPENDS+= p5-Class-Accessor>=0:devel/p5-Class-Accessor \
1519
p5-File-Slurp>=0:devel/p5-File-Slurp
1620

1721
USES= perl5

0 commit comments

Comments
 (0)