<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/1e579c647d3ffa7fe494f5daee22bf6a0b723311">https://github.com/macports/macports-ports/commit/1e579c647d3ffa7fe494f5daee22bf6a0b723311</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1e579c647d3ffa7fe494f5daee22bf6a0b723311
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Sep 3 14:14:21 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> liblas: use last github version instead of 3-year old+ release
</span>---
gis/liblas/Portfile | 27 ++++++++++++++++-----------
gis/liblas/files/patch-gt_wkt_srs_cpp.diff | 29 +++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 11 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 5fb539d..68d672f 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;'>@@ -1,13 +1,13 @@
</span> #-*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libLAS libLAS 8c7f310
</span> name liblas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname libLAS-${version}-src.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.1.99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license BSD
categories gis
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,24 +21,29 @@ long_description \
</span> interchange and archival.
homepage http://www.liblas.org/index.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.osgeo.org/liblas
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b397a8a1a108ea694f6fccbe8463636cff9a04d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9adb4a98c63b461ed2bc82e214ae522cbd809cff578f28511122efe6c7ea4e76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c6622541324b2483cdc0e4e3db459c4c9400fda0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 327aea3d248d3921ec36a2866cbf98f940542ad1fe8b64079f7041a7e8005330 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10734404
</span>
distname libLAS-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-gt_citation_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gt_wkt_srs_cpp.diff
</span>
configure.args-append \
-DWITH_GEOTIFF=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_GDAL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GDAL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LASZIP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_LIBRARY=${prefix}/lib/proj6
</span>
configure.cxxflags-append -std=c++11
depends_lib-append port:boost \
port:gdal \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgeotiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgeotiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:laszip
</span>
post-destroot {
exec install_name_tool -id ${prefix}/lib/liblas.2.4.0.dylib ${destroot}${prefix}/lib/liblas.2.4.0.dylib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/files/patch-gt_wkt_srs_cpp.diff b/gis/liblas/files/patch-gt_wkt_srs_cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..22c8b00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/liblas/files/patch-gt_wkt_srs_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gt_wkt_srs.cpp.old 2019-09-03 14:09:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gt_wkt_srs.cpp 2019-09-03 14:09:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,7 +299,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oSRS.SetFromUserInput(pszWKT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oSRS.SetExtension( "PROJCS", "PROJ4",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- oSRS.FixupOrdering();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //oSRS.FixupOrdering();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPLFree(pszWKT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pszWKT = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oSRS.exportToWkt(&pszWKT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -505,7 +505,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *pszWKT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oSRS.morphFromESRI();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- oSRS.FixupOrdering();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //oSRS.FixupOrdering();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return pszWKT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1107,7 +1107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ==================================================================== */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *pszWKT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- oSRS.FixupOrdering();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //oSRS.FixupOrdering();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return pszWKT;
</span></pre><pre style='margin:0'>
</pre>