(math/R) As an interim fix --disable-nls, as the same as 4.2.0

diff --git a/R/Makefile b/R/Makefile
index c4de89529922ac0de17ab83ea04462ecbdca264b..77a54bf1a0a902a51b01af565d226dfb524bcc78 100644 (file)
--- a/R/Makefile
+++ b/R/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=      --with-readline
 CONFIGURE_ARGS+=       --with-tcltk
 CONFIGURE_ARGS+=       --with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ARGS+=       --with-tk-config=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
+CONFIGURE_ARGS+=       --disable-nls
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
@@ -147,30 +148,6 @@ 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 4a6002a6b8c75e216a328b9b4ff26cfc44924350..f2ebd760a39ce8b0f0bf85d7dcc3fcb86b766599 100644 (file)
--- a/R/distinfo
+++ b/R/distinfo
@@ -5,18 +5,3 @@ SHA512 (R-4.3.1.tar.gz) = f571c378dbdd675e267ef4419bb1141198924dadc08297c93c8dff
 Size (R-4.3.1.tar.gz) = 34899964 bytes
 SHA1 (patch-configure.ac) = 56a92d2d75ecdad45c06ca05ebc260af83a5a0ea
 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_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_appl_pretty.c b/R/patches/patch-src_appl_pretty.c
deleted file mode 100644 (file)
index 2571f3a..0000000
--- a/R/patches/patch-src_appl_pretty.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-gettext-0.22 API change
-
---- src/appl/pretty.c.orig     2023-03-23 23:02:02.000000000 +0000
-+++ src/appl/pretty.c  2023-07-20 06:48:51.271243263 +0000
-@@ -45,10 +45,10 @@
- #endif
- 
- #ifdef ENABLE_NLS
--#include <libintl.h>
--#define _(String) gettext (String)
--#else
--#define _(String) (String)
-+/* starting gettext-0.22, some symbols are hidden, and make them visible */
-+#define _INTL_REDIRECT_MACROS
-+#include <gettext/libintl.h>
- #endif
-+#define _(String) (String)
- 
- #include <math.h>

diff --git a/R/patches/patch-src_extra_tre_regerror.c b/R/patches/patch-src_extra_tre_regerror.c
deleted file mode 100644 (file)
index 7e47fc9..0000000
--- a/R/patches/patch-src_extra_tre_regerror.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-gettext-0.22 API change
-
---- src/extra/tre/regerror.c.orig      2018-09-25 08:46:40.000000000 +0000
-+++ src/extra/tre/regerror.c   2023-07-20 06:58:53.519846262 +0000
-@@ -22,7 +22,11 @@
- #include "tre.h"
- 
- #ifdef HAVE_GETTEXT
--#include <libintl.h>
-+# ifndef _LIBINTL_H
-+#  define _INTL_REDIRECT_MACROS
-+#  include <gettext/libintl.h>
-+# endif
-+
- #else
- #define dgettext(p, s) s
- #define gettext(s) s

