<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2e93434123951087efcb7f6637de0394fbfe7b13">https://github.com/macports/macports-ports/commit/2e93434123951087efcb7f6637de0394fbfe7b13</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2e93434123951087efcb7f6637de0394fbfe7b13
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Tue Mar 28 20:21:45 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> liblas: minor version bump and add proj9
</span>---
gis/liblas/Portfile | 53 ++++++++++++++++-----------------
gis/liblas/files/liblas-endian_hpp.diff | 10 -------
2 files changed, 26 insertions(+), 37 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 db1acb1274e..f8de89d6bcd 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;'>@@ -5,13 +5,13 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libLAS libLAS e6a1aaed412d638687b8aec44f7b12df7ca2bbbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libLAS libLAS 7fc45ebf6f6d811a442b05f0637a0712da00d934
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.1-20210819
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2fca9309ae78305236b5ae9cfd732f5472c46bf5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6ffb77728631d092656879c5bfb97a78a38b18a15d2dd7b53513135fd0c50287 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10742415
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.1-20230311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 53cb0080e653155b79f7912fa37056cf5a3a0900 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 43b9e91ad31d5f76ae8af1a0665d0e95f0ccb177471024cf66eae2b46d99103a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10743587
</span>
name liblas
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,7 @@ homepage https://liblas.org/
</span> compiler.cxx_standard 2011
patchfiles patch-gt_wkt_srs_cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-apps_CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- liblas-endian_hpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-apps_CMakeLists.txt.diff
</span>
configure.args-append \
-DWITH_GEOTIFF=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,31 +40,31 @@ configure.args-append \
</span>
configure.env-append GDAL_HOME=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 conflicts proj7 proj8 description "Build with proj6" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_LIBRARY=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set PROJ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_versions {6 7 8 9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend proj_variants proj${pjver}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach proj_ver ${proj_versions} {
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts proj6 proj8 description "Build with proj7" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_LIBRARY=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj${proj_ver} description "Build with Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj${proj_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_LIBRARY=${prefix}/lib/proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj8 conflicts proj6 proj7 description "Build with proj8" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ4_LIBRARY=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj6] && ![variant_isset proj7] && ![variant_isset proj8]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${projdf}
</span>
depends_lib-append port:gdal \
port:libgeotiff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/files/liblas-endian_hpp.diff b/gis/liblas/files/liblas-endian_hpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0edaa01fc0b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/liblas/files/liblas-endian_hpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/liblas/detail/endian.hpp.orig 2021-08-20 04:01:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/liblas/detail/endian.hpp 2021-10-18 08:08:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,6 +88,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || defined(_M_ALPHA) || defined(__amd64) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || defined(__amd64__) || defined(_M_AMD64) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || defined(__x86_64) || defined(__x86_64__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || defined(__arm64) || defined(__arm64__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || defined(_M_X64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define LIBLAS_LITTLE_ENDIAN
</span></pre><pre style='margin:0'>
</pre>