MFC r275385 (by bapt):

  Sync the svn template with the one from ports

MFC r289180 (by peter):
  Update from svn-1.8.14 to 1.9.2.

  Formal release notes are available:
    https://subversion.apache.org/docs/release-notes/1.9.html

  Of particular note, the client checkout format has *not* changed so
  upgrades should *not* be required.

  When reading a repository (file:// or running as a local server), an
  improved fsfs version 7 is available with significant performance
  improvements.  An optional upgrade is possible to use the new features.
  Without the upgrade, this is fully read/write compatible with the
  version 6 fsfs as in svn-1.8.

MFC r298845:
  Update from subversion 1.9.2 to 1.9.4.

  This contains only bug fixes, no new features.  The repository format is
  also unchanged from 1.9.2.  Full list of changes between 1.9.4 and
  earlier versions:

    https://svn.apache.org/repos/asf/subversion/tags/1.9.4/CHANGES

  Note that the two security issues fixed in 1.9.4 (CVE-2016-2167 and
  CVE-2016-2168) do not affect the version of Subversion in the FreeBSD
  base system, since neither SASL nor Apache modules are enabled.

MFC r298996:
  Re-sync the FreeBSD-specific Subversion template with the one from
  ports.

Relnotes:	yes

9 files changed, 61 insertions, 27 deletions

diff --git a/usr.bin/svn/lib/Makefile b/usr.bin/svn/lib/Makefile
index befbe4a..26395e1 100644
--- a/usr.bin/svn/lib/Makefile
+++ b/usr.bin/svn/lib/Makefile
@@ -2,7 +2,7 @@
 
 SUBDIR=	libapr libapr_util libserf libsqlite3 \
 	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
 SUBDIR_PARALLEL=
 
diff --git a/usr.bin/svn/lib/libsvn_client/Makefile b/usr.bin/svn/lib/libsvn_client/Makefile
index 2e1949c..2eb7a23 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 54ff3f2..f9d342c 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 c6c5020..467ac93 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 b747877..eabb4f2 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 0000000..d4b06d2
--- /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_ra_serf/Makefile b/usr.bin/svn/lib/libsvn_ra_serf/Makefile
index f9ff6ff..74d9557 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 92c2b86..474a293 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 4523197..0ec200c 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 \