Update subversion

13 files changed, 53 insertions, 403 deletions

diff --git a/data/subversion/_metadata/libserf.dep b/data/subversion/_metadata/libserf.dep
new file mode 120000
index 000000000..dfb4ae0df
--- /dev/null
+++ b/data/subversion/_metadata/libserf.dep
@@ -0,0 +1 @@
+../../libserf
\ No newline at end of file
diff --git a/data/subversion/_metadata/libutf8proc.dep b/data/subversion/_metadata/libutf8proc.dep
new file mode 120000
index 000000000..c539d7f01
--- /dev/null
+++ b/data/subversion/_metadata/libutf8proc.dep
@@ -0,0 +1 @@
+../../libutf8proc
\ No newline at end of file
diff --git a/data/subversion/_metadata/lz4.dep b/data/subversion/_metadata/lz4.dep
new file mode 120000
index 000000000..bccb2875c
--- /dev/null
+++ b/data/subversion/_metadata/lz4.dep
@@ -0,0 +1 @@
+../../lz4
\ No newline at end of file
diff --git a/data/subversion/_metadata/neon.dep b/data/subversion/_metadata/neon.dep
deleted file mode 120000
index 271602162..000000000
--- a/data/subversion/_metadata/neon.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../neon
\ No newline at end of file
diff --git a/data/subversion/_metadata/version b/data/subversion/_metadata/version
index c514bd85c..5ad2491cf 100644
--- a/data/subversion/_metadata/version
+++ b/data/subversion/_metadata/version
@@ -1 +1 @@
-1.4.6
+1.10.2
diff --git a/data/subversion/macho_iterate.diff b/data/subversion/macho_iterate.diff
new file mode 100644
index 000000000..dcd5a1e73
--- /dev/null
+++ b/data/subversion/macho_iterate.diff
@@ -0,0 +1,30 @@
+diff -ur subversion-1.10.2/build/ac-macros/macosx.m4 subversion-1.10.2+iPhone/build/ac-macros/macosx.m4
+--- subversion-1.10.2/build/ac-macros/macosx.m4	2012-11-25 17:04:27.000000000 -1000
++++ subversion-1.10.2+iPhone/build/ac-macros/macosx.m4	2018-08-17 16:55:02.000000000 -1000
+@@ -21,25 +21,7 @@
+ 
+ dnl SVN_LIB_MACHO_ITERATE
+ dnl Check for _dyld_image_name and _dyld_image_header availability
+-AC_DEFUN(SVN_LIB_MACHO_ITERATE,
+-[
+-  AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
+-  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+-    #include <mach-o/dyld.h>
+-    #include <mach-o/loader.h>
+-  ]],[[
+-    const struct mach_header *header = _dyld_get_image_header(0);
+-    const char *name = _dyld_get_image_name(0);
+-    if (name && header) return 0;
+-    return 1;
+-  ]])],[
+-    AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
+-              [Is Mach-O low-level _dyld API available?])
+-    AC_MSG_RESULT([yes])
+-  ],[
+-    AC_MSG_RESULT([no])
+-  ])
+-])
++    AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], [Is Mach-O low-level _dyld API available?])
+ 
+ dnl SVN_LIB_MACOS_PLIST
+ dnl Assign variables for Mac OS property list support
diff --git a/data/subversion/make.sh b/data/subversion/make.sh
index 96932fd82..a0478408f 100644
--- a/data/subversion/make.sh
+++ b/data/subversion/make.sh
@@ -1,5 +1,6 @@
 pkg:setup
 autoconf
