<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aefda6858c38b27dddc59f0e57cf311f853cfccb">https://github.com/macports/macports-ports/commit/aefda6858c38b27dddc59f0e57cf311f853cfccb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new aefda6858c3 liblas, py-pyproj: add proj7 variant
</span>aefda6858c3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aefda6858c38b27dddc59f0e57cf311f853cfccb
</span>Author: Veence <vince@macports.org>
AuthorDate: Mon Aug 24 22:06:27 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> liblas, py-pyproj: add proj7 variant
</span>---
gis/liblas/Portfile | 22 +++++++++++++++++++---
python/py-pyproj/Portfile | 21 +++++++++++++++++----
2 files changed, 36 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/Portfile b/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 475d81d9ed5..16ae118ff5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span>
github.setup libLAS libLAS e12742f4152146d3a71f9b2de573257e91736c93
version 1.8.1-20200508
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 821d42764b5233beedc1772f0bb8ca69da3f35af \
sha256 a2e007246148e631b38e3afe6c4f3058751cdc894260ab6b1ce7f5380b13de70 \
size 10742250
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,26 @@ patchfiles patch-gt_wkt_srs_cpp.diff
</span> configure.args-append \
-DWITH_GEOTIFF=ON \
-DWITH_GDAL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_LASZIP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LASZIP=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts proj7 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span> -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj6 \
-DPROJ4_LIBRARY=${prefix}/lib/proj6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj7 conflicts proj6 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_LIBRARY=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_lib-append port:boost \
port:gdal \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,5 +61,4 @@ depends_lib-append port:boost \
</span> port:tiff \
port:jpeg \
port:zlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj6 \
</span> port:laszip
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyproj/Portfile b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78a2931486b..c2d9c576cda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,10 +41,23 @@ if {${name} ne ${subport}} {
</span> depends_lib-append port:py${python.version}-aenum
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj6 conflicts proj7 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj7 conflicts proj6 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PROJ_DIR=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PROJ_DIR=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PROJ_DIR=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
patchfiles-append patch-pyproj_datadir.py.diff
</pre><pre style='margin:0'>
</pre>