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

1 files changed, 41 insertions, 9 deletions

diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
index 40da1cb..4907e98 100644
--- a/usr.bin/svn/svn_private_config.h
+++ b/usr.bin/svn/svn_private_config.h
@@ -17,7 +17,7 @@
 /* #undef ENABLE_NLS */
 
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
@@ -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.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "subversion"
@@ -114,20 +119,17 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.8.14"
+#define PACKAGE_VERSION "1.9.4"
 
 /* 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) )
+