<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ba92d98d09579faefd9c0f46ae90dbf7b0a321ac">https://github.com/macports/macports-ports/commit/ba92d98d09579faefd9c0f46ae90dbf7b0a321ac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ba92d98d09579faefd9c0f46ae90dbf7b0a321ac
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Tue Aug 1 15:42:37 2023 +0200

<span style='display:block; white-space:pre;color:#404040;'>    rsgislib: update to 5.0.14
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    In addition new Python sub-ports are added (eg. 'py311-rsgislib').
</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/67796
</span>---
 gis/rsgislib/Portfile                              | 188 ++++++++++++---------
 gis/rsgislib/files/patch-CMakeLists.txt.diff       |   8 +-
 .../files/patch-RSGISHistoCubeFileIO_cpp.diff      |  11 --
 gis/rsgislib/files/patch-cmakelists_txt.diff       |  11 --
 gis/rsgislib/files/patch_python.cmakelist.diff     |  41 +++++
 5 files changed, 156 insertions(+), 103 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/rsgislib/Portfile b/gis/rsgislib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0416f24a396..03e9e14b57c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/rsgislib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/rsgislib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,110 +1,144 @@
</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           bitbucket 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           github 1.0
</span> PortGroup           cmake 1.1
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           active_variants   1.1
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup     petebunting rsgislib 3.7.54a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        remotesensinginfo rsgislib 5.0.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          gis
 license             GPL-3
 maintainers         {vince @Veence}
 description         RSGISlib - Remote Sensing and GIS Library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description    This library provides a lot of advanced tools to \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    perform image analysis and feature detection in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description    The {*}${description} provides a lot of advanced tools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    to perform image analysis and feature detection in \
