<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc13b5482f71bd8b9bde87576bd47d79310d4fd3">https://github.com/macports/macports-ports/commit/fc13b5482f71bd8b9bde87576bd47d79310d4fd3</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 fc13b5482f7 gnome-photo-print: Use unversioned automake executables
</span>fc13b5482f7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fc13b5482f71bd8b9bde87576bd47d79310d4fd3
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 23 00:36:15 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> gnome-photo-print: Use unversioned automake executables
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> instead of assuming the version is 1.16. Specify executable paths using
</span><span style='display:block; white-space:pre;color:#404040;'> environment variables as the authors of the script intended rather than
</span><span style='display:block; white-space:pre;color:#404040;'> patching the script.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/70408
</span>---
gnome/gnome-photo-print/Portfile | 15 ++++++++++-----
gnome/gnome-photo-print/files/patch-autogen.sh.diff | 16 ----------------
2 files changed, 10 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-photo-print/Portfile b/gnome/gnome-photo-print/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fa5d2eef667..271ee962b59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-photo-print/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-photo-print/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,6 @@ long_description \
</span> ${description}
maintainers nomaintainer
categories gnome
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage http://www.fogman.de/?page_id=7
distname ${gname}-${version}
master_sites http://www.fogman.de/gpp/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +19,11 @@ checksums md5 ff8fdd9a8f741b346a8d87045d1d02e3 \
</span> sha1 e79ee69c7fb3961f1c8fb28e00f88f4d4ecedb97 \
rmd160 7a96e9b5cd05f2c6ce8017888aa2751934283a80
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span> port:automake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib port:libgnomeprintui \
port:libgnomeui \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +34,12 @@ patchfiles patch-autogen.sh.diff
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env ACLOCAL=${prefix}/bin/aclocal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOCONF=${prefix}/bin/autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOHEADER=${prefix}/bin/autoheader \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=${prefix}/bin/automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBTOOL=${prefix}/bin/glibtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBTOOLIZE=${prefix}/bin/glibtoolize
</span>
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-photo-print/files/patch-autogen.sh.diff b/gnome/gnome-photo-print/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index df9704e01ac..ed3770f822b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-photo-print/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-photo-print/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,5 @@
</span> --- autogen.sh.orig 2015-04-27 22:38:26.000000000 -0700
+++ autogen.sh 2015-04-27 22:45:25.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,11 +3,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : ${AUTOCONF=autoconf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : ${AUTOHEADER=autoheader}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--: ${AUTOMAKE=automake-1.9}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--: ${ACLOCAL=aclocal-1.9}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--: ${LIBTOOLIZE=libtoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+: ${AUTOMAKE=automake-1.16}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+: ${ACLOCAL=aclocal-1.16}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+: ${LIBTOOLIZE=glibtoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : ${INTLTOOLIZE=intltoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--: ${LIBTOOL=libtool}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+: ${LIBTOOL=glibtool}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : ${GNOME_DOC_PREPARE=gnome-doc-prepare}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srcdir=`dirname $0`
</span> @@ -165,7 +165,7 @@
fi
done
</pre><pre style='margin:0'>
</pre>