<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/d6757740d0c4fdb89da590fb778e7e83f5f912c0">https://github.com/macports/macports-ports/commit/d6757740d0c4fdb89da590fb778e7e83f5f912c0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d6757740d0c4fdb89da590fb778e7e83f5f912c0
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Sep 6 14:26:18 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-seededlda: update to 1.4.1
</span>---
R/R-seededlda/Portfile | 36 ++++++++++++++++++++-----
R/R-seededlda/files/patch-Makevars.diff | 7 -----
R/R-seededlda/files/patch-atomics.diff | 11 ++++++++
R/R-seededlda/files/patch-fix-finding-TBB.diff | 23 ++++++++++++++++
R/R-seededlda/files/patch-use-right-prefix.diff | 11 ++++++++
5 files changed, 75 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-seededlda/Portfile b/R/R-seededlda/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63b9513c19b..7aee0b2bf01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-seededlda/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-seededlda/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 koheiw seededlda 1.3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran koheiw seededlda 1.4.1
</span> revision 0
categories-append textproc
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,16 +11,40 @@ license GPL-3
</span> description Seeded sequential LDA for topic modelling
long_description {*}${description}
homepage https://koheiw.github.io/seededlda
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 60571f84262f5ed818c2d30a06363ab5bb057ef6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dd0d1641595ab47df1baab53f03dc5ab066829c66a2dfc329aa8aaa8c859630c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3809399
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 093b904697b489e2073e5d4375a28972e3b0a48e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 80299411c82ff5e7f1d26256572736faa891d8cd4339ee67d71246ad0ef1acec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3849062
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makevars.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/koheiw/seededlda/issues/93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-finding-TBB.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/koheiw/seededlda/issues/94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-use-right-prefix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-atomics.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} in [list arm i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bitness 32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fallback to 64-bit, so that this works on riscv64 etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bitness 64
</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;'>+ reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@BIT@|${bitness}|g" ${worksrcpath}/configure
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/libexec/onetbb/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBFLAGS=${prefix}/libexec/onetbb/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBLIBS=${prefix}/libexec/onetbb/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:onetbb \
port:R-proxyC \
port:R-quanteda \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-seededlda/files/patch-Makevars.diff b/R/R-seededlda/files/patch-Makevars.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6b3aa413685..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-seededlda/files/patch-Makevars.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars 2024-04-08 07:59:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars 2024-04-19 18:04:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,2 +1,2 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/libtbb.R`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CXXFLAGS = -DARMA_64BIT_WORD=1 `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/deftbb.R`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -L@PREFIX@/libexec/onetbb/lib `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/libtbb.R`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_CXXFLAGS = -I@PREFIX@/libexec/onetbb/include -DARMA_64BIT_WORD=1 `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/deftbb.R`
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-seededlda/files/patch-atomics.diff b/R/R-seededlda/files/patch-atomics.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8c1e6f6b669
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-seededlda/files/patch-atomics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2024-09-05 13:04:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-09-06 14:17:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4344,7 +4344,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ${TBB_EXISTS} = yes ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBFLAGS="-DTBB $(pkg-config --cflags tbb@BIT@)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TBBLIBS="$(pkg-config --libs tbb@BIT@)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TBBLIBS="$(pkg-config --libs tbb@BIT@) -latomic"
</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;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking tbb available for compiling and linking:" >&5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-seededlda/files/patch-fix-finding-TBB.diff b/R/R-seededlda/files/patch-fix-finding-TBB.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b5040851cc0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-seededlda/files/patch-fix-finding-TBB.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2024-09-05 13:04:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-09-06 13:45:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4319,7 +4319,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel TBB existence:" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf %s "checking Intel TBB existence:... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBB_EXISTS=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkg-config --exists tbb >/dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg-config --exists tbb@BIT@ >/dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_TBB_EXISTS=`echo $?`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ${SH_TBB_EXISTS} = 0 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBB_EXISTS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4342,9 +4342,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ${TBB_EXISTS} = yes ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TBBFLAGS="-DTBB $(pkg-config --cflags tbb)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TBBFLAGS="-DTBB $(pkg-config --cflags tbb@BIT@)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TBBLIBS="$(pkg-config --libs tbb)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TBBLIBS="$(pkg-config --libs tbb@BIT@)"
</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;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking tbb available for compiling and linking:" >&5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-seededlda/files/patch-use-right-prefix.diff b/R/R-seededlda/files/patch-use-right-prefix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d3015592480
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-seededlda/files/patch-use-right-prefix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2024-09-05 13:04:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-09-06 13:43:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -595,7 +595,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initializations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ac_default_prefix=/usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_default_prefix=@PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_clean_files=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_config_libobj_dir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBOBJS=
</span></pre><pre style='margin:0'>
</pre>