<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/0f65c1302d12fc70ecabcac09d0ee5e26d3b68b5">https://github.com/macports/macports-ports/commit/0f65c1302d12fc70ecabcac09d0ee5e26d3b68b5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0f65c1302d12fc70ecabcac09d0ee5e26d3b68b5
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat May 28 14:26:08 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    gtk-osx-application: segregate subports, to eliminate conflicts
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/63609
</span>---
 devel/gtk-osx-application/Portfile | 47 +++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 19 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 b32dd0394bf..3d38126f876 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;'>@@ -7,7 +7,7 @@ name                gtk-osx-application
</span> conflicts           ige-mac-integration
 set my_name         gtk-mac-integration
 version             3.0.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 categories          devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,8 @@ checksums           sha256  f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e
</span> depends_build       port:pkgconfig
 
 set gtk_version     gtk2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: This must be updated within subports, when value of 'gtk_version' changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set subport_dir     gtkmacintegration-${gtk_version}
</span> 
 pre-configure {
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,16 +65,13 @@ dependencies are built with variants +quartz and try again.
</span>  
 configure.ccache    no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --includedir=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --libdir=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gtk-osx-application-gtk3 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-gtk3 {
</span>     set gtk_version gtk3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set subport_dir gtkmacintegration-${gtk_version}
</span> 
     depends_lib-append \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:include/${subport_dir}/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk3
</span> 
     # force gtk version
     configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,13 +84,14 @@ subport gtk-osx-application-gtk3 {
</span>     post-destroot {
         delete ${destroot}${prefix}/include
         delete ${destroot}${prefix}/lib/pkgconfig/gtk-mac-integration.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        delete ${destroot}${prefix}/share/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        delete ${destroot}${prefix}/share/strings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        delete ${destroot}${prefix}/share/${subport_dir}/locale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        delete ${destroot}${prefix}/share/${subport_dir}/strings
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gtk-osx-application-common-gtk3 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-common-gtk3 {
</span>     set gtk_version gtk3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set subport_dir gtkmacintegration-${gtk_version}
</span> 
     depends_lib-append \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,41 +106,43 @@ subport gtk-osx-application-common-gtk3 {
</span> 
     post-destroot {
         delete ${destroot}${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        delete ${destroot}${prefix}/share/gir-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        delete ${destroot}${prefix}/share/${subport_dir}/gir-1.0
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gtk-osx-application-gtk2 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-gtk2 {
</span>     set gtk_version gtk2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set subport_dir gtkmacintegration-${gtk_version}
</span> 
     depends_lib-append \
                     path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:include/${subport_dir}/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk2
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # force gtk version to 2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # force gtk version
</span>     configure.args-append \
                     --with-gtk2 \
                     --without-gtk3 \
                     --disable-introspection
 
     configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        --enable-python=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --enable-python=no
</span> 
     post-destroot {
         delete ${destroot}${prefix}/include
         delete ${destroot}${prefix}/lib/pkgconfig/gtk-mac-integration.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        delete ${destroot}${prefix}/share/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        delete ${destroot}${prefix}/share/strings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        delete ${destroot}${prefix}/share/${subport_dir}/locale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        delete ${destroot}${prefix}/share/${subport_dir}/strings
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gtk-osx-application-common-gtk2 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-common-gtk2 {
</span>     set gtk_version gtk2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set subport_dir gtkmacintegration-${gtk_version}
</span> 
     depends_lib-append \
                     path:lib/pkgconfig/gtk+-2.0.pc:gtk2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # force gtk version to 2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # force gtk version
</span>     configure.args-append \
                     --with-gtk2 \
                     --without-gtk3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,5 +156,12 @@ subport gtk-osx-application-common-gtk2 {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 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;'>+configure.cmd-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --includedir=${prefix}/include/${subport_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --libdir=${prefix}/lib/${subport_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --datarootdir=${prefix}/share/${subport_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-pkgconfigdir=${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type      gnome
 livecheck.name      ${my_name}
</pre><pre style='margin:0'>

</pre>