[144929] trunk/dports/gis/qgis/Portfile

vince at macports.org vince at macports.org
Thu Jan 21 07:41:00 PST 2016


Revision: 144929
          https://trac.macports.org/changeset/144929
Author:   vince at macports.org
Date:     2016-01-21 07:40:59 -0800 (Thu, 21 Jan 2016)
Log Message:
-----------
qgis: bump to 2.12.3. Prepare for qt5 (though qgis is not yet compatible with Qt5). Tentatively fix #50281.

Modified Paths:
--------------
    trunk/dports/gis/qgis/Portfile

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2016-01-21 15:30:57 UTC (rev 144928)
+++ trunk/dports/gis/qgis/Portfile	2016-01-21 15:40:59 UTC (rev 144929)
@@ -3,11 +3,9 @@
 
 PortSystem          1.0
 PortGroup           cmake   1.0
-PortGroup           qt4     1.0
 
 name                qgis
-version             2.12.0
-revision            1
+version             2.12.3
 categories          gis
 maintainers         vince
 description         QGIS is a user-friendly GIS based on Qt 4
@@ -26,8 +24,8 @@
 master_sites        http://qgis.org/downloads/
 use_bzip2           yes
 
-checksums           rmd160  87b234216c2dbd02ea2b5413b4787cea4e083638 \
-                    sha256  b8e58ef85e6686349993acf2cb83060135f2794f03475f7a3da788c458b81b1d
+checksums           rmd160  6b3350e978d27397020b01983ceaa00104d1bd17 \
+                    sha256  342b1d9962d2104539abe44cf48d5e871e8ecebc4655bf9d34b14df7acf7c63a
 
 patchfiles          patch-app_info_plist_in.diff
 
@@ -41,16 +39,11 @@
                     port:gdal \
                     port:sqlite3 \
                     port:gsl \
-                    port:qwt52 \
                     port:fcgi \
                     port:spatialindex \
                     port:postgis2 \
                     port:python27 \
-                    port:py27-pyqt4 \
-                    port:py27-qscintilla \
                     port:py27-gdal \
-                    port:qca \
-                    port:qca-ossl
 
 depends_build-append \
                     port:bison \
@@ -68,6 +61,11 @@
 post-patch {
     reinplace -E "s|@@@|${prefix}|g" \
         ${worksrcpath}/mac/app.info.plist.in
+#    reinplace -E "s|Clang|AppleClang|" ${worksrcpath}/CMakeLists.txt
+    # Handle legacy OS/XCode
+    if {[vercmp $xcodeversion 4.6.3] <= 0} {
+        configure.compiler  llvm-gcc-4.2
+    }
 }
 
 # Overrides default
@@ -77,26 +75,64 @@
     default_variants    +postgresql94
 }
 
+if {![variant_isset qt4] && ![variant_isset qt5]} {
+
+    default_variants    +qt4
+}
+
 # Python related stuff
 
 set Py_FRM              ${frameworks_dir}/Python.framework/Versions/2.7
 
 configure.args-append  "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
-configure.args-append  "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7"
-configure.args-append  "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7"
-configure.args-append  "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
-configure.args-append  "-DSIP_BINARY_PATH=${prefix}/bin/sip-2.7"
 configure.args-append  "-DWITH_GRASS=OFF"
 configure.args-append  "-DWITH_GRASS7=OFF"
-configure.args-append  "-DWITH_SERVER=TRUE"
-configure.args-append  "-DWITH_SERVER_PLUGINS=TRUE"
-configure.args-append  "-DGIT_MARKER=GIT_MARKER-NOTFOUND"
+configure.args-append  "-DWITH_QWTPOLAR=FALSE"
 
 pre-configure {
     reinplace -E "s|Versions/Current|Versions/2.7|" \
         ${worksrcpath}/cmake/FindPythonLibrary.cmake
 }
 
+variant qt5 conflicts qt4 description "Build with Qt5" {
+    PortGroup               qt5     1.0
+    #patchfiles-append       patch-CMakeLists_txt.diff
+    #post-patch {
+    #    reinplace           "s|ZZZ|${prefix}|" ${worksrcpath}/CMakeLists.txt
+    #}
+
+    configure.ldflags       "-Wl,-rpath,${prefix}/libexec/qt5/lib"
+    configure.args-append   "-DENABLE_QT5=ON"
+    configure.args-append   "-DWITH_BINDINGS=FALSE"
+    configure.args-append   "-DQCA_INCLUDE_DIR=${prefix}/lib/qca.framework/Headers"
+    configure.args-append   "-DQCA_LIBRARY=${prefix}/lib/qca.framework/qca"
+    configure.args-append   "-DQSCINTILLA_INCLUDE_DIR=${prefix}/libexec/qt5/include"
+    configure.args-append   "-DQSCINTILLA_LIBRARY=${prefix}/libexec/qt5/lib/libqscintilla2.dylib"
+    configure.args-append   "-DQWT_LIBRARY=${prefix}/libexec/qt5/lib/libqwt.dylib"
+
+    depends_lib-append      port:py27-pyqt5 \
+                            port:qt5-qtscript \
+                            port:qca
+
+}
+
+variant qt4 conflicts qt5 description "Build with Qt4" {
+    PortGroup               qt4     1.0
+
+    configure.args-append   "-DENABLE_QT5=OFF"
+    configure.args-append   "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
+    configure.args-append   "-DSIP_BINARY_PATH=${prefix}/bin/sip-2.7"
+    configure.args-append   "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7"
+    configure.args-append   "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7"
+    configure.args-append   "-DWITH_SERVER=TRUE"
+    configure.args-append   "-DWITH_SERVER_PLUGINS=TRUE"
+
+    depends_lib-append      port:py27-pyqt4 \
+                            port:py27-qscintilla \
+                            port:qca \
+                            port:qwt61
+}
+
 variant postgresql93    conflicts postgresql94 \
                         description "Use postgresql 9.3" {
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160121/0eec5f6f/attachment.html>


More information about the macports-changes mailing list