<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/a124487d8afce8b143df9b48b309d24d9b20257b">https://github.com/macports/macports-ports/commit/a124487d8afce8b143df9b48b309d24d9b20257b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a124487d8afce8b143df9b48b309d24d9b20257b
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Dec 14 05:56:14 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-*: switch PROJ dependents to proj9
</span>---
R/R-PROJ/Portfile | 18 +++++++++++++-----
R/R-gdalraster/Portfile | 26 ++++++++++++++++----------
R/R-lwgeom/Portfile | 16 ++++++++++------
R/R-proj4/Portfile | 8 +++++---
R/R-reproj/Portfile | 7 ++++---
R/R-rgdal/Portfile | 16 ++++++++++------
R/R-sf/Portfile | 16 ++++++++++------
R/R-terra/Portfile | 16 ++++++++++------
R/R-vapour/Portfile | 24 ++++++++++++++----------
9 files changed, 92 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-PROJ/Portfile b/R/R-PROJ/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da92e0ac470..c7317cfc85b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-PROJ/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-PROJ/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran hypertidy PROJ 0.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran hypertidy PROJ 0.4.5
</span> revision 0
categories-append gis
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,13 +11,21 @@ license GPL-3
</span> description Generic coordinate system transformations using PROJ
long_description {*}${description}
homepage https://hypertidy.github.io/PROJ
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9e25eee3c7885876ab84365259609e05ae43f4b0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dde90cfeca83864e61a7422e1573d2d55bb0377c32b9a8f550f47b8631121ce7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 136201
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7207025590dce5d4da589ccaf57594f62c19711c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 abef2f862aa3cf62e642990c6fb9ea8735e7331d4ae9b7130e9f5ef0cd1e0347 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 179671
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span>
depends_test-append port:R-knitr \
port:R-rmarkdown \
port:R-spelling \
port:R-testthat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-gdalraster/Portfile b/R/R-gdalraster/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5caa397763..d4de01daaba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-gdalraster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-gdalraster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,30 +4,36 @@ PortSystem 1.0
</span> PortGroup R 1.0
# GitHub version lags behind.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran USDAForestService gdalraster 1.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran USDAForestService gdalraster 1.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append gis
maintainers nomaintainer
license MIT
description Bindings to the Geospatial Data Abstraction Library Raster API
long_description {*}${description}
homepage https://usdaforestservice.github.io/gdalraster
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e09e46cef78ed295000bfe662e71251c43062d34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e8f64442f50e1c77ead2ba4e2e4f7fdb100d90dbcc22a9ba9219d2f3f99869a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1532553
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 13d1e93cd496139ecd0bd92c692fee8f7f935f67 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dfb0b638ce7222a25f7e7cd9f10a33595e08f6eead19290750b86818069f41a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1769718
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:gdal \
port:R-Rcpp \
port:R-xml2 \
port:sqlite3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.pre_args-append \
--configure-args=' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/proj5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-lib=${prefix}/lib/proj5/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj5/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-api=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-lib=${prefix}/lib/${proj_v}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span> '
depends_test-append port:R-gt \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-lwgeom/Portfile b/R/R-lwgeom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a311f195ac..988b041f037 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-lwgeom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-lwgeom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup R 1.0
</span>
# GitHub version is old.
R.setup cran r-spatial lwgeom 0.2-13
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories-append math
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,20 +15,24 @@ checksums rmd160 364c9fb4936512b3712b096b7fda48d4458ffe24 \
</span> sha256 f0822888c029af48bf0238e3d20d82d3c75018e7e63728765a6220a6a0151c67 \
size 474857
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:geos \
port:R-Rcpp \
port:R-sf \
port:R-units
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.pre_args-append \
--configure-args=' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/proj5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-lib=${prefix}/lib/proj5/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj5/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-api=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-lib=${prefix}/lib/${proj_v}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span> '
depends_test-append port:R-covr \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-proj4/Portfile b/R/R-proj4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 728bae33227..8e6f70af7bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-proj4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-proj4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup R 1.0
R.setup cran s-u proj4 1.0-13
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append gis
maintainers nomaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +15,10 @@ checksums rmd160 252f84cd496405608e8de0e16777162ab5aae17e \
</span> sha256 ac5440cb8f29fa5cc0ee0cf540fe3d6fe813dd6f115c996d25c14454fa0977f3 \
size 42991
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PKG_CONFIG_PATH=${prefix}/lib/proj5/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-reproj/Portfile b/R/R-reproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 158ee747a62..40ae78ba5ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-reproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-reproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup R 1.0
</span>
# GitHub version lags behind.
R.setup cran hypertidy reproj 0.4.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append gis
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +17,9 @@ checksums rmd160 df1f71641b812e1c09f4faab7c14c268e69b4a7a \
</span> size 262365
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Keep PROJ version used by packages in sync.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:R-crsmeta \
port:R-PROJ \
port:R-proj4
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-rgdal/Portfile b/R/R-rgdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 913725401a3..84b38f06bac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-rgdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-rgdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup R 1.0
R.setup cran r-forge rgdal 1.6-7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories-append gis
maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,18 +15,22 @@ checksums rmd160 4940dae6f902f495e691b75f298748a45836a6f1 \
</span> sha256 555cedfdadb05db90b061d4b056f96d8b7010c00ea54bc6c1bbcc7684fadae33 \
size 4351163
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:gdal \
port:R-sp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.pre_args-append \
--configure-args=' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/proj5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-lib=${prefix}/lib/proj5/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj5/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-api=proj_api.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-lib=${prefix}/lib/${proj_v}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-api=proj.h \
</span> '
patchfiles patch-no-mapview.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-sf/Portfile b/R/R-sf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07470f79e0c..34927803b11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-sf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-sf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup R 1.0
</span>
# GitHub version is old.
R.setup cran r-spatial sf 1.0-14
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories-append math
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license {GPL-2 MIT}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,11 @@ checksums rmd160 a53d5bcba73f92ab78d44f59f9a975f19aadc7ba \
</span> sha256 8b535648d537a1a95920c938e43692c1dfaac8d293ff3f506334001352c339f7 \
size 3488161
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:gdal \
port:geos \
port:R-classInt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +32,13 @@ depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span> port:R-units \
port:sqlite3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.pre_args-append \
--configure-args=' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/proj5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-lib=${prefix}/lib/proj5/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj5/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-api=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-lib=${prefix}/lib/${proj_v}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span> --with-sqlite3-lib=${prefix}/lib \
'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-terra/Portfile b/R/R-terra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bb08be49b1a..d4f20e62f92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup R 1.0
R.setup cran rspatial terra 1.7-55
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories-append gis
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +15,11 @@ checksums rmd160 0eb0f0001d192b419d430c0123d22de0914ae5db \
</span> sha256 7000bdfd8591be64921cf841ef29b2aad74661781865f29e1540e57a7d7231ec \
size 827639
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:gdal \
port:geos \
port:R-Rcpp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,12 +27,14 @@ depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.pre_args-append \
--configure-args=' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/proj5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-lib=${prefix}/lib/proj5/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj5/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-api=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-lib=${prefix}/lib/${proj_v}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span> '
depends_test-append port:R-deldir \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-vapour/Portfile b/R/R-vapour/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a129ea7990..181a483bc47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-vapour/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-vapour/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,31 +4,35 @@ PortSystem 1.0
</span> PortGroup R 1.0
R.setup github hypertidy vapour 0.9.5 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories-append gis
maintainers nomaintainer
license GPL-3
description Access to the Geospatial Data Abstraction Library (GDAL)
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage hypertidy.github.io/vapour
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://hypertidy.github.io/vapour
</span> checksums rmd160 843d5f053aed9b40d42bbc5264bb9512af7e8499 \
sha256 d05430a3e10e2055e98bee97b494141d20dcada18981081561ef9f14e57f33e1 \
size 2421197
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_v proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/proj5/lib/pkgconfig/proj.pc:proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gdal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:R-jsonlite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-jsonlite \
</span> port:R-nanoarrow \
port:R-Rcpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.pre_args-append \
--configure-args=' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/proj5/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-lib=${prefix}/lib/proj5/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj5/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-api=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-lib=${prefix}/lib/${proj_v}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span> '
depends_test-append port:R-knitr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,4 +41,4 @@ depends_test-append port:R-knitr \
</span> port:R-spelling \
port:R-testthat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run no
</span></pre><pre style='margin:0'>
</pre>