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

<span style='display:block; white-space:pre;color:#404040;'>    anjuta: 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;'>    - Drop python 3.6/3.7
</span><span style='display:block; white-space:pre;color:#404040;'>    - Add variants x11/quartz
</span><span style='display:block; white-space:pre;color:#404040;'>    - Cleanup
</span>---
 gnome/anjuta/Portfile | 90 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 40 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/anjuta/Portfile b/gnome/anjuta/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0c1a4b2491..7fd18c7ffe4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/anjuta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/anjuta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,27 +4,29 @@ PortSystem          1.0
</span> PortGroup           gobject_introspection 1.0
 PortGroup           muniversal 1.0
 PortGroup           yelp 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           app 1.0
</span> 
 name                anjuta
 version             3.34.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            4
</span> checksums           rmd160  113e01eee1675d08ff2fc4f56e755d6e01b8ce07 \
                     sha256  42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f \
                     size    6420472
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+categories          gnome devel
</span> license             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         A GNOME/GTK IDE
 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          gnome devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> homepage            https://wiki.gnome.org/Apps/Anjuta
<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
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:pkgconfig \
</span>                     port:intltool \
                     port:itstool \
                     port:yelp-tools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +36,8 @@ depends_build       port:pkgconfig \
</span>                     port:automake \
                     port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:desktop-file-utils \
</span>                     port:autogen \
                     port:shared-mime-info \
                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,25 +49,24 @@ depends_lib         port:desktop-file-utils \
</span>                     port:libxml2 \
                     port:vte
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run         port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:adwaita-icon-theme \
</span>                     port:epiphany \
                     port:xdg-utils
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-configure.ac.diff \
</span>                     patch-python-cflags.diff \
                     python-ldflags.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-plugins-python-loader-plugin.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} ne "linux"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-plugins-python-loader-plugin.c.diff \
</span>                     shm_open.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> 
 # apply various upstream fixes
 # allow configuration with libgda master (5.90+)
 # allow configuration with vala 0.32 through 0.54
 # allow vala language plugin to build with vala 0.50+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   gda6-config-fixes.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    gda6-config-fixes.patch \
</span>                     vala-config-fixes.patch \
                     build-with-vala-0.50.patch
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,13 +76,13 @@ gobject_introspection yes
</span> compiler.c_standard 2011
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cmd       ./autogen.sh
 
 configure.cflags-append \
                     -std=gnu89
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args      --enable-static \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --enable-static \
</span>                     --enable-compile-warnings=minimum \
                     --disable-maintainer-mode \
                     --disable-schemas-compile \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +93,8 @@ configure.args      --enable-static \
</span>                     --disable-plugin-subversion \
                     --disable-vala
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon            ${worksrcpath}/pixmaps/hicolor/scalable/anjuta.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant devhelp description {Enable devhelp plugin support} {
     configure.args-delete   --disable-plugin-devhelp
     depends_lib-append      port:devhelp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,43 +124,49 @@ variant vala description {Enable vala support} {
</span> 
 default_variants +devhelp +glade +vala
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python36 python37 python38 python39 python310 description {Use Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.python        ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:py27-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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
</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:#ffe0e0;'>-variant python36 conflicts python27 python37 python38 python39 python310 description {Use Python 3.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.python        ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:py36-gobject3
</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;'>+    depends_lib-append      port:py${python_version}-gobject3
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python36 python38 python39 python310 description {Use Python 3.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.python        ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:py37-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python38 python39 python310 description {Use Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    py_setup 2.7
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 python36 python37 python39 python310 description {Use Python 3.8} {
</span><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;'>-    depends_lib-append      port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python39 python310 description {Use Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    py_setup 3.8
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python27 python36 python37 python38 python310 description {Use Python 3.9} {
</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;'>-    depends_lib-append      port:py39-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python27 python38 python310 description {Use Python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    py_setup 3.9
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python27 python36 python37 python38 python39 description {Use Python 3.10} {
</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;'>-    depends_lib-append      port:py310-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python27 python38 python39 description {Use Python 3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    py_setup 3.10
</span> }
 
 if {![variant_isset python27] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    && ![variant_isset python36] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    && ![variant_isset python37] \
</span>     && ![variant_isset python38] \
     && ![variant_isset python39] \
     && ![variant_isset python310]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants-append +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants-append +python310
</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;'>+# Dummy variants, to ensure user's choice cascades to dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts 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]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><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> }
 
 post-activate {
</pre><pre style='margin:0'>

</pre>