25 files changed, 293 insertions, 47 deletions

diff --git a/usr.bin/svn/Makefile b/usr.bin/svn/Makefile
index 1d2ae21d56c6..cafa47d6a5d8 100644
--- a/usr.bin/svn/Makefile
+++ b/usr.bin/svn/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-SUBDIR = lib .WAIT \
-	 svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion \
-	 svnmucc svnrdump
+SUBDIR=	lib .WAIT \
+	svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnserve \
+	svnsync svnversion svnmucc svnrdump
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc
index 5fe6464d035d..330e201186bf 100644
--- a/usr.bin/svn/Makefile.inc
+++ b/usr.bin/svn/Makefile.inc
@@ -29,6 +29,7 @@ LIBSVN_DIFFDIR=		${.OBJDIR}/../lib/libsvn_diff
 LIBSVN_FSDIR=		${.OBJDIR}/../lib/libsvn_fs
 LIBSVN_FS_FSDIR=	${.OBJDIR}/../lib/libsvn_fs_fs
 LIBSVN_FS_UTILDIR=	${.OBJDIR}/../lib/libsvn_fs_util
+LIBSVN_FS_XDIR=		${.OBJDIR}/../lib/libsvn_fs_x
 LIBSVN_RADIR=		${.OBJDIR}/../lib/libsvn_ra
 LIBSVN_RA_LOCALDIR=	${.OBJDIR}/../lib/libsvn_ra_local
 LIBSVN_RA_SVNDIR=	${.OBJDIR}/../lib/libsvn_ra_svn
@@ -47,6 +48,7 @@ LIBSVN_DIFF=		${LIBSVN_DIFFDIR}/libsvn_diff.a
 LIBSVN_FS=		${LIBSVN_FSDIR}/libsvn_fs.a
 LIBSVN_FS_FS=		${LIBSVN_FS_FSDIR}/libsvn_fs_fs.a
 LIBSVN_FS_UTIL=		${LIBSVN_FS_UTILDIR}/libsvn_fs_util.a
+LIBSVN_FS_X=		${LIBSVN_FS_XDIR}/libsvn_fs_x.a
 LIBSVN_RA=		${LIBSVN_RADIR}/libsvn_ra.a
 LIBSVN_RA_LOCAL=	${LIBSVN_RA_LOCALDIR}/libsvn_ra_local.a
 LIBSVN_RA_SVN=		${LIBSVN_RA_SVNDIR}/libsvn_ra_svn.a
diff --git a/usr.bin/svn/lib/Makefile b/usr.bin/svn/lib/Makefile
index 5f4cf28d029f..ff8309b2f676 100644
--- a/usr.bin/svn/lib/Makefile
+++ b/usr.bin/svn/lib/Makefile
@@ -2,7 +2,7 @@
 
 SUBDIR=	libapr libapr_util libserf \
 	libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \
-	libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_serf \
+	libsvn_fs_util libsvn_fs_x libsvn_ra libsvn_ra_local libsvn_ra_serf \
 	libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/svn/lib/libsvn_client/Makefile b/usr.bin/svn/lib/libsvn_client/Makefile
index 2e1949c757ae..2eb7a2341fa6 100644
--- a/usr.bin/svn/lib/libsvn_client/Makefile
+++ b/usr.bin/svn/lib/libsvn_client/Makefile
@@ -12,7 +12,7 @@ SRCS=		add.c blame.c cat.c changelist.c checkout.c cleanup.c \
 		copy_foreign.c ctx.c delete.c deprecated.c diff.c \
 		diff_local.c diff_summarize.c export.c externals.c import.c \
 		info.c iprops.c list.c locking_commands.c log.c merge.c \
-		mergeinfo.c patch.c log.c prop_commands.c \
+		mergeinfo.c mtcc.c patch.c log.c prop_commands.c \
 		ra.c relocate.c repos_diff.c resolved.c revert.c revisions.c \
 		status.c switch.c update.c upgrade.c url.c util.c version.c
 
diff --git a/usr.bin/svn/lib/libsvn_diff/Makefile b/usr.bin/svn/lib/libsvn_diff/Makefile
index 54ff3f297fc0..f9d342c61180 100644
--- a/usr.bin/svn/lib/libsvn_diff/Makefile
+++ b/usr.bin/svn/lib/libsvn_diff/Makefile
@@ -7,8 +7,9 @@
 INTERNALLIB=	yes
 LIB=		svn_diff
 
