<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/d9040ae7ff507ce20446c55a27bd4794587dcb7d">https://github.com/macports/macports-ports/commit/d9040ae7ff507ce20446c55a27bd4794587dcb7d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d9040ae7ff507ce20446c55a27bd4794587dcb7d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Apr 24 15:10:04 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk2: cleanup
</span>---
gnome/gtk2/Portfile | 41 +++++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2/Portfile b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd260c99985..9c01ac4a113 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,21 +13,19 @@ version 2.24.33
</span> revision 3
epoch 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set proj_name gtk+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span> categories gnome x11
license LGPL-2+
maintainers {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
description GTK+ widget toolkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description GTK+ is a highly usable, feature rich toolkit for creating graphical \
user interfaces which boasts cross platform compatibility and an easy \
to use API. GTK+ it is written in C, but has bindings to many other \
popular programming languages such as C++, Python and C# among others.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://www.gtk.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_name gtk+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span> distname ${proj_name}-${version}
dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +39,13 @@ checksums rmd160 85333860bdeda25f28c45177fe08d5f0914d4e52 \
</span>
set port_ver_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc \
</span> port:pkgconfig \
port:perl5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:atk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:atk \
</span> path:lib/pkgconfig/pango.pc:pango \
path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,24 +54,29 @@ depends_lib port:atk \
</span> # indirectly depends on gtk2, so we can not list it as a dependency here.
# path:lib/pkgconfig/librsvg-2.0.pc:librsvg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:shared-mime-info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hicolor-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:hicolor-icon-theme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:shared-mime-info
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-aliases.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gtk-builder-convert.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-aliases.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gtk-builder-convert.diff
</span>
# autoreconf to deal with stupid issues during install (install: .libs/libferret.lai: No such file or directory)
use_autoreconf yes
autoreconf.args -fvi
<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> --disable-glibtest \
--enable-introspection \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-static \
</span> gio_can_sniff=yes
configure.ccache no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -DX_LOCALE -D_IPP_PRIVATE_STRUCTURES=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -fstrict-aliasing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DX_LOCALE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_IPP_PRIVATE_STRUCTURES=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fstrict-aliasing
</span>
# gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,15 +104,14 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.target check
post-destroot {
set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTHORS COPYING HACKING NEWS README \
</span> ${destroot}${docdir}
ui_debug "Creating gtk.immodules..."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +119,8 @@ post-destroot {
</span> ${destroot}${prefix}/bin/gtk-query-immodules-2.0 \
${destroot}${prefix}/lib/gtk-2.0/2.10.0/immodules/*.so \
>${destroot}${prefix}/etc/gtk-2.0/gtk.immodules"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${destroot}||" ${destroot}${prefix}/etc/gtk-2.0/gtk.immodules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${destroot}||" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/gtk-2.0/gtk.immodules
</span> }
post-activate {
</pre><pre style='margin:0'>
</pre>