diff --git a/R/patches/patch-src_include_Defn.h b/R/patches/patch-src_include_Defn.h
deleted file mode 100644 (file)
index 9fcb055..0000000
--- a/R/patches/patch-src_include_Defn.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-starting gettext-0.22, some symbols are hidden, and make them visible
-
---- src/include/Defn.h.orig    2023-05-02 07:15:02.000000000 +0900
-+++ src/include/Defn.h 2023-07-17 20:40:16.631815063 +0900
-@@ -2355,6 +2355,10 @@ extern void *alloca(size_t);
- // for reproducibility for now: use exp10 or pown later if accurate enough.
- #define Rexp10(x) pow(10.0, x)
- 
-+/* starting gettext-0.22, some symbols are hidden, and make them visible */
-+#define _INTL_REDIRECT_MACROS
-+#include "gettext/libintl.h"
-+
- #endif /* DEFN_H_ */
- /*
-  *- Local Variables:

diff --git a/R/patches/patch-src_include_R.h b/R/patches/patch-src_include_R.h
deleted file mode 100644 (file)
index 45d989b..0000000
--- a/R/patches/patch-src_include_R.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$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
deleted file mode 100644 (file)
index 1aa76bd..0000000
--- a/R/patches/patch-src_library_grDevices_src_axis__scales.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644 (file)
index 3d6694d..0000000
--- a/R/patches/patch-src_library_grDevices_src_devQuartz.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644 (file)
index fb1a8e5..0000000
--- a/R/patches/patch-src_library_graphics_src_stem.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$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_Makefile.in b/R/patches/patch-src_library_stats_src_Makefile.in
deleted file mode 100644 (file)
index 9847dd8..0000000
--- a/R/patches/patch-src_library_stats_src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_library_stats_src_Makefile.in,v 1.2 2016/07/26 04:53:33 wen Exp $
-
-${R_INCLUDE_DIR} is used in the default compiler flags.
-
---- src/library/stats/src/Makefile.in.orig     2016-07-26 01:57:49.000000000 +0000
-+++ src/library/stats/src/Makefile.in
-@@ -10,6 +10,7 @@ top_srcdir = @top_srcdir@
- top_builddir = ../../../..
- subdir = src/library/$(pkg)/src
- R_HOME = $(top_builddir)
-+R_INCLUDE_DIR = $(R_HOME)/include
- ## for $(R_HOME)/etc${R_ARCH}/Makeconf
- R_SHARE_DIR = $(R_HOME)/share
- R_INCLUDE_DIR = $(R_HOME)/include

diff --git a/R/patches/patch-src_library_stats_src_port.c b/R/patches/patch-src_library_stats_src_port.c
deleted file mode 100644 (file)
index 2046fd9..0000000
--- a/R/patches/patch-src_library_stats_src_port.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644 (file)
index de5d406..0000000
--- a/R/patches/patch-src_library_tools_src_http.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$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
deleted file mode 100644 (file)
index 108aaeb..0000000
--- a/R/patches/patch-src_library_tools_src_pdscan.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644 (file)
index 0f005c3..0000000
--- a/R/patches/patch-src_library_tools_src_text.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644 (file)
index 5e98726..0000000
--- a/R/patches/patch-src_library_utils_src_utils.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$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);
- 

diff --git a/R/patches/patch-src_main_character.c b/R/patches/patch-src_main_character.c
deleted file mode 100644 (file)
index 423b8c4..0000000
--- a/R/patches/patch-src_main_character.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_main_character.c,v 1.5 2021/06/13 13:10:47 wen Exp $
-
---- src/main/character.c.orig  2021-06-13 06:56:55.454092033 +0000
-+++ src/main/character.c
-@@ -1744,7 +1744,7 @@ SEXP attribute_hidden do_strtrim(SEXP ca
-     return s;
- }
- 
--static int strtoi(SEXP s, int base)
-+static int my_strtoi(SEXP s, int base)
- {
-     if(s == NA_STRING || CHAR(s)[0] == '\0') return(NA_INTEGER);
- 
-@@ -1777,7 +1777,7 @@ SEXP attribute_hidden do_strtoi(SEXP cal
- 
-     PROTECT(ans = allocVector(INTSXP, n = LENGTH(x)));
-     for(i = 0; i < n; i++)
--      INTEGER(ans)[i] = strtoi(STRING_ELT(x, i), base);
-+      INTEGER(ans)[i] = my_strtoi(STRING_ELT(x, i), base);
-     UNPROTECT(1);
- 
-     return ans;

diff --git a/R/patches/patch-src_nmath_nmath.h b/R/patches/patch-src_nmath_nmath.h
deleted file mode 100644 (file)
index 5508578..0000000
--- a/R/patches/patch-src_nmath_nmath.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-API change on gettext-lib 0.22
-
---- src/nmath/nmath.h.orig     2023-05-02 07:15:02.000000000 +0900
-+++ src/nmath/nmath.h  2023-07-19 23:52:26.912202724 +0900
-@@ -233,4 +233,9 @@ void attribute_hidden bratio(double a, d
-                            double *w, double *w1, int *ierr, int log_p);
- 
- 
-+#ifndef _LIBINTL_H
-+#  define _INTL_REDIRECT_MACROS
-+#  include "gettext/libintl.h"
-+#endif
-+
- #endif /* MATHLIB_PRIVATE_H */