[146464] trunk/dports/gis/qgis

[vince at macports.org]

Revision: 146464
          https://trac.macports.org/changeset/146464
Author:   vince at macports.org
Date:     2016-03-09 01:58:53 -0800 (Wed, 09 Mar 2016)
Log Message:
-----------
qgis: bump to 2.14.0

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

Added Paths:
-----------
    trunk/dports/gis/qgis/files/patch-PyQtMacros.diff

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2016-03-09 03:03:01 UTC (rev 146463)
+++ trunk/dports/gis/qgis/Portfile	2016-03-09 09:58:53 UTC (rev 146464)
@@ -5,8 +5,7 @@
 PortGroup           cmake   1.0
 
 name                qgis
-version             2.12.3
-revision            3
+version             2.14.0
 categories          gis
 maintainers         vince
 description         QGIS is a user-friendly GIS based on Qt 4
@@ -25,10 +24,11 @@
 master_sites        http://qgis.org/downloads/
 use_bzip2           yes
 
-checksums           rmd160  6b3350e978d27397020b01983ceaa00104d1bd17 \
-                    sha256  342b1d9962d2104539abe44cf48d5e871e8ecebc4655bf9d34b14df7acf7c63a
+checksums           rmd160  25f3c07f441a3c31786a4ce588db92a1f521dc43 \
+                    sha256  678699612503df10cb036d922793aab4e182fb1db1aaeb5428c23e9e6c6ffad5
 
-patchfiles          patch-app_info_plist_in.diff
+patchfiles          patch-app_info_plist_in.diff \
+                    patch-PyQtMacros.diff
 
 worksrcdir          ${name}-${version}
 
@@ -88,6 +88,8 @@
 configure.args-append  "-DWITH_GRASS7=OFF"
 configure.args-append  "-DWITH_QWTPOLAR=FALSE"
 configure.args-append  "-DGIT_MARKER=NOTFOUND"
+#configure.args-append  "-DPYUIC_PROGRAM=${prefix}/bin/pyuic4-2.7"
+#configure.args-append  "-DPYRCC_PROGRAM=${prefix}/bin/pyuic4-2.7"
 
 pre-configure {
     reinplace -E "s|Versions/Current|Versions/2.7|" \

Added: trunk/dports/gis/qgis/files/patch-PyQtMacros.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-PyQtMacros.diff	                        (rev 0)
+++ trunk/dports/gis/qgis/files/patch-PyQtMacros.diff	2016-03-09 09:58:53 UTC (rev 146464)
@@ -0,0 +1,15 @@
+--- cmake/PyQtMacros.cmake.old	2016-03-09 10:31:17.000000000 +0100
++++ cmake/PyQtMacros.cmake	2016-03-09 10:31:53.000000000 +0100
+@@ -9,9 +9,9 @@
+   SET(PYUIC_PROG_NAMES pyuic5)
+   SET(PYRCC_PROG_NAME pyrcc5)
+ ELSE(ENABLE_QT5)
+-  SET(PYUIC_PROG_NAME pyuic4)
+-  SET(PYUIC_PROG_NAMES python2-pyuic4 pyuic4)
+-  SET(PYRCC_PROG_NAME pyrcc4)
++  SET(PYUIC_PROG_NAME pyuic4-2.7)
++  SET(PYUIC_PROG_NAMES python2-pyuic4 pyuic4-2.7)
++  SET(PYRCC_PROG_NAME pyrcc4-2.7)
+ ENDIF(ENABLE_QT5)
+ 
+ IF(NOT PYUIC_PROGRAM)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160309/1d278142/attachment.html>