<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ca282e5a50d54db46d29c59312f785fbc3e2a325">https://github.com/macports/macports-ports/commit/ca282e5a50d54db46d29c59312f785fbc3e2a325</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ca282e5a50d54db46d29c59312f785fbc3e2a325
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Sat Mar 3 17:51:02 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> qgis3: Update to 3.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55906
</span>---
gis/qgis3/Portfile | 14 ++++++--------
gis/qgis3/files/patch-FindPyQt5_py.diff | 14 +++++++-------
2 files changed, 13 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab2553b..8e68ee8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,10 +7,9 @@ PortGroup cxx11 1.1
</span> PortGroup github 1.0
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup qgis QGIS 3_0_0 final-
</span> name qgis3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set commit 36bf093
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup qgis QGIS ${commit}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.99.20180124
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version [string map {_ .} ${github.version}]
</span> categories gis
maintainers {vince @Veence}
description QGIS 3 is a user-friendly GIS based on Qt 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,10 +23,9 @@ license GPL-2+
</span>
homepage http://www.qgis.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d53c504d41960b547e407e1922e1c1b3d876629a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 17fa868f00f30184431e219f41fcb785d818e5ba89678dc9ec2ad9630c83237f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir QGIS-${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f72016dbf0c5d7ad34393713f1372be379fe3bbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c54d5deb739532aee858d049deaa45edff34c0a56ce2d6556250d86be6f4d2e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 111733389
</span>
depends_lib-append port:libiconv \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,7 +192,7 @@ variant grass description "Build Grass 7 plugin" {
</span>
depends_lib-append port:grass7
global grass_version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set grass_version 7.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set grass_version 7.4.0
</span> post-patch {
reinplace "s|@GRASS_VERSION@|${grass_version}|g" \
${worksrcpath}/mac/app.info.plist.in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/files/patch-FindPyQt5_py.diff b/gis/qgis3/files/patch-FindPyQt5_py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index feb778b..0dd8838 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/files/patch-FindPyQt5_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/files/patch-FindPyQt5_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/FindPyQt5.py.orig 2017-12-07 07:54:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindPyQt5.py 2017-12-07 07:56:08.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sipconfig # won't work for SIP v5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/FindPyQt5.py.orig 2018-02-23 06:09:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindPyQt5.py 2018-02-27 08:01:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span> import os.path
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span> cfg = sipconfig.Configuration()
- sip_dir = cfg.default_sip_dir
+ sip_dir = "@FRAMEWORKS_DIR@/Python.framework/Versions/@PYVERSION@/share/sip"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for p in (os.path.join(sip_dir, "PyQt5"), sip_dir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sip_dir = p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform.startswith('freebsd'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_version = str(sys.version_info.major) + str(sys.version_info.minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sip_dir = sip_dir.replace(py_version, '')
</span></pre><pre style='margin:0'>
</pre>