12 files changed, 300 insertions, 280 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 5ce054e8c62f..0cb992131d18 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1868	# 0.12.0
+PORTVERSION=	r2376	# 0.13.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/196/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/340/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.21:${PORTSDIR}/www/neon \
 		expat.2:${PORTSDIR}/textproc/expat2 \
-		apr:${PORTSDIR}/devel/apr-devel
+		apr:${PORTSDIR}/devel/apr
 RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 
@@ -22,24 +22,22 @@ MAN1=		svn.1
 
 WRKSRC=	${WRKDIR}/subversion-${PORTVERSION}
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
+		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib \
 		--with-apr=${LOCALBASE} \
 		--with-apr-util=${LOCALBASE}
 
 post-extract:
-	# work around libdb4's name.
-	@${PERL} -pi -e 's/ldb/ldb4/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure
 
-	# axe the neon, apr, and apr-util subdirs to keep svn's build process
-	# from using them, since we're providing our own.
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-configure:
-	# make sure we don't install the swig stuff, even if it was found
-	@${PERL} -pi -e 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
-	@${PERL} -pi -e 's/swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/swig-py-lib//g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index 901b16a7b99d..f44044f7cd12 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1868.tar.gz) = f4a2c531797a0af297bd89757e75645f
+MD5 (subversion-r2376.tar.gz) = f49b9c2747ef9f306245eb89334f2a1b
diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist
index 176090442f6f..cd2971497010 100644
--- a/devel/subversion-devel/pkg-plist
+++ b/devel/subversion-devel/pkg-plist
@@ -1,68 +1,75 @@
 bin/svn
 bin/svnadmin
 bin/svnlook
-include/svn_base64.h
-include/svn_client.h
-include/svn_config.h
-include/svn_dav.h
-include/svn_delta.h
-include/svn_error.h
-include/svn_error_codes.h
-include/svn_fs.h
-include/svn_hash.h
-include/svn_io.h
-include/svn_path.h
-include/svn_pools.h
-include/svn_quoprint.h
-include/svn_ra.h
-include/svn_repos.h
-include/svn_sorts.h
-include/svn_string.h
-include/svn_test.h
-include/svn_time.h
-include/svn_types.h
-include/svn_version.h
-include/svn_wc.h
-include/svn_xml.h
+include/subversion-1/svn_auth.h
+include/subversion-1/svn_base64.h
+include/subversion-1/svn_client.h
+include/subversion-1/svn_config.h
+include/subversion-1/svn_dav.h
+include/subversion-1/svn_delta.h
+include/subversion-1/svn_diff.h
+include/subversion-1/svn_error.h
+include/subversion-1/svn_error_codes.h
+include/subversion-1/svn_fs.h
+include/subversion-1/svn_hash.h
+include/subversion-1/svn_io.h
+include/subversion-1/svn_path.h
+include/subversion-1/svn_pools.h
+include/subversion-1/svn_quoprint.h
+include/subversion-1/svn_ra.h
+include/subversion-1/svn_repos.h
+include/subversion-1/svn_sorts.h
+include/subversion-1/svn_string.h
+include/subversion-1/svn_test.h
+include/subversion-1/svn_time.h
+include/subversion-1/svn_types.h
+include/subversion-1/svn_version.h
+include/subversion-1/svn_wc.h
+include/subversion-1/svn_xml.h
 info/svn-design.info
 info/svn-design.info-1
 info/svn-design.info-2
 info/svn-design.info-3
 info/svn-manual.info
 info/svn_for_cvs_users.info
