[144930] trunk/dports/graphics/qwt/Portfile

[vince at macports.org]

Revision: 144930
          https://trac.macports.org/changeset/144930
Author:   vince at macports.org
Date:     2016-01-21 07:49:27 -0800 (Thu, 21 Jan 2016)
Log Message:
-----------
qwt: introduces version 6.1, used for port:qgis

Modified Paths:
--------------
    trunk/dports/graphics/qwt/Portfile

Modified: trunk/dports/graphics/qwt/Portfile
===================================================================
--- trunk/dports/graphics/qwt/Portfile	2016-01-21 15:40:59 UTC (rev 144929)
+++ trunk/dports/graphics/qwt/Portfile	2016-01-21 15:49:27 UTC (rev 144930)
@@ -62,18 +62,17 @@
 
 }
 
-subport qwt-devel {
+subport qwt61 {
 
-    version         6.1.0-rc3
-    revision        1
-    distname        qwt-6.1-rc3
+    version         6.1.2
+    distname        qwt-6.1.2
     conflicts       qwt qwt52 qwt60 qwt-60
-    checksums       sha1    0ee2e80fd9a5d5cc1efc2e09783d20fc4f76aa13 \
-                    rmd160  560fb2e91eb3a825bcc93fc970ab574b85f3390d
-    patchfiles      patch-qwtconfig.pri.610rc3.diff \
-                    patch-qwtbuild.pri.610rc3.diff \
-                    patch-qwtfunctions.pri.610rc3.diff \
-                    patch-designer_designer.pro.610rc3.diff
+    checksums       sha1    6af82b6ee4132f779d1c8c2db872f01463b0d61c \
+                    sha256  2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c
+
+    patchfiles      patch-designer_designer.pro.61.diff \
+                    patch-qwtconfig.pri.61.diff \
+                    patch-qwtbuild.pri.61.diff 
     livecheck.url   http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss
     livecheck.regex \\/(6\\.1\\.\\d-rc\\d)\\/
 
@@ -163,15 +162,27 @@
     }
 } else {
 
+    variant qt5 conflicts qt4 description "Build with Qt5" {}
+    variant qt4 conflicts qt5 description "Build with Qt4" {}
+
     # QWT 6+ uses Qt4+ only
-    PortGroup qt4 1.0
-
+    if {![variant_isset qt5]} {
+        PortGroup qt4 1.0
+    } else {
+        PortGroup           qt5 1.0
+        set qt_arch_types   "x86_64"
+        post-patch {
+            reinplace "s|QT_STATIC_CONST|static const|" \
+                ${worksrcpath}/src/qwt_scale_map.cpp \
+                ${worksrcpath}/src/qwt_scale_map.h
+        }
+    }
 }
 
 configure.cmd       ${qt_qmake_cmd}
 configure.pre_args  INSTALLBASE="${prefix}"
 
-# qmake does not handle these flags flags
+# qmake does not handle these flags
 configure.universal_args-delete --disable-dependency-tracking
 configure.args-delete           --disable-dependency-tracking
 
@@ -200,6 +211,8 @@
             # link headers into ${qt_includes_dir}, removing
             # directories if they are already there first
 
+            file mkdir ${destroot}${qt_includes_dir}
+            file mkdir ${destroot}${qt_libs_dir}
             set inc_file ${destroot}${qt_includes_dir}/${tf}
             if {[file exists ${inc_file}]} {
                 file delete -force ${inc_file}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160121/251f386b/attachment-0001.html>