- prepare for devel/subversion17 removal

9 files changed, 11 insertions, 46 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index b22ee3ce8e95..10ea38fd2d46 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -80,8 +80,8 @@ GUI_MAKE_ARGS_OFF=	NO_TCLTK=yes
 
 # While this port does not explicity honor WITH_SUBVERSION_VER knob it does
 # depend upon devel/p5-subversion, which does honor that knob. If you want
-# to have git use devel/subversion16 it will be brought in through
-# devel/p5-subversion if you set WITH_SUBVERSION_VER=16. Otherwise
+# to have git use devel/subversion18 it will be brought in through
+# devel/p5-subversion if you set WITH_SUBVERSION_VER=18. Otherwise
 # devel/subversion will be brought in.
 SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
 			p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 51529e1d6616..89384bbc468c 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -6,11 +6,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Perl bindings for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-MASTERDIR=	${.CURDIR}/../../devel/subversion17
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
 MASTERDIR=	${.CURDIR}/../../devel/subversion18
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 1687cca59a0e..f8d879e7640c 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -6,11 +6,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Python bindings for version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-MASTERDIR=	${.CURDIR}/../../devel/subversion17
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
 MASTERDIR=	${.CURDIR}/../../devel/subversion18
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index c05a64bc7d36..fb4828636bf6 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -6,12 +6,7 @@ PKGNAMEPREFIX=	ruby-
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Ruby bindings for version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-BROKEN=	does not build with subversion17
-MASTERDIR=	${.CURDIR}/../../devel/subversion17
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
 MASTERDIR=	${.CURDIR}/../../devel/subversion18
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile
index e7539769f886..b0bd42d97969 100644
--- a/java/java-subversion/Makefile
+++ b/java/java-subversion/Makefile
@@ -7,11 +7,7 @@ CATEGORIES=	java
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Java bindings for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-MASTERDIR=	${.CURDIR}/../../devel/subversion17
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
 MASTERDIR=	${.CURDIR}/../../devel/subversion18
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
diff --git a/ports-mgmt/portshaker/Makefile b/ports-mgmt/portshaker/Makefile
index 00e9b7755c95..0051b61612e1 100644
--- a/ports-mgmt/portshaker/Makefile
+++ b/ports-mgmt/portshaker/Makefile
@@ -22,8 +22,8 @@ RSYNC_DESC=	rsync support
 GIT_DESC=	git support
 HG_DESC=	mercurial support
 RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-SVN_RUN_DEPENDS=        svn:${PORTSDIR}/devel/subversion17
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+SVN_RUN_DEPENDS=        svn:${PORTSDIR}/devel/subversion18
 .else
 SVN_RUN_DEPENDS=        svn:${PORTSDIR}/devel/subversion
 .endif
diff --git a/security/subversion-gnome-keyring/Makefile b/security/subversion-gnome-keyring/Makefile
index eaedfbdb9ea3..571939bb1820 100644
--- a/security/subversion-gnome-keyring/Makefile
+++ b/security/subversion-gnome-keyring/Makefile
@@ -7,13 +7,7 @@ CATEGORIES=	security gnome
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Gnome KWyring integration for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
-BROKEN=		does not build with subversion16
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-BROKEN=		does not build with subversion17
-MASTERDIR=	${.CURDIR}/../../devel/subversion17
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
 MASTERDIR=	${.CURDIR}/../../devel/subversion18
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
diff --git a/security/subversion-kwallet/Makefile b/security/subversion-kwallet/Makefile
index f4d5a26a8152..6cd0a6cce81c 100644
--- a/security/subversion-kwallet/Makefile
+++ b/security/subversion-kwallet/Makefile
@@ -7,13 +7,7 @@ CATEGORIES=	security kde
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	KDE KWallet integration for Version control system
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
-BROKEN=		does not build with subversion16
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-BROKEN=		does not build with subversion17
-MASTERDIR=	${.CURDIR}/../../devel/subversion17
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
 PORTREVISION=	2
 MASTERDIR=	${.CURDIR}/../../devel/subversion18
 .else
diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile
index 486cadd4a131..1a357d5c248c 100644
--- a/www/mod_dav_svn/Makefile
+++ b/www/mod_dav_svn/Makefile
@@ -9,13 +9,7 @@ CATEGORIES=	www
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Apache module for subversion serving.
 
-.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
-BROKEN=		does not build with subversion16
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-BROKEN=		does not build with subversion17
-MASTERDIR=	${.CURDIR}/../../devel/subversion17
-.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
+.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
 MASTERDIR=	${.CURDIR}/../../devel/subversion18
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion