diff options
author | markd <markd@pkgsrc.org> | 2004-01-05 12:20:57 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2004-01-05 12:20:57 +0000 |
commit | 56811f2ffca5cf8178ad0e7e6f630201d64a074b (patch) | |
tree | a0837f25fc49175c72c36d81eeb6cd7a024d8887 /math/R | |
parent | 6139b280411c0af69b251b3adf0916feba4d8f3d (diff) | |
download | pkgsrc-56811f2ffca5cf8178ad0e7e6f630201d64a074b.tar.gz |
Reintroduce reordering tests for termcap vs termlib vs ncurses and
make dependency on libbz2 explicit
Fixes build on Solaris 8.
Diffstat (limited to 'math/R')
-rw-r--r-- | math/R/Makefile | 3 | ||||
-rw-r--r-- | math/R/distinfo | 6 | ||||
-rw-r--r-- | math/R/patches/patch-aa | 15 | ||||
-rw-r--r-- | math/R/patches/patch-ac | 146 |
4 files changed, 163 insertions, 7 deletions
diff --git a/math/R/Makefile b/math/R/Makefile index 95dd7d29489..7d407d2c2b6 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2003/12/04 13:42:37 adam Exp $ +# $NetBSD: Makefile,v 1.47 2004/01/05 12:20:57 markd Exp $ DISTNAME= R-1.8.1 PKGREVISION= 1 @@ -111,6 +111,7 @@ post-install: ${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" diff --git a/math/R/distinfo b/math/R/distinfo index 31fbad84082..da7b669b610 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2003/12/19 11:43:19 markd Exp $ +$NetBSD: distinfo,v 1.15 2004/01/05 12:20:57 markd Exp $ SHA1 (R-1.8.1.tgz) = 397511dcef3a04ebb67ef23988f5c32eee72fe95 Size (R-1.8.1.tgz) = 9407628 bytes -SHA1 (patch-aa) = c81131e2a8601ff061502e72a9f322d955dfe72c +SHA1 (patch-aa) = 84d8c8015910521fd1b8678d0dae61e535acab27 SHA1 (patch-ab) = 192044af2d9cd73f19e8324384cab91635e27067 -SHA1 (patch-ac) = 83f261aa8a538ad013505582c821c459d4628f08 +SHA1 (patch-ac) = f121529c3d0db8e4a93587b9675c25915c9b2ee4 SHA1 (patch-ad) = 69706964d6bc13e40ade009cbf1bb61d80d4fb36 SHA1 (patch-ae) = 917fe5d509bcef59e18215c4a4ad3662694fca37 SHA1 (patch-af) = da90dd523784806ffc71617760c71b4dbf0dfbe3 diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa index 60370a823c7..23cf99ac22f 100644 --- a/math/R/patches/patch-aa +++ b/math/R/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.11 2003/12/03 12:05:18 markd Exp $ +$NetBSD: patch-aa,v 1.12 2004/01/05 12:20:57 markd Exp $ --- configure.ac.orig 2003-09-17 11:01:04.000000000 +1200 +++ configure.ac @@ -11,6 +11,19 @@ $NetBSD: patch-aa,v 1.11 2003/12/03 12:05:18 markd Exp $ else LIBR= fi +@@ -436,9 +436,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) @@ -592,13 +592,6 @@ case "${host_cpu}" in R_PROG_CC_FLAG([-ieee_with_inexact], R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact])) diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index adfdfeb566c..6c497e3a508 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.10 2003/12/03 12:05:18 markd Exp $ +$NetBSD: patch-ac,v 1.11 2004/01/05 12:20:57 markd Exp $ ---- configure.orig 2003-10-08 22:59:51.000000000 +1300 +--- configure.orig 2003-11-21 23:31:30.000000000 +1300 +++ configure @@ -2108,7 +2108,7 @@ else WANT_R_SHLIB_FALSE= @@ -11,6 +11,148 @@ $NetBSD: patch-ac,v 1.10 2003/12/03 12:05:18 markd Exp $ else LIBR= fi +@@ -11414,13 +11414,13 @@ _ACEOF + fi + + +-echo "$as_me:$LINENO: checking for main in -lncurses" >&5 +-echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6 +-if test "${ac_cv_lib_ncurses_main+set}" = set; then ++echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 ++echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 ++if test "${ac_cv_lib_termcap_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-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 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_ncurses_main=yes ++ ac_cv_lib_termcap_main=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_ncurses_main=no ++ac_cv_lib_termcap_main=no + fi + rm -f 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 +-echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6 +-if test $ac_cv_lib_ncurses_main = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 ++if test $ac_cv_lib_termcap_main = yes; then + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBNCURSES 1 ++#define HAVE_LIBTERMCAP 1 + _ACEOF + +- LIBS="-lncurses $LIBS" ++ LIBS="-ltermcap $LIBS" + + else + +-echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 +-echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 +-if test "${ac_cv_lib_termcap_main+set}" = set; then ++echo "$as_me:$LINENO: checking for main in -ltermlib" >&5 ++echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6 ++if test "${ac_cv_lib_termlib_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-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 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_termcap_main=yes ++ ac_cv_lib_termlib_main=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_termcap_main=no ++ac_cv_lib_termlib_main=no + fi + rm -f 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 +-echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 +-if test $ac_cv_lib_termcap_main = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6 ++if test $ac_cv_lib_termlib_main = yes; then + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBTERMCAP 1 ++#define HAVE_LIBTERMLIB 1 + _ACEOF + +- LIBS="-ltermcap $LIBS" ++ LIBS="-ltermlib $LIBS" + + else + +-echo "$as_me:$LINENO: checking for main in -ltermlib" >&5 +-echo $ECHO_N "checking for main in -ltermlib... $ECHO_C" >&6 +-if test "${ac_cv_lib_termlib_main+set}" = set; then ++echo "$as_me:$LINENO: checking for main in -lncurses" >&5 ++echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6 ++if test "${ac_cv_lib_ncurses_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-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 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_termlib_main=yes ++ ac_cv_lib_ncurses_main=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_termlib_main=no ++ac_cv_lib_ncurses_main=no + fi + rm -f 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 +-echo "${ECHO_T}$ac_cv_lib_termlib_main" >&6 +-if test $ac_cv_lib_termlib_main = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6 ++if test $ac_cv_lib_ncurses_main = yes; then + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBTERMLIB 1 ++#define HAVE_LIBNCURSES 1 + _ACEOF + +- LIBS="-ltermlib $LIBS" ++ LIBS="-lncurses $LIBS" + + fi + @@ -15834,6 +15834,7 @@ cat > conftest.c <<EOF #else # define F77_SYMBOL(x) x |