<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2c45791cccd129d7ca14631d6d09591dda2228fd">https://github.com/macports/macports-ports/commit/2c45791cccd129d7ca14631d6d09591dda2228fd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2c45791cccd129d7ca14631d6d09591dda2228fd
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Jul 27 16:25:59 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> subversion: update to 1.14.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - refresh patches
</span><span style='display:block; white-space:pre;color:#404040;'> - use pkg-config
</span>---
devel/subversion/Portfile | 21 ++++++------
devel/subversion/files/config_impl.h.patch | 6 ++--
devel/subversion/files/dynamic_lookup-11.patch | 8 ++---
devel/subversion/files/patch-Makefile.in.diff | 11 -------
.../files/patch-osx_unicode_precomp.diff | 38 +++++++++-------------
5 files changed, 31 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion/Portfile b/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 016be4c738c..77de2a1b719 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name subversion
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.13.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.14.1
</span> revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,14 +20,18 @@ homepage https://subversion.apache.org/
</span> master_sites apache:subversion
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a6f2731a87d612b85d4a82571948150d09b2643a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bc50ce2c3faa7b1ae9103c432017df98dfd989c4239f9f8270bb3a314ed9e5bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8508122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 037b14fd7e47a470a3b4925a4fe925d866c8c718 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8504612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib-append port:apr \
port:apr-util \
port:cyrus-sasl2 \
port:db48 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dbus \
</span> port:expat \
port:gettext \
port:libcomerr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,14 +58,9 @@ post-patch {
</span>
configure.args-append \
--with-berkeley-db=:${prefix}/include/db48:${prefix}/lib/db48:db-4.8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apr=${prefix}/bin/apr-1-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apr-util=${prefix}/bin/apu-1-config \
</span> --without-apxs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=\\\${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-serf=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sasl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libmagic=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gnome-keyring
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gnome-keyring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-boost
</span>
build.target all tools
destroot.target-append install-tools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion/files/config_impl.h.patch b/devel/subversion/files/config_impl.h.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b14e6e5d1e..baf6e4db167 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/files/config_impl.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/files/config_impl.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- subversion/libsvn_subr/config_impl.h.orig 2011-02-12 00:18:15.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subversion/libsvn_subr/config_impl.h 2012-02-21 21:07:53.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,7 +131,7 @@ svn_error_t *svn_config__parse_registry(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subversion/libsvn_subr/config_impl.h.orig 2017-01-01 05:43:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subversion/libsvn_subr/config_impl.h 2021-08-24 15:25:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +135,7 @@
</span> # define SVN_CONFIG__SYS_DIRECTORY "subversion"
# define SVN_CONFIG__USR_DIRECTORY "subversion"
#else /* ! WIN32 && ! __HAIKU__ */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion/files/dynamic_lookup-11.patch b/devel/subversion/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e6be28616f5..bcb39acb5c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Recognize macOS 11 and later, remove inaccurate comment, and simplify.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-10-25 04:30:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-01-12 13:20:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10789,16 +10789,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-02-04 07:21:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-08-24 15:25:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10798,16 +10798,11 @@
</span> _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion/files/patch-Makefile.in.diff b/devel/subversion/files/patch-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b83f2a8937e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig Sun Aug 17 19:45:25 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in Sun Aug 17 19:45:54 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -204,7 +204,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean: external-clean local-clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distclean: external-distclean local-distclean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extraclean: external-extraclean local-extraclean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install: external-install local-install revision-install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: external-install local-install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @INCLUDE_OUTPUTS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion/files/patch-osx_unicode_precomp.diff b/devel/subversion/files/patch-osx_unicode_precomp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d432837b079..f5bd3f7c017 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/files/patch-osx_unicode_precomp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/files/patch-osx_unicode_precomp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: subversion/libsvn_subr/io.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- subversion/libsvn_subr/io.c (revision 1527683)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subversion/libsvn_subr/io.c (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +154,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subversion/libsvn_subr/io.c.orig 2020-03-25 05:04:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subversion/libsvn_subr/io.c 2021-08-24 15:42:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -216,7 +216,7 @@
</span> const char *path_apr,
apr_pool_t *pool)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +9,7 @@ Index: subversion/libsvn_subr/io.c
</span> *path_utf8 = path_apr;
return SVN_NO_ERROR;
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -237,7 +237,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,7 +299,7 @@
</span> const char *parent,
apr_pool_t *pool)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,10 +18,8 @@ Index: subversion/libsvn_subr/io.c
</span> *name_p = apr_pstrdup(pool, name);
return SVN_NO_ERROR;
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: subversion/libsvn_subr/path.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- subversion/libsvn_subr/path.c (revision 1527683)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subversion/libsvn_subr/path.c (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subversion/libsvn_subr/path.c.orig 2016-01-10 13:35:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subversion/libsvn_subr/path.c 2021-08-24 15:42:15.000000000 -0400
</span> @@ -40,6 +40,9 @@
#include "dirent_uri.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +30,7 @@ Index: subversion/libsvn_subr/path.c
</span>
/* The canonical empty path. Can this be changed? Well, change the empty
test below and the path library will work, not so sure about the fs/wc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1100,7 +1103,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1111,7 +1114,7 @@
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +39,7 @@ Index: subversion/libsvn_subr/path.c
</span> /** Get APR's internal path encoding. */
static svn_error_t *
get_path_encoding(svn_boolean_t *path_is_utf8, apr_pool_t *pool)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1127,7 +1130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1138,7 +1141,7 @@
</span> const char *path_utf8,
apr_pool_t *pool)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +48,7 @@ Index: subversion/libsvn_subr/path.c
</span> svn_boolean_t path_is_utf8;
SVN_ERR(get_path_encoding(&path_is_utf8, pool));
if (path_is_utf8)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1136,7 +1139,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1147,7 +1150,7 @@
</span> *path_apr = apr_pstrdup(pool, path_utf8);
return SVN_NO_ERROR;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +57,7 @@ Index: subversion/libsvn_subr/path.c
</span> else
return svn_utf_cstring_from_utf8(path_apr, path_utf8, pool);
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1148,18 +1151,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1159,18 +1162,38 @@
</span> const char *path_apr,
apr_pool_t *pool)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,10 +99,8 @@ Index: subversion/libsvn_subr/path.c
</span> #endif
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: subversion/svn/proplist-cmd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- subversion/svn/proplist-cmd.c (revision 1527683)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subversion/svn/proplist-cmd.c (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subversion/svn/proplist-cmd.c.orig 2021-08-24 15:41:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subversion/svn/proplist-cmd.c 2021-08-24 15:42:15.000000000 -0400
</span> @@ -98,6 +98,11 @@
else
name_local = path;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,10 +125,8 @@ Index: subversion/svn/proplist-cmd.c
</span> if (inherited_props)
{
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: subversion/svn/status-cmd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- subversion/svn/status-cmd.c (revision 1527683)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subversion/svn/status-cmd.c (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subversion/svn/status-cmd.c.orig 2015-04-10 03:58:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subversion/svn/status-cmd.c 2021-08-24 15:42:15.000000000 -0400
</span> @@ -114,6 +114,10 @@
{
svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,5 +136,5 @@ Index: subversion/svn/status-cmd.c
</span> +#endif
+
svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "target",
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "path", target, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "path", target, SVN_VA_NULL);
</span>
</pre><pre style='margin:0'>
</pre>