<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f31dfa307208536530722a4364bdc41983863837">https://github.com/macports/macports-ports/commit/f31dfa307208536530722a4364bdc41983863837</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f31dfa3 librsvg: patch configure.ac when using autoreconf
</span>f31dfa3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f31dfa307208536530722a4364bdc41983863837
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Apr 4 09:57:05 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> librsvg: patch configure.ac when using autoreconf
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using one patchfile for both configure and configure.ac yields:
</span><span style='display:block; white-space:pre;color:#404040;'> WARNING: 'aclocal-1.15' is missing on your system.
</span><span style='display:block; white-space:pre;color:#404040;'> make: *** [aclocal.m4] Error 127
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56192
</span>---
graphics/librsvg/Portfile | 12 +++++++++++-
.../files/patch-configure-ac-rust_target_subdir.diff | 15 +++++++++++++++
...ubdir.diff => patch-configure-rust_target_subdir.diff} | 0
3 files changed, 26 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/Portfile b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de4379d..ed6978e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,17 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> PortGroup muniversal 1.0
# when CARGO_BUILD_TARGET is set, directory structure changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patching configure.ac without autoreconf leads to:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # WARNING: 'aclocal-1.15' is missing on your system.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make: *** [aclocal.m4] Error 127
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset viewer]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configure-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configure-ac-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
if {![variant_isset universal]} {
if {${build_arch} eq "i386"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-configure-ac-rust_target_subdir.diff b/graphics/librsvg/files/patch-configure-ac-rust_target_subdir.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2c279ce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/files/patch-configure-ac-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-01-23 13:21:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-04-01 09:49:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,9 +261,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x$cross_compiling" = "xyes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if test "x$cross_compiling" = "xyes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RUST_TARGET_SUBDIR="$CARGO_BUILD_TARGET/$RUST_TARGET_SUBDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST([RUST_TARGET_SUBDIR])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ===========================================================================
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-rust_target_subdir.diff b/graphics/librsvg/files/patch-configure-rust_target_subdir.diff
</span>similarity index 100%
rename from graphics/librsvg/files/patch-rust_target_subdir.diff
rename to graphics/librsvg/files/patch-configure-rust_target_subdir.diff
</pre><pre style='margin:0'>
</pre>