-lib/libsvn_client.a
-lib/libsvn_client.la
-lib/libsvn_client.so
-lib/libsvn_client.so.0
-lib/libsvn_delta.a
-lib/libsvn_delta.la
-lib/libsvn_delta.so
-lib/libsvn_delta.so.0
-lib/libsvn_fs.a
-lib/libsvn_fs.la
-lib/libsvn_fs.so
-lib/libsvn_fs.so.0
-lib/libsvn_ra.a
-lib/libsvn_ra.la
-lib/libsvn_ra.so
-lib/libsvn_ra.so.0
-lib/libsvn_ra_dav.a
-lib/libsvn_ra_dav.la
-lib/libsvn_ra_dav.so
-lib/libsvn_ra_dav.so.0
-lib/libsvn_ra_local.a
-lib/libsvn_ra_local.la
-lib/libsvn_ra_local.so
-lib/libsvn_ra_local.so.0
-lib/libsvn_repos.a
-lib/libsvn_repos.la
-lib/libsvn_repos.so
-lib/libsvn_repos.so.0
-lib/libsvn_subr.a
-lib/libsvn_subr.la
-lib/libsvn_subr.so
-lib/libsvn_subr.so.0
-lib/libsvn_wc.a
-lib/libsvn_wc.la
-lib/libsvn_wc.so
-lib/libsvn_wc.so.0
+lib/libsvn_auth-1.a
+lib/libsvn_auth-1.la
+lib/libsvn_auth-1.so
+lib/libsvn_auth-1.so.0
+lib/libsvn_client-1.a
+lib/libsvn_client-1.la
+lib/libsvn_client-1.so
+lib/libsvn_client-1.so.0
+lib/libsvn_delta-1.a
+lib/libsvn_delta-1.la
+lib/libsvn_delta-1.so
+lib/libsvn_delta-1.so.0
+lib/libsvn_fs-1.a
+lib/libsvn_fs-1.la
+lib/libsvn_fs-1.so
+lib/libsvn_fs-1.so.0
+lib/libsvn_ra-1.a
+lib/libsvn_ra-1.la
+lib/libsvn_ra-1.so
+lib/libsvn_ra-1.so.0
+lib/libsvn_ra_dav-1.a
+lib/libsvn_ra_dav-1.la
+lib/libsvn_ra_dav-1.so
+lib/libsvn_ra_dav-1.so.0
+lib/libsvn_ra_local-1.a
+lib/libsvn_ra_local-1.la
+lib/libsvn_ra_local-1.so
+lib/libsvn_ra_local-1.so.0
+lib/libsvn_repos-1.a
+lib/libsvn_repos-1.la
+lib/libsvn_repos-1.so
+lib/libsvn_repos-1.so.0
+lib/libsvn_subr-1.a
+lib/libsvn_subr-1.la
+lib/libsvn_subr-1.so
+lib/libsvn_subr-1.so.0
+lib/libsvn_wc-1.a
+lib/libsvn_wc-1.la
+lib/libsvn_wc-1.so
+lib/libsvn_wc-1.so.0
+@dirrm include/subversion-1
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 5ce054e8c62f..0cb992131d18 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1868	# 0.12.0
+PORTVERSION=	r2376	# 0.13.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/196/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/340/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.21:${PORTSDIR}/www/neon \
 		expat.2:${PORTSDIR}/textproc/expat2 \
-		apr:${PORTSDIR}/devel/apr-devel
+		apr:${PORTSDIR}/devel/apr
 RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 
@@ -22,24 +22,22 @@ MAN1=		svn.1
 
 WRKSRC=	${WRKDIR}/subversion-${PORTVERSION}
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
+		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib \
 		--with-apr=${LOCALBASE} \
 		--with-apr-util=${LOCALBASE}
 
 post-extract:
-	# work around libdb4's name.
-	@${PERL} -pi -e 's/ldb/ldb4/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure
 
-	# axe the neon, apr, and apr-util subdirs to keep svn's build process
-	# from using them, since we're providing our own.
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-configure:
-	# make sure we don't install the swig stuff, even if it was found
-	@${PERL} -pi -e 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
-	@${PERL} -pi -e 's/swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/swig-py-lib//g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index 901b16a7b99d..f44044f7cd12 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1868.tar.gz) = f4a2c531797a0af297bd89757e75645f
+MD5 (subversion-r2376.tar.gz) = f49b9c2747ef9f306245eb89334f2a1b
diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist
index 176090442f6f..cd2971497010 100644
--- a/devel/subversion-freebsd/pkg-plist
+++ b/devel/subversion-freebsd/pkg-plist
@@ -1,68 +1,75 @@
 bin/svn
 bin/svnadmin
 bin/svnlook
