[113211] trunk/dports/aqua/qt4-mac/Portfile

michaelld at macports.org michaelld at macports.org
Tue Nov 12 06:00:20 PST 2013


Revision: 113211
          https://trac.macports.org/changeset/113211
Author:   michaelld at macports.org
Date:     2013-11-12 06:00:20 -0800 (Tue, 12 Nov 2013)
Log Message:
-----------
qt4-mac: corerctly compare strings, using eq and ne.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2013-11-12 09:44:33 UTC (rev 113210)
+++ trunk/dports/aqua/qt4-mac/Portfile	2013-11-12 14:00:20 UTC (rev 113211)
@@ -292,7 +292,7 @@
 
 # hopefully the macosx_deployment_target exists and is set by now.  if
 # not, last resort (which is not desirable) is to use the os.version.
-if {${macosx_deployment_target} != ""} {
+if {${macosx_deployment_target} ne ""} {
     set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
 } else {
     set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
@@ -304,10 +304,10 @@
 
 global SDK
 set SDK ${configure.sdkroot}
-if {${SDK} == ""} {
+if {${SDK} eq ""} {
     # set SDK version depending on OS version
     set sdk_version ""
-    if {${MINOR} == "4"} {
+    if {${MINOR} eq "4"} {
         # OSX 10.4 requires an additional 'u'
         set sdk_version "10.4u"
     } else {
@@ -558,7 +558,7 @@
 
     # for 10.4 or 10.5 32-bit PPC, build as Carbon only, not Cocoa
 
-    if {${MINOR} == "4"} {
+    if {${MINOR} eq "4"} {
 
         configure.args-append -carbon
 
@@ -567,7 +567,7 @@
         configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms \
             -lssl -lz
 
-    } elseif {${MINOR} == "5" &&
+    } elseif {${MINOR} eq "5" &&
               [llength ${qt_arch_types}] == 1 &&
               [lsearch -exact ${qt_arch_types} ppc] == 0} {
 
@@ -593,7 +593,7 @@
         # not building for native arch: disable optimizing qmake
         configure.args-delete -optimized-qmake
 
-    } elseif {${MINOR} == "6" &&
+    } elseif {${MINOR} eq "6" &&
               [llength ${qt_arch_types}] == 1 &&
               [lsearch -exact ${qt_arch_types} x86] == 0} {
 
@@ -619,7 +619,7 @@
     if {[string match *clang* ${configure.compiler}]} {
         if {[info exists configure.cxx_stdlib]} {
             configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
-        } elseif {${MINOR} = "9"} {
+        } elseif {${MINOR} eq "9"} {
             configure.env-append QMAKE_STDLIB="-stdlib=libc++"
         } else {
             configure.env-append QMAKE_STDLIB="-stdlib=libstdc++"
@@ -1016,7 +1016,7 @@
     # make sure 'none' is selected by qt4_select, so that there is no
     # conflict between it and this port.
     if {[file exists ${prefix}/bin/qt4_select]} {
-        if {[exec ${prefix}/bin/qt4_select -s] != "none"} {
+        if {[exec ${prefix}/bin/qt4_select -s] ne "none"} {
             ui_msg "Disabling 'qt4_select' selection."
             system "exec ${prefix}/bin/qt4_select none"
         }
@@ -1064,7 +1064,7 @@
     set psql_version "91"
 }
 
-if {${psql_version} != ""} {
+if {${psql_version} ne ""} {
     ui_error "${name} variant +psql${psql_version} has been replaced by the port 'qt4-mac-postgresql91-plugin' and its subports.  Please install ${name} without +psql${psql_version}, then install your desired PostgreSQL Qt plugin."
     return -code error "Variant disabled"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131112/0fdfbc1b/attachment.html>


More information about the macports-changes mailing list