-SRCS=		deprecated.c diff.c diff3.c diff4.c diff_file.c diff_memory.c \
-		diff_tree.c lcs.c parse-diff.c token.c util.c
+SRCS=		binary_diff.c deprecated.c diff.c diff3.c diff4.c \
+		diff_file.c diff_memory.c diff_tree.c lcs.c parse-diff.c \
+		token.c util.c
 
 CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
 		-I${.CURDIR}/../libapr \
diff --git a/usr.bin/svn/lib/libsvn_fs/Makefile b/usr.bin/svn/lib/libsvn_fs/Makefile
index c6c50207214b..467ac93967d4 100644
--- a/usr.bin/svn/lib/libsvn_fs/Makefile
+++ b/usr.bin/svn/lib/libsvn_fs/Makefile
@@ -7,7 +7,7 @@
 INTERNALLIB=	yes
 LIB=		svn_fs
 
-SRCS=		access.c editor.c fs-loader.c
+SRCS=		access.c deprecated.c editor.c fs-loader.c
 
 CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
 		-I${.CURDIR}/../libapr \
diff --git a/usr.bin/svn/lib/libsvn_fs_fs/Makefile b/usr.bin/svn/lib/libsvn_fs_fs/Makefile
index b747877e2a02..eabb4f29d4bd 100644
--- a/usr.bin/svn/lib/libsvn_fs_fs/Makefile
+++ b/usr.bin/svn/lib/libsvn_fs_fs/Makefile
@@ -7,8 +7,11 @@
 INTERNALLIB=	yes
 LIB=		svn_fs_fs
 
-SRCS=		caching.c dag.c fs.c fs_fs.c id.c key-gen.c lock.c \
-		rep-cache.c temp_serializer.c tree.c
+SRCS=		cached_data.c caching.c dag.c dump-index.c fs.c fs_fs.c \
+		hotcopy.c id.c index.c load-index.c lock.c low_level.c \
+		pack.c recovery.c rep-cache.c rev_file.c revprops.c \
+		stats.c temp_serializer.c transaction.c tree.c util.c \
+		verify.c
 
 CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
 		-I${.CURDIR}/../libapr \
diff --git a/usr.bin/svn/lib/libsvn_fs_x/Makefile b/usr.bin/svn/lib/libsvn_fs_x/Makefile
new file mode 100644
index 000000000000..d4b06d2b59db
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_fs_x/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/libsvn_fs_x
+
+INTERNALLIB=	yes
+LIB=		svn_fs_x
+
+SRCS=		cached_data.c caching.c changes.c dag.c fs.c fs_id.c fs_x.c \
+		hotcopy.c id.c index.c lock.c low_level.c noderevs.c pack.c \
+		recovery.c rep-cache.c reps.c rev_file.c revprops.c \
+		string_table.c temp_serializer.c transaction.c tree.c \
+		util.c verify.c
+
+CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
+		-I${.CURDIR}/../libapr \
+		-I${APR}/include/arch/unix \
+		-I${APR}/include \
+		-I${.CURDIR}/../libapr_util \
+		-I${APRU}/include/private \
+		-I${APRU}/include
+
+.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsvn_fs_x/Makefile.depend b/usr.bin/svn/lib/libsvn_fs_x/Makefile.depend
new file mode 100644
index 000000000000..18be76b0cb6f
--- /dev/null
+++ b/usr.bin/svn/lib/libsvn_fs_x/Makefile.depend
@@ -0,0 +1,13 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/svn/lib/libsvn_ra_serf/Makefile b/usr.bin/svn/lib/libsvn_ra_serf/Makefile
index f9ff6ffbe2b4..74d95574deef 100644
--- a/usr.bin/svn/lib/libsvn_ra_serf/Makefile
+++ b/usr.bin/svn/lib/libsvn_ra_serf/Makefile
@@ -7,11 +7,12 @@
 INTERNALLIB=	yes
 LIB=		svn_ra_serf
 
-SRCS=		blame.c blncache.c commit.c get_deleted_rev.c getdate.c \
+SRCS=		blame.c blncache.c commit.c eagain_bucket.c \
+		get_deleted_rev.c get_file.c get_lock.c getdate.c \
 		getlocations.c getlocationsegments.c getlocks.c \
