<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc6ca95612716d5ea20337b33b7431986fce02ad">https://github.com/macports/macports-ports/commit/fc6ca95612716d5ea20337b33b7431986fce02ad</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 fc6ca956127 gtk-osx-application: cleanup: eliminate copy-pasta, via helper proc
</span>fc6ca956127 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fc6ca95612716d5ea20337b33b7431986fce02ad
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Jun 1 09:04:51 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk-osx-application: cleanup: eliminate copy-pasta, via helper proc
</span>---
devel/gtk-osx-application/Portfile | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gtk-osx-application/Portfile b/devel/gtk-osx-application/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d38126f876..1fa4654a003 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gtk-osx-application/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gtk-osx-application/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,14 @@ checksums sha256 f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gtk_version gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: This must be updated within subports, when value of 'gtk_version' changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set subport_dir gtkmacintegration-${gtk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc gtk_version {ver} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global gtk_version subport_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gtk_version ${ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport_dir gtkmacintegration-${gtk_version}
</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;'>+gtk_version gtk2
</span>
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,8 +71,7 @@ dependencies are built with variants +quartz and try again.
</span> configure.ccache no
subport ${name}-gtk3 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gtk_version gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set subport_dir gtkmacintegration-${gtk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_version gtk3
</span>
depends_lib-append \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,8 +94,7 @@ subport ${name}-gtk3 {
</span> }
subport ${name}-common-gtk3 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gtk_version gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set subport_dir gtkmacintegration-${gtk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_version gtk3
</span>
depends_lib-append \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,8 +114,7 @@ subport ${name}-common-gtk3 {
</span> }
subport ${name}-gtk2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gtk_version gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set subport_dir gtkmacintegration-${gtk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_version gtk2
</span>
depends_lib-append \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,8 +138,7 @@ subport ${name}-gtk2 {
</span> }
subport ${name}-common-gtk2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gtk_version gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set subport_dir gtkmacintegration-${gtk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_version gtk2
</span>
depends_lib-append \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +157,7 @@ subport ${name}-common-gtk2 {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE: Do this after all subport declarations, as we're dependent on value of 'subport_dir'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: This must be done after all subport declarations, as we're dependent on value of 'subport_dir'
</span> configure.cmd-append \
--includedir=${prefix}/include/${subport_dir} \
--libdir=${prefix}/lib/${subport_dir} \
</pre><pre style='margin:0'>
</pre>