<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/90b2f9742367e6baf41f5d5657923af373af5b96">https://github.com/macports/macports-ports/commit/90b2f9742367e6baf41f5d5657923af373af5b96</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 90b2f9742367e6baf41f5d5657923af373af5b96
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Sep 11 12:16:51 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    glade: add app bundle; eliminate copy-pasta for python variants
</span><span style='display:block; white-space:pre;color:#404040;'>    - Add myself as co-maintainer
</span><span style='display:block; white-space:pre;color:#404040;'>    - Cleanup
</span>---
 devel/glade/Portfile | 66 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 28 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/Portfile b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 602c9ec3f8d..6c2f178cc21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,20 +3,23 @@
</span> PortSystem          1.0
 PortGroup           active_variants 1.1
 PortGroup           meson 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           app 1.0
</span> 
 name                glade
 version             3.38.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories          devel gnome
</span> license             LGPL-2+ GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch          [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers         {devans @dbevans} {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description         Glade is a RAD tool to enable quick & easy development of user interfaces \
                     for the GTK+ 3.* toolkit and the GNOME desktop environment.
 long_description    {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers         {devans @dbevans} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories          devel gnome
</span> homepage            https://wiki.gnome.org/Apps/Glade
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        gnome:sources/${name}/${branch}/
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch          [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites        gnome:sources/${name}/${branch}/
</span> use_xz              yes
 
 checksums           rmd160  78381c71685f0ea17fecd975b356168737b7a315 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,19 +36,23 @@ depends_build-append \
</span>                     port:docbook-xml \
                     port:docbook-xsl-nons
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span>                     path:lib/pkgconfig/gjs-1.0.pc:gjs \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     port:libxml2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run         port:desktop-file-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:desktop-file-utils
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          LINGUAS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    LINGUAS.patch \
</span>                     meson.build.patch
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args      -Dgladeui=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -Dgladeui=true \
</span>                     -Dgjs=enabled \
                     -Dpython=disabled \
                     -Dwebkit2gtk=disabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,34 +68,31 @@ if {${universal_possible} && [variant_isset universal]} {
</span>     destroot.env-append    "CC=${configure.cc} ${configure.cc_archflags}"
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 python310 description {Build Python 3.8 widgets support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon            ${worksrcpath}/data/icons/hicolor/scalable/apps/org.gnome.Glade.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc py_setup {python_branch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global prefix frameworks_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_version          [string map {"." ""} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework        ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     configure.args-replace      -Dpython=disabled -Dpython=enabled
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.python            ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_framework        ${frameworks_dir}/Python.framework/Versions/3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append        "PYTHON_LIBS=-L${python_framework}/lib -lpython3.8" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.python            ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env-append        "PYTHON_LIBS=-L${python_framework}/lib -lpython${python_branch}" \
</span>                                 PYTHON_LIB_LOC=${python_framework}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append          port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          port:py${python_version}-gobject3
</span>     configure.pkg_config_path   ${python_framework}/lib/pkgconfig
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 description {Build Python 3.8 widgets support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    py_setup 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant python39 conflicts python38 python310 description {Build Python 3.9 widgets support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-replace      -Dpython=disabled -Dpython=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.python            ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_framework        ${frameworks_dir}/Python.framework/Versions/3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append        "PYTHON_LIBS=-L${python_framework}/lib -lpython3.9" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append          port:py39-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.pkg_config_path   ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    py_setup 3.9
</span> }
 
 variant python310 conflicts python38 python39 description {Build Python 3.10 widgets support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-replace      -Dpython=disabled -Dpython=enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.python            ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_framework        ${frameworks_dir}/Python.framework/Versions/3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append        "PYTHON_LIBS=-L${python_framework}/lib -lpython3.10" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append          port:py310-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.pkg_config_path   ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    py_setup 3.10
</span> }
 
 if {![variant_isset python38] && \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,5 +135,11 @@ variant quartz conflicts x11 {
</span> if {![variant_isset quartz]} {
     default_variants +x11
 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    error "Either +x11 or +quartz is required"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 livecheck.type      gnome
</pre><pre style='margin:0'>

</pre>