pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/R Update R to 1.9.0 and buildlink3ify
details: https://anonhg.NetBSD.org/pkgsrc/rev/f053ebe175b4
branches: trunk
changeset: 474286:f053ebe175b4
user: markd <markd%pkgsrc.org@localhost>
date: Tue Apr 27 11:24:31 2004 +0000
description:
Update R to 1.9.0 and buildlink3ify
USER-VISIBLE CHANGES
o Underscore '_' is now allowed in syntactically valid names, and
make.names() no longer changes underscores. Very old code
that makes use of underscore for assignment may now give
confusing error messages.
o Package 'base' has been split into packages 'base', 'graphics',
'stats' and 'utils'. All four are loaded in a default
installation, but the separation allows a 'lean and mean'
version of R to be used for tasks such as building indices.
Packages ctest, eda, modreg, mva, nls, stepfun and ts have been
merged into stats, and lqs has been returned to MASS. In all
cases a stub has been left that will issue a warning and ensure
that the appropriate new home is loaded. All the time series
datasets have been moved to package stats. Sweave has been
moved to utils.
Package mle has been moved to stats4 which will become the
central place for statistical S4 classes and methods
distributed with base R. Package mle remains as a stub.
Users may notice that code in .Rprofile is run with only the
new base loaded and so functions may now not be found. For
example, ps.options(horizontal = TRUE) should be preceded by
library(graphics) or called as graphics::ps.options or,
better, set as a hook -- see ?setHook.
o There has been a concerted effort to speed up the startup of
an R session: it now takes about 2/3rds of the time of 1.8.1.
o A warning is issued at startup in a UTF-8 locale, as currently R
only supports single-byte encodings.
plus many new features and bug fixes.
diffstat:
math/R/Makefile | 28 ++++++++++-------
math/R/distinfo | 29 +++++++++---------
math/R/patches/patch-aa | 14 ++++----
math/R/patches/patch-ac | 75 ++++++++++++++++++++++++++++++++----------------
math/R/patches/patch-ad | 13 --------
math/R/patches/patch-af | 16 +++++-----
math/R/patches/patch-ag | 14 ++++----
math/R/patches/patch-ah | 14 ++++----
math/R/patches/patch-aj | 14 ++++----
math/R/patches/patch-ak | 14 ++++----
math/R/patches/patch-al | 14 ++++----
math/R/patches/patch-an | 14 ++++----
math/R/patches/patch-aq | 14 ++++----
math/R/patches/patch-as | 14 ++++----
14 files changed, 150 insertions(+), 137 deletions(-)
diffs (truncated from 607 to 300 lines):
diff -r 45953c2fa3f6 -r f053ebe175b4 math/R/Makefile
--- a/math/R/Makefile Tue Apr 27 11:06:56 2004 +0000
+++ b/math/R/Makefile Tue Apr 27 11:24:31 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2004/03/11 21:04:47 markd Exp $
+# $NetBSD: Makefile,v 1.52 2004/04/27 11:24:31 markd Exp $
-DISTNAME= R-1.8.1
-PKGREVISION= 2
+DISTNAME= R-1.9.0
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/}
EXTRACT_SUFX= .tgz
@@ -15,7 +14,7 @@
NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
TEST_TARGET= check
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= # defined
USE_X11= # defined
USE_PERL5= # defined
USE_GNU_TOOLS+= make
@@ -31,6 +30,9 @@
CONFIGURE_ARGS+= --with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
CONFIGURE_ARGS+= --with-tk-config=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
CONFIGURE_ARGS+= --without-gnome # not yet stable
+CONFIGURE_ARGS+= --with-zlib
+CONFIGURE_ARGS+= --with-bzlib
+CONFIGURE_ARGS+= --with-pcre
CONFIGURE_ENV+= XMKMF="${XMKMF}"
# Use BLAS (math/blas)
@@ -112,12 +114,14 @@
${ECHO} "@exec R CMD ${PERL5} %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null" >> ${PLIST_SRC}
${ECHO} "@exec ${CAT} %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null" >> ${PLIST_SRC}
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../devel/pcre/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../math/blas/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../math/blas/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 45953c2fa3f6 -r f053ebe175b4 math/R/distinfo
--- a/math/R/distinfo Tue Apr 27 11:06:56 2004 +0000
+++ b/math/R/distinfo Tue Apr 27 11:24:31 2004 +0000
@@ -1,24 +1,23 @@
-$NetBSD: distinfo,v 1.16 2004/03/30 16:49:32 jwise Exp $
+$NetBSD: distinfo,v 1.17 2004/04/27 11:24:31 markd Exp $
-SHA1 (R-1.8.1.tgz) = 397511dcef3a04ebb67ef23988f5c32eee72fe95
-Size (R-1.8.1.tgz) = 9407628 bytes
-SHA1 (patch-aa) = 84d8c8015910521fd1b8678d0dae61e535acab27
+SHA1 (R-1.9.0.tgz) = 7b74c59838fb4a4129a21bbcbe1c83eeed7ac4b9
+Size (R-1.9.0.tgz) = 9505598 bytes
+SHA1 (patch-aa) = f435eae9f0a348f5f2e105045015039abf8ac102
SHA1 (patch-ab) = 192044af2d9cd73f19e8324384cab91635e27067
-SHA1 (patch-ac) = f121529c3d0db8e4a93587b9675c25915c9b2ee4
-SHA1 (patch-ad) = 69706964d6bc13e40ade009cbf1bb61d80d4fb36
+SHA1 (patch-ac) = 42329fa99c63c3823151f7a18e0ec5b6f2f5d6dd
SHA1 (patch-ae) = 917fe5d509bcef59e18215c4a4ad3662694fca37
-SHA1 (patch-af) = da90dd523784806ffc71617760c71b4dbf0dfbe3
-SHA1 (patch-ag) = 108795b4e679aa5149df1dcb3d3b7cf40c5b3f86
-SHA1 (patch-ah) = b986ada9088875748361dc1750812e53d1900260
+SHA1 (patch-af) = 6c004f9bac11324f3cc43dcf5964411070700a46
+SHA1 (patch-ag) = ce1e2a053132a7dd63d01b7fa0af5c238e415713
+SHA1 (patch-ah) = 647f6b1c53bab8d39582d93ad31fdbc96a9658c7
SHA1 (patch-ai) = 2f7fc15dcc08659dfb6c2fef097af7f86bb17e67
-SHA1 (patch-aj) = b23b6f4d113cf2a49881bff6c34b0408c961499c
-SHA1 (patch-ak) = 5927f451f05674d431687c93dca4c452e59889da
-SHA1 (patch-al) = 9081ae2e771fcede31b085097f41334030d36ebe
+SHA1 (patch-aj) = 238efe9407740b229b46e31800c0c6f6caa625c8
+SHA1 (patch-ak) = d81c7ac6f2ee718afce8303668bee8d12dc8f7c4
+SHA1 (patch-al) = 25692fe45674b8be9468f9e89864b1a23becce55
SHA1 (patch-am) = 47c47fdc12e7c771eb29c066575c666eaec96870
-SHA1 (patch-an) = e45ce6861ec7e35e02faf46c95863803783f2bda
+SHA1 (patch-an) = 121ccb559d6fdfd70bcfcfcf1bfaa7628f334b61
SHA1 (patch-ao) = c99629da4329e67d1adbb48cd89a50531743d63f
SHA1 (patch-ap) = b75680bae0d75f417c74d2137ba4b43ec1428131
-SHA1 (patch-aq) = 512d7613bbba00c0cb3e4543812f734159e12a92
+SHA1 (patch-aq) = 4bc27494b0e8d99d4edf4710d0c5647861aacea2
SHA1 (patch-ar) = 5cc4a77c253a77a564433187babb0135ccb84eaf
-SHA1 (patch-as) = 37db149821a49c86463683f3b82e8a763bbfcd1b
+SHA1 (patch-as) = bb00673f7ea02d72b5d8bac6de43b68bd2e1c1ea
SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952
diff -r 45953c2fa3f6 -r f053ebe175b4 math/R/patches/patch-aa
--- a/math/R/patches/patch-aa Tue Apr 27 11:06:56 2004 +0000
+++ b/math/R/patches/patch-aa Tue Apr 27 11:24:31 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.12 2004/01/05 12:20:57 markd Exp $
+$NetBSD: patch-aa,v 1.13 2004/04/27 11:24:31 markd Exp $
---- configure.ac.orig 2003-09-17 11:01:04.000000000 +1200
+--- configure.ac.orig 2004-03-20 04:15:44.000000000 +1300
+++ configure.ac
-@@ -134,7 +134,7 @@ AC_ARG_ENABLE([R-shlib],
- [want_R_shlib=no])
+@@ -171,7 +171,7 @@ AC_ARG_ENABLE([R-shlib],
+ [want_R_shlib="${want_R_framework}"])
AM_CONDITIONAL(WANT_R_SHLIB, [test "x${want_R_shlib}" = xyes])
if test "${want_R_shlib}" = yes; then
- LIBR="-L\$(R_HOME)/bin -lR"
@@ -11,7 +11,7 @@
else
LIBR=
fi
-@@ -436,9 +436,9 @@ AC_SUBST(LIBM)
+@@ -477,9 +477,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)
@@ -24,7 +24,7 @@
case "${host_os}" in
darwin*)
AM_CONDITIONAL(BUILD_DLFCN_DARWIN, true)
-@@ -592,13 +592,6 @@ case "${host_cpu}" in
+@@ -634,13 +634,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 @@
if test "${GXX}" = yes; then
R_PROG_CXX_FLAG([-mieee],
R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee]))
-@@ -891,6 +884,7 @@ case "${host_os}" in
+@@ -933,6 +926,7 @@ case "${host_os}" in
fpicflags=
;;
netbsd*)
diff -r 45953c2fa3f6 -r f053ebe175b4 math/R/patches/patch-ac
--- a/math/R/patches/patch-ac Tue Apr 27 11:06:56 2004 +0000
+++ b/math/R/patches/patch-ac Tue Apr 27 11:24:31 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2004/01/05 12:20:57 markd Exp $
+$NetBSD: patch-ac,v 1.12 2004/04/27 11:24:31 markd Exp $
---- configure.orig 2003-11-21 23:31:30.000000000 +1300
+--- configure.orig 2004-04-12 21:28:02.000000000 +1200
+++ configure
-@@ -2108,7 +2108,7 @@ else
+@@ -2193,7 +2193,7 @@ else
WANT_R_SHLIB_FALSE=
fi
if test "${want_R_shlib}" = yes; then
@@ -11,7 +11,7 @@
else
LIBR=
fi
-@@ -11414,13 +11414,13 @@ _ACEOF
+@@ -20883,13 +20932,13 @@ _ACEOF
fi
@@ -27,9 +27,9 @@
-LIBS="-lncurses $LIBS"
+LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
/* confdefs.h. */
-@@ -11450,34 +11450,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ _ACEOF
+@@ -20927,35 +20977,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -42,7 +42,8 @@
-ac_cv_lib_ncurses_main=no
+ac_cv_lib_termcap_main=no
fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
@@ -73,9 +74,9 @@
-LIBS="-ltermcap $LIBS"
+LIBS="-ltermlib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
/* confdefs.h. */
-@@ -11507,34 +11507,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ _ACEOF
+@@ -20993,35 +21044,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -88,7 +89,8 @@
-ac_cv_lib_termcap_main=no
+ac_cv_lib_termlib_main=no
fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
@@ -119,9 +121,9 @@
-LIBS="-ltermlib $LIBS"
+LIBS="-lncurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
/* confdefs.h. */
-@@ -11564,24 +11564,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ _ACEOF
+@@ -21059,25 +21111,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -134,7 +136,8 @@
-ac_cv_lib_termlib_main=no
+ac_cv_lib_ncurses_main=no
fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5
@@ -153,7 +156,7 @@
fi
-@@ -15834,6 +15834,7 @@ cat > conftest.c <<EOF
+@@ -25738,6 +25851,7 @@ cat > conftest.c <<EOF
#else
# define F77_SYMBOL(x) x
#endif
@@ -161,7 +164,7 @@
int main () {
exit(0);
}
-@@ -15902,6 +15903,9 @@ cat > conftest.c <<EOF
+@@ -25806,6 +25920,9 @@ cat > conftest.c <<EOF
extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
@@ -171,7 +174,7 @@
int main () {
int a[3] = {17, 237, 2000000000}, b[2], res = 0;
double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -15990,6 +15994,9 @@ typedef struct {
+@@ -25894,6 +26011,9 @@ typedef struct {
extern void F77_SYMBOL(cftest)(Rcomplex *x);
@@ -181,7 +184,7 @@
int main () {
Rcomplex z[3];
-@@ -17020,135 +17027,6 @@ echo "${ECHO_T}no" >&6
+@@ -27020,155 +27149,6 @@ echo "${ECHO_T}no" >&6
fi
fi
@@ -206,11 +209,20 @@
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
@@ -223,7 +235,8 @@
-
-eval "r_cv_prog_f77_flag_${ac_safe}=no"
-fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-FFLAGS="${r_save_FFLAGS}"
-ac_ext=c
Home |
Main Index |
Thread Index |
Old Index