-include/svn_base64.h
-include/svn_client.h
-include/svn_config.h
-include/svn_dav.h
-include/svn_delta.h
-include/svn_error.h
-include/svn_error_codes.h
-include/svn_fs.h
-include/svn_hash.h
-include/svn_io.h
-include/svn_path.h
-include/svn_pools.h
-include/svn_quoprint.h
-include/svn_ra.h
-include/svn_repos.h
-include/svn_sorts.h
-include/svn_string.h
-include/svn_test.h
-include/svn_time.h
-include/svn_types.h
-include/svn_version.h
-include/svn_wc.h
-include/svn_xml.h
+include/subversion-1/svn_auth.h
+include/subversion-1/svn_base64.h
+include/subversion-1/svn_client.h
+include/subversion-1/svn_config.h
+include/subversion-1/svn_dav.h
+include/subversion-1/svn_delta.h
+include/subversion-1/svn_diff.h
+include/subversion-1/svn_error.h
+include/subversion-1/svn_error_codes.h
+include/subversion-1/svn_fs.h
+include/subversion-1/svn_hash.h
+include/subversion-1/svn_io.h
+include/subversion-1/svn_path.h
+include/subversion-1/svn_pools.h
+include/subversion-1/svn_quoprint.h
+include/subversion-1/svn_ra.h
+include/subversion-1/svn_repos.h
+include/subversion-1/svn_sorts.h
+include/subversion-1/svn_string.h
+include/subversion-1/svn_test.h
+include/subversion-1/svn_time.h
+include/subversion-1/svn_types.h
+include/subversion-1/svn_version.h
+include/subversion-1/svn_wc.h
+include/subversion-1/svn_xml.h
 info/svn-design.info
 info/svn-design.info-1
 info/svn-design.info-2
 info/svn-design.info-3
 info/svn-manual.info
 info/svn_for_cvs_users.info
-lib/libsvn_client.a
-lib/libsvn_client.la
-lib/libsvn_client.so
-lib/libsvn_client.so.0
-lib/libsvn_delta.a
-lib/libsvn_delta.la
-lib/libsvn_delta.so
-lib/libsvn_delta.so.0
-lib/libsvn_fs.a
-lib/libsvn_fs.la
-lib/libsvn_fs.so
-lib/libsvn_fs.so.0
-lib/libsvn_ra.a
-lib/libsvn_ra.la
-lib/libsvn_ra.so
-lib/libsvn_ra.so.0
-lib/libsvn_ra_dav.a
-lib/libsvn_ra_dav.la
-lib/libsvn_ra_dav.so
-lib/libsvn_ra_dav.so.0
-lib/libsvn_ra_local.a
-lib/libsvn_ra_local.la
-lib/libsvn_ra_local.so
-lib/libsvn_ra_local.so.0
-lib/libsvn_repos.a
-lib/libsvn_repos.la
-lib/libsvn_repos.so
-lib/libsvn_repos.so.0
-lib/libsvn_subr.a
-lib/libsvn_subr.la
-lib/libsvn_subr.so
-lib/libsvn_subr.so.0
-lib/libsvn_wc.a
-lib/libsvn_wc.la
-lib/libsvn_wc.so
-lib/libsvn_wc.so.0
+lib/libsvn_auth-1.a
+lib/libsvn_auth-1.la
+lib/libsvn_auth-1.so
+lib/libsvn_auth-1.so.0
+lib/libsvn_client-1.a
+lib/libsvn_client-1.la
+lib/libsvn_client-1.so
+lib/libsvn_client-1.so.0
+lib/libsvn_delta-1.a
+lib/libsvn_delta-1.la
+lib/libsvn_delta-1.so
+lib/libsvn_delta-1.so.0
+lib/libsvn_fs-1.a
+lib/libsvn_fs-1.la
+lib/libsvn_fs-1.so
+lib/libsvn_fs-1.so.0
+lib/libsvn_ra-1.a
+lib/libsvn_ra-1.la
+lib/libsvn_ra-1.so
+lib/libsvn_ra-1.so.0
+lib/libsvn_ra_dav-1.a
+lib/libsvn_ra_dav-1.la
+lib/libsvn_ra_dav-1.so
+lib/libsvn_ra_dav-1.so.0
+lib/libsvn_ra_local-1.a
+lib/libsvn_ra_local-1.la
+lib/libsvn_ra_local-1.so
+lib/libsvn_ra_local-1.so.0
+lib/libsvn_repos-1.a
+lib/libsvn_repos-1.la
+lib/libsvn_repos-1.so
+lib/libsvn_repos-1.so.0
+lib/libsvn_subr-1.a
+lib/libsvn_subr-1.la
+lib/libsvn_subr-1.so
+lib/libsvn_subr-1.so.0
+lib/libsvn_wc-1.a
+lib/libsvn_wc-1.la
+lib/libsvn_wc-1.so
+lib/libsvn_wc-1.so.0
+@dirrm include/subversion-1
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 5ce054e8c62f..0cb992131d18 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1868	# 0.12.0
+PORTVERSION=	r2376	# 0.13.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/196/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/340/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.21:${PORTSDIR}/www/neon \
 		expat.2:${PORTSDIR}/textproc/expat2 \