-		inherited_props.c locks.c log.c merge.c mergeinfo.c options.c \
-		property.c replay.c sb_bucket.c serf.c update.c util.c \
-		util_error.c xml.c
+		inherited_props.c lock.c log.c merge.c mergeinfo.c \
+		multistatus.c options.c property.c replay.c sb_bucket.c \
+		serf.c stat.c update.c util.c util_error.c xml.c
 
 CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
 		-I${.CURDIR}/../libapr \
diff --git a/usr.bin/svn/lib/libsvn_repos/Makefile b/usr.bin/svn/lib/libsvn_repos/Makefile
index 92c2b861b271..474a293331c4 100644
--- a/usr.bin/svn/lib/libsvn_repos/Makefile
+++ b/usr.bin/svn/lib/libsvn_repos/Makefile
@@ -7,9 +7,10 @@
 INTERNALLIB=	yes
 LIB=		svn_repos
 
-SRCS=		authz.c commit.c delta.c deprecated.c dump.c fs-wrap.c \
-		hooks.c load-fs-vtable.c load.c log.c node_tree.c notify.c \
-		replay.c reporter.c repos.c rev_hunt.c \
+SRCS=		authz.c authz_pool.c config_pool.c commit.c delta.c \
+		deprecated.c dump.c fs-wrap.c hooks.c load-fs-vtable.c \
+		load.c log.c node_tree.c notify.c replay.c reporter.c \
+		repos.c rev_hunt.c
 
 CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
 		-I${.CURDIR}/../libapr \
diff --git a/usr.bin/svn/lib/libsvn_subr/Makefile b/usr.bin/svn/lib/libsvn_subr/Makefile
index 45231973fbfe..0ec200c9b187 100644
--- a/usr.bin/svn/lib/libsvn_subr/Makefile
+++ b/usr.bin/svn/lib/libsvn_subr/Makefile
@@ -7,21 +7,25 @@
 INTERNALLIB=	yes
 LIB=		svn_subr
 
-SRCS=		adler32.c atomic.c auth.c base64.c cache-inprocess.c \
-		cache-membuffer.c cache-memcache.c cache.c cache_config.c \
-		checksum.c cmdline.c compat.c config.c config_auth.c \
-		config_file.c config_win.c crypto.c ctype.c date.c debug.c \
-		deprecated.c dirent_uri.c dso.c eol.c error.c gpg_agent.c \
-		hash.c io.c iter.c lock.c log.c macos_keychain.c magic.c \
-		md5.c mergeinfo.c mutex.c named_atomic.c nls.c opt.c path.c \
-		pool.c prompt.c properties.c pseudo_md5.c quoprint.c sha1.c \
-		simple_providers.c skel.c sorts.c spillbuf.c sqlite.c \
-		sqlite3wrapper.c ssl_client_cert_providers.c \
+SRCS=		adler32.c atomic.c auth.c base64.c bit_array.c \
+		cache-inprocess.c cache-membuffer.c cache-memcache.c \
+		cache.c cache_config.c checksum.c cmdline.c compat.c \
+		compress.c config.c config_auth.c config_file.c \
+		config_win.c crypto.c ctype.c date.c debug.c \
+		deprecated.c dirent_uri.c dso.c eol.c error.c fnv1a.c \
+		gpg_agent.c hash.c io.c iter.c lock.c log.c \
+		macos_keychain.c magic.c md5.c mergeinfo.c mutex.c nls.c \
+		object_pool.c opt.c packed_data.c path.c \
+		pool.c prefix_string.c prompt.c properties.c quoprint.c \
+		root_pools.c simple_providers.c skel.c sorts.c spillbuf.c \
+		sqlite.c sqlite3wrapper.c ssl_client_cert_providers.c \
 		ssl_client_cert_pw_providers.c ssl_server_trust_providers.c \
-		stream.c string.c subst.c sysinfo.c target.c temp_serializer.c \
-		time.c token.c types.c user.c username_providers.c utf.c \
+		stream.c string.c subst.c sysinfo.c target.c \
+		temp_serializer.c time.c token.c types.c user.c \
+		username_providers.c utf.c utf8proc.c \
 		utf_validate.c utf_width.c validate.c version.c \
