[114358] trunk/dports
mojca at macports.org
mojca at macports.org
Thu Dec 5 16:47:24 PST 2013
Revision: 114358
https://trac.macports.org/changeset/114358
Author: mojca at macports.org
Date: 2013-12-05 16:47:24 -0800 (Thu, 05 Dec 2013)
Log Message:
-----------
wxWidgets and dependencies: replace '!=' & '==' with 'ne' & 'eq' for string comparison
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl
trunk/dports/devel/codeblocks/Portfile
trunk/dports/graphics/wxWidgets-2.8/Portfile
trunk/dports/graphics/wxWidgets-3.0/Portfile
trunk/dports/python/py-wxpython-2.8/Portfile
Modified: trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl 2013-12-06 00:30:07 UTC (rev 114357)
+++ trunk/dports/_resources/port1.0/group/wxWidgets-1.0.tcl 2013-12-06 00:47:24 UTC (rev 114358)
@@ -47,11 +47,11 @@
proc wxWidgets._set {option action args} {
global prefix frameworks_dir os.major
global wxWidgets.name wxWidgets.version wxWidgets.prefix wxWidgets.wxdir
- if {"set" != ${action}} {
+ if {"set" ne ${action}} {
return
}
- if {${args} == "wxWidgets-2.8"} {
+ if {${args} eq "wxWidgets-2.8"} {
wxWidgets.name "wxWidgets"
wxWidgets.version "2.8"
wxWidgets.port "wxWidgets-2.8"
@@ -81,15 +81,15 @@
}
}
}
- } elseif {${args} == "wxGTK-2.8"} {
+ } elseif {${args} eq "wxGTK-2.8"} {
wxWidgets.name "wxGTK"
wxWidgets.version "2.8"
wxWidgets.port "wxgtk-2.8"
- } elseif {${args} == "wxGTK-3.0"} {
+ } elseif {${args} eq "wxGTK-3.0"} {
wxWidgets.name "wxGTK"
wxWidgets.version "3.0"
wxWidgets.port "wxgtk-3.0"
- } elseif {${args} == "wxWidgets-3.0"} {
+ } elseif {${args} eq "wxWidgets-3.0"} {
wxWidgets.name "wxWidgets"
wxWidgets.version "3.0"
wxWidgets.port "wxWidgets-3.0"
@@ -99,7 +99,7 @@
return -code error "incompatible Mac OS X version"
}
}
- } elseif {${args} == "wxPython-3.0"} {
+ } elseif {${args} eq "wxPython-3.0"} {
wxWidgets.name "wxPython"
wxWidgets.version "2.9"
wxWidgets.port "wxPython-3.0"
Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile 2013-12-06 00:30:07 UTC (rev 114357)
+++ trunk/dports/devel/codeblocks/Portfile 2013-12-06 00:47:24 UTC (rev 114358)
@@ -124,7 +124,7 @@
patchfiles-append patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
configure.args-append --with-wxdir=${wxWidgets.wxdir}
- if {${wxWidgets.sdk} != ""} {
+ if {${wxWidgets.sdk} ne ""} {
configure.sdkroot ${wxWidgets.sdk}
}
}
Modified: trunk/dports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-2.8/Portfile 2013-12-06 00:30:07 UTC (rev 114357)
+++ trunk/dports/graphics/wxWidgets-2.8/Portfile 2013-12-06 00:47:24 UTC (rev 114358)
@@ -49,7 +49,7 @@
subport wxgtk-2.8 {}
-if {$subport == $name || $subport == ""} {
+if {${name} eq ${subport}} {
wxWidgets.use wxWidgets-2.8
set installname wxWidgets
set wxtype mac
@@ -109,7 +109,7 @@
--enable-graphics_ctx \
--enable-universal_binary
-if {${wxWidgets.sdk} == ""} {
+if {${wxWidgets.sdk} eq ""} {
configure.args-append --with-macosx-sdk=no \
--with-macosx-version-min=no
} else {
@@ -118,7 +118,7 @@
}
# wxgtk-2.8 (it doesn't work with Quartz)
-if {$subport != $name} {
+if {${name} ne ${subport}} {
depends_build-append port:pkgconfig
depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
port:gtk2 \
Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile 2013-12-06 00:30:07 UTC (rev 114357)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile 2013-12-06 00:47:24 UTC (rev 114358)
@@ -15,13 +15,13 @@
set installname wxWidgets
set wxtype osx_cocoa
-if {$subport == $name} {
+if {${subport} eq ${name}} {
wxWidgets.use wxWidgets-3.0
-} elseif {$subport == "wxPython-3.0"} {
+} elseif {${subport} eq "wxPython-3.0"} {
wxWidgets.use wxPython-3.0
version 2.9.5
revision 1
-} elseif {$subport == "wxgtk-3.0"} {
+} elseif {${subport} eq "wxgtk-3.0"} {
# with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
# wxgtk-3.0 is here mainly for testing purposes
# it might be useful to report GTK-related bugs upstream
@@ -105,7 +105,7 @@
--with-macosx-sdk=no \
--with-macosx-version-min=no
-if {$subport == "wxPython-3.0"} {
+if {${subport} eq "wxPython-3.0"} {
set wxpythonsubset wxPython-2.9.5.0-MacPorts-subset
distfiles-append ${wxpythonsubset}${extract.suffix}:trac
@@ -136,7 +136,7 @@
}
livecheck.type none
-} elseif {$subport == "wxgtk-3.0"} {
+} elseif {${subport} eq "wxgtk-3.0"} {
# both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa
#
# patch-sdl.diff: the patch allows using --wxth-sdl
Modified: trunk/dports/python/py-wxpython-2.8/Portfile
===================================================================
--- trunk/dports/python/py-wxpython-2.8/Portfile 2013-12-06 00:30:07 UTC (rev 114357)
+++ trunk/dports/python/py-wxpython-2.8/Portfile 2013-12-06 00:47:24 UTC (rev 114358)
@@ -59,7 +59,7 @@
post-patch {
reinplace "s|# @@FLAGS1@@|cflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
reinplace "s|# @@FLAGS2@@|lflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
- if {${wxWidgets.sdk} != ""} {
+ if {${wxWidgets.sdk} ne ""} {
reinplace "s|# @@FLAGS3@@|cflags.extend(\[\"-isysroot\", \"${wxWidgets.sdk}\"\])|" ${worksrcpath}/config.py
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131205/bb8f8966/attachment.html>
More information about the macports-changes
mailing list