Index: cad/kicad-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/cad/kicad-devel/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- cad/kicad-devel/Makefile	2 May 2011 12:44:28 -0000	1.36
+++ cad/kicad-devel/Makefile	3 Jul 2011 20:04:33 -0000
@@ -80,7 +80,7 @@
 # make makesum && make && make install
 # make build-plist
 
-FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 FETCH_DEPENDS+= bzr:${PORTSDIR}/devel/bazaar-ng
 
 do-fetch:
Index: comms/wsjt/Makefile
===================================================================
RCS file: /home/pcvs/ports/comms/wsjt/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- comms/wsjt/Makefile	24 Feb 2011 23:25:54 -0000	1.16
+++ comms/wsjt/Makefile	3 Jul 2011 20:04:33 -0000
@@ -63,7 +63,7 @@
 .endif
 
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
Index: devel/anjuta/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/anjuta/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- devel/anjuta/Makefile	20 May 2011 08:31:47 -0000	1.98
+++ devel/anjuta/Makefile	3 Jul 2011 20:04:33 -0000
@@ -69,10 +69,9 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SVN)
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	yes
 LIB_DEPENDS+=	apr-1.4:${PORTSDIR}/devel/apr1
 LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 PLIST_SUB+=	SVN=""
 .else
 CONFIGURE_ARGS+=--disable-plugin-subversion
Index: devel/compiler-rt/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/compiler-rt/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- devel/compiler-rt/Makefile	19 May 2011 16:43:40 -0000	1.6
+++ devel/compiler-rt/Makefile	3 Jul 2011 20:04:33 -0000
@@ -58,7 +58,7 @@
 .endif
 
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
Index: devel/cvs2svn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/cvs2svn/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- devel/cvs2svn/Makefile	25 Feb 2011 07:50:35 -0000	1.31
+++ devel/cvs2svn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,7 +15,8 @@
 COMMENT=	CVS to Subversion Repository Converter
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
-RUN_DEPENDS=	${BUILD_DEPENDS}
+
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_SAFE=	yes
 
@@ -33,7 +34,7 @@
 .endif
 
 .if defined(WITH_SUBVERSION)
-RUN_DEPENDS+=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/py-subversion
+USE_SVN_RUN=	yes
 .endif
 
 .if defined(WITH_GIT)
Index: devel/ditrack/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/ditrack/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- devel/ditrack/Makefile	18 May 2010 04:07:37 -0000	1.11
+++ devel/ditrack/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,12 +15,11 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tracking system based on Subversion repository
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
-
 NO_BUILD=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	DITrack
+USE_SVN_RUN=	yes
 WRKSRC=		${WRKDIR}/DITrack-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
Index: devel/esvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/esvn/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- devel/esvn/Makefile	24 Sep 2010 09:49:54 -0000	1.24
+++ devel/esvn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,7 +16,6 @@
 COMMENT=	GUI frontend for the Subversion revision system
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
 
 ESVN_DIST=	esvn
 ESVNPRO=	esvn.pro esvn-diff-wrapper.pro
@@ -27,6 +26,7 @@
 HAS_CONFIGURE=	yes
 USE_QT_VER=	3
 USE_GMAKE=	yes
+USE_SVN_RUN=	yes
 CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 CONFIGURE_ARGS=	--qtdir=${QT_PREFIX}
 MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
Index: devel/fossology/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/fossology/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- devel/fossology/Makefile	2 May 2011 12:44:31 -0000	1.7
+++ devel/fossology/Makefile	3 Jul 2011 20:04:33 -0000
@@ -25,8 +25,7 @@
 COMMENT=	License analysis tool for Open Source software
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
-		svn:${PORTSDIR}/devel/subversion
+		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template
 LIB_DEPENDS=	extractor.3:${PORTSDIR}/textproc/libextractor
 RUN_DEPENDS=	cabextract:${PORTSDIR}/archivers/cabextract \
 		icat:${PORTSDIR}/sysutils/sleuthkit \
@@ -40,6 +39,7 @@
 
 BROKEN=		does not compile
 
+USE_SVN_BUILD=	yes
 USE_APACHE=	2.0+
 USE_CDRTOOLS=	yes
 USE_GMAKE=	yes
Index: devel/git/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/git/Makefile,v
retrieving revision 1.109
diff -u -r1.109 Makefile
--- devel/git/Makefile	30 Jun 2011 22:19:09 -0000	1.109
+++ devel/git/Makefile	3 Jul 2011 20:04:33 -0000
@@ -190,7 +190,6 @@
 
 OPTIONS=	GUI "Enable building of GUI tools" off \
 		SVN "Enable required dependencies for SVN tools" off \
-		SVN_FBSD "Use subversion-freebsd dependency (implies SVN)" off \
 		GITWEB "Install gitweb" off \
 		CONTRIB "Install contributed scripts" on \
 		P4 "Enable Perforce support" on \
@@ -271,14 +270,9 @@
 MAKE_ARGS+=	NO_TCLTK=yes
 .endif
 
-.ifdef (WITH_SVN) || defined(WITH_SVN_FBSD)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion
-.ifdef (WITH_SVN_FBSD)
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion-freebsd
-.else
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-.endif
+.ifdef (WITH_SVN)
+USE_SVN_RUN=	yes perl
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
 PLIST_SUB+=	SVN=""
 MAN1+=		git-svn.1
 .else
Index: devel/hgsvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/hgsvn/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- devel/hgsvn/Makefile	18 May 2010 04:07:38 -0000	1.10
+++ devel/hgsvn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,9 +16,9 @@
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Scripts to work locally on Subversion checkouts using Mercurial
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion \
-		hg:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial
 
+USE_SVN_RUN=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 PLIST_SUB=	VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
Index: devel/horde-chora/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/horde-chora/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- devel/horde-chora/Makefile	25 Feb 2011 01:31:42 -0000	1.44
+++ devel/horde-chora/Makefile	3 Jul 2011 20:04:33 -0000
@@ -28,7 +28,7 @@
 #-----------------------------------------------------------------------
 
 .if !defined(WITHOUT_SVN)
