pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(math/R) dirty hack completed, hope clean up many points
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By: mef
Date: Fri Jul 21 06:31:45 2023 +0900
Changeset: 1c28551fec01378d9e47899a6ce0d995ba2932b3
Modified Files:
R/Makefile
R/distinfo
Added Files:
R/patches/patch-src_include_R.h
R/patches/patch-src_library_grDevices_src_axis__scales.c
R/patches/patch-src_library_grDevices_src_devQuartz.c
R/patches/patch-src_library_graphics_src_stem.c
R/patches/patch-src_library_stats_src_port.c
R/patches/patch-src_library_tools_src_http.c
R/patches/patch-src_library_tools_src_pdscan.c
R/patches/patch-src_library_tools_src_text.c
R/patches/patch-src_library_utils_src_utils.c
Log Message:
(math/R) dirty hack completed, hope clean up many points
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c28551fec01378d9e47899a6ce0d995ba2932b3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
R/Makefile | 24 +++++++++++++++++++++
R/distinfo | 12 ++++++++---
R/patches/patch-src_include_R.h | 21 ++++++++++++++++++
.../patch-src_library_grDevices_src_axis__scales.c | 19 ++++++++++++++++
.../patch-src_library_grDevices_src_devQuartz.c | 18 ++++++++++++++++
R/patches/patch-src_library_graphics_src_stem.c | 20 +++++++++++++++++
R/patches/patch-src_library_stats_src_port.c | 18 ++++++++++++++++
R/patches/patch-src_library_tools_src_http.c | 17 +++++++++++++++
R/patches/patch-src_library_tools_src_pdscan.c | 19 ++++++++++++++++
R/patches/patch-src_library_tools_src_text.c | 25 ++++++++++++++++++++++
R/patches/patch-src_library_utils_src_utils.c | 19 ++++++++++++++++
11 files changed, 209 insertions(+), 3 deletions(-)
diffs:
diff --git a/R/Makefile b/R/Makefile
index 19bb63dfe2..c4de895299 100644
--- a/R/Makefile
+++ b/R/Makefile
@@ -147,6 +147,30 @@ SUBST_STAGE.fixwrap= post-build
SUBST_FILES.fixwrap= libtool
SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/libtool,${PKG_LIBTOOL},g"
+SUBST_CLASSES+= libintl
+SUBST_STAGE.libintl= pre-configure
+SUBST_SED.libintl= -e "s,<libintl.h>,<gettext/libintl.h>,g"
+SUBST_FILES.libintl= \
+ src/library/stats/src/approx.c \
+ src/library/stats/src/bandwidths.c \
+ src/library/stats/src/complete_cases.c \
+ src/library/stats/src/cov.c \
+ src/library/stats/src/deriv.c \
+ src/library/stats/src/distn.c \
+ src/library/stats/src/fourier.c \
+ src/library/stats/src/integrate.c \
+ src/library/stats/src/ksmooth.c \
+ src/library/stats/src/lm.c \
+ src/library/stats/src/loglin.c \
+ src/library/stats/src/lowess.c \
+ src/library/stats/src/model.c \
+ src/library/stats/src/optim.c \
+ src/library/stats/src/optimize.c \
+ src/library/stats/src/rcont.c \
+ src/library/stats/src/smooth.c \
+ src/library/stats/src/stats.h
+
+
BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.5
# failed to convert strong functions and variables: Invalid type identifier
diff --git a/R/distinfo b/R/distinfo
index 59fe789f0d..4a6002a6b8 100644
--- a/R/distinfo
+++ b/R/distinfo
@@ -8,9 +8,15 @@ SHA1 (patch-m4_R.m4) = 76a280dc2aeea2eb0e473ae770f636d00314d68a
SHA1 (patch-src_appl_pretty.c) = 8671eb4accb643611f6d8cc90f981eaf9360df9a
SHA1 (patch-src_extra_tre_regerror.c) = 6097e84aefeb65c84c956df75bec27aeb28d03a7
SHA1 (patch-src_include_Defn.h) = 950a9a5ec0b6ace1ca96f17cce5e332376a2a305
+SHA1 (patch-src_include_R.h) = 9528510c38708e647065fbab5b6f84177d3bae57
+SHA1 (patch-src_library_grDevices_src_axis__scales.c) = 444f8da7a22f6db63c218ad29488514f5ae7766e
+SHA1 (patch-src_library_grDevices_src_devQuartz.c) = 1740daf26284afa424ce30e4a29fee2949704bfc
+SHA1 (patch-src_library_graphics_src_stem.c) = c365d2b7b5bf6ec8504c9912d9e567953c3e37cb
SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
-SHA1 (patch-src_library_tools_src_http.c) = 34519249161445db444152381d81b02c4819e49e
-SHA1 (patch-src_library_tools_src_pdscan.c) = 142066f8ab4ed4f8e640a712ecba114ff196489f
-SHA1 (patch-src_library_tools_src_text.c) = 3c1c47435c9fcb6a9f30b4c6b44b3e80cf03bd4e
+SHA1 (patch-src_library_stats_src_port.c) = d1bf1e3f7a71408ba82912130ab2b7130fec9d13
+SHA1 (patch-src_library_tools_src_http.c) = 70c09354ec8be0b854c636e8a48180c60e9f1598
+SHA1 (patch-src_library_tools_src_pdscan.c) = b6cfc09800b2af51688ab077fc7e3d625d31014c
+SHA1 (patch-src_library_tools_src_text.c) = 6097a3c5756d3abbdcb5a3d3549a0f0580ee5ef0
+SHA1 (patch-src_library_utils_src_utils.c) = c86b5e70f62aa8fbb8135337a1c6c424dcf02c6c
SHA1 (patch-src_main_character.c) = 842ae5d291f36f2beead4d32c1d41b18cbff878d
SHA1 (patch-src_nmath_nmath.h) = a957aafef7f41157e0e05fefb3daf68375da65a8
diff --git a/R/patches/patch-src_include_R.h b/R/patches/patch-src_include_R.h
new file mode 100644
index 0000000000..45d989b500
--- /dev/null
+++ b/R/patches/patch-src_include_R.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+gettext-0.22 API change
+
+--- src/include/R.h.orig 2023-03-24 08:02:03.000000000 +0900
++++ src/include/R.h 2023-07-20 23:52:00.503517487 +0900
+@@ -28,6 +28,14 @@
+ # define USING_R
+ #endif
+
++
++# ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++# endif
++
++
++
+ /* same as Rmath.h: needed for cospi etc */
+ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+ # define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
diff --git a/R/patches/patch-src_library_grDevices_src_axis__scales.c b/R/patches/patch-src_library_grDevices_src_axis__scales.c
new file mode 100644
index 0000000000..1aa76bd16f
--- /dev/null
+++ b/R/patches/patch-src_library_grDevices_src_axis__scales.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+gettext-0.22 API change
+
+--- src/library/grDevices/src/axis_scales.c.orig 2022-03-25 08:02:04.000000000 +0900
++++ src/library/grDevices/src/axis_scales.c 2023-07-20 21:55:19.787805362 +0900
+@@ -27,6 +27,12 @@
+
+ #include "grDevices.h"
+
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
++
++
+ SEXP R_CreateAtVector(SEXP axp, SEXP usr, SEXP nint, SEXP is_log)
+ {
+ int nint_v = asInteger(nint);
diff --git a/R/patches/patch-src_library_grDevices_src_devQuartz.c b/R/patches/patch-src_library_grDevices_src_devQuartz.c
new file mode 100644
index 0000000000..3d6694d96f
--- /dev/null
+++ b/R/patches/patch-src_library_grDevices_src_devQuartz.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+gettext-0.22 API change
+
+--- src/library/grDevices/src/devQuartz.c.orig 2023-04-04 07:15:01.000000000 +0900
++++ src/library/grDevices/src/devQuartz.c 2023-07-20 22:43:32.558162937 +0900
+@@ -25,6 +25,11 @@
+ #include <config.h>
+ #endif
+
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
++
+ #if HAVE_AQUA
+
+ #include <Defn.h>
diff --git a/R/patches/patch-src_library_graphics_src_stem.c b/R/patches/patch-src_library_graphics_src_stem.c
new file mode 100644
index 0000000000..fb1a8e55e4
--- /dev/null
+++ b/R/patches/patch-src_library_graphics_src_stem.c
@@ -0,0 +1,20 @@
+$NetBSD$
+
+
+--- src/library/graphics/src/stem.c.orig 2018-09-25 17:45:05.000000000 +0900
++++ src/library/graphics/src/stem.c 2023-07-20 22:26:30.332036921 +0900
+@@ -33,8 +33,12 @@
+ #include <R_ext/Arith.h> /* for R_FINITE */
+
+ #ifdef ENABLE_NLS
+-#include <libintl.h>
+-#define _(String) dgettext ("graphics", String)
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
++
++#define _(String) libintl_dgettext ("graphics", String)
+ #else
+ #define _(String) (String)
+ #endif
diff --git a/R/patches/patch-src_library_stats_src_port.c b/R/patches/patch-src_library_stats_src_port.c
new file mode 100644
index 0000000000..2046fd9249
--- /dev/null
+++ b/R/patches/patch-src_library_stats_src_port.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+gettext-0.22 API Change
+
+--- src/library/stats/src/port.c.orig 2023-03-24 08:02:04.000000000 +0900
++++ src/library/stats/src/port.c 2023-07-21 06:08:04.881125778 +0900
+@@ -23,6 +23,11 @@
+ #include <R_ext/BLAS.h>
+ #include <R_ext/Print.h>
+
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
++
+ /* names of 1-based indices into iv and v */
+ #define AFCTOL 31
+ #define ALGSAV 51
diff --git a/R/patches/patch-src_library_tools_src_http.c b/R/patches/patch-src_library_tools_src_http.c
new file mode 100644
index 0000000000..de5d406145
--- /dev/null
+++ b/R/patches/patch-src_library_tools_src_http.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+gettext-0.22 API change
+
+--- src/library/tools/src/http.c.orig 2018-09-25 17:45:10.000000000 +0900
++++ src/library/tools/src/http.c 2023-07-20 22:02:16.548699208 +0900
+@@ -21,6 +21,10 @@
+ #include <Rinternals.h>
+ #include "tools.h"
+
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
+
+ extern int extR_HTTPDCreate(const char *ip, int port);
+ extern void extR_HTTPDStop(void);
diff --git a/R/patches/patch-src_library_tools_src_pdscan.c b/R/patches/patch-src_library_tools_src_pdscan.c
new file mode 100644
index 0000000000..108aaeb400
--- /dev/null
+++ b/R/patches/patch-src_library_tools_src_pdscan.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+gettext-0.22 API change
+
+--- src/library/tools/src/pdscan.c.orig 2022-03-25 08:02:05.000000000 +0900
++++ src/library/tools/src/pdscan.c 2023-07-20 22:03:41.827382802 +0900
+@@ -22,6 +22,12 @@
+ #include <ctype.h>
+ #include "tools.h"
+
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
++
++
+ static SEXP package_dependencies_scan_one(SEXP this) {
+ SEXP y;
+ Rboolean save, skip;
diff --git a/R/patches/patch-src_library_tools_src_text.c b/R/patches/patch-src_library_tools_src_text.c
new file mode 100644
index 0000000000..0f005c31f0
--- /dev/null
+++ b/R/patches/patch-src_library_tools_src_text.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+gettext-0.22 API change
+
+--- src/library/tools/src/text.c.orig 2022-05-30 07:15:01.000000000 +0900
++++ src/library/tools/src/text.c 2023-07-20 22:00:39.895082036 +0900
+@@ -25,11 +25,18 @@
+ #include <R.h>
+ #include "tools.h"
+
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
++
+ #include <stdlib.h> /* for MB_CUR_MAX */
+ #include <wchar.h>
+ LibExtern Rboolean mbcslocale;
+ LibExtern int R_MB_CUR_MAX;
+
++
++
+ size_t Rf_mbrtowc(wchar_t *wc, const char *s, size_t n, mbstate_t *ps);
+
+ /* .Call, so manages R_alloc stack */
diff --git a/R/patches/patch-src_library_utils_src_utils.c b/R/patches/patch-src_library_utils_src_utils.c
new file mode 100644
index 0000000000..5e98726cfa
--- /dev/null
+++ b/R/patches/patch-src_library_utils_src_utils.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+gettext-0.22 API change
+
+--- src/library/utils/src/utils.c.orig 2023-03-24 08:02:05.000000000 +0900
++++ src/library/utils/src/utils.c 2023-07-20 22:20:01.864010902 +0900
+@@ -27,6 +27,12 @@
+
+ #include "utils.h"
+
++#ifndef _LIBINTL_H
++# define _INTL_REDIRECT_MACROS
++# include "gettext/libintl.h"
++#endif
++
++
+ /* from src/main/eval.c */
+ SEXP do_Rprof(SEXP args);
+
Home |
Main Index |
Thread Index |
Old Index