-		apr:${PORTSDIR}/devel/apr-devel
+		apr:${PORTSDIR}/devel/apr
 RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 
@@ -22,24 +22,22 @@ MAN1=		svn.1
 
 WRKSRC=	${WRKDIR}/subversion-${PORTVERSION}
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
+		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib \
 		--with-apr=${LOCALBASE} \
 		--with-apr-util=${LOCALBASE}
 
 post-extract:
-	# work around libdb4's name.
-	@${PERL} -pi -e 's/ldb/ldb4/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure
 
-	# axe the neon, apr, and apr-util subdirs to keep svn's build process
-	# from using them, since we're providing our own.
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-configure:
-	# make sure we don't install the swig stuff, even if it was found
-	@${PERL} -pi -e 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
-	@${PERL} -pi -e 's/swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/swig-py-lib//g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 901b16a7b99d..f44044f7cd12 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1868.tar.gz) = f4a2c531797a0af297bd89757e75645f
+MD5 (subversion-r2376.tar.gz) = f49b9c2747ef9f306245eb89334f2a1b
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 176090442f6f..cd2971497010 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -1,68 +1,75 @@
 bin/svn
 bin/svnadmin
 bin/svnlook
-include/svn_base64.h
-include/svn_client.h
-include/svn_config.h
-include/svn_dav.h
-include/svn_delta.h
-include/svn_error.h
-include/svn_error_codes.h
-include/svn_fs.h
-include/svn_hash.h
-include/svn_io.h
-include/svn_path.h
-include/svn_pools.h
-include/svn_quoprint.h
-include/svn_ra.h
-include/svn_repos.h
-include/svn_sorts.h
-include/svn_string.h
-include/svn_test.h
-include/svn_time.h
-include/svn_types.h
-include/svn_version.h
-include/svn_wc.h
-include/svn_xml.h
+include/subversion-1/svn_auth.h
+include/subversion-1/svn_base64.h
+include/subversion-1/svn_client.h
+include/subversion-1/svn_config.h
+include/subversion-1/svn_dav.h
+include/subversion-1/svn_delta.h
+include/subversion-1/svn_diff.h
+include/subversion-1/svn_error.h
+include/subversion-1/svn_error_codes.h
+include/subversion-1/svn_fs.h
+include/subversion-1/svn_hash.h
+include/subversion-1/svn_io.h
+include/subversion-1/svn_path.h
+include/subversion-1/svn_pools.h
+include/subversion-1/svn_quoprint.h
+include/subversion-1/svn_ra.h
+include/subversion-1/svn_repos.h
+include/subversion-1/svn_sorts.h
+include/subversion-1/svn_string.h
+include/subversion-1/svn_test.h
+include/subversion-1/svn_time.h
+include/subversion-1/svn_types.h
+include/subversion-1/svn_version.h
+include/subversion-1/svn_wc.h
+include/subversion-1/svn_xml.h
 info/svn-design.info
 info/svn-design.info-1
 info/svn-design.info-2
 info/svn-design.info-3
 info/svn-manual.info
 info/svn_for_cvs_users.info