</span>                     remote sensing and GIS applications.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> homepage            http://www.rsgislib.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.tarball_from  downloads
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  4783091dcb08444f6cba7b906fca2cf7b4917409 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  9320ca4033a6c30b3252efe4ecf65e3ca97982dd8924e0a796f4793da204a8ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    31306935
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  5900234d26cf21f33466230006f07261153a8e9b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  771476cd6a02da3324aa336bd88568f4278289337ab06ac4899a1ceabbcc4341 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    124217018
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version       1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:gdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:gsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:kealib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:muparser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:hdf5
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append  port:gdal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:geos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:cgal4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:xercesc3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gsl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:kealib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:muparser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch_python.cmakelist.diff
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python35] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants +python37
</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;'>-patchfiles          patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-RSGISHistoCubeFileIO_cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.mkdir       yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# /bin/sh: line 0: cd: build/python: No such file or directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# want -std=c++11 otherwise doesn’t compile with GDAL 2.3+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard       2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard       2014
</span> compiler.blacklist-append   {clang < 340}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append   -std=c++11
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   -DCGAL_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DCGAL_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DFFTW_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DFFTW_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DGDAL_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DGDAL_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DGEOS_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DGEOS_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DGMP_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DGMP_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   -DBOOST_INCLUDE_DIR=[boost::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DBOOST_LIB_PATH=[boost::lib_dir] \
</span>                         -DGSL_INCLUDE_DIR=${prefix}/include \
                         -DGSL_LIB_PATH=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DHDF5_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DHDF5_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DINSTALL_PYTHON_USING_PREFIX=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DKEA_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DKEA_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DMPFR_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DMPFR_LIB_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DGDAL_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DGDAL_LIB_PATH=${prefix}/lib \
</span>                         -DMUPARSER_INCLUDE_DIR=${prefix}/include \
                         -DMUPARSER_LIB_PATH=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DXERCESC_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DXERCESC_LIB_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DKEA_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DKEA_LIB_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   -DRSGISLIB_WITH_UTILTIES=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DRSGISLIB_WITH_DATA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DRSGIS_PYTHON=OFF
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Build with Python 2.7 bindings} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 conflicts python35 python36 python37 {
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:py27-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_EXE=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_INSTALL_PREFIX=${destroot}${frameworks_dir}/Python.framework/Versions/2.7/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Figure out HDF5's mpi include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set mpl_include_dir ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![catch {set result [active_variants hdf5 openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set mpl_include_dir "-I${prefix}/include/openmpi-mp"
</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 {![catch {set result [active_variants hdf5 mpich]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set mpl_include_dir "-I${prefix}/include/mpich-mp"
</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;'>+configure.args-append   -DHDF5_INCLUDE_DIR=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   -DHDF5_LIB_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${mpl_include_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove python executables, they are re-added in Python subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach pyfile [glob ${destroot}${prefix}/bin/*.py] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_info "${subport}: deleting python file: ${pyfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                delete ${pyfile}
</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;'>+    notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        Install a Python sub-port to install Python bindings,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        for available sub-ports see: 'port info --subports ${name}'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 description {Build with Python 3.5 bindings} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 conflicts python27 python36 python37 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# create Python subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions {38 39 310 311}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    subport py${v}-${github.project} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PortGroup           python 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:py35-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_EXE=${prefix}/bin/python3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_INSTALL_PREFIX=${destroot}${frameworks_dir}/Python.framework/Versions/3.5/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        categories          gis python
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 description {Build with Python 3.6 bindings} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 conflicts python27 python35 python37 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:${github.project}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:py36-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_EXE=${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_INSTALL_PREFIX=${destroot}${frameworks_dir}/Python.framework/Versions/3.6/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        use_configure       yes
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 description {Build with Python 2.7 bindings} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 conflicts python35 python36 python27 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.default_version  ${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.add_dependencies no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.cmd           make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot.cmd        make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot.destdir    DESTDIR=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        master_sites        ${github.master_sites}
</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:#ffe0e0;'>-    depends_build-append    port:py37-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_EXE=${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   -DPYTHON_INSTALL_PREFIX=${destroot}${frameworks_dir}/Python.framework/Versions/3.7/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python bindings for supported Python versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match "py*" ${subport}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description     "Python ${python.branch} bindings for {*}${description}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    long_description\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    This package provides Python ${python.branch}\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    bindings, modules, and scripts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append   port:py${python.version}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append   port:py${python.version}-gdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-replace -DRSGIS_PYTHON=OFF -DRSGIS_PYTHON=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append  -DPython3_SITELIB=${python.pkgd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -q "s|__PYVER__|${python.branch}|" ${worksrcpath}/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -q "s|/usr/bin/env python|${python.bin}|" {*}[glob ${worksrcpath}/tools/*.py.in]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[file extension ${f}] eq ".py"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace -q "s|/usr/bin/env python|${python.bin}|" ${f}
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${destroot}${python.pkgd}/rsgislib "${python.bin} -m compileall ."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        move {*}[glob ${destroot}${prefix}/bin/*.py] ${destroot}${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        delete {*}[glob ${destroot}${prefix}/bin/*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[catch {file type "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}-${python.branch}"
</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;'>+        delete ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        delete ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/rsgislib/files/patch-CMakeLists.txt.diff b/gis/rsgislib/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0be824a8a2c..d79b6e2d76e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/rsgislib/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/rsgislib/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig    2018-01-25 02:36:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-01-25 02:37:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,7 +328,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2023-06-21 23:35:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-07-31 13:37:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,7 @@
</span>      message(STATUS "Found boost libraries " ${BOOST_FS_LIB} ${BOOST_SYS_LIB} ${BOOST_DT_LIB})
      set(BOOST_LIBRARIES -LIBPATH:${BOOST_LIB_PATH} ${BOOST_FS_LIB} ${BOOST_SYS_LIB} ${BOOST_DT_LIB})
  else()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,4 +8,4 @@
</span> +    set(BOOST_LIBRARIES -L${BOOST_LIB_PATH} -lboost_filesystem-mt -lboost_system-mt -lboost_date_time-mt)
  endif(MSVC)
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(PYTHON_EXE STREQUAL "PYTHON_EXE-NOTFOUND")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${GDAL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/rsgislib/files/patch-RSGISHistoCubeFileIO_cpp.diff b/gis/rsgislib/files/patch-RSGISHistoCubeFileIO_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7ee8296fb58..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/rsgislib/files/patch-RSGISHistoCubeFileIO_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/histocube/RSGISHistoCubeFileIO.cpp.orig    2018-05-21 10:47:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/histocube/RSGISHistoCubeFileIO.cpp 2018-05-21 10:47:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,7 +351,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 fileChuckSize = this->numOfFeats;
</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;'>--            hsize_t dimsDataChunkSize[] = { fileChuckSize, numBins };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            hsize_t dimsDataChunkSize[] = {static_cast<hsize_t>(fileChuckSize), numBins };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             H5::DSetCreatPropList initParamsCubeLayer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             initParamsCubeLayer.setChunk(2, dimsDataChunkSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             initParamsCubeLayer.setShuffle();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/rsgislib/files/patch-cmakelists_txt.diff b/gis/rsgislib/files/patch-cmakelists_txt.diff
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 653e407b108..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/rsgislib/files/patch-cmakelists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.old     2014-08-22 17:03:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2014-08-22 17:04:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -404,7 +404,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (BUILD_PYTHON_BINDINGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  install(CODE "execute_process(COMMAND ${PYTHON_EXE} \"setup.py\" \"install\" \"--prefix=${CMAKE_INSTALL_PREFIX}\"  WORKING_DIRECTORY \"python\")")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  install(CODE "execute_process(COMMAND ${PYTHON_EXE} \"setup.py\" \"install\" \"--prefix=${PYTHON_INSTALL_PREFIX}\"  WORKING_DIRECTORY \"python\")")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(BUILD_PYTHON_BINDINGS)
</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;color:#808080;'>diff --git a/gis/rsgislib/files/patch_python.cmakelist.diff b/gis/rsgislib/files/patch_python.cmakelist.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b960066bc47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/rsgislib/files/patch_python.cmakelist.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- python/CMakeLists.txt.orig     2023-06-21 23:35:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ python/CMakeLists.txt  2023-07-31 15:18:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For find_package (Python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_minimum_required(VERSION 3.12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package (Python COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package (Python __PYVER__ EXACT COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT Python_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     message(FATAL_ERROR "Could not find Python. Set RSGIS_PYTHON=OFF to disable.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(NOT Python_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,14 +12,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #set(PYRSGIS_ROOT_PATH "${Python_SITELIB}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-file(TO_CMAKE_PATH "${Python_SITELIB}" PYRSGIS_ROOT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT MSVC AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    # user has set CMAKE_INSTALL_PREFIX - ensure we install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    # under there rather than the default Python install location.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    # BUT we want to keep the last part of the path the same as Python_SITELIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    # (ie the lib/pythonX.X/site-packages part)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    string(REPLACE "${_Python_PREFIX}" "${CMAKE_INSTALL_PREFIX}" PYRSGIS_ROOT_PATH "${PYRSGIS_ROOT_PATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(NOT MSVC AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++file(TO_CMAKE_PATH "${Python3_SITELIB}" PYRSGIS_ROOT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if(NOT MSVC AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#     # user has set CMAKE_INSTALL_PREFIX - ensure we install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#     # under there rather than the default Python install location.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#     # BUT we want to keep the last part of the path the same as Python_SITELIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#     # (ie the lib/pythonX.X/site-packages part)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#     string(REPLACE "${_Python_PREFIX}" "${CMAKE_INSTALL_PREFIX}" PYRSGIS_ROOT_PATH "${PYRSGIS_ROOT_PATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif(NOT MSVC AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "installing Python libs to ${PYRSGIS_ROOT_PATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #set(PYRSGIS_INSTALL_PATH "${PYRSGIS_ROOT_PATH}/rsgislib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,5 +231,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS _specunmixing DESTINATION "${PYRSGIS_INSTALL_PATH}/imagecalc/specunmixing")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # custom install step to create .pyc files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(CODE "execute_process(COMMAND ${Python_EXECUTABLE} -m compileall ${PYRSGIS_INSTALL_PATH})")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#install(CODE "execute_process(COMMAND ${Python_EXECUTABLE} -m compileall ${PYRSGIS_INSTALL_PATH})")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>