-RUN_DEPENDS+=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+USE_SVN_RUN=	yes
 .endif
 
 .if !defined(WITHOUT_CVSPS)
Index: devel/kdesdk3/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/kdesdk3/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- devel/kdesdk3/Makefile	25 Feb 2011 01:31:43 -0000	1.77
+++ devel/kdesdk3/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,12 +17,12 @@
 COMMENT=	KDE Software Development Kit
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion
 
 CONFLICTS=	umbrello-[0-9]* kcachegrind-[0-9]*
 
 USE_KDEBASE_VER=3
 
+USE_SVN_LIB=	yes
 USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
Index: devel/kdesdk4/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/kdesdk4/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- devel/kdesdk4/Makefile	25 Mar 2011 10:33:48 -0000	1.98
+++ devel/kdesdk4/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,14 +16,14 @@
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion \
-		boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		hunspell-1.2.0:${PORTSDIR}/hungarian/hunspell
 
 LATEST_LINK=	${PORTNAME}4
 
 CONFLICTS=	kdeutils-4.5.[0-5]
 
+USE_SVN_LIB=	yes
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier \
 		automoc4 akonadi kdebase
Index: devel/kdesvn-kde4/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/kdesvn-kde4/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- devel/kdesvn-kde4/Makefile	15 Sep 2010 18:47:10 -0000	1.46
+++ devel/kdesvn-kde4/Makefile	3 Jul 2011 20:04:33 -0000
@@ -12,12 +12,11 @@
 MAINTAINER=	naylor.b.david@gmail.com
 COMMENT=	KDE frontend for Subversion
 
-LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
-
 LICENSE=	GPLv2
 
 CONFLICTS=	qsvn-[0-9]*
 
+USE_SVN_LIB=	yes
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1
Index: devel/kdevelop/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/kdevelop/Makefile,v
retrieving revision 1.114
diff -u -r1.114 Makefile
--- devel/kdevelop/Makefile	25 Feb 2011 01:31:43 -0000	1.114
+++ devel/kdevelop/Makefile	3 Jul 2011 20:04:33 -0000
@@ -19,7 +19,6 @@
 
 BUILD_DEPENDS=	cervisia:${PORTSDIR}/devel/kdesdk3 \
 		dot:${PORTSDIR}/graphics/graphviz
-LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion
 RUN_DEPENDS=	${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
 		extractrc:${PORTSDIR}/devel/kdesdk3 \
 		gdb66:${PORTSDIR}/devel/gdb66 \
@@ -48,6 +47,7 @@
 
 # KDE_DISTNAME=		${PORTNAME}-${PORTVERSION}_for_KDE_3.1
 
+USE_SVN_LIB=	yes
 USE_LDCONFIG=	yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
Index: devel/kdevplatform/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/kdevplatform/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/kdevplatform/Makefile	9 Nov 2010 01:52:43 -0000	1.2
+++ devel/kdevplatform/Makefile	3 Jul 2011 20:04:33 -0000
@@ -14,10 +14,10 @@
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE development platform
 
-LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion \
-		boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS= 	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		qjson.0:${PORTSDIR}/devel/qjson
 
+USE_SVN_LIB=	yes
 USE_BZIP2=	yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 KDE4_BUILDENV=	yes
Index: devel/llvm-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/llvm-devel/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- devel/llvm-devel/Makefile	16 Jun 2011 15:07:40 -0000	1.54
+++ devel/llvm-devel/Makefile	3 Jul 2011 20:04:33 -0000
@@ -87,7 +87,7 @@
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
Index: devel/llvm-etoile/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/llvm-etoile/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/llvm-etoile/Makefile	16 Jun 2011 15:07:40 -0000	1.3
+++ devel/llvm-etoile/Makefile	3 Jul 2011 20:04:33 -0000
@@ -63,7 +63,7 @@
 .endif
 
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
Index: devel/monodevelop/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/monodevelop/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- devel/monodevelop/Makefile	12 Jun 2011 19:06:21 -0000	1.10
+++ devel/monodevelop/Makefile	3 Jul 2011 20:04:33 -0000
@@ -56,7 +56,7 @@
 .endif
 
 .if !defined(WITHOUT_SVN)
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN_RUN=	yes
 CONFIGURE_ARGS+=--enable-subversion
 PLIST_SUB+=	SVN=""
 .else
Index: devel/p5-App-SVN-Bisect/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-App-SVN-Bisect/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/p5-App-SVN-Bisect/Makefile	18 May 2010 04:07:40 -0000	1.4
+++ devel/p5-App-SVN-Bisect/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,10 +16,11 @@
 COMMENT=	Binary search through svn revisions
 
 BUILD_DEPENDS=	p5-IO-All>0:${PORTSDIR}/devel/p5-IO-All \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN_RUN=	yes
 PERL_CONFIGURE=	yes
 
 MAN1=	svn-bisect.1
Index: devel/p5-Log-Accounting-SVN/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-Log-Accounting-SVN/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- devel/p5-Log-Accounting-SVN/Makefile	18 May 2010 04:07:41 -0000	1.13
+++ devel/p5-Log-Accounting-SVN/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,12 +15,13 @@
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Perl module for accounting SVN repository
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		p5-SVN-Log>=0:${PORTSDIR}/devel/p5-SVN-Log \
+BUILD_DEPENDS=	p5-SVN-Log>=0:${PORTSDIR}/devel/p5-SVN-Log \
 		p5-Algorithm-Accounting>=0:${PORTSDIR}/devel/p5-Algorithm-Accounting \
 		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_CONFIGURE=	5.8.0+
 
 MAN3=	Log::Accounting::SVN.3
Index: devel/p5-SVN-ACL/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-ACL/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- devel/p5-SVN-ACL/Makefile	18 May 2010 04:07:41 -0000	1.8
+++ devel/p5-SVN-ACL/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,11 +16,11 @@
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A simple ACL frontend for subversion
 
-BUILD_DEPENDS=	\
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_CONFIGURE=	yes
 
 MAN3=		SVN::ACL.3
Index: devel/p5-SVN-Access/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Access/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- devel/p5-SVN-Access/Makefile	9 Dec 2010 23:54:17 -0000	1.11
+++ devel/p5-SVN-Access/Makefile	3 Jul 2011 20:04:33 -0000
@@ -14,11 +14,11 @@
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Perl extension to manipulate SVN Access files
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Base.pm:${PORTSDIR}/devel/p5-subversion \
-		p5-Tie-IxHash>=1.21:${PORTSDIR}/devel/p5-Tie-IxHash
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Base.pm:${PORTSDIR}/devel/p5-subversion \
-		p5-Tie-IxHash>=1.21:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Tie-IxHash>=1.21:${PORTSDIR}/devel/p5-Tie-IxHash
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_CONFIGURE=	yes
 
 MAN3=		SVN::Access.3 \
Index: devel/p5-SVN-Agent/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Agent/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- devel/p5-SVN-Agent/Makefile	18 May 2010 04:07:41 -0000	1.11
+++ devel/p5-SVN-Agent/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,11 +15,12 @@
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Simple svn manipulation
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
+BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_CONFIGURE=	5.8.0+
 
 MAN3=	SVN::Agent.3
Index: devel/p5-SVN-Log/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Log/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/p5-SVN-Log/Makefile	18 May 2010 04:07:42 -0000	1.9
+++ devel/p5-SVN-Log/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,10 +15,11 @@
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	SVN::Log - Extract change logs from a Subversion server
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_MODBUILD=	5.8.0+
 
 MAN3=	SVN::Log.3
Index: devel/p5-SVN-Look/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Look/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- devel/p5-SVN-Look/Makefile	17 Dec 2010 17:48:51 -0000	1.11
+++ devel/p5-SVN-Look/Makefile	3 Jul 2011 20:04:33 -0000
@@ -14,9 +14,7 @@
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	A caching wrapper aroung the svnlook command
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/svnlook:${PORTSDIR}/devel/subversion
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+USE_SVN=	yes
 PERL_CONFIGURE=	yes
 
 MAN3=		SVN::Look.3
Index: devel/p5-SVN-Mirror/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Mirror/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- devel/p5-SVN-Mirror/Makefile	18 May 2010 04:07:42 -0000	1.43
+++ devel/p5-SVN-Mirror/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,7 +16,6 @@
 COMMENT=	Mirror remote subversion repository to local
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Data/UUID.pm:${PORTSDIR}/devel/p5-Data-UUID \
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
 		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
 		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
@@ -24,8 +23,10 @@
 		${SITE_PERL}/SVN/Simple/Edit.pm:${PORTSDIR}/devel/p5-SVN-Simple \
 		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/VCP.pm:${PORTSDIR}/devel/p5-VCP-autrijus
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_CONFIGURE=	yes
 
 MAN1=		svm.1
Index: devel/p5-SVN-Notify-Config/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Notify-Config/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- devel/p5-SVN-Notify-Config/Makefile	18 May 2010 04:07:42 -0000	1.8
+++ devel/p5-SVN-Notify-Config/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,12 +16,13 @@
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Perl module for config-driven Subversion notification
 
-RUN_DEPENDS=	${LOCALBASE}/bin/svnlook:${PORTSDIR}/devel/subversion \
-		p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
+RUN_DEPENDS= 	p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
 		p5-YAML>=0.62:${PORTSDIR}/textproc/p5-YAML
-BUILD_DEPENDS=	p5-Test-Deep>=0.1:${PORTSDIR}/devel/p5-Test-Deep \
+
+BUILD_DEPENDS:=	p5-Test-Deep>=0.1:${PORTSDIR}/devel/p5-Test-Deep \
 		${RUN_DEPENDS}
 
+USE_SVN=	yes
 PERL_MODBUILD=	yes
 
 MAN3=		SVN::Notify::Config.3
Index: devel/p5-SVN-S4/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-S4/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- devel/p5-SVN-S4/Makefile	14 Jun 2011 19:35:08 -0000	1.18
+++ devel/p5-SVN-S4/Makefile	3 Jul 2011 20:04:33 -0000
@@ -14,14 +14,13 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wrapper for subversion program
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
 RUN_DEPENDS=	p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-IO-AIO>=0:${PORTSDIR}/devel/p5-IO-AIO \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+		p5-IO-AIO>=0:${PORTSDIR}/devel/p5-IO-AIO
 
 LICENSE_COMB=	dual
 LICENSE=	ART20 LGPL3
 
+USE_SVN=	perl
 PERL_CONFIGURE=	yes
 INSTALL_TARGET=	pure_install
 
Index: devel/p5-SVN-Simple/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Simple/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- devel/p5-SVN-Simple/Makefile	18 May 2010 04:07:43 -0000	1.15
+++ devel/p5-SVN-Simple/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,9 +15,7 @@
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Simple interface to SVN::Delta::Editor
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+USE_SVN=	perl
 PERL_CONFIGURE=	yes
 
 MAN3=		SVN::Simple::Edit.3 SVN::Simple::Editor.3
Index: devel/p5-SVN-Statistics/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Statistics/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- devel/p5-SVN-Statistics/Makefile	18 May 2010 04:07:43 -0000	1.11
+++ devel/p5-SVN-Statistics/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,11 +15,12 @@
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	SVN::Statistics - perl module to create subversion statistics
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO \
+BUILD_DEPENDS=	p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO \
 		p5-Data-Dumper-Simple>=0:${PORTSDIR}/devel/p5-Data-Dumper-Simple \
 		p5-IO-Toolkit>=0:${PORTSDIR}/devel/p5-IO-Toolkit
-RUN_DEPENDS=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	5.8.0+
 
Index: devel/p5-SVN-Web/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SVN-Web/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- devel/p5-SVN-Web/Makefile	18 May 2010 04:07:43 -0000	1.25
+++ devel/p5-SVN-Web/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,8 +16,7 @@
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Subversion repository web frontend
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Locale/Maketext/Simple.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
 		${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff \
 		${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \
@@ -34,11 +33,13 @@
 		p5-Template-Plugin-Subst>=0:${PORTSDIR}/www/p5-Template-Plugin-Subst \
 		p5-Text-Diff-HTML>=0:${PORTSDIR}/textproc/p5-Text-Diff-HTML \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI
-BUILD_DEPENDS=	${RUN_DEPENDS} \
+
+BUILD_DEPENDS:=	${RUN_DEPENDS} \
 		${SITE_PERL}/Test/Benchmark.pm:${PORTSDIR}/devel/p5-Test-Benchmark \
 		${SITE_PERL}/Test/HTML/Tidy.pm:${PORTSDIR}/devel/p5-Test-HTML-Tidy \
 		${SITE_PERL}/Test/WWW/Mechanize.pm:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
 
+USE_SVN=	perl
 PERL_MODBUILD=	yes
 CONFIGURE_ARGS=	--skip_questions
 
Index: devel/p5-VCP-Dest-svk/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-VCP-Dest-svk/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- devel/p5-VCP-Dest-svk/Makefile	20 Jun 2011 08:36:15 -0000	1.16
+++ devel/p5-VCP-Dest-svk/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,11 +17,12 @@
 COMMENT=	VCP destination driver for svn/svk
 
 BUILD_DEPENDS=	${SITE_PERL}/VCP.pm:${PORTSDIR}/devel/p5-VCP-autrijus \
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
 		${SITE_PERL}/SVK.pm:${PORTSDIR}/devel/svk \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_CONFIGURE=	5.8.0+
 
 MAN3=		VCP::Dest::svk.3
Index: devel/pecl-svn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/pecl-svn/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- devel/pecl-svn/Makefile	26 Jan 2011 04:58:21 -0000	1.22
+++ devel/pecl-svn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,9 +17,8 @@
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A PECL extension to the libsvn library
 
-LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
-
 LICENSE=	PHP301
+USE_SVN_LIB=	yes
 USE_PHP=	yes
 USE_PHPEXT=	yes
 
Index: devel/psvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/psvn/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- devel/psvn/Makefile	18 May 2010 04:07:44 -0000	1.38
+++ devel/psvn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,8 +17,7 @@
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Subversion interface for Emacs
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
-
+USE_SVN_RUN=	yes
 USE_EMACS=	yes
 
 NO_WRKSUBDIR=	yes
Index: devel/pushmi/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/pushmi/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/pushmi/Makefile	22 May 2011 22:23:16 -0000	1.14
+++ devel/pushmi/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,19 +16,20 @@
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Subversion repository replication tool
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
-		p5-App-CLI>=0.06:${PORTSDIR}/devel/p5-App-CLI \
+RUN_DEPENDS=	p5-App-CLI>=0.06:${PORTSDIR}/devel/p5-App-CLI \
 		p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
 		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
 		p5-version>=0:${PORTSDIR}/devel/p5-version \
 		svk>=2.0.0:${PORTSDIR}/devel/svk
-BUILD_DEPENDS=	${RUN_DEPENDS} \
+
+BUILD_DEPENDS:=	${RUN_DEPENDS} \
 		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
 		p5-RunApp>=0.13:${PORTSDIR}/devel/p5-RunApp \
 		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
 		${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
 
+USE_SVN=	perl
 PERL_CONFIGURE=	yes
 
 MAN3=		Pushmi.3 \
Index: devel/py-subvertpy/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/py-subvertpy/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- devel/py-subvertpy/Makefile	1 Apr 2011 02:30:43 -0000	1.5
+++ devel/py-subvertpy/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,11 +15,10 @@
 MAINTAINER=	c-s@c-s.li
 COMMENT=	Python bindings for subversion
 
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_SVN_BUILD=	yes
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	subvertpy
Index: devel/pysvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/pysvn/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- devel/pysvn/Makefile	7 Jun 2011 10:57:44 -0000	1.17
+++ devel/pysvn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -7,15 +7,13 @@
 
 PORTNAME=	pysvn
 PORTVERSION=	1.7.5
-PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://pysvn.barrys-emacs.org/source_kits/
 
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Python binding for Subversion
 
-LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
-
+USE_SVN_LIB=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_NOEGGINFO=yes
Index: devel/qsvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/qsvn/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- devel/qsvn/Makefile	18 May 2010 04:07:44 -0000	1.17
+++ devel/qsvn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,8 +15,7 @@
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt based GUI frontend for Subversion
 
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
-
+USE_SVN_LIB=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui sql moc_build uic_build rcc_build qmake_build
 USE_LDCONFIG=	yes
Index: devel/rapidsvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/rapidsvn/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- devel/rapidsvn/Makefile	22 Dec 2010 20:05:42 -0000	1.32
+++ devel/rapidsvn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,10 +16,10 @@
 COMMENT=	Cross-platform GUI front-end for the Subversion revision system
 
 BUILD_DEPENDS=	neon-config:${PORTSDIR}/www/neon29 \
-		svn:${PORTSDIR}/devel/subversion \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
 
+USE_SVN_BUILD=	yes
 USE_WX=	2.6
 WX_CONF_ARGS=	absolute
 
Index: devel/rsvndump/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/rsvndump/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/rsvndump/Makefile	22 Apr 2011 20:29:52 -0000	1.14
+++ devel/rsvndump/Makefile	3 Jul 2011 20:04:33 -0000
@@ -43,5 +43,5 @@
 CONFIGURE_ARGS+=--disable-man
 .endif
 
-BUILD_DEPENDS+=	subversion>=0:${PORTSDIR}/devel/subversion
+USE_SVN_BUILD=	yes
 .include <bsd.port.post.mk>
Index: devel/statsvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/statsvn/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- devel/statsvn/Makefile	18 May 2010 04:07:44 -0000	1.5
+++ devel/statsvn/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,8 +15,7 @@
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Subversion repository activity report generator
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper \
-		subversion>=1.3:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
@@ -25,6 +24,7 @@
 USE_JAVA=	yes
 USE_ANT=	yes
 JAVA_VERSION=	1.4+
+USE_SVN_RUN=	yes
 
 .if !defined(NOPORTDOCS)
 ALL_TARGET=	dist javadoc
Index: devel/subcommander/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subcommander/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- devel/subcommander/Makefile	30 Jul 2010 22:14:46 -0000	1.22
+++ devel/subcommander/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,19 +16,19 @@
 COMMENT=	Qt based multiplatform subversion client, diff & merge tool
 
 LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
-		boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		svn_client-1.0:${PORTSDIR}/devel/subversion
+		boost_thread.4:${PORTSDIR}/devel/boost-libs
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_SVN_LIB=	yes
 USE_QT_VER=	3
 CONFIGURE_ARGS+=--with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \
 		--with-subversion=${LOCALBASE}
-CONFIGURE_ENV=	QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
+CONFIGURE_ENV=	QTDIR=${LOCALBASE} \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 NO_LATEST_LINK=	yes
 
 .include <bsd.port.mk>
Index: devel/subcommander2/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subcommander2/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- devel/subcommander2/Makefile	23 May 2011 23:02:24 -0000	1.23
+++ devel/subcommander2/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,7 +17,6 @@
 
 LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		svn_client-1.0:${PORTSDIR}/devel/subversion \
 		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 BROKEN=		does not link
@@ -28,6 +27,7 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b/b/g}
 USE_DOS2UNIX=	*.cpp
 
+USE_SVN_LIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
@@ -38,8 +38,7 @@
 			--with-apr=${LOCALBASE}/bin/apr-1-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-1-config \
 			--with-openssl=${OPENSSLBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"
 
 post-extract:
 	@${CHMOD} +x ${WRKSRC}/configure
Index: devel/subversion/Makefile.common
===================================================================
RCS file: /home/pcvs/ports/devel/subversion/Makefile.common,v
retrieving revision 1.46
diff -u -r1.46 Makefile.common
--- devel/subversion/Makefile.common	2 Jun 2011 14:02:36 -0000	1.46
+++ devel/subversion/Makefile.common	3 Jul 2011 20:04:33 -0000
@@ -14,6 +14,12 @@
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
+.if defined(SVN_PORT) && !empty(SVN_PORT)
+.	if ${SVN_PORT} == "devel/subversion-freebsd"
+WITH_FREEBSD_SUBVERSION=	yes
+.	endif
+.endif
+
 # Patches required for use with the FreeBSD Project repository only
 .if defined(WITH_FREEBSD_SUBVERSION)
 PATCH_SITES=		${MASTER_SITE_LOCAL}
Index: devel/svk/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/svk/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- devel/svk/Makefile	20 Jun 2011 08:36:19 -0000	1.53
+++ devel/svk/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,7 +17,6 @@
 COMMENT=	A Distributed Version Control System
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-List-MoreUtils \
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
 		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${SITE_PERL}/Algorithm/Annotate.pm:${PORTSDIR}/devel/p5-Algorithm-Annotate \
 		${SITE_PERL}/App/CLI.pm:${PORTSDIR}/devel/p5-App-CLI \
@@ -51,8 +50,10 @@
 		p5-YAML-Syck>=0.60:${PORTSDIR}/textproc/p5-YAML-Syck \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-version>=0.68:${PORTSDIR}/devel/p5-version
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	perl
 PERL_CONFIGURE=	5.8.1+
 
 MAN1=		svk.1
Index: devel/svn2git/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/svn2git/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/svn2git/Makefile	13 Apr 2011 19:38:28 -0000	1.2
+++ devel/svn2git/Makefile	3 Jul 2011 20:04:33 -0000
@@ -12,14 +12,14 @@
 MAINTAINER=	naylor.b.david@gmail.com
 COMMENT=	Imports svn repositories into git
 
-LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
 RUN_DEPENDS+=	git:${PORTSDIR}/devel/git \
-		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion
+		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
 
 LICENSES=	GPLv1 GPLv2 GPLv3
 
 USE_XZ=		yes
+USE_SVN_LIB=	yes
+USE_SVN_RUN=	perl
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib qmake_build
 MAKE_JOBS_SAFE=	yes
Index: devel/svn_load_dirs/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/svn_load_dirs/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- devel/svn_load_dirs/Makefile	25 Dec 2010 16:55:28 -0000	1.10
+++ devel/svn_load_dirs/Makefile	3 Jul 2011 20:04:33 -0000
@@ -14,9 +14,9 @@
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl script to load directories into a Subversion repository
 
-RUN_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
 
+USE_SVN_RUN=	yes
 USE_BZIP2=	yes
 USE_PERL5=	5.8.0+
 
Index: devel/svndelta/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/svndelta/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- devel/svndelta/Makefile	18 May 2010 04:07:46 -0000	1.6
+++ devel/svndelta/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,8 +15,7 @@
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Summarizes and manages differences between local files and Subversion
 
-RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
-
+USE_SVN_RUN=	yes
 USE_RUBY=	yes
 NO_BUILD=	yes
 
Index: devel/svnmerge/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/svnmerge/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- devel/svnmerge/Makefile	13 Nov 2010 15:38:25 -0000	1.1
+++ devel/svnmerge/Makefile	3 Jul 2011 20:04:33 -0000
@@ -13,8 +13,7 @@
 MAINTAINER=	tom@tomjudge.com
 COMMENT=	A Python script to managing merges in a Subversion repository
 
-RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
-
+USE_SVN_RUN=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	2.5+
 NO_BUILD=	yes
Index: devel/svntrac/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/svntrac/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- devel/svntrac/Makefile	18 May 2010 04:07:46 -0000	1.6
+++ devel/svntrac/Makefile	3 Jul 2011 20:04:33 -0000
@@ -11,7 +11,7 @@
 
 COMMENT=	Web-Based Bug And Patch-Set Tracking System For Subversion
 
-RUN_DEPENDS=	subversion>=0:${PORTSDIR}/devel/subversion
+USE_SVN_RUN=	yes
 
 MASTERDIR=	${.CURDIR}/../cvstrac
 MAKE_ARGS=	APPNAME=svntrac
Index: devel/thunar-vcs-plugin/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/thunar-vcs-plugin/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- devel/thunar-vcs-plugin/Makefile	7 Jun 2011 12:23:03 -0000	1.21
+++ devel/thunar-vcs-plugin/Makefile	3 Jul 2011 20:04:33 -0000
@@ -52,7 +52,7 @@
 .endif
 
 .if !defined(WITHOUT_SVN)
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+USE_SVN_LIB=	yes
 CONFIGURE_ARGS+=--enable-subversion
 PLIST_SUB+=	SVN=""
 .else
Index: devel/viewvc/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/viewvc/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- devel/viewvc/Makefile	23 May 2011 04:45:26 -0000	1.59
+++ devel/viewvc/Makefile	3 Jul 2011 20:04:33 -0000
@@ -45,7 +45,7 @@
 # viewvc can support CVS or SVN, controlled with the parameter
 # cvs_roots (for CVS), svn_roots (for Subversion) in viewvc.conf
 .if defined (WITH_SUBVERSION)
-RUN_DEPENDS+=	${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/py-subversion
+USE_SVN_RUN=	python
 .endif
 
 .if defined (WITH_APACHE)
Index: games/antrix/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/antrix/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- games/antrix/Makefile	19 Mar 2011 13:15:22 -0000	1.10
+++ games/antrix/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,11 +16,10 @@
 MAINTAINER=	skillcoder@mail.ru
 COMMENT=	Free stable dedicated-server for World of Warcraft
 
-BUILD_DEPENDS=	svn:${PORTSDIR}/devel/subversion
-
 USE_AUTOTOOLS=	aclocal libtoolize autoconf autoheader automake libtool
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a
+USE_SVN_BUILD=	yes
 USE_MYSQL=	yes
 CFLAGS+=	-O0
 USE_LDCONFIG=	yes
Index: games/gtkradiant/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/gtkradiant/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- games/gtkradiant/Makefile	7 Jan 2011 07:43:39 -0000	1.17
+++ games/gtkradiant/Makefile	3 Jul 2011 20:04:33 -0000
@@ -18,15 +18,15 @@
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Level design program developed by id Software and Loki Software
 
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libsvn/__init__.py:${PORTSDIR}/devel/py-subversion
 LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
 		mhash.2:${PORTSDIR}/security/mhash \
 		png.6:${PORTSDIR}/graphics/png
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/GPL/GtkRadiant
 
+USE_SVN_BUILD=	python
 USE_ZIP=	yes
 USE_GNOME=	gtk20 libxml2
 USE_PYTHON_BUILD=	yes
Index: graphics/seom/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/seom/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- graphics/seom/Makefile	6 Jun 2010 17:00:56 -0000	1.5
+++ graphics/seom/Makefile	3 Jul 2011 20:04:33 -0000
@@ -44,7 +44,7 @@
 # To roll snapshot: as bms: make BOOTSTRAP=defined fetch
 #
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 SVN_REV=	196		# svn tip at epoch 2009120801
 SVNROOT_URI=	https://devel.neopsis.com/svn/seom
 
Index: graphics/yukon/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/yukon/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- graphics/yukon/Makefile	6 Jun 2010 17:00:56 -0000	1.2
+++ graphics/yukon/Makefile	3 Jul 2011 20:04:33 -0000
@@ -41,7 +41,7 @@
 # To roll snapshot: as bms: make BOOTSTRAP=defined fetch
 #
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 SVN_REV=	158		# svn tip at epoch 2009120801
 SVNROOT_URI=	https://devel.neopsis.com/svn/yukon
 
Index: japanese/trac/Makefile
===================================================================
RCS file: /home/pcvs/ports/japanese/trac/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- japanese/trac/Makefile	26 Mar 2011 15:18:32 -0000	1.47
+++ japanese/trac/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,7 +17,8 @@
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \
 		${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS=	SILVERCITY "Use Silvercity for syntax highlighting" On \
 		DOCUTILS   "Allow additional text markup" On \
@@ -89,7 +90,7 @@
 .endif
 
 .if !defined(WITHOUT_SUBVERSION)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/svn/__init__.py:${PORTSDIR}/devel/py-subversion
+USE_SVN_RUN=	python
 .endif
 
 .include <bsd.port.post.mk>
Index: lang/clang-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/clang-devel/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- lang/clang-devel/Makefile	16 Jun 2011 15:07:40 -0000	1.17
+++ lang/clang-devel/Makefile	3 Jul 2011 20:04:33 -0000
@@ -72,7 +72,7 @@
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
Index: mail/svnmailer/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/svnmailer/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- mail/svnmailer/Makefile	25 Feb 2011 03:19:24 -0000	1.17
+++ mail/svnmailer/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,9 +15,7 @@
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A tool to post subversion repository commit information
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libsvn/__init__.py:${PORTSDIR}/devel/py-subversion
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+USE_SVN=	python
 USE_BZIP2=	YES
 USE_PYTHON=		2.5+
 USE_PYDISTUTILS=	yes
Index: math/asymptote/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/asymptote/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- math/asymptote/Makefile	27 Jun 2011 02:41:53 -0000	1.70
+++ math/asymptote/Makefile	3 Jul 2011 20:04:33 -0000
@@ -28,7 +28,6 @@
 		latex:${PORTSDIR}/print/teTeX-base \
 		makeinfo:${PORTSDIR}/textproc/texi2html \
 		${MKTEXLSR}:${PORTSDIR}/print/teTeX-base \
-		svn:${PORTSDIR}/devel/subversion \
 		texi2dvi:${PORTSDIR}/print/texinfo
 RUN_DEPENDS=	gv:${PORTSDIR}/print/gv \
 		latex:${PORTSDIR}/print/teTeX-base \
@@ -39,6 +38,7 @@
 # it requires boehm-gc 7.X
 CONFIGURE_ARGS=	--disable-gc
 
+USE_SVN_BUILD=	yes
 USE_GHOSTSCRIPT=yes
 USE_GL=	glut
 USE_GMAKE=	yes
Index: math/petsc/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/petsc/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- math/petsc/Makefile	1 Jul 2011 20:35:53 -0000	1.35
+++ math/petsc/Makefile	3 Jul 2011 20:04:33 -0000
@@ -195,8 +195,7 @@
 WITH_SVN=	yes
 .endif
 .if defined(WITH_SVN)
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	yes
 .endif
 
 #.if exists(${LOCALBASE}/bin/valgrind)
Index: net/xorp-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/xorp-devel/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- net/xorp-devel/Makefile	1 Jul 2010 03:54:28 -0000	1.5
+++ net/xorp-devel/Makefile	3 Jul 2011 20:04:33 -0000
@@ -42,7 +42,7 @@
 # To roll snapshot: as bms: make BOOTSTRAP=defined fetch
 #
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 SVN_REV=	11685		# svn tip at epoch 2009120801
 SVNROOT_URI=	http://xorp.svn.sourceforge.net/svnroot/xorp
 
Index: net-mgmt/rancid/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/rancid/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- net-mgmt/rancid/Makefile	3 Mar 2011 19:35:08 -0000	1.31
+++ net-mgmt/rancid/Makefile	3 Jul 2011 20:04:33 -0000
@@ -51,8 +51,8 @@
 .include <bsd.port.options.mk>
 
 .if defined(WITH_SVN)
+USE_SVN_BUILD=	yes
 CONFIGURE_ARGS+=	--with-svn
-BUILD_DEPENDS+=		svn:${PORTSDIR}/devel/subversion
 .endif
 
 pre-everything::
Index: ports-mgmt/p5-App-Pm2Port/Makefile
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/p5-App-Pm2Port/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ports-mgmt/p5-App-Pm2Port/Makefile	18 May 2010 04:07:48 -0000	1.7
+++ ports-mgmt/p5-App-Pm2Port/Makefile	3 Jul 2011 20:04:33 -0000
@@ -17,10 +17,11 @@
 BUILD_DEPENDS=	p5-CPANPLUS>=0:${PORTSDIR}/devel/p5-CPANPLUS \
 		p5-FreeBSD-Ports-INDEXhash>=0:${PORTSDIR}/ports-mgmt/p5-FreeBSD-Ports-INDEXhash \
 		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		subversion>=0:${PORTSDIR}/devel/subversion
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_SVN=	yes		
 PERL_CONFIGURE=	5.10.0+
 MAN1=		pm2port.1
 MAN3=		App::Pm2Port.3
Index: ports-mgmt/portshaker/Makefile
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/portshaker/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ports-mgmt/portshaker/Makefile	23 Sep 2010 08:12:30 -0000	1.2
+++ ports-mgmt/portshaker/Makefile	3 Jul 2011 20:04:33 -0000
@@ -40,7 +40,7 @@
 RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
 . endif
 . if defined(WITH_SVN)
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN_RUN=	yes
 . endif
 . if defined(WITH_GIT)
 RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
Index: security/hydra/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/hydra/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- security/hydra/Makefile	25 Jun 2011 05:23:42 -0000	1.28
+++ security/hydra/Makefile	3 Jul 2011 20:04:33 -0000
@@ -41,7 +41,7 @@
 LIB_DEPENDS+=	ssh.4:${PORTSDIR}/security/libssh
 .endif
 .if defined(WITH_SVN)
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+USE_SVN_LIB=	yes
 .endif
 
 .if defined(WITH_X11)
Index: security/medusa/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/medusa/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- security/medusa/Makefile	22 Feb 2010 21:58:41 -0000	1.11
+++ security/medusa/Makefile	3 Jul 2011 20:04:33 -0000
@@ -34,8 +34,8 @@
 
 .if defined(WITH_SVN)
 PLIST_SUB+=	SVN=""
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion \
-		apr-1:${PORTSDIR}/devel/apr
+USE_SVN_LIB=	yes
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
 CFLAGS+=	-I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1
 .else
 CONFIGURE_ARGS+=	--enable-module-svn=no
Index: security/metasploit/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/metasploit/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- security/metasploit/Makefile	26 Apr 2011 18:27:29 -0000	1.23
+++ security/metasploit/Makefile	3 Jul 2011 20:04:33 -0000
@@ -22,8 +22,7 @@
 		msfopcode msfpayload msfpescan msfweb
 
 OPTIONS=	MSFGUI "Build GUI scripts" off \
-		SVN "Use subversion" off \
-		SVN_FBSD "Use subversion-freebsd" off
+		SVN "Use subversion" off
 
 NO_BUILD=	yes
 USE_RUBY=	yes
@@ -49,12 +48,8 @@
 SCRIPTS+=	msfgui
 .endif
 
-.if defined(WITH_SVN) || defined(WITH_SVN_FBSD)
-.if defined(WITH_SVN_FBSD)
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion-freebsd
-.else
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-.endif
+.if defined(WITH_SVN)
+USE_SVN_RUN=	yes
 .endif
 
 do-install:
Index: shells/scponly/Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/scponly/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- shells/scponly/Makefile	18 Jun 2011 17:24:07 -0000	1.37
+++ shells/scponly/Makefile	3 Jul 2011 20:04:33 -0000
@@ -96,10 +96,8 @@
 CONFIGURE_ARGS+=--disable-winscp-compat
 .endif
 
-# svn, svnlook ... are per default in subversion
-# only check for one of them!
 .if defined(WITH_SCPONLY_SVN) || defined(WITH_SCPONLY_SVNSERVE)
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN_BUILD=	yes
 .endif
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
Index: sysutils/confman/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/confman/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sysutils/confman/Makefile	15 Aug 2010 08:10:45 -0000	1.9
+++ sysutils/confman/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,12 +15,13 @@
 COMMENT=	A revision controlled configuration manager
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		svn:${PORTSDIR}/devel/subversion \
 		sudo:${PORTSDIR}/security/sudo \
 		greadlink:${PORTSDIR}/sysutils/coreutils \
 		wget:${PORTSDIR}/ftp/wget
-BUILD_DEPENDS=	${RUN_DEPENDS}
 
+BUILD_DEPENDS:=	${RUN_DEPENDS}
+
+USE_SVN=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--localstatedir=/var
Index: textproc/p5-Plagger/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-Plagger/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- textproc/p5-Plagger/Makefile	23 Aug 2010 07:03:43 -0000	1.30
+++ textproc/p5-Plagger/Makefile	3 Jul 2011 20:04:33 -0000
@@ -346,7 +346,7 @@
 .endif
 
 .if defined(WITH_CUSTOMSVNLOG)
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/SVN/Client.pm:${PORTSDIR}/devel/p5-subversion
+USE_SVN=	perl
 .endif
 
 .if defined(WITH_NTFYNETSEND)
@@ -373,7 +373,7 @@
 BUILD_DEPENDS+=	${SITE_PERL}/Text/Original.pm:${PORTSDIR}/textproc/p5-Text-Original
 .endif
 
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 
 MAN3=		Plagger.3 \
Index: textproc/pootle/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/pootle/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- textproc/pootle/Makefile	15 Apr 2011 06:49:42 -0000	1.16
+++ textproc/pootle/Makefile	3 Jul 2011 20:04:33 -0000
@@ -64,7 +64,7 @@
 .endif
 
 .if defined(WITH_SUBVERSION)
-RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN_RUN=	yes
 .endif
 
 .if defined(WITH_LUCENE)
Index: textproc/svn2cl/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/svn2cl/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- textproc/svn2cl/Makefile	24 Oct 2010 05:10:24 -0000	1.12
+++ textproc/svn2cl/Makefile	3 Jul 2011 20:04:33 -0000
@@ -14,8 +14,9 @@
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Subversion ChangeLog generator
 
-RUN_DEPENDS=	${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+
+USE_SVN_RUN=	yes
 
 NO_BUILD=	yes
 MAN1=		${PORTNAME}.1
Index: www/repos-style/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/repos-style/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/repos-style/Makefile	18 May 2010 04:07:53 -0000	1.3
+++ www/repos-style/Makefile	3 Jul 2011 20:04:33 -0000
@@ -15,8 +15,7 @@
 MAINTAINER=	avk@vl.ru
 COMMENT=	Stylesheet for the Subversion index web page
 
-RUN_DEPENDS=	subversion>=0:${PORTSDIR}/devel/subversion
-
+USE_SVN_RUN=	yes
 USE_ZIP=	YES
 NO_BUILD=	YES
 
Index: www/ruby-cruisecontrolrb/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/ruby-cruisecontrolrb/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- www/ruby-cruisecontrolrb/Makefile	6 Jan 2011 09:53:46 -0000	1.12
+++ www/ruby-cruisecontrolrb/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,9 +16,9 @@
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Continuous Integration Server For Rails Applications
 
-RUN_DEPENDS=	rubygem-mongrel>=1.0.1:${PORTSDIR}/www/rubygem-mongrel \
-		svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	rubygem-mongrel>=1.0.1:${PORTSDIR}/www/rubygem-mongrel
 
+USE_SVN_RUN=	yes
 USE_RC_SUBR=	cruisecontrolrb
 
 NO_BUILD=	yes
Index: www/trac/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- www/trac/Makefile	25 Feb 2011 06:06:35 -0000	1.53
+++ www/trac/Makefile	3 Jul 2011 20:04:33 -0000
@@ -18,7 +18,8 @@
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \
 		${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+
+RUN_DEPENDSi:=	${BUILD_DEPENDS}
 
 OPTIONS=	SILVERCITY "Use Silvercity for syntax highlighting" On \
 		DOCUTILS   "Allow additional text markup" On \
@@ -88,7 +89,7 @@
 .endif
 
 .if !defined(WITHOUT_SUBVERSION)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/svn/__init__.py:${PORTSDIR}/devel/py-subversion
+USE_SVN_RUN=	python
 .endif
 
 .include <bsd.port.post.mk>
Index: www/trac-discussion/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-discussion/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/trac-discussion/Makefile	25 Dec 2010 16:55:38 -0000	1.3
+++ www/trac-discussion/Makefile	3 Jul 2011 20:04:33 -0000
@@ -28,7 +28,7 @@
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
Index: www/trac-fivestarvote/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-fivestarvote/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/trac-fivestarvote/Makefile	25 Dec 2010 16:55:38 -0000	1.4
+++ www/trac-fivestarvote/Makefile	3 Jul 2011 20:04:33 -0000
@@ -27,7 +27,7 @@
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
Index: www/trac-math/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-math/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/trac-math/Makefile	12 Jan 2011 01:21:43 -0000	1.7
+++ www/trac-math/Makefile	3 Jul 2011 20:04:33 -0000
@@ -34,7 +34,7 @@
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
Index: www/trac-revtree/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-revtree/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/trac-revtree/Makefile	26 Jul 2010 19:26:59 -0000	1.7
+++ www/trac-revtree/Makefile	3 Jul 2011 20:04:33 -0000
@@ -16,12 +16,12 @@
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Graphical representation of an SVN repository
 
-RUN_DEPENDS+=	trac>=0.12:${PORTSDIR}/www/trac \
-		subversion>=0:${PORTSDIR}/devel/subversion
+RUN_DEPENDS+=	trac>=0.12:${PORTSDIR}/www/trac
 
 OPTIONS=	MINFOENH "Enable mergeinfo display enhancer" On \
 		LOGENH "Enable log message display enhancer" Off
 
+USE_SVN_RUN=	yes
 USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
Index: www/trac-ticketimport/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-ticketimport/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/trac-ticketimport/Makefile	25 Dec 2010 16:55:39 -0000	1.4
+++ www/trac-ticketimport/Makefile	3 Jul 2011 20:04:33 -0000
@@ -28,7 +28,7 @@
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \
Index: www/trac-vote/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-vote/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/trac-vote/Makefile	25 Dec 2010 16:55:40 -0000	1.4
+++ www/trac-vote/Makefile	3 Jul 2011 20:04:33 -0000
@@ -27,7 +27,7 @@
 
 # Retrieve the latest version from SVN and package in a tarball.
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+USE_SVN=	fetch
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} && \