-lib/libsvn_client.a
-lib/libsvn_client.la
-lib/libsvn_client.so
-lib/libsvn_client.so.0
-lib/libsvn_delta.a
-lib/libsvn_delta.la
-lib/libsvn_delta.so
-lib/libsvn_delta.so.0
-lib/libsvn_fs.a
-lib/libsvn_fs.la
-lib/libsvn_fs.so
-lib/libsvn_fs.so.0
-lib/libsvn_ra.a
-lib/libsvn_ra.la
-lib/libsvn_ra.so
-lib/libsvn_ra.so.0
-lib/libsvn_ra_dav.a
-lib/libsvn_ra_dav.la
-lib/libsvn_ra_dav.so
-lib/libsvn_ra_dav.so.0
-lib/libsvn_ra_local.a
-lib/libsvn_ra_local.la
-lib/libsvn_ra_local.so
-lib/libsvn_ra_local.so.0
-lib/libsvn_repos.a
-lib/libsvn_repos.la
-lib/libsvn_repos.so
-lib/libsvn_repos.so.0
-lib/libsvn_subr.a
-lib/libsvn_subr.la
-lib/libsvn_subr.so
-lib/libsvn_subr.so.0
-lib/libsvn_wc.a
-lib/libsvn_wc.la
-lib/libsvn_wc.so
-lib/libsvn_wc.so.0
+lib/libsvn_auth-1.a
+lib/libsvn_auth-1.la
+lib/libsvn_auth-1.so
+lib/libsvn_auth-1.so.0
+lib/libsvn_client-1.a
+lib/libsvn_client-1.la
+lib/libsvn_client-1.so
+lib/libsvn_client-1.so.0
+lib/libsvn_delta-1.a
+lib/libsvn_delta-1.la
+lib/libsvn_delta-1.so
+lib/libsvn_delta-1.so.0
+lib/libsvn_fs-1.a
+lib/libsvn_fs-1.la
+lib/libsvn_fs-1.so
+lib/libsvn_fs-1.so.0
+lib/libsvn_ra-1.a
+lib/libsvn_ra-1.la
+lib/libsvn_ra-1.so
+lib/libsvn_ra-1.so.0
+lib/libsvn_ra_dav-1.a
+lib/libsvn_ra_dav-1.la
+lib/libsvn_ra_dav-1.so
+lib/libsvn_ra_dav-1.so.0
+lib/libsvn_ra_local-1.a
+lib/libsvn_ra_local-1.la
+lib/libsvn_ra_local-1.so
+lib/libsvn_ra_local-1.so.0
+lib/libsvn_repos-1.a
+lib/libsvn_repos-1.la
+lib/libsvn_repos-1.so
+lib/libsvn_repos-1.so.0
+lib/libsvn_subr-1.a
+lib/libsvn_subr-1.la
+lib/libsvn_subr-1.so
+lib/libsvn_subr-1.so.0
+lib/libsvn_wc-1.a
+lib/libsvn_wc-1.la
+lib/libsvn_wc-1.so
+lib/libsvn_wc-1.so.0
+@dirrm include/subversion-1
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 5ce054e8c62f..0cb992131d18 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1868	# 0.12.0
+PORTVERSION=	r2376	# 0.13.2
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/196/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/340/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.21:${PORTSDIR}/www/neon \
 		expat.2:${PORTSDIR}/textproc/expat2 \
-		apr:${PORTSDIR}/devel/apr-devel
+		apr:${PORTSDIR}/devel/apr
 RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 
@@ -22,24 +22,22 @@ MAN1=		svn.1
 
 WRKSRC=	${WRKDIR}/subversion-${PORTVERSION}
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
+		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib \
 		--with-apr=${LOCALBASE} \
 		--with-apr-util=${LOCALBASE}
 
 post-extract:
-	# work around libdb4's name.
-	@${PERL} -pi -e 's/ldb/ldb4/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's/ldb/ldb4/g' ${WRKSRC}/configure
 
-	# axe the neon, apr, and apr-util subdirs to keep svn's build process
-	# from using them, since we're providing our own.
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
 
 post-configure:
-	# make sure we don't install the swig stuff, even if it was found
-	@${PERL} -pi -e 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
-	@${PERL} -pi -e 's/swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's/swig-py-lib//g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 901b16a7b99d..f44044f7cd12 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1868.tar.gz) = f4a2c531797a0af297bd89757e75645f
+MD5 (subversion-r2376.tar.gz) = f49b9c2747ef9f306245eb89334f2a1b
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 176090442f6f..cd2971497010 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -1,68 +1,75 @@
 bin/svn
 bin/svnadmin
 bin/svnlook
