From 4e6e7dd792d327a1b8efc2f8f0216414e55ce40d Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 1 Dec 2005 23:11:26 +0000 Subject: - correctly depend on devel/gettext-lib, bump revision for this - this uses libtool, tell the framework so - don't declare alloca on DragonFly, it conflicts with system headers - patch libtool.m4 fragment for DrgaonFly --- math/R/Makefile | 5 +- math/R/distinfo | 9 +++- math/R/patches/patch-ab | 13 +++++ math/R/patches/patch-ac | 123 +++++++++++++++++++++++++++++++++++++++++++----- math/R/patches/patch-ae | 13 +++++ math/R/patches/patch-af | 13 +++++ math/R/patches/patch-ag | 13 +++++ math/R/patches/patch-ah | 13 +++++ math/R/patches/patch-ai | 13 +++++ 9 files changed, 200 insertions(+), 15 deletions(-) create mode 100644 math/R/patches/patch-ab create mode 100644 math/R/patches/patch-ae create mode 100644 math/R/patches/patch-af create mode 100644 math/R/patches/patch-ag create mode 100644 math/R/patches/patch-ah create mode 100644 math/R/patches/patch-ai (limited to 'math') diff --git a/math/R/Makefile b/math/R/Makefile index 03fb9a70d3e..5a070b1cc61 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.74 2005/09/28 20:52:24 rillig Exp $ +# $NetBSD: Makefile,v 1.75 2005/12/01 23:11:26 joerg Exp $ DISTNAME= R-2.1.1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-2/} @@ -18,6 +19,7 @@ TEST_TARGET= check USE_TOOLS+= gmake perl:run sed xmkmf USE_GNU_READLINE= # uses callback interface USE_LANGUAGES= c fortran +USE_LIBTOOL= yes USE_MAKEINFO= yes TEXINFO_REQD= 4.5 @@ -84,6 +86,7 @@ CONFIGURE_ARGS+= --enable-mbcs=no .include "../../archivers/bzip2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/math/R/distinfo b/math/R/distinfo index 0f8f2a7e103..883de20f4f9 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,9 +1,14 @@ -$NetBSD: distinfo,v 1.24 2005/06/24 12:28:31 markd Exp $ +$NetBSD: distinfo,v 1.25 2005/12/01 23:11:26 joerg Exp $ SHA1 (R-2.1.1.tar.gz) = e43f743c9ad4147f23cf89c771364168b078a0db RMD160 (R-2.1.1.tar.gz) = a850608eb5edb90f426331fd2596ba8fc7175dce Size (R-2.1.1.tar.gz) = 12644376 bytes SHA1 (patch-aa) = 52f7ca0159087a6a5f319dd5476223785fe75a7a -SHA1 (patch-ac) = 18a9287109499e8263f2869d0cf4b32814760f11 +SHA1 (patch-ab) = d5919d2864c70cc2d541a62099fca35b5d10bb99 +SHA1 (patch-ac) = ce9e1b9f3de07ea3724a1215cfe648770d5c09ca SHA1 (patch-ad) = 83c9b046822b1d350daec8739ca4ee2a6b7e1978 +SHA1 (patch-ae) = 89580496f3614deaa6ef81306e3d2247e46839e6 +SHA1 (patch-af) = 84ab0aec4edd9469e1dcf3eb0b06e898265dae1d +SHA1 (patch-ag) = caa653a3717c4f1173f431865fbef999f350f211 +SHA1 (patch-ah) = 8c12f620ac4923373771b95010df87eb2587b957 SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952 diff --git a/math/R/patches/patch-ab b/math/R/patches/patch-ab new file mode 100644 index 00000000000..20f0f9f7983 --- /dev/null +++ b/math/R/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.17 2005/12/01 23:11:26 joerg Exp $ + +--- src/main/errors.c.orig 2005-12-01 22:38:35.000000000 +0000 ++++ src/main/errors.c +@@ -39,7 +39,7 @@ extern void R_ProcessEvents(void); + #ifdef HAVE_ALLOCA_H + #include + #endif +-#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) ++#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__) + extern char *alloca(size_t); + #endif + diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac index f0e6a6af9c3..ba01294eac8 100644 --- a/math/R/patches/patch-ac +++ b/math/R/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ +$NetBSD: patch-ac,v 1.15 2005/12/01 23:11:26 joerg Exp $ ---- configure.orig 2005-04-19 00:11:52.000000000 +0200 +--- configure.orig 2005-06-20 09:02:39.000000000 +0000 +++ configure -@@ -2170,7 +2170,7 @@ else +@@ -2173,7 +2173,7 @@ else fi if test "${want_R_shlib}" = yes; then @@ -11,7 +11,97 @@ $NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ else LIBR= fi -@@ -21681,13 +21681,13 @@ fi +@@ -6413,7 +6413,7 @@ darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu) ++freebsd* | kfreebsd*-gnu | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -8934,7 +8934,7 @@ if test -z "$aix_libpath"; then aix_libp + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -9512,7 +9512,7 @@ kfreebsd*-gnu) + dynamic_linker='GNU ld.so' + ;; + +-freebsd*) ++freebsd* | dragonfly*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in +@@ -11892,7 +11892,7 @@ if test -z "$aix_libpath"; then aix_libp + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +@@ -12599,7 +12599,7 @@ echo $ECHO_N "checking for $compiler opt + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -13210,7 +13210,7 @@ kfreebsd*-gnu) + dynamic_linker='GNU ld.so' + ;; + +-freebsd*) ++freebsd* | dragonfly*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in +@@ -15781,7 +15781,7 @@ if test -z "$aix_libpath"; then aix_libp + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -16359,7 +16359,7 @@ kfreebsd*-gnu) + dynamic_linker='GNU ld.so' + ;; + +-freebsd*) ++freebsd* | dragonfly*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in +@@ -18128,7 +18128,7 @@ if test -z "$aix_libpath"; then aix_libp + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -18706,7 +18706,7 @@ kfreebsd*-gnu) + dynamic_linker='GNU ld.so' + ;; + +-freebsd*) ++freebsd* | dragonfly*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in +@@ -21697,13 +21697,13 @@ fi ## only need ncurses if libreadline is not statically linked against it unset ac_cv_lib_readline_rl_callback_read_char @@ -29,7 +119,7 @@ $NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21726,35 +21726,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21742,35 +21742,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -76,7 +166,7 @@ $NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21793,35 +21793,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21809,35 +21809,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -123,7 +213,7 @@ $NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21860,25 +21860,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21876,25 +21876,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -156,7 +246,7 @@ $NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ fi -@@ -27049,6 +27049,7 @@ cat > conftest.c < conftest.c < conftest.c < conftest.c <&6 +@@ -28047,157 +28054,6 @@ echo "${ECHO_T}no" >&6 fi fi @@ -342,7 +432,16 @@ $NetBSD: patch-ac,v 1.14 2005/05/02 16:57:19 drochner Exp $ if test "${GXX}" = yes; then ac_safe=_mieee echo "$as_me:$LINENO: checking whether ${CXX-c++} accepts -mieee" >&5 -@@ -29135,6 +28991,7 @@ fi ;; +@@ -29093,7 +28949,7 @@ fi ;; + SHLIB_LIBADD="-lcc_dynamic" + fi + ;; +- freebsd*) ++ freebsd* | dragonfly*) + ## Only sure for FreeBSD 3 and above. + main_ldflags="-export-dynamic" + shlib_ldflags="-shared" +@@ -29151,6 +29007,7 @@ fi ;; fpicflags= ;; netbsd*) diff --git a/math/R/patches/patch-ae b/math/R/patches/patch-ae new file mode 100644 index 00000000000..b88539ff919 --- /dev/null +++ b/math/R/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.9 2005/12/01 23:11:27 joerg Exp $ + +--- src/main/pcre.c.orig 2005-12-01 22:44:25.000000000 +0000 ++++ src/main/pcre.c +@@ -37,7 +37,7 @@ + #ifdef HAVE_ALLOCA_H + #include + #endif +-#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) ++#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__) + extern char *alloca(size_t); + #endif + diff --git a/math/R/patches/patch-af b/math/R/patches/patch-af new file mode 100644 index 00000000000..a160e707c44 --- /dev/null +++ b/math/R/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.9 2005/12/01 23:11:27 joerg Exp $ + +--- src/main/printarray.c.orig 2005-12-01 22:45:25.000000000 +0000 ++++ src/main/printarray.c +@@ -45,7 +45,7 @@ + #ifdef HAVE_ALLOCA_H + #include + #endif +-#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) ++#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__) + extern char *alloca(size_t); + #endif + diff --git a/math/R/patches/patch-ag b/math/R/patches/patch-ag new file mode 100644 index 00000000000..7bc087441e5 --- /dev/null +++ b/math/R/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.9 2005/12/01 23:11:27 joerg Exp $ + +--- src/main/util.c.orig 2005-12-01 22:46:34.000000000 +0000 ++++ src/main/util.c +@@ -41,7 +41,7 @@ + #ifdef HAVE_ALLOCA_H + #include + #endif +-#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) ++#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__) + extern char *alloca(size_t); + #endif + diff --git a/math/R/patches/patch-ah b/math/R/patches/patch-ah new file mode 100644 index 00000000000..be72532e1c3 --- /dev/null +++ b/math/R/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.7 2005/12/01 23:11:27 joerg Exp $ + +--- src/main/vfonts.c.orig 2005-12-01 22:47:24.000000000 +0000 ++++ src/main/vfonts.c +@@ -32,7 +32,7 @@ + #ifdef HAVE_ALLOCA_H + #include + #endif +-#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) ++#if !HAVE_DECL_ALLOCA && !defined(__FreeBSD__) && !defined(__DragonFly__) + extern char *alloca(size_t); + #endif + diff --git a/math/R/patches/patch-ai b/math/R/patches/patch-ai new file mode 100644 index 00000000000..dfbc790504d --- /dev/null +++ b/math/R/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.4 2005/12/01 23:11:27 joerg Exp $ + +--- src/library/grDevices/src/devPS.c.orig 2005-12-01 22:54:39.000000000 +0000 ++++ src/library/grDevices/src/devPS.c +@@ -47,7 +47,7 @@ extern int errno; + + #ifdef HAVE_ALLOCA_H + #include +-#elif !defined (__FreeBSD__) ++#elif !defined (__FreeBSD__) && !defined(__DragonFly__) + extern char *alloca(size_t); + #endif + -- cgit v1.2.3