From 8548982304110627b6fa55c6876802d9826af06f Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 2 May 2005 16:57:19 +0000 Subject: update to 2.1.0 too many changes to list here ...still doesn't work within TEXmacs --- math/R/Makefile | 4 ++-- math/R/distinfo | 14 +++++++------- math/R/patches/patch-aa | 38 +++++++++++++++++++------------------- math/R/patches/patch-ac | 30 +++++++++++++++--------------- math/R/patches/patch-ad | 6 +++--- 5 files changed, 46 insertions(+), 46 deletions(-) (limited to 'math/R') diff --git a/math/R/Makefile b/math/R/Makefile index 0b0557a4637..a52925dd9dc 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.63 2005/04/11 21:46:28 tv Exp $ +# $NetBSD: Makefile,v 1.64 2005/05/02 16:57:19 drochner Exp $ -DISTNAME= R-2.0.1 +DISTNAME= R-2.1.0 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-2/} diff --git a/math/R/distinfo b/math/R/distinfo index ce18e4c2ad5..01f2edfc2d3 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.22 2005/02/23 12:06:53 agc Exp $ +$NetBSD: distinfo,v 1.23 2005/05/02 16:57:19 drochner Exp $ -SHA1 (R-2.0.1.tar.gz) = 6440c0506b170edcea6bebba5faebc3ee682dcf2 -RMD160 (R-2.0.1.tar.gz) = 06eff22a7f48201419abaf3795239508acb4132f -Size (R-2.0.1.tar.gz) = 10645703 bytes -SHA1 (patch-aa) = fa1aba5fa71e8ec219ab6cd0f61ad0c22e6e4f10 -SHA1 (patch-ac) = 84a7ab545e5f462d3c62745cc110ffcbc293ca49 -SHA1 (patch-ad) = b8cb795218f95113d512923a55e153e9cf9af7ee +SHA1 (R-2.1.0.tar.gz) = ad6707b88bb07c6dfc0d9a60da51cec0177cc8ec +RMD160 (R-2.1.0.tar.gz) = 852910bcdd52928e07cc2182630896561e4224c4 +Size (R-2.1.0.tar.gz) = 12173182 bytes +SHA1 (patch-aa) = 52f7ca0159087a6a5f319dd5476223785fe75a7a +SHA1 (patch-ac) = 18a9287109499e8263f2869d0cf4b32814760f11 +SHA1 (patch-ad) = 83c9b046822b1d350daec8739ca4ee2a6b7e1978 SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952 diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa index 985a7b6455a..0960f1a4a7f 100644 --- a/math/R/patches/patch-aa +++ b/math/R/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.14 2004/11/18 12:31:29 markd Exp $ +$NetBSD: patch-aa,v 1.15 2005/05/02 16:57:19 drochner Exp $ ---- configure.ac.orig 2004-09-17 23:20:14.000000000 +1200 +--- configure.ac.orig 2005-04-18 23:30:54.000000000 +0200 +++ configure.ac -@@ -171,7 +171,7 @@ AC_ARG_ENABLE([R-shlib], - [want_R_shlib="${want_R_framework}"]) +@@ -306,7 +306,7 @@ AC_ARG_WITH([pcre], + ## needs to come after GNOME AM_CONDITIONAL(WANT_R_SHLIB, [test "x${want_R_shlib}" = xyes]) if test "${want_R_shlib}" = yes; then - LIBR="-L\$(R_HOME)/lib -lR" @@ -11,20 +11,20 @@ $NetBSD: patch-aa,v 1.14 2004/11/18 12:31:29 markd Exp $ else LIBR= fi -@@ -491,9 +491,9 @@ AC_SUBST(LIBM) - ## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do - ## the following as well. - AC_CHECK_LIB(m, sin) --AC_CHECK_LIB(ncurses, main, [], -- AC_CHECK_LIB(termcap, main, [], -- AC_CHECK_LIB(termlib, main))) -+AC_CHECK_LIB(termcap, main, [], -+ AC_CHECK_LIB(termlib, main, [], -+ AC_CHECK_LIB(ncurses, main))) - case "${host_os}" in - darwin*) - AM_CONDITIONAL(BUILD_DLFCN_DARWIN, true) -@@ -654,13 +654,6 @@ case "${host_cpu}" in +@@ -536,9 +536,9 @@ if test "${use_readline}" = yes; then + if test "${use_readline}" = no; then + ## only need ncurses if libreadline is not statically linked against it + unset ac_cv_lib_readline_rl_callback_read_char +- AC_CHECK_LIB(ncurses, main, [], +- AC_CHECK_LIB(termcap, main, [], +- AC_CHECK_LIB(termlib, main))) ++ AC_CHECK_LIB(termcap, main, [], ++ AC_CHECK_LIB(termlib, main, [], ++ AC_CHECK_LIB(ncurses, main))) + AC_CHECK_LIB(readline, rl_callback_read_char) + use_readline="${ac_cv_lib_readline_rl_callback_read_char}" + fi +@@ -681,13 +681,6 @@ case "${host_cpu}" in R_PROG_CC_FLAG([-ieee_with_inexact], R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact])) fi @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.14 2004/11/18 12:31:29 markd Exp $ if test "${GXX}" = yes; then R_PROG_CXX_FLAG([-mieee], R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee])) -@@ -958,6 +951,7 @@ case "${host_os}" in +@@ -986,6 +979,7 @@ case "${host_os}" in fpicflags= ;; netbsd*) diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index ef83b5c39d8..f0e6a6af9c3 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,19 +1,19 @@ -$NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ +$NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ ---- configure.orig 2004-09-21 11:05:49.000000000 +1200 +--- configure.orig 2005-04-19 00:11:52.000000000 +0200 +++ configure -@@ -2204,7 +2204,7 @@ else - WANT_R_SHLIB_FALSE= +@@ -2170,7 +2170,7 @@ else fi + if test "${want_R_shlib}" = yes; then - LIBR="-L\$(R_HOME)/lib -lR" + LIBR="-Wl,-R${prefix}/lib/R/lib -L\$(R_HOME)/lib -lR" else LIBR= fi -@@ -21299,13 +21299,13 @@ _ACEOF - fi - +@@ -21681,13 +21681,13 @@ fi + ## only need ncurses if libreadline is not statically linked against it + unset ac_cv_lib_readline_rl_callback_read_char -echo "$as_me:$LINENO: checking for main in -lncurses" >&5 -echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6 @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21344,35 +21344,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21726,35 +21726,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -76,7 +76,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21411,35 +21411,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21793,35 +21793,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -123,7 +123,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21478,25 +21478,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21860,25 +21860,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -156,7 +156,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ fi -@@ -26355,6 +26355,7 @@ cat > conftest.c < conftest.c < conftest.c < conftest.c <&6 +@@ -28031,157 +28038,6 @@ echo "${ECHO_T}no" >&6 fi fi @@ -342,7 +342,7 @@ $NetBSD: patch-ac,v 1.13 2004/11/18 12:31:29 markd Exp $ if test "${GXX}" = yes; then ac_safe=_mieee echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5 -@@ -28751,6 +28607,7 @@ fi ;; +@@ -29135,6 +28991,7 @@ fi ;; fpicflags= ;; netbsd*) diff --git a/math/R/patches/patch-ad b/math/R/patches/patch-ad index 5ef649acef2..bdff1143661 100644 --- a/math/R/patches/patch-ad +++ b/math/R/patches/patch-ad @@ -1,11 +1,11 @@ -$NetBSD: patch-ad,v 1.8 2004/11/24 10:14:10 markd Exp $ +$NetBSD: patch-ad,v 1.9 2005/05/02 16:57:19 drochner Exp $ ---- src/main/Makefile.in.orig 2004-11-16 01:31:44.000000000 +1300 +--- src/main/Makefile.in.orig 2005-04-18 23:29:59.000000000 +0200 +++ src/main/Makefile.in @@ -144,7 +144,7 @@ R: Makefile $(R_binary): $(R_bin_OBJECTS) $(R_bin_DEPENDENCIES) - @WANT_R_SHLIB_FALSE@ $(MAIN_LINK) -o $@ $(R_bin_LDFLAGS) $(R_bin_OBJECTS) $(R_bin_LDADD) $(LIBS) + @WANT_R_SHLIB_FALSE@ $(MAIN_LINK) -o $@ $(R_bin_LDFLAGS) $(R_bin_OBJECTS) $(R_bin_LDADD) $(READLINE_LIBS) $(LIBS) -@WANT_R_SHLIB_TRUE@ $(MAIN_LINK) -o $@ $(R_bin_LDFLAGS) $(R_bin_OBJECTS) -L../../lib -lR +@WANT_R_SHLIB_TRUE@ $(MAIN_LINK) -o $@ $(R_bin_LDFLAGS) $(R_bin_OBJECTS) -L../../lib ${COMPILER_RPATH_FLAG}$(Rexeclibdir) -lR -- cgit v1.2.3