-include/svn_base64.h
-include/svn_client.h
-include/svn_config.h
-include/svn_dav.h
-include/svn_delta.h
-include/svn_error.h
-include/svn_error_codes.h
-include/svn_fs.h
-include/svn_hash.h
-include/svn_io.h
-include/svn_path.h
-include/svn_pools.h
-include/svn_quoprint.h
-include/svn_ra.h
-include/svn_repos.h
-include/svn_sorts.h
-include/svn_string.h
-include/svn_test.h
-include/svn_time.h
-include/svn_types.h
-include/svn_version.h
-include/svn_wc.h
-include/svn_xml.h
+include/subversion-1/svn_auth.h
+include/subversion-1/svn_base64.h
+include/subversion-1/svn_client.h
+include/subversion-1/svn_config.h
+include/subversion-1/svn_dav.h
+include/subversion-1/svn_delta.h
+include/subversion-1/svn_diff.h
+include/subversion-1/svn_error.h
+include/subversion-1/svn_error_codes.h
+include/subversion-1/svn_fs.h
+include/subversion-1/svn_hash.h
+include/subversion-1/svn_io.h
+include/subversion-1/svn_path.h
+include/subversion-1/svn_pools.h
+include/subversion-1/svn_quoprint.h
+include/subversion-1/svn_ra.h
+include/subversion-1/svn_repos.h
+include/subversion-1/svn_sorts.h
+include/subversion-1/svn_string.h
+include/subversion-1/svn_test.h
+include/subversion-1/svn_time.h
+include/subversion-1/svn_types.h
+include/subversion-1/svn_version.h
+include/subversion-1/svn_wc.h
+include/subversion-1/svn_xml.h
 info/svn-design.info
 info/svn-design.info-1
 info/svn-design.info-2
 info/svn-design.info-3
 info/svn-manual.info
 info/svn_for_cvs_users.info
-lib/libsvn_client.a
-lib/libsvn_client.la
-lib/libsvn_client.so
-lib/libsvn_client.so.0
-lib/libsvn_delta.a
-lib/libsvn_delta.la
-lib/libsvn_delta.so
-lib/libsvn_delta.so.0
-lib/libsvn_fs.a
-lib/libsvn_fs.la
-lib/libsvn_fs.so
-lib/libsvn_fs.so.0
-lib/libsvn_ra.a
-lib/libsvn_ra.la
-lib/libsvn_ra.so
-lib/libsvn_ra.so.0
-lib/libsvn_ra_dav.a
-lib/libsvn_ra_dav.la
-lib/libsvn_ra_dav.so
-lib/libsvn_ra_dav.so.0
-lib/libsvn_ra_local.a
-lib/libsvn_ra_local.la
-lib/libsvn_ra_local.so
-lib/libsvn_ra_local.so.0
-lib/libsvn_repos.a
-lib/libsvn_repos.la
-lib/libsvn_repos.so
-lib/libsvn_repos.so.0
-lib/libsvn_subr.a
-lib/libsvn_subr.la
-lib/libsvn_subr.so
-lib/libsvn_subr.so.0
-lib/libsvn_wc.a
-lib/libsvn_wc.la
-lib/libsvn_wc.so
-lib/libsvn_wc.so.0
+lib/libsvn_auth-1.a
+lib/libsvn_auth-1.la
+lib/libsvn_auth-1.so
+lib/libsvn_auth-1.so.0
+lib/libsvn_client-1.a
+lib/libsvn_client-1.la
+lib/libsvn_client-1.so
+lib/libsvn_client-1.so.0
+lib/libsvn_delta-1.a
+lib/libsvn_delta-1.la
+lib/libsvn_delta-1.so
+lib/libsvn_delta-1.so.0
+lib/libsvn_fs-1.a
+lib/libsvn_fs-1.la
+lib/libsvn_fs-1.so
+lib/libsvn_fs-1.so.0
+lib/libsvn_ra-1.a
+lib/libsvn_ra-1.la
+lib/libsvn_ra-1.so
+lib/libsvn_ra-1.so.0
+lib/libsvn_ra_dav-1.a
+lib/libsvn_ra_dav-1.la
+lib/libsvn_ra_dav-1.so
+lib/libsvn_ra_dav-1.so.0
+lib/libsvn_ra_local-1.a
+lib/libsvn_ra_local-1.la
+lib/libsvn_ra_local-1.so
+lib/libsvn_ra_local-1.so.0
+lib/libsvn_repos-1.a
+lib/libsvn_repos-1.la
+lib/libsvn_repos-1.so
+lib/libsvn_repos-1.so.0
+lib/libsvn_subr-1.a
+lib/libsvn_subr-1.la
+lib/libsvn_subr-1.so
+lib/libsvn_subr-1.so.0
+lib/libsvn_wc-1.a
+lib/libsvn_wc-1.la
+lib/libsvn_wc-1.so
+lib/libsvn_wc-1.so.0
+@dirrm include/subversion-1