<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118978] trunk/dports/aqua/qt4-mac/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118978">118978</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-04-14 06:54:02 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt4-mac:
+ use MINOR instead of os.version throughout; addresses ticket #43329;
+ MINOR is an integer, so treat is as such (e.g., use "==" etc instead of "eq");
+ fix livecheck for latest qt download method;
+ use just "error" instead of "return -code error".</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macPortfile">trunk/dports/aqua/qt4-mac/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt4macPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt4-mac/Portfile (118977 => 118978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/Portfile 2014-04-14 13:28:00 UTC (rev 118977)
+++ trunk/dports/aqua/qt4-mac/Portfile 2014-04-14 13:54:02 UTC (rev 118978)
</span><span class="lines">@@ -50,6 +50,22 @@
</span><span class="cx"> port:openssl port:tiff \
</span><span class="cx"> port:libpng port:libmng port:jpeg
</span><span class="cx">
</span><ins>+# find a way to specify the OS MINOR version. For OSX 10.X, this
+# value will be X. The type is this variable is integer, so we can
+# use "==" and so forth for comparison.
+
+global MINOR
+set MINOR ""
+
+# 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} ne ""} {
+ set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
+} else {
+ set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
+}
+
</ins><span class="cx"> ###############################################
</span><span class="cx"> # Patches are used to both fix compiling on various OS versions, and
</span><span class="cx"> # to enhance the functionality of QMake and its build files. Some of
</span><span class="lines">@@ -221,8 +237,10 @@
</span><span class="cx"> # to do "-lQtHelp -lQtCLucene -lQtNetwork -lQtWebKit" instead. For
</span><span class="cx"> # some reason 10.5+ "knows" that how to do this correctly.
</span><span class="cx">
</span><del>-platform darwin 8 {
- patchfiles-append patch-QtHelp_10.4_only.diff
</del><ins>+platform darwin {
+ if {${MINOR} == 4} {
+ patchfiles-append patch-QtHelp_10.4_only.diff
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # (20) fix the Mac timer's use of "mach_timebase_info"
</span><span class="lines">@@ -238,7 +256,7 @@
</span><span class="cx"> # (22) Under 10.8 and 10.9: Patch to fix corelib linking
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><del>- if {${os.major} > 12} {
</del><ins>+ if {${MINOR} >= 8} {
</ins><span class="cx"> patchfiles-append patch-src_corelib_corelib.pro.diff
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -257,35 +275,39 @@
</span><span class="cx"> # (26) Fix qglobals.h to build under 10.9 CLang
</span><span class="cx"> # (27 a-e) Fix WebKit to build under 10.9 CLang
</span><span class="cx">
</span><del>-platform darwin 13 {
- patchfiles-append \
- patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp.diff \
- patch-src_corelib_global_qglobal.h.diff \
- patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h.diff \
- patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp.diff \
- patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff \
- patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp.diff \
- patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff
</del><ins>+platform darwin {
+ if {${MINOR} == 9} {
+ patchfiles-append \
+ patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp.diff \
+ patch-src_corelib_global_qglobal.h.diff \
+ patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h.diff \
+ patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp.diff \
+ patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp.diff \
+ patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp.diff \
+ patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp.diff
</ins><span class="cx">
</span><del>- # Copy new version of webkit's lib for OS X 10.9 only.
- # Attached by reference:
- # https://codereview.qt-project.org/#change,69328
- # http://trac.webkit.org/browser/trunk/WebKitLibraries/ChangeLog?rev=157771
</del><ins>+ # Copy new version of webkit's lib for OS X 10.9 only.
+ # Attached by reference:
+ # https://codereview.qt-project.org/#change,69328
+ # http://trac.webkit.org/browser/trunk/WebKitLibraries/ChangeLog?rev=157771
</ins><span class="cx">
</span><del>- distfiles-append libWebKitSystemInterfaceMavericks.a
- post-patch {
- copy ${distpath}/libWebKitSystemInterfaceMavericks.a \
- ${worksrcpath}/src/3rdparty/webkit/WebKitLibraries
</del><ins>+ distfiles-append libWebKitSystemInterfaceMavericks.a
+ post-patch {
+ copy ${distpath}/libWebKitSystemInterfaceMavericks.a \
+ ${worksrcpath}/src/3rdparty/webkit/WebKitLibraries
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# error out if trying to build on a new OSX version (> 10.9).
+
</ins><span class="cx"> platform darwin {
</span><del>- if {${os.major} > 13} {
</del><ins>+ if {${MINOR} > 9} {
</ins><span class="cx"> # This project needs to be updated to build with clang++ against libc++
</span><span class="cx"> depends_lib
</span><span class="cx"> depends_run
</span><span class="cx"> pre-fetch {
</span><del>- ui_error "$name does not build on OSX later than 10.9 'Mavericks'."
</del><ins>+ ui_error "$name does not currently build on OSX later than 10.9 'Mavericks'."
</ins><span class="cx"> error "unsupported platform"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -297,18 +319,6 @@
</span><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="cx">
</span><del>-# find a way to specify the OS MINOR version.
-global MINOR
-set MINOR ""
-
-# 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} ne ""} {
- set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
-} else {
- set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
-}
-
</del><span class="cx"> # find a way to specify the SDK to use; Qt will use the 10.4u by
</span><span class="cx"> # default which won't work on 10.6 since it is not supported. Allow
</span><span class="cx"> # the user to specify the SDK if desired.
</span><span class="lines">@@ -318,7 +328,7 @@
</span><span class="cx"> if {${SDK} eq ""} {
</span><span class="cx"> # set SDK version depending on OS version
</span><span class="cx"> set sdk_version ""
</span><del>- if {${MINOR} eq "4"} {
</del><ins>+ if {${MINOR} == 4} {
</ins><span class="cx"> # OSX 10.4 requires an additional 'u'
</span><span class="cx"> set sdk_version "10.4u"
</span><span class="cx"> } else {
</span><span class="lines">@@ -566,7 +576,7 @@
</span><span class="cx">
</span><span class="cx"> # for 10.4 or 10.5 32-bit PPC, build as Carbon only, not Cocoa
</span><span class="cx">
</span><del>- if {${MINOR} eq "4"} {
</del><ins>+ if {${MINOR} == 4} {
</ins><span class="cx">
</span><span class="cx"> configure.args-append -carbon
</span><span class="cx">
</span><span class="lines">@@ -575,7 +585,7 @@
</span><span class="cx"> configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms \
</span><span class="cx"> -lssl -lz
</span><span class="cx">
</span><del>- } elseif {${MINOR} eq "5" &&
</del><ins>+ } elseif {${MINOR} == 5 &&
</ins><span class="cx"> [llength ${qt_arch_types}] == 1 &&
</span><span class="cx"> [lsearch -exact ${qt_arch_types} ppc] == 0} {
</span><span class="cx">
</span><span class="lines">@@ -601,7 +611,7 @@
</span><span class="cx"> # not building for native arch: disable optimizing qmake
</span><span class="cx"> configure.args-delete -optimized-qmake
</span><span class="cx">
</span><del>- } elseif {${MINOR} eq "6" &&
</del><ins>+ } elseif {${MINOR} == 6 &&
</ins><span class="cx"> [llength ${qt_arch_types}] == 1 &&
</span><span class="cx"> [lsearch -exact ${qt_arch_types} x86] == 0} {
</span><span class="cx">
</span><span class="lines">@@ -627,7 +637,7 @@
</span><span class="cx"> if {[string match *clang* ${configure.compiler}]} {
</span><span class="cx"> if {[info exists configure.cxx_stdlib]} {
</span><span class="cx"> configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
</span><del>- } elseif {${MINOR} eq "9"} {
</del><ins>+ } elseif {${MINOR} == 9} {
</ins><span class="cx"> configure.env-append QMAKE_STDLIB="-stdlib=libc++"
</span><span class="cx"> } else {
</span><span class="cx"> configure.env-append QMAKE_STDLIB="-stdlib=libstdc++"
</span><span class="lines">@@ -1033,12 +1043,12 @@
</span><span class="cx">
</span><span class="cx"> variant framework description {Framework Legacy Compatibility Variant} {
</span><span class="cx"> ui_error "${name} variant +framework has been disabled because ${name} now installs as both libraries and frameworks. Please install ${name} without +framework."
</span><del>- return -code error "Variant disabled"
</del><ins>+ error "Variant disabled"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql description {MySQL Qt4 Plugin Legacy Compatibility Variant} {
</span><span class="cx"> ui_error "${name} variant +mysql has been replaced by the port 'qt4-mac-mysql55-plugin' and its subports. Please install ${name} without +mysql, then install your desired MySQL Qt plugin."
</span><del>- return -code error "Variant disabled"
</del><ins>+ error "Variant disabled"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant odbc description {Enable iODBC SQL Driver} {
</span><span class="lines">@@ -1074,7 +1084,7 @@
</span><span class="cx">
</span><span class="cx"> if {${psql_version} ne ""} {
</span><span class="cx"> 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."
</span><del>- return -code error "Variant disabled"
</del><ins>+ error "Variant disabled"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant raster description {Use raster graphics system by default} {
</span><span class="lines">@@ -1169,5 +1179,5 @@
</span><span class="cx"> #}
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><del>-livecheck.url http://releases.qt-project.org/qt4/source
-livecheck.regex "qt-everywhere-opensource-src-(\[0-9a-z.-\]+)${extract.suffix}"
</del><ins>+livecheck.url http://download.qt-project.org/official_releases/qt/${branch}/
+livecheck.regex >(\[0-9.\]+)/<
</ins></span></pre>
</div>
</div>
</body>
</html>