<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/4db8835ad0cbb870f464da96b4ffb50f40b4c15d">https://github.com/macports/macports-ports/commit/4db8835ad0cbb870f464da96b4ffb50f40b4c15d</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 4db8835ad0c gtk-osx-application: cleanup whitespace and indentation
</span>4db8835ad0c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4db8835ad0cbb870f464da96b4ffb50f40b4c15d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat May 28 13:37:27 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk-osx-application: cleanup whitespace and indentation
</span>---
devel/gtk-osx-application/Portfile | 118 +++++++++++++++++++++----------------
1 file changed, 68 insertions(+), 50 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 893d931e9d8..b32dd0394bf 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;'>@@ -1,42 +1,41 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name gtk-osx-application
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ige-mac-integration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-2.1
</span><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:#ffe0e0;'>-categories devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name gtk-osx-application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ige-mac-integration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name gtk-mac-integration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Mac OS X menu bar integration library for GTK2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} openmaintainer
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+description Mac OS X menu bar integration library for GTK2 quartz
</span> long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- A simple library whose purpose is to \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow GTK quartz applications to integrate with \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the Mac OS X menu bar. Requires gtk2 or gtk3 and its \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies to be built with variant +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ A simple library whose purpose is to \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow GTK quartz applications to integrate with \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the Mac OS X menu bar. Requires gtk2 or gtk3 and its \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies to be built with variant +quartz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set myname gtk-mac-integration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/gtk-mac-integration/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${myname}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</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/gtk-mac-integration/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
# sha256 from upstream, rmd160 computed locally
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e890873ceb22d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 50b403a4fa0216f87fc462b775dacd4a366935df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 349228
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 f19e35bc4534963127bbe629b9b3ccb9677ef012fc7f8e97fd5e890873ceb22d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 50b403a4fa0216f87fc462b775dacd4a366935df \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 349228
</span>
<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 port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gtk_version gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gtk_version gtk2
</span>
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,18 +60,27 @@ dependencies are built with variants +quartz and try again.
</span> error "$gtk_version +quartz not installed."
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --libdir=${prefix}/lib
</span>
subport gtk-osx-application-gtk3 {
set gtk_version gtk3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><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:#ffe0e0;'>-
</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/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # force gtk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gtk3 --without-gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gtk2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-python=no
</span>
post-destroot {
delete ${destroot}${prefix}/include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,14 +92,17 @@ subport gtk-osx-application-gtk3 {
</span>
subport gtk-osx-application-common-gtk3 {
set gtk_version gtk3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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/gtk+-3.0.pc:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # force gtk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gtk3 --without-gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gtk2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-python=no
</span>
post-destroot {
delete ${destroot}${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,13 +113,18 @@ subport gtk-osx-application-common-gtk3 {
</span> subport gtk-osx-application-gtk2 {
set gtk_version gtk2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><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;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk2
</span>
# force gtk version to 2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gtk2 --without-gtk3 --disable-introspection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-introspection
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-python=no
</span>
post-destroot {
delete ${destroot}${prefix}/include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,20 +137,22 @@ subport gtk-osx-application-gtk2 {
</span> subport gtk-osx-application-common-gtk2 {
set gtk_version gtk2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
</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/gtk+-2.0.pc:gtk2
</span>
# force gtk version to 2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gtk2 --without-gtk3 --disable-introspection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-introspection
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-python=no
</span>
post-destroot {
delete ${destroot}${prefix}/lib
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ccache no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd-append --libdir=${prefix}/lib --includedir=${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.name ${myname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.name ${my_name}
</span></pre><pre style='margin:0'>
</pre>