-		win32_crashrpt.c win32_crypto.c win32_xlate.c xml.c \
+		win32_crashrpt.c win32_crypto.c win32_xlate.c \
+		x509info.c x509parse.c xml.c
 
 CFLAGS+=	-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
 		-I${.CURDIR}/../libapr \
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index b4f76f581fe2..e88dbdf0fd32 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -6,15 +6,16 @@
 
 PROG=	svn${SVNLITE}
 
-SRCS=	add-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c checkout-cmd.c \
-	cl-conflicts.c cleanup-cmd.c commit-cmd.c conflict-callbacks.c \
-	copy-cmd.c delete-cmd.c deprecated.c diff-cmd.c export-cmd.c \
-	file-merge.c help-cmd.c import-cmd.c info-cmd.c list-cmd.c \
-	lock-cmd.c log-cmd.c merge-cmd.c mergeinfo-cmd.c mkdir-cmd.c \
-	move-cmd.c notify.c patch-cmd.c propdel-cmd.c propedit-cmd.c \
-	propget-cmd.c proplist-cmd.c props.c propset-cmd.c relocate-cmd.c \
-	resolve-cmd.c resolved-cmd.c revert-cmd.c status-cmd.c status.c \
-	svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c 
+SRCS=	add-cmd.c auth-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c \
+	checkout-cmd.c cl-conflicts.c cleanup-cmd.c commit-cmd.c \
+	conflict-callbacks.c copy-cmd.c delete-cmd.c deprecated.c \
+	diff-cmd.c export-cmd.c file-merge.c help-cmd.c import-cmd.c \
+	info-cmd.c list-cmd.c lock-cmd.c log-cmd.c merge-cmd.c \
+	mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \
+	propdel-cmd.c propedit-cmd.c propget-cmd.c proplist-cmd.c \
+	props.c propset-cmd.c relocate-cmd.c resolve-cmd.c \
+	resolved-cmd.c revert-cmd.c status-cmd.c similarity.c status.c \
+	svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
@@ -33,6 +34,7 @@ LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
index 40da1cb31598..03ff60408d05 100644
--- a/usr.bin/svn/svn_private_config.h
+++ b/usr.bin/svn/svn_private_config.h
@@ -25,6 +25,9 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 /* #undef HAVE_DOPRNT */
 
+/* Define to 1 if you have the `getpid' function. */
+#define HAVE_GETPID 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -49,6 +52,9 @@
 /* Define to 1 if you have the <serf.h> header file. */
 #define HAVE_SERF_H 1
 
+/* Define to 1 if you have the <stdbool.h> header file. */
+#define HAVE_STDBOOL_H 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
@@ -94,8 +100,7 @@
 /* Define to 1 if you have the <zlib.h> header file. */
 /* #undef HAVE_ZLIB_H */
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
 /* Define to the address where bug reports for this package should be sent. */
@@ -105,7 +110,7 @@
 #define PACKAGE_NAME "subversion"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "subversion 1.8.14"
+#define PACKAGE_STRING "subversion 1.9.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "subversion"
@@ -119,15 +124,12 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Defined to allow building against httpd 2.4 with broken auth */
+/* Defined to build against httpd 2.4 with broken auth */
 /* #undef SVN_ALLOW_BROKEN_HTTPD_AUTH */
 
 /* Define to the Python/C API format character suitable for apr_int64_t */
 #define SVN_APR_INT64_T_PYCFMT "l"
 
-/* Define if circular linkage is not possible on this platform. */
-/* #undef SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK */
-
 /* Defined to be the path to the installed binaries */
 #define SVN_BINDIR "/usr/bin"
 
@@ -206,6 +208,9 @@
 /* Defined if libsvn_fs should link against libsvn_fs_fs */
 #define SVN_LIBSVN_FS_LINKS_FS_FS 1
 
+/* Defined if libsvn_fs should link against libsvn_fs_x */
+#define SVN_LIBSVN_FS_LINKS_FS_X 1
+
 /* Defined to be the path to the installed locale dirs */
 #define SVN_LOCALE_DIR "NONE/share/locale"
 
@@ -224,6 +229,9 @@
 /* Defined if svn should try to load DSOs */
 /* #undef SVN_USE_DSO */
 