-CFLAGS="-DSVN_NEON_0_25 -DSVN_NEON_0_26" pkg:configure --enable-maintainer-mode --disable-keychain --with-neon="$(PKG_DEST_ neon)/usr" --with-apr="$(PKG_WORK_ apr)/apr-1.2.12" --with-apr-util="$(PKG_WORK_ apr-util)/apr-util-1.2.12"
-make
+#EXTRA_CFLAGS='-DSVN_SQLITE_MIN_VERSION="3.19.3"' pkg:configure --enable-maintainer-mode --disable-keychain --with-apr="$(PKG_WORK_ _apr)/apr-$(cat $(PKG_DATA_ _apr)/_metadata/version)/" --with-apr-util="$(PKG_WORK_ apr-util)/apr-util-$(cat $(PKG_DATA_ apr-util)/_metadata/version)/" --without-apxs
+pkg:configure --enable-maintainer-mode --disable-keychain --with-apr="$(PKG_WORK_ _apr)/apr-$(cat $(PKG_DATA_ _apr)/_metadata/version)/" --with-apr-util="$(PKG_WORK_ apr-util)/apr-util-$(cat $(PKG_DATA_ apr-util)/_metadata/version)/" --without-apxs --enable-sqlite-compatibility-version=3.8.11.1
+make -j8
 pkg:install
