From cc653e9fb65ad2bb65b758cd8e53dcc1bfc23548 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Thu, 23 Apr 2026 12:59:12 -0500 Subject: [PATCH] gwenhywfar*: Use eq for string comparisons And use curly braces around variable names. --- devel/gwenhywfar4/Portfile | 10 +++++----- devel/gwenhywfar5/Portfile | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/devel/gwenhywfar4/Portfile b/devel/gwenhywfar4/Portfile index 07c8fdc5ca9..65c761f1c7d 100644 --- a/devel/gwenhywfar4/Portfile +++ b/devel/gwenhywfar4/Portfile @@ -45,7 +45,7 @@ patchfiles patch-gwenhywfar-config.cmake.in.diff \ patch-gwengui-cpp-config.cmake.in.diff \ implicit.patch -if {$subport eq $name} { +if {${subport} eq ${name}} { # the correct way to depend on Qt4: PortGroup qt4 1.0 configure.args-append --with-qt4-libs=${qt_libs_dir} \ @@ -58,19 +58,19 @@ if {$subport eq $name} { master_sites https://www.aquamaniac.de/rdm/attachments/download/${release}/ distname gwenhywfar-${version} -if {$subport == "gwenhywfar4-gtk"} { +if {${subport} eq "gwenhywfar4-gtk"} { depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 configure.args-append --with-guis="gtk2 cpp" --disable-qt4 } -if {$subport == "gwenhywfar4-gtk3"} { +if {${subport} eq "gwenhywfar4-gtk3"} { depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3 configure.args-append --with-guis="gtk3 cpp" --disable-qt4 } # Allow gtk3 version to replace any gtk2 version if it is installed # This will conflicts during gnucash upgrade. -if {$subport == "gwenhywfar4-gtk3"} { +if {${subport} eq "gwenhywfar4-gtk3"} { conflicts-delete gwenhywfar4-gtk pre-activate { if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk] 0]}] } { @@ -83,7 +83,7 @@ variant enable_local_install description "Enable local installation mode (plugin configure.args-append --enable-local-install } -variant debug description "Enable debug." { +variant debug description "Enable debug" { configure.args-append --enable-debug } diff --git a/devel/gwenhywfar5/Portfile b/devel/gwenhywfar5/Portfile index 51a157223f5..056a447ccee 100644 --- a/devel/gwenhywfar5/Portfile +++ b/devel/gwenhywfar5/Portfile @@ -65,7 +65,7 @@ pre-configure { " } -if {$subport eq $name} { +if {${subport} eq ${name}} { PortGroup qt4 1.0 configure.args-append \ --with-qt4-libs=${qt_libs_dir} \ @@ -76,7 +76,7 @@ if {$subport eq $name} { } # variants -variant debug description "Enable debug." { +variant debug description "Enable debug" { configure.args-append --enable-debug } @@ -85,7 +85,7 @@ configure.args-append --disable-dependency-tracking --disable-silent-rules # allow installation to replace the equivalent subport of gwenhywfar4, to # support migrating dependent ports to a new version -if {$subport == $name} { +if {${subport} eq ${name}} { conflicts-delete gwenhywfar4 pre-activate { if { ![catch {set vers [lindex [registry_active gwenhywfar4] 0]}] } { @@ -93,7 +93,7 @@ if {$subport == $name} { } } } -if {$subport == "gwenhywfar5-gtk"} { +if {${subport} eq "gwenhywfar5-gtk"} { conflicts-delete gwenhywfar4-gtk pre-activate { if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk] 0]}] } { @@ -101,7 +101,7 @@ if {$subport == "gwenhywfar5-gtk"} { } } } -if {$subport == "gwenhywfar5-gtk3"} { +if {${subport} eq "gwenhywfar5-gtk3"} { conflicts-delete gwenhywfar4-gtk3 pre-activate { if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk3] 0]}] } {