+/* Defined to build with patched httpd 2.4 and working auth */
+/* #undef SVN_USE_FORCE_AUTHN */
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
@@ -261,3 +269,27 @@
 #define dgettext(domain, x) (x)
 #endif
 
+/* compiler hints */
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+# define SVN__PREDICT_FALSE(x) (__builtin_expect(x, 0))
+# define SVN__PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
+#else
+# define SVN__PREDICT_FALSE(x) (x)
+# define SVN__PREDICT_TRUE(x) (x)
+#endif
+
+#if defined(SVN_DEBUG)
+# define SVN__FORCE_INLINE
+# define SVN__PREVENT_INLINE
+#elif defined(__GNUC__)
+# define SVN__FORCE_INLINE APR_INLINE __attribute__ ((always_inline))
+# define SVN__PREVENT_INLINE __attribute__ ((noinline))
+#else
+# define SVN__FORCE_INLINE APR_INLINE
+# define SVN__PREVENT_INLINE
+#endif
+
+/* Macro used to specify that a variable is intentionally left unused.
+   Supresses compiler warnings about the variable being unused.  */
+#define SVN_UNUSED(v) ( (void)(v) )
+
diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile
index 00a9e2fb3f51..9cda0f02ad84 100644
--- a/usr.bin/svn/svnadmin/Makefile
+++ b/usr.bin/svn/svnadmin/Makefile
@@ -21,6 +21,7 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
diff --git a/usr.bin/svn/svnbench/Makefile b/usr.bin/svn/svnbench/Makefile
new file mode 100644
index 000000000000..8f54bafde929
--- /dev/null
+++ b/usr.bin/svn/svnbench/Makefile
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+MAN=
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnbench
+
+PROG=	svn${SVNLITE}bench
+
+SRCS=	help-cmd.c notify.c null-blame-cmd.c null-export-cmd.c \
+	null-info-cmd.c null-list-cmd.c null-log-cmd.c svnbench.c util.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
+	-L${LIBSVN_WCDIR} -lsvn_wc \
+	-L${LIBSVN_RADIR} -lsvn_ra \
+	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
+	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
+	-L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \
+	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBSERFDIR} -lserf \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-L${LIBAPRDIR} -lapr
+
+LIBADD+=	bsdxml sqlite3 z magic crypto ssl pthread
+
+DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
+	${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \
+	${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \
+	${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \
+	${LIBAPR}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnbench/Makefile.depend b/usr.bin/svn/svnbench/Makefile.depend
new file mode 100644
index 000000000000..da1efbd4fbad
--- /dev/null
+++ b/usr.bin/svn/svnbench/Makefile.depend
@@ -0,0 +1,41 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libcrypt \
+	lib/libexpat \
+	lib/libmagic \
+	lib/libthr \
+	lib/libz \
+	secure/lib/libcrypto \
+	secure/lib/libssl \
+	usr.bin/svn/lib/libapr \
+	usr.bin/svn/lib/libapr_util \
+	usr.bin/svn/lib/libserf \
+	usr.bin/svn/lib/libsqlite3 \
+	usr.bin/svn/lib/libsvn_client \
+	usr.bin/svn/lib/libsvn_delta \
+	usr.bin/svn/lib/libsvn_diff \
+	usr.bin/svn/lib/libsvn_fs \
+	usr.bin/svn/lib/libsvn_fs_fs \
+	usr.bin/svn/lib/libsvn_fs_util \
+	usr.bin/svn/lib/libsvn_ra \
+	usr.bin/svn/lib/libsvn_ra_local \
+	usr.bin/svn/lib/libsvn_ra_serf \
+	usr.bin/svn/lib/libsvn_ra_svn \
+	usr.bin/svn/lib/libsvn_repos \
+	usr.bin/svn/lib/libsvn_subr \
+	usr.bin/svn/lib/libsvn_wc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile
index 44b4f075ba0c..09bb541c5a62 100644
--- a/usr.bin/svn/svndumpfilter/Makefile
+++ b/usr.bin/svn/svndumpfilter/Makefile
@@ -21,6 +21,7 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
diff --git a/usr.bin/svn/svnfsfs/Makefile b/usr.bin/svn/svnfsfs/Makefile
new file mode 100644
index 000000000000..67be6387b107
--- /dev/null
+++ b/usr.bin/svn/svnfsfs/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+MAN=
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.PATH:	${SVNDIR}/svnfsfs
+
+PROG=	svn${SVNLITE}fsfs
+
+SRCS=	dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c
+
+CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
+	-I${.CURDIR}/../lib/libapr \
+	-I${APR}/include/arch/unix \
+	-I${APR}/include \
+	-I${.CURDIR}/../lib/libapr_util \
+	-I${APRU}/include/private \
+	-I${APRU}/include
+
+LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
+	-L${LIBSVN_FSDIR} -lsvn_fs \
+	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
+	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
+	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_SUBRDIR} -lsvn_subr \
+	-L${LIBAPR_UTILDIR} -lapr-util \
+	-L${LIBAPRDIR} -lapr
+LIBADD+=	bsdxml sqlite3 z pthread
+
+DPADD=	${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \
+	${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \
+	${LIBAPR}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/svn/svnfsfs/Makefile.depend b/usr.bin/svn/svnfsfs/Makefile.depend
new file mode 100644
index 000000000000..ae47f0bd1ce4
--- /dev/null
+++ b/usr.bin/svn/svnfsfs/Makefile.depend
@@ -0,0 +1,29 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libcrypt \
+	lib/libexpat \
+	lib/libz \
+	usr.bin/svn/lib/libapr \
+	usr.bin/svn/lib/libapr_util \
+	usr.bin/svn/lib/libsqlite3 \
+	usr.bin/svn/lib/libsvn_delta \
+	usr.bin/svn/lib/libsvn_fs \
+	usr.bin/svn/lib/libsvn_fs_fs \
+	usr.bin/svn/lib/libsvn_fs_util \
+	usr.bin/svn/lib/libsvn_repos \
+	usr.bin/svn/lib/libsvn_subr \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile
index 6e9f2faa39c9..f024d5089720 100644
--- a/usr.bin/svn/svnlook/Makefile
+++ b/usr.bin/svn/svnlook/Makefile
@@ -21,6 +21,7 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 LDADD=	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile
index 0b45ed6d3f0b..0815b3089405 100644
--- a/usr.bin/svn/svnmucc/Makefile
+++ b/usr.bin/svn/svnmucc/Makefile
@@ -19,6 +19,7 @@ CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${APRU}/include
 
 LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
+	-L${LIBSVN_WCDIR} -lsvn_wc \
 	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \
 	-L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \
@@ -26,8 +27,10 @@ LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
+	-L${LIBSVN_DIFFDIR} -lsvn_diff \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
 	-L${LIBSERFDIR} -lserf \
 	-L${LIBAPR_UTILDIR} -lapr-util \
diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile
index ca9022cdcc59..a63ac6226a56 100644
--- a/usr.bin/svn/svnrdump/Makefile
+++ b/usr.bin/svn/svnrdump/Makefile
@@ -27,6 +27,7 @@ LDADD=	-L${LIBSVN_CLIENTDIR} -lsvn_client \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_DIFFDIR} -lsvn_diff \
diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile
index 0622740a89d8..4b79cf4c477e 100644
--- a/usr.bin/svn/svnserve/Makefile
+++ b/usr.bin/svn/svnserve/Makefile
@@ -8,7 +8,7 @@ MAN=
 
 PROG=	svn${SVNLITE}serve
 
-SRCS=	cyrus_auth.c log-escape.c serve.c svnserve.c winservice.c
+SRCS=	cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
 	-I${.CURDIR}/../lib/libapr \
@@ -25,6 +25,7 @@ LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \
diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile
index 4417760dd146..dddd77328dc5 100644
--- a/usr.bin/svn/svnsync/Makefile
+++ b/usr.bin/svn/svnsync/Makefile
@@ -25,6 +25,7 @@ LDADD=	-L${LIBSVN_RADIR} -lsvn_ra \
 	-L${LIBSVN_REPOSDIR} -lsvn_repos \
 	-L${LIBSVN_FSDIR} -lsvn_fs \
 	-L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \
+	-L${LIBSVN_FS_XDIR} -lsvn_fs_x \
 	-L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \
 	-L${LIBSVN_DELTADIR} -lsvn_delta \
 	-L${LIBSVN_SUBRDIR} -lsvn_subr \