<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/92e735e530af90cf47d2834916c4dae48cbdf926">https://github.com/macports/macports-ports/commit/92e735e530af90cf47d2834916c4dae48cbdf926</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 92e735e530af90cf47d2834916c4dae48cbdf926
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri Apr 26 20:00:22 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R: non-functional: portfile clean-up
</span>---
math/R/Portfile | 73 ++++++++++++++++++++++++++-------------------------------
1 file changed, 33 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/Portfile b/math/R/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0669f3fa5f..a3596d18aad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</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 compilers 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span> PortGroup legacysupport 1.1
name R
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +13,11 @@ revision 0
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {me.com:kjell.konis @kjellpk} {i0ntempest @i0ntempest} {@barracuda156 gmail.com:vital.had} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {me.com:kjell.konis @kjellpk} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {i0ntempest @i0ntempest} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {@barracuda156 gmail.com:vital.had} \
</span> openmaintainer
license {GPL-2 GPL-3}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms macosx
</span>
description \
R is GNU S - an interpreted language for statistical computing
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +28,7 @@ long_description \
</span> classical statistical tests, time-series analysis, classification, \
clustering, ...) and graphical techniques, and is highly extensible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.r-project.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.r-project.org
</span>
master_sites https://cran.rstudio.com/src/base/R-4/ \
https://cran.r-project.org/src/base/R-4/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +61,7 @@ compilers.choose fc f77
</span> compilers.setup require_fortran
# https://trac.macports.org/ticket/67298
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.r-project.org/show_bug.cgi?id=18520
</span> # See related: https://skia.googlesource.com/skia/+/3490263287e9432119c501884e45840de4d986bc
if {${os.platform} eq "darwin" && ${os.major} < 11} {
patchfiles-append patch-fix-10.6.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,27 +87,27 @@ if {[string match macports-clang-* ${configure.compiler}]} {
</span> depends_run-append port:gcc${gcc_v}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ld64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnutar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gzip \
</span> path:lib/pkgconfig/icu-uc.pc:icu \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ld64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:less \
</span> port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre2 \
</span> path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span> port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:less \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span> port:texinfo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gzip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span> port:unzip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnutar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,34 +138,25 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note: gcc may not be used for the C compiler on some OS X versions. It will give:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build In file included from /usr/include/dispatch/dispatch.h:51:0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFStream.h:15,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFPropertyList.h:13,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build from langprefs.c:30:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build /usr/include/dispatch/object.h:143:15: error: expected identifier or '(' before '^' token
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build typedef void (^dispatch_block_t)(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build /usr/include/dispatch/object.h:362:3: error: unknown type name 'dispatch_block_t'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build dispatch_block_t notification_block);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# However, use of compiler.blacklist *gcc* would remove the GCC Fortran compilers too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gcc works fine on < 10.7. See also: https://trac.macports.org/ticket/66453
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: if Aqua support is desired, gcc may not be used for the C compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# on some OS X versions due to lack of support for Apple blocks extension:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# However, it works fine on < 10.7. See also: https://trac.macports.org/ticket/66453
</span>
configure.pre_args --prefix=${frameworks_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-java \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-BLAS-shlib \
</span> --enable-R-framework \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-memory-profiling \
</span> --enable-R-shlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-BLAS-shlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-memory-profiling \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-included-gettext \
</span> --without-aqua \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-tcltk \
</span> --without-cairo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-java \
</span> --without-recommended-packages \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-included-gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-tcltk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x
</span>
# disable tex/latex the hard way as there's no configure args for these
configure.env-append ac_cv_path_TEX= \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,8 +236,8 @@ variant tests description {include tests of R installation} {
</span>
variant x11 conflicts quartz {
require_active_variants tk x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libice \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:xorg-libice \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libsm \
</span> port:xorg-libX11 \
port:xorg-libXt
configure.args-delete --without-x
</pre><pre style='margin:0'>
</pre>