diff --git a/data/subversion/mdns.diff b/data/subversion/mdns.diff
deleted file mode 100644
index 636a3aa37..000000000
--- a/data/subversion/mdns.diff
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -ru subversion-1.4.6/contrib/client-side/mucc.c subversion-1.4.6+iPhone/contrib/client-side/mucc.c
---- subversion-1.4.6/contrib/client-side/mucc.c	2005-12-19 23:24:53.000000000 +0000
-+++ subversion-1.4.6+iPhone/contrib/client-side/mucc.c	2008-01-31 08:02:38.000000000 +0000
-@@ -1,3 +1,5 @@
-+#include <mach-o/nlist.h>
-+
- /*  Multiple URL Command Client
- 
-     Combine a list of mv, cp and rm commands on URLs into a single commit.
-@@ -445,6 +447,15 @@
- int
- main(int argc, const char **argv)
- {
-+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    nlist("/usr/lib/libc.dylib", nl);
-+    if (nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
-+#endif
-+
-   apr_pool_t *pool = init("mucc");
-   apr_array_header_t *actions = apr_array_make(pool, 1, sizeof(struct action*));
-   const char *anchor = NULL;
-diff -ru subversion-1.4.6/subversion/svn/main.c subversion-1.4.6+iPhone/subversion/svn/main.c
---- subversion-1.4.6/subversion/svn/main.c	2006-08-14 20:47:44.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/svn/main.c	2008-01-31 08:03:11.000000000 +0000
-@@ -1,3 +1,5 @@
-+#include <mach-o/nlist.h>
-+
- /*
-  * main.c:  Subversion command line client.
-  *
-@@ -815,6 +817,15 @@
- int
- main(int argc, const char *argv[])
- {
-+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    nlist("/usr/lib/libc.dylib", nl);
-+    if (nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
-+#endif
-+
-   svn_error_t *err;
-   apr_allocator_t *allocator;
-   apr_pool_t *pool;
-diff -ru subversion-1.4.6/subversion/svnadmin/main.c subversion-1.4.6+iPhone/subversion/svnadmin/main.c
---- subversion-1.4.6/subversion/svnadmin/main.c	2007-12-12 22:45:36.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/svnadmin/main.c	2008-01-31 08:03:07.000000000 +0000
-@@ -1,3 +1,5 @@
-+#include <mach-o/nlist.h>
-+
- /*
-  * main.c: Subversion server administration tool.
-  *
-@@ -1148,6 +1150,15 @@
- int
- main(int argc, const char *argv[])
- {
-+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    nlist("/usr/lib/libc.dylib", nl);
-+    if (nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
-+#endif
-+
-   svn_error_t *err;
-   apr_status_t apr_err;
-   apr_allocator_t *allocator;
-diff -ru subversion-1.4.6/subversion/svnlook/main.c subversion-1.4.6+iPhone/subversion/svnlook/main.c
---- subversion-1.4.6/subversion/svnlook/main.c	2006-07-12 17:07:21.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/svnlook/main.c	2008-01-31 08:03:00.000000000 +0000
-@@ -1,3 +1,5 @@
-+#include <mach-o/nlist.h>
-+
- /*
-  * main.c: Subversion server inspection tool.
-  *
-@@ -1858,6 +1860,15 @@
- int
- main(int argc, const char *argv[])
- {
-+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    nlist("/usr/lib/libc.dylib", nl);
-+    if (nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
-+#endif
-+
-   svn_error_t *err;
-   apr_status_t apr_err;
-   apr_allocator_t *allocator;
-diff -ru subversion-1.4.6/subversion/svnserve/main.c subversion-1.4.6+iPhone/subversion/svnserve/main.c
---- subversion-1.4.6/subversion/svnserve/main.c	2006-07-12 17:07:21.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/svnserve/main.c	2008-01-31 08:03:05.000000000 +0000
-@@ -1,3 +1,5 @@
-+#include <mach-o/nlist.h>
-+
- /*
-  * main.c :  Main control function for svnserve
-  *
-@@ -297,6 +299,15 @@
- 
- int main(int argc, const char *argv[])
- {
-+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    nlist("/usr/lib/libc.dylib", nl);
-+    if (nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
-+#endif
-+
-   enum run_mode run_mode = run_mode_unspecified;
-   svn_boolean_t foreground = FALSE;
-   apr_socket_t *sock, *usock;
-diff -ru subversion-1.4.6/subversion/svnsync/main.c subversion-1.4.6+iPhone/subversion/svnsync/main.c
---- subversion-1.4.6/subversion/svnsync/main.c	2007-10-30 21:56:56.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/svnsync/main.c	2008-01-31 08:03:14.000000000 +0000
-@@ -1,3 +1,5 @@
-+#include <mach-o/nlist.h>
-+
- /*
-  * ====================================================================
-  * Copyright (c) 2005-2006 CollabNet.  All rights reserved.
-@@ -1295,6 +1297,15 @@
- int
- main(int argc, const char *argv[])
- {
-+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    nlist("/usr/lib/libc.dylib", nl);
-+    if (nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
-+#endif
-+
-   const svn_opt_subcommand_desc_t *subcommand = NULL;
-   apr_array_header_t *received_opts;
-   opt_baton_t opt_baton;
-diff -ru subversion-1.4.6/subversion/svnversion/main.c subversion-1.4.6+iPhone/subversion/svnversion/main.c
---- subversion-1.4.6/subversion/svnversion/main.c	2006-07-12 17:07:21.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/svnversion/main.c	2008-01-31 08:03:09.000000000 +0000
-@@ -1,3 +1,5 @@
-+#include <mach-o/nlist.h>
-+
- /*
-  * ====================================================================
-  * Copyright (c) 2003-2004 CollabNet.  All rights reserved.
-@@ -108,6 +110,15 @@
- int
- main(int argc, const char *argv[])
- {
-+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    nlist("/usr/lib/libc.dylib", nl);
-+    if (nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
-+#endif
-+
-   const char *wc_path, *trail_url;
-   apr_allocator_t *allocator;
-   apr_pool_t *pool;
diff --git a/data/subversion/neon.diff b/data/subversion/neon.diff
deleted file mode 100644
index 6dde31ed3..000000000
--- a/data/subversion/neon.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru subversion-1.4.6/build/ac-macros/neon.m4 subversion-1.4.6+iPhone/build/ac-macros/neon.m4
---- subversion-1.4.6/build/ac-macros/neon.m4	2006-10-20 23:44:09.000000000 +0000
-+++ subversion-1.4.6+iPhone/build/ac-macros/neon.m4	2007-12-28 12:43:02.000000000 +0000
-@@ -38,10 +38,11 @@
-     if test "$withval" = "yes" ; then
-       AC_MSG_ERROR([--with-neon requires an argument.])
-     else
--      neon_config="$withval/bin/neon-config"
-+            svn_allowed_neon_on_system="yes"
-+            SVN_NEON_INCLUDES="-I$withval/include/neon"
-+            NEON_LIBS="$withval/lib/libneon.dylib"
-+            svn_lib_neon="yes"
-     fi
--
--    SVN_NEON_CONFIG()
-   ],
-   [
-     if test -d $abs_srcdir/neon ; then
diff --git a/data/subversion/subversion-1.10.2.tar.bz2 b/data/subversion/subversion-1.10.2.tar.bz2
new file mode 100644
index 000000000..276e55419
--- /dev/null
+++ b/data/subversion/subversion-1.10.2.tar.bz2
diff --git a/data/subversion/subversion-1.4.6.tar.bz2 b/data/subversion/subversion-1.4.6.tar.bz2
deleted file mode 100644
index 31f96af06..000000000
--- a/data/subversion/subversion-1.4.6.tar.bz2
+++ /dev/null
diff --git a/data/subversion/svnversion.diff b/data/subversion/svnversion.diff
deleted file mode 100644
index 31ae342a5..000000000
--- a/data/subversion/svnversion.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u subversion-1.4.6/Makefile.in subversion-1.4.6+iPhone/Makefile.in
---- subversion-1.4.6/Makefile.in	2007-03-03 00:30:11.000000000 +0000
-+++ subversion-1.4.6+iPhone/Makefile.in	2007-12-28 13:36:33.000000000 +0000
-@@ -325,7 +325,7 @@
- 
- ### HACK!! Find a better way to do this
- revision-install:
--	subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
-+	svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
- 
- install-static: @INSTALL_STATIC_RULES@
- 
diff --git a/data/subversion/timestamp.diff b/data/subversion/timestamp.diff
index 9011446e5..7f4d0fd68 100644
--- a/data/subversion/timestamp.diff
+++ b/data/subversion/timestamp.diff
@@ -1,194 +1,16 @@
-diff -ur subversion-1.4.6/subversion/libsvn_subr/opt.c subversion-1.4.6+iPhone/subversion/libsvn_subr/opt.c
---- subversion-1.4.6/subversion/libsvn_subr/opt.c	2007-12-06 18:50:24.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/libsvn_subr/opt.c	2008-06-18 06:53:08.000000000 +0000
-@@ -972,8 +972,8 @@
-     }
- 
-   SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n"
--                                     "   compiled %s, %s\n\n"), pgm_name,
--                             SVN_VERSION, __DATE__, __TIME__));
-+                                     "\n"), pgm_name,
-+                             SVN_VERSION));
-   SVN_ERR(svn_cmdline_fputs(_("Copyright (C) 2000-2007 CollabNet.\n"
-                               "Subversion is open source software, see"
-                               " http://subversion.tigris.org/\n"
-diff -ur subversion-1.4.6/subversion/po/de.po subversion-1.4.6+iPhone/subversion/po/de.po
---- subversion-1.4.6/subversion/po/de.po	2006-10-24 07:17:59.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/de.po	2008-06-18 06:53:13.000000000 +0000
-@@ -4351,11 +4351,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, Version %s\n"
--"   übersetzt %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:977
-diff -ur subversion-1.4.6/subversion/po/es.po subversion-1.4.6+iPhone/subversion/po/es.po
---- subversion-1.4.6/subversion/po/es.po	2006-11-10 18:45:10.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/es.po	2008-06-18 06:53:16.000000000 +0000
-@@ -4254,11 +4254,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, versión %s\n"
--"   compilado %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:957
-diff -ur subversion-1.4.6/subversion/po/fr.po subversion-1.4.6+iPhone/subversion/po/fr.po
---- subversion-1.4.6/subversion/po/fr.po	2006-08-24 07:06:31.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/fr.po	2008-06-18 06:53:18.000000000 +0000
-@@ -4363,11 +4363,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, version %s\n"
--"    compilé %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:957
-diff -ur subversion-1.4.6/subversion/po/it.po subversion-1.4.6+iPhone/subversion/po/it.po
---- subversion-1.4.6/subversion/po/it.po	2006-12-25 23:16:34.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/it.po	2008-06-18 06:53:21.000000000 +0000
-@@ -4343,11 +4343,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, versione %s\n"
--"   compilato %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:957
-diff -ur subversion-1.4.6/subversion/po/ja.po subversion-1.4.6+iPhone/subversion/po/ja.po
---- subversion-1.4.6/subversion/po/ja.po	2007-03-26 17:25:34.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/ja.po	2008-06-18 06:53:24.000000000 +0000
-@@ -4490,11 +4490,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, バージョン %s\n"
--"   コンパイル日時: %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:977
-diff -ur subversion-1.4.6/subversion/po/ko.po subversion-1.4.6+iPhone/subversion/po/ko.po
---- subversion-1.4.6/subversion/po/ko.po	2006-11-20 07:02:47.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/ko.po	2008-06-18 06:53:27.000000000 +0000
-@@ -4159,11 +4159,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, 버젼 %s\n"
--"    %s, %s에 컴파일 됨\n"
- "\n"
- 
- #: libsvn_subr/opt.c:977
-diff -ur subversion-1.4.6/subversion/po/nb.po subversion-1.4.6+iPhone/subversion/po/nb.po
---- subversion-1.4.6/subversion/po/nb.po	2007-03-07 15:17:47.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/nb.po	2008-06-18 06:53:31.000000000 +0000
-@@ -4268,11 +4268,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, versjon %s\n"
--"   kompilert %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:977
-diff -ur subversion-1.4.6/subversion/po/pl.po subversion-1.4.6+iPhone/subversion/po/pl.po
---- subversion-1.4.6/subversion/po/pl.po	2006-08-23 19:35:09.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/pl.po	2008-06-18 06:53:34.000000000 +0000
-@@ -4261,11 +4261,8 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
--"\n"
- msgstr ""
- "%s, wersja %s\n"
--"   kompilacja %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:957
-diff -ur subversion-1.4.6/subversion/po/pt_BR.po subversion-1.4.6+iPhone/subversion/po/pt_BR.po
---- subversion-1.4.6/subversion/po/pt_BR.po	2006-10-28 20:37:07.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/pt_BR.po	2008-06-18 06:53:38.000000000 +0000
-@@ -4238,11 +4238,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, versão %s\n"
--"   compilado %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:977
-diff -ur subversion-1.4.6/subversion/po/sv.po subversion-1.4.6+iPhone/subversion/po/sv.po
---- subversion-1.4.6/subversion/po/sv.po	2006-10-25 07:32:55.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/sv.po	2008-06-18 06:53:45.000000000 +0000
-@@ -4194,11 +4194,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, version %s\n"
--"   kompilerad %s, %s\n"
- "\n"
- 
- #: libsvn_subr/opt.c:977
-diff -ur subversion-1.4.6/subversion/po/zh_CN.po subversion-1.4.6+iPhone/subversion/po/zh_CN.po
---- subversion-1.4.6/subversion/po/zh_CN.po	2007-12-09 14:28:45.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/zh_CN.po	2008-06-18 06:53:49.000000000 +0000
-@@ -4140,11 +4140,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s，版本 %s\n"
--"   编译于 %s，%s\n"
- "\n"
- 
- #: ../libsvn_subr/opt.c:977
-diff -ur subversion-1.4.6/subversion/po/zh_TW.po subversion-1.4.6+iPhone/subversion/po/zh_TW.po
---- subversion-1.4.6/subversion/po/zh_TW.po	2006-08-23 19:35:09.000000000 +0000
-+++ subversion-1.4.6+iPhone/subversion/po/zh_TW.po	2008-06-18 06:53:54.000000000 +0000
-@@ -4216,11 +4216,9 @@
- #, c-format
- msgid ""
- "%s, version %s\n"
--"   compiled %s, %s\n"
- "\n"
- msgstr ""
- "%s, 版本 %s\n"
--"   編譯於 %s, %s\n"
- "\n"
- 
- # as-is
+--- subversion-1.10.2/subversion/libsvn_subr/opt.c	2015-10-04 07:15:07.000000000 -1000
++++ subversion-1.10.2+iPhone/subversion/libsvn_subr/opt.c	2018-08-17 16:07:19.000000000 -1000
+@@ -1118,12 +1118,7 @@
+   if (quiet)
+     return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
+ 
+-  SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n"
+-                                     "   compiled %s, %s on %s\n\n"),
+-                             pgm_name, SVN_VERSION,
+-                             svn_version_ext_build_date(info),
+-                             svn_version_ext_build_time(info),
+-                             svn_version_ext_build_host(info)));
++  SVN_ERR(svn_cmdline_printf(pool, "%s, version %s\n", pgm_name, SVN_VERSION));
+   SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
+ 
+   if (footer)