<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/021e117743db35ce2e5c8c62e912645c025d9328">https://github.com/macports/macports-ports/commit/021e117743db35ce2e5c8c62e912645c025d9328</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 021e117743db35ce2e5c8c62e912645c025d9328
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Feb 1 14:23:46 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R packages: switch from destroot.args to build.args following changes in R PG
</span>---
R/R-PROJ/Portfile | 2 +-
R/R-RMariaDB/Portfile | 6 ++----
R/R-RMySQL/Portfile | 6 ++----
R/R-RPostgreSQL/Portfile | 2 +-
R/R-RcppParallel/Portfile | 4 ++--
R/R-Rhdf5lib/Portfile | 6 ++----
R/R-Rmpi/Portfile | 8 +++-----
R/R-bigGP/Portfile | 16 +++++++---------
R/R-crc32c/Portfile | 3 +--
R/R-gdalBindings/Portfile | 3 +--
R/R-gdalraster/Portfile | 9 +++------
R/R-leidenbase/Portfile | 3 +--
R/R-lwgeom/Portfile | 9 +++------
R/R-nanonext/Portfile | 2 +-
R/R-osqp/Portfile | 2 +-
R/R-pbdMPI/Portfile | 10 ++++------
R/R-proj4/Portfile | 2 +-
R/R-rgdal/Portfile | 9 +++------
R/R-rgl/Portfile | 14 +++++---------
R/R-sf/Portfile | 9 +++------
R/R-terra/Portfile | 3 +--
R/R-vapour/Portfile | 9 +++------
22 files changed, 51 insertions(+), 86 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 c7317cfc85b..fe0056abbc2 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;'>@@ -21,7 +21,7 @@ depends_build-append \
</span> port:pkgconfig
depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span>
depends_test-append port:R-knitr \
port:R-rmarkdown \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RMariaDB/Portfile b/R/R-RMariaDB/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d9d7f56692..feb364d94e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RMariaDB/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RMariaDB/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +29,8 @@ depends_lib-append port:mariadb-${mariadb_ver} \
</span> port:R-plogr \
port:R-rlang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-vars=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE_DIR=${prefix}/include/mariadb-${mariadb_ver}/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_DIR=${prefix}/lib/mariadb-${mariadb_ver}/mysql'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-vars="INCLUDE_DIR=${prefix}/include/mariadb-${mariadb_ver}/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_DIR=${prefix}/lib/mariadb-${mariadb_ver}/mysql"
</span>
depends_test-append port:R-DBItest \
port:R-decor \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RMySQL/Portfile b/R/R-RMySQL/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec9fc42d125..676926d0d67 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RMySQL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RMySQL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,10 +24,8 @@ depends_lib-append port:mariadb-${mariadb_ver} \
</span>
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-vars=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE_DIR=${prefix}/include/mariadb-${mariadb_ver}/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_DIR=${prefix}/lib/mariadb-${mariadb_ver}/mysql'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-vars="INCLUDE_DIR=${prefix}/include/mariadb-${mariadb_ver}/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_DIR=${prefix}/lib/mariadb-${mariadb_ver}/mysql"
</span>
depends_test-append port:R-curl \
port:R-testthat
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RPostgreSQL/Portfile b/R/R-RPostgreSQL/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 502c9292b55..6deac9ca802 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RPostgreSQL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RPostgreSQL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,6 +19,6 @@ set pgsql postgresql15
</span> depends_lib-append port:${pgsql} \
port:R-DBI
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PG_CONFIG=${prefix}/lib/${pgsql}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PG_CONFIG=${prefix}/lib/${pgsql}/bin/pg_config
</span>
test.run no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppParallel/Portfile b/R/R-RcppParallel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e73c9f9620..6ac33dc4616 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RcppParallel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RcppParallel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,14 +53,14 @@ platform powerpc {
</span> if {${build_arch} eq "ppc64"} {
configure.env-append \
arch=ppc64
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span> arch=ppc64
test.env-append \
arch=ppc64
} else {
configure.env-append \
arch=ppc32
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span> arch=ppc32
test.env-append \
arch=ppc32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-Rhdf5lib/Portfile b/R/R-Rhdf5lib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2053d9cf16..f3215be649b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-Rhdf5lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-Rhdf5lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,10 +24,8 @@ platform darwin 10 powerpc {
</span> reinplace "s,@BUILD@,powerpc-apple-darwin10,g" ${worksrcpath}/src/Makevars.in
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --build=powerpc-apple-darwin10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --configure-args="--build=powerpc-apple-darwin10"
</span> }
depends_test-append port:R-BiocStyle \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-Rmpi/Portfile b/R/R-Rmpi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0cb6bb71c1..b5c9ae54f39 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-Rmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-Rmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,9 @@ if {[string match macports-clang-* ${configure.compiler}]} {
</span>
depends_lib-append port:${mpi_port}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Rmpi-include=${prefix}/include/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Rmpi-libpath=${prefix}/lib/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Rmpi-type=MPICH2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-Rmpi-include=${prefix}/include/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-Rmpi-libpath=${prefix}/lib/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-Rmpi-type=MPICH2"
</span>
# Configure script is a painful mess and fails to do its job.
# There seems to be no easy way to force right settings into the test env.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-bigGP/Portfile b/R/R-bigGP/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49133b3296e..f7368a24b04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-bigGP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-bigGP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran cran bigGP 0.1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran paciorek bigGP 0.1.8
</span> revision 0
categories-append math parallel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license {GPL-2 GPL-3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span> description Distributed Gaussian process calculations
long_description {*}${description}
checksums rmd160 2422b9e2158e776959b7dd16a8bc9fae9c9f1441 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,14 +33,12 @@ depends_lib-append port:${mpi_port} \
</span>
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mpi-include=${prefix}/include/openmpi-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mpi-libpath=${prefix}/lib/openmpi-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mpi-type=OPENMPI"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-mpi-include=${prefix}/include/openmpi-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpi-libpath=${prefix}/lib/openmpi-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpi-type=OPENMPI"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_test-append port:R-fields \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:R-rlecuyer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-fields \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:R-rlecuyer
</span>
# Need to find a way to ensure correct implementation is picked when running check.
test.run no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-crc32c/Portfile b/R/R-crc32c/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a9b6451d77a..28790eb49f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-crc32c/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-crc32c/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,6 @@ depends_build-append \
</span> path:bin/cmake:cmake
depends_lib-append port:R-tidyCpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} CXX=${configure.cxx}
</span>
test.run no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-gdalBindings/Portfile b/R/R-gdalBindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1d24ed2661..ddd9834d960 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-gdalBindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-gdalBindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,5 +20,4 @@ depends_lib-append port:gdal \
</span> port:R-R6 \
port:R-Rcpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args='--with-gdal=${prefix}/bin/gdal-config'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-gdal=${prefix}/bin/gdal-config"
</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 51799bb4411..d435c1313f6 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;'>@@ -28,14 +28,11 @@ depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:sqlite3
# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-proj-include=${prefix}/lib/${proj_v}/include \
</span> --with-proj-lib=${prefix}/lib/${proj_v}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</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 \
port:R-knitr \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-leidenbase/Portfile b/R/R-leidenbase/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 46356d4e3a8..f2bd9267542 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-leidenbase/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-leidenbase/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,7 @@ depends_lib-append port:glpk \
</span> port:libxml2 \
port:R-igraph
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args="--prefix=${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--prefix=${prefix}"
</span>
compilers.setup require_fortran
<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 988b041f037..710caf292d5 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;'>@@ -26,14 +26,11 @@ depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:R-units
# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-proj-include=${prefix}/lib/${proj_v}/include \
</span> --with-proj-lib=${prefix}/lib/${proj_v}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</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 \
port:R-geosphere \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-nanonext/Portfile b/R/R-nanonext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 35869741585..96d752063de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-nanonext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-nanonext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ post-patch {
</span> reinplace "s,@PREFIX@,${prefix},g" ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CC=${configure.cc} CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} CXX=${configure.cxx}
</span>
depends_test-append port:R-knitr \
port:R-markdown
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-osqp/Portfile b/R/R-osqp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 035b02797b3..602c1569668 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-osqp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-osqp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ post-patch {
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CC=${configure.cc} CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} CXX=${configure.cxx}
</span>
depends_test-append port:R-slam \
port:R-testthat
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-pbdMPI/Portfile b/R/R-pbdMPI/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1655711258a..c7181a8f13f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-pbdMPI/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-pbdMPI/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,11 +34,9 @@ depends_lib-append port:${mpi_port} \
</span> port:R-float
# At the moment there is no MPICH4 type. However, it does build against MPICH4.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mpi=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mpi-include=${prefix}/include/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mpi-libpath=${prefix}/lib/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mpi-type=MPICH3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-mpi=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpi-include=${prefix}/include/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpi-libpath=${prefix}/lib/mpich-${mpi_suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpi-type=MPICH3"
</span>
test.run no
<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 ff1b1b1a95f..49cb6c07778 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;'>@@ -21,4 +21,4 @@ depends_build-append \
</span> port:pkgconfig
depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.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-rgdal/Portfile b/R/R-rgdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84b38f06bac..3dcffa02671 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;'>@@ -23,15 +23,12 @@ 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:#ffe0e0;'>-destroot.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/lib/${proj_v}/lib/pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-proj-include=${prefix}/lib/${proj_v}/include \
</span> --with-proj-lib=${prefix}/lib/${proj_v}/lib \
--with-proj-share=${prefix}/lib/${proj_v}/share/proj \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-api=proj.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</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-rgl/Portfile b/R/R-rgl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f56ccd97138..3c7832ec39c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-rgl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-rgl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,19 +37,15 @@ if {(${os.platform} eq "darwin" && ${os.major} < 22) || ${os.platform} ne "darwi
</span> depends_lib-append \
port:xorg-libX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --configure-args="--with-x \
</span> --x-includes=${prefix}/include/X11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-libraries=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-libraries=${prefix}/lib"
</span> }
# TODO: implement tests, verify on PowerPC.
# FIXME: https://github.com/dmurdoch/rgl/issues/317
if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-opengl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --configure-args="--disable-opengl"
</span> }
<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 696d421e601..a80185833e5 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;'>@@ -33,12 +33,9 @@ depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:sqlite3
# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-proj-include=${prefix}/lib/${proj_v}/include \
</span> --with-proj-lib=${prefix}/lib/${proj_v}/lib \
--with-proj-share=${prefix}/lib/${proj_v}/share/proj \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sqlite3-lib=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite3-lib=${prefix}/lib"
</span><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 a91bcf6e7ab..76215c42f21 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;'>@@ -30,8 +30,7 @@ compiler.cxx_standard 2017
</span> # configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
build.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args="--with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-proj-include=${prefix}/lib/${proj_v}/include \
</span> --with-proj-lib=${prefix}/lib/${proj_v}/lib \
--with-proj-share=${prefix}/lib/${proj_v}/share/proj"
<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 181a483bc47..f3aecdc1b6b 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;'>@@ -26,14 +26,11 @@ depends_lib-append path:lib/${proj_v}/lib/pkgconfig/proj.pc:${proj_v} \
</span> port:R-Rcpp
# configure fails to do its job: https://github.com/r-spatial/sf/issues/2292
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CPPFLAGS=-I${prefix}/lib/${proj_v}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --configure-args=' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-include=${prefix}/lib/${proj_v}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append --configure-args="--with-proj-include=${prefix}/lib/${proj_v}/include \
</span> --with-proj-lib=${prefix}/lib/${proj_v}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/${proj_v}/share/proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '
</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 \
port:R-markdown \
</pre><pre style='margin:0'>
</pre>