gwenhywfar*: Use eq for string comparisons

And use curly braces around variable names.
This commit is contained in:
Ryan Carsten Schmidt
2026-04-23 12:59:12 -05:00
parent fa542a6b5b
commit cc653e9fb6
2 changed files with 10 additions and 10 deletions
+5 -5
View File
@@ -45,7 +45,7 @@ patchfiles patch-gwenhywfar-config.cmake.in.diff \
patch-gwengui-cpp-config.cmake.in.diff \ patch-gwengui-cpp-config.cmake.in.diff \
implicit.patch implicit.patch
if {$subport eq $name} { if {${subport} eq ${name}} {
# the correct way to depend on Qt4: # the correct way to depend on Qt4:
PortGroup qt4 1.0 PortGroup qt4 1.0
configure.args-append --with-qt4-libs=${qt_libs_dir} \ 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}/ master_sites https://www.aquamaniac.de/rdm/attachments/download/${release}/
distname gwenhywfar-${version} distname gwenhywfar-${version}
if {$subport == "gwenhywfar4-gtk"} { if {${subport} eq "gwenhywfar4-gtk"} {
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-append --with-guis="gtk2 cpp" --disable-qt4 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 depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3
configure.args-append --with-guis="gtk3 cpp" --disable-qt4 configure.args-append --with-guis="gtk3 cpp" --disable-qt4
} }
# Allow gtk3 version to replace any gtk2 version if it is installed # Allow gtk3 version to replace any gtk2 version if it is installed
# This will conflicts during gnucash upgrade. # This will conflicts during gnucash upgrade.
if {$subport == "gwenhywfar4-gtk3"} { if {${subport} eq "gwenhywfar4-gtk3"} {
conflicts-delete gwenhywfar4-gtk conflicts-delete gwenhywfar4-gtk
pre-activate { pre-activate {
if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk] 0]}] } { 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 configure.args-append --enable-local-install
} }
variant debug description "Enable debug." { variant debug description "Enable debug" {
configure.args-append --enable-debug configure.args-append --enable-debug
} }
+5 -5
View File
@@ -65,7 +65,7 @@ pre-configure {
" "
} }
if {$subport eq $name} { if {${subport} eq ${name}} {
PortGroup qt4 1.0 PortGroup qt4 1.0
configure.args-append \ configure.args-append \
--with-qt4-libs=${qt_libs_dir} \ --with-qt4-libs=${qt_libs_dir} \
@@ -76,7 +76,7 @@ if {$subport eq $name} {
} }
# variants # variants
variant debug description "Enable debug." { variant debug description "Enable debug" {
configure.args-append --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 # allow installation to replace the equivalent subport of gwenhywfar4, to
# support migrating dependent ports to a new version # support migrating dependent ports to a new version
if {$subport == $name} { if {${subport} eq ${name}} {
conflicts-delete gwenhywfar4 conflicts-delete gwenhywfar4
pre-activate { pre-activate {
if { ![catch {set vers [lindex [registry_active gwenhywfar4] 0]}] } { 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 conflicts-delete gwenhywfar4-gtk
pre-activate { pre-activate {
if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk] 0]}] } { 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 conflicts-delete gwenhywfar4-gtk3
pre-activate { pre-activate {
if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk3] 0]}] } { if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk3] 0]}] } {