Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
math/R/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.162 2015/09/11 13:16:16 jperkin Exp $
# $NetBSD: Makefile,v 1.168 2016/09/08 20:41:25 joerg Exp $
DISTNAME= R-3.2.2
DISTNAME= R-3.3.1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-3/}
@@ -69,6 +69,8 @@ CONFIGURE_ENV+= r_cv_complete_blas=yes
# Broken test for bzlib >= 1.0.5 in R 2.7.0
CONFIGURE_ENV+= r_cv_have_bzlib=yes
# Override zlib 1.2.5 requirement
CONFIGURE_ENV+= r_cv_header_zlib_h=yes
CONFIGURE_ENV+= GETWD=${TOOLS_PWD_CMD}
CONFIGURE_ENV+= lt_cv_path_LD=${LD:Q}
@@ -85,11 +87,7 @@ CONFIGURE_ENV+= LIBnn=lib
# been installed SHAREMODE
SHAREMODE= 644
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --disable-openmp
.endif
CONFIGURE_ARGS.Darwin+= --disable-openmp
# R_PAPERSIZE can be: A4, Letter, Legal, Executive
.if defined(PAPERSIZE)
@@ -132,8 +130,7 @@ SUBST_STAGE.fixwrap= post-build
SUBST_FILES.fixwrap= libtool
SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/libtool,${PKG_LIBTOOL},g"
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.5
BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.5
.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)
CONFIGURE_ARGS+= --enable-mbcs=no
@@ -144,16 +141,10 @@ CONFIGURE_ARGS+= --enable-mbcs=no
.PHONY: fix-darwin-install-name
post-install: fix-darwin-install-name
fix-darwin-install-name:
install_name_tool -id ${PREFIX}/lib/R/lib/libR.dylib \
${DESTDIR}${PREFIX}/lib/R/lib/libR.dylib
install_name_tool -id ${PREFIX}/lib/R/lib/libRlapack.dylib \
${DESTDIR}${PREFIX}/lib/R/lib/libRlapack.dylib
${FIND} ${DESTDIR}${PREFIX} -name "*.so" | while read lib; do \
libname=`basename $${lib}`; \
libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`; \
install_name_tool -id $${libdir}/$${libname} \
-change libR.dylib \
${PREFIX}/lib/R/lib/libR.dylib $${lib}; \
install_name_tool -id $${libdir}/$${libname} $${lib}; \
done
.endif
@@ -170,6 +161,7 @@ fix-darwin-install-name:
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../math/blas/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"

15
math/R/Makefile.extension
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.extension,v 1.19 2014/10/09 14:06:41 wiz Exp $
# $NetBSD: Makefile.extension,v 1.20 2016/02/29 20:05:00 jperkin Exp $
#
# This Makefile fragment is included by packages for R library packages.
#
@@ -26,6 +26,19 @@ do-install:
${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/R \
CMD INSTALL ${R_PKG_INSTALL_ARGS} ${WRKDIR}/${R_PKGNAME}
.include "../../mk/bsd.fast.prefs.mk"
.if ${OPSYS} == "Darwin"
.PHONY: fix-darwin-install-name
post-install: fix-darwin-install-name
fix-darwin-install-name:
${FIND} ${DESTDIR}${PREFIX} -name "*.so" | while read lib; do \
libname=`basename $${lib}`; \
libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`; \
install_name_tool -id $${libdir}/$${libname} $${lib}; \
done
.endif
R_LIB= lib/R/library
R_INST_DIRS?= ${R_PKGNAME}
R_HOMEPAGE_BASE= http://cran.r-project.org/web/packages

13
math/R/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.23 2015/08/14 12:40:19 wen Exp $
@comment $NetBSD: PLIST,v 1.25 2016/07/26 04:53:33 wen Exp $
bin/R
bin/Rscript
info/R-FAQ.info.gz
@@ -54,6 +54,8 @@ lib/R/doc/THANKS
lib/R/doc/html/NEWS.2.html
lib/R/doc/html/NEWS.html
lib/R/doc/html/R.css
lib/R/doc/html/Rlogo.pdf
lib/R/doc/html/Rlogo.svg
lib/R/doc/html/Search.html
lib/R/doc/html/SearchOn.html
lib/R/doc/html/about.html
@@ -61,7 +63,6 @@ lib/R/doc/html/favicon.ico
lib/R/doc/html/index.html
lib/R/doc/html/left.jpg
lib/R/doc/html/logo.jpg
lib/R/doc/html/logosm.jpg
lib/R/doc/html/packages-head-utf8.html
lib/R/doc/html/resources.html
lib/R/doc/html/right.jpg
@@ -203,6 +204,7 @@ lib/R/library/Matrix/Copyrights
lib/R/library/Matrix/DESCRIPTION
lib/R/library/Matrix/Doxyfile
lib/R/library/Matrix/INDEX
lib/R/library/Matrix/LICENCE
lib/R/library/Matrix/Meta/Rd.rds
lib/R/library/Matrix/Meta/data.rds
lib/R/library/Matrix/Meta/hsearch.rds
@@ -767,6 +769,7 @@ lib/R/library/mgcv/po/pl/LC_MESSAGES/mgcv.mo
lib/R/library/nlme/CITATION
lib/R/library/nlme/DESCRIPTION
lib/R/library/nlme/INDEX
lib/R/library/nlme/LICENCE
lib/R/library/nlme/Meta/Rd.rds
lib/R/library/nlme/Meta/data.rds
lib/R/library/nlme/Meta/hsearch.rds
@@ -808,6 +811,7 @@ lib/R/library/nlme/scripts/ch04.R
lib/R/library/nlme/scripts/ch05.R
lib/R/library/nlme/scripts/ch06.R
lib/R/library/nlme/scripts/ch08.R
lib/R/library/nlme/scripts/runme.R
lib/R/library/nlme/scripts/sims.rda
lib/R/library/nnet/CITATION
lib/R/library/nnet/DESCRIPTION
@@ -1026,7 +1030,6 @@ lib/R/library/survival/Meta/package.rds
lib/R/library/survival/Meta/vignette.rds
lib/R/library/survival/NAMESPACE
lib/R/library/survival/NEWS.Rd
lib/R/library/survival/NEWS.Rd.orig
lib/R/library/survival/R/survival
lib/R/library/survival/R/survival.rdb
lib/R/library/survival/R/survival.rdx
@@ -1050,6 +1053,8 @@ lib/R/library/survival/doc/tests.pdf
lib/R/library/survival/doc/timedep.R
lib/R/library/survival/doc/timedep.Rnw
lib/R/library/survival/doc/timedep.pdf
lib/R/library/survival/doc/validate.R
lib/R/library/survival/doc/validate.Rnw
lib/R/library/survival/doc/validate.pdf
lib/R/library/survival/help/AnIndex
lib/R/library/survival/help/aliases.rds
@@ -1404,6 +1409,8 @@ lib/R/library/utils/Meta/links.rds
lib/R/library/utils/Meta/nsInfo.rds
lib/R/library/utils/Meta/package.rds
lib/R/library/utils/NAMESPACE
lib/R/library/utils/R/sysdata.rdb
lib/R/library/utils/R/sysdata.rdx
lib/R/library/utils/R/utils
lib/R/library/utils/R/utils.rdb
lib/R/library/utils/R/utils.rdx

8
math/R/PLIST.Darwin
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.Darwin,v 1.2 2015/09/01 06:14:36 dbj Exp $
@comment $NetBSD: PLIST.Darwin,v 1.4 2016/08/15 09:36:31 jperkin Exp $
@comment
@comment The configure script has explicit check for darwin and sets
@comment --with-internal-tzcode=yes
@@ -123,6 +123,7 @@ lib/R/share/zoneinfo/America/Edmonton
lib/R/share/zoneinfo/America/Eirunepe
lib/R/share/zoneinfo/America/El_Salvador
lib/R/share/zoneinfo/America/Ensenada
lib/R/share/zoneinfo/America/Fort_Nelson
lib/R/share/zoneinfo/America/Fort_Wayne
lib/R/share/zoneinfo/America/Fortaleza
lib/R/share/zoneinfo/America/Glace_Bay
@@ -255,6 +256,7 @@ lib/R/share/zoneinfo/Asia/Baghdad
lib/R/share/zoneinfo/Asia/Bahrain
lib/R/share/zoneinfo/Asia/Baku
lib/R/share/zoneinfo/Asia/Bangkok
lib/R/share/zoneinfo/Asia/Barnaul
lib/R/share/zoneinfo/Asia/Beirut
lib/R/share/zoneinfo/Asia/Bishkek
lib/R/share/zoneinfo/Asia/Brunei
@@ -326,6 +328,7 @@ lib/R/share/zoneinfo/Asia/Tel_Aviv
lib/R/share/zoneinfo/Asia/Thimbu
lib/R/share/zoneinfo/Asia/Thimphu
lib/R/share/zoneinfo/Asia/Tokyo
lib/R/share/zoneinfo/Asia/Tomsk
lib/R/share/zoneinfo/Asia/Ujung_Pandang
lib/R/share/zoneinfo/Asia/Ulaanbaatar
lib/R/share/zoneinfo/Asia/Ulan_Bator
@@ -431,6 +434,7 @@ lib/R/share/zoneinfo/Etc/Universal
lib/R/share/zoneinfo/Etc/Zulu
lib/R/share/zoneinfo/Europe/Amsterdam
lib/R/share/zoneinfo/Europe/Andorra
lib/R/share/zoneinfo/Europe/Astrakhan
lib/R/share/zoneinfo/Europe/Athens
lib/R/share/zoneinfo/Europe/Belfast
lib/R/share/zoneinfo/Europe/Belgrade
@@ -451,6 +455,7 @@ lib/R/share/zoneinfo/Europe/Istanbul
lib/R/share/zoneinfo/Europe/Jersey
lib/R/share/zoneinfo/Europe/Kaliningrad
lib/R/share/zoneinfo/Europe/Kiev
lib/R/share/zoneinfo/Europe/Kirov
lib/R/share/zoneinfo/Europe/Lisbon
lib/R/share/zoneinfo/Europe/Ljubljana
lib/R/share/zoneinfo/Europe/London
@@ -478,6 +483,7 @@ lib/R/share/zoneinfo/Europe/Stockholm
lib/R/share/zoneinfo/Europe/Tallinn
lib/R/share/zoneinfo/Europe/Tirane
lib/R/share/zoneinfo/Europe/Tiraspol
lib/R/share/zoneinfo/Europe/Ulyanovsk
lib/R/share/zoneinfo/Europe/Uzhgorod
lib/R/share/zoneinfo/Europe/Vaduz
lib/R/share/zoneinfo/Europe/Vatican

4
math/R/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.9 2010/02/09 07:02:53 adam Exp $
# $NetBSD: buildlink3.mk,v 1.10 2016/02/29 20:00:44 jperkin Exp $
BUILDLINK_TREE+= R
@@ -10,4 +10,6 @@ BUILDLINK_ABI_DEPENDS.R+= R>=2.2.1nb2
BUILDLINK_PKGSRCDIR.R?= ../../math/R
.endif # R_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_TREE+= -R

19
math/R/distinfo
View File

@@ -1,10 +1,11 @@
$NetBSD: distinfo,v 1.69 2015/08/14 12:40:19 wen Exp $
$NetBSD: distinfo,v 1.73 2016/07/26 04:53:33 wen Exp $
SHA1 (R-3.2.2.tar.gz) = 68c74db1c5a2f2040280a03b8396e4d28a5a7617
RMD160 (R-3.2.2.tar.gz) = 0e8bf2ecca48f0f2433f6b07f422b7730a76fbb4
Size (R-3.2.2.tar.gz) = 29772864 bytes
SHA1 (patch-ac) = 1dc842ca867a1efa4f757ec5cbdca68a6957dd55
SHA1 (patch-ad) = 0a08f293bc1cdc130047868e5d574c2df1f4c6cf
SHA1 (patch-src_include_GraphicsBase.h) = 5f999e4d124afd38d5c7e18d936942f2c6f27c86
SHA1 (patch-src_library_stats_src_Makefile.in) = b468becd011fa4828e50f5d13d700825655c89e8
SHA1 (patch-src_main_character.c) = bd6e9b5b633d86c913c98d9d87c66f982d1ca258
SHA1 (R-3.3.1.tar.gz) = df853188d3e2b1c2d32393016401c432a5192c4d
RMD160 (R-3.3.1.tar.gz) = 200071bfb126195f7bbc56ad7678227274d72f5b
SHA512 (R-3.3.1.tar.gz) = d0ff85e99b9ec9cac672aa30d7d1a854778c6a610bcc5336e8c60c8c74f20856f2bfeae085af793fad646ff45cb4677d9d6dcbaa18212591f72f00a02339f4cd
Size (R-3.3.1.tar.gz) = 29848329 bytes
SHA1 (patch-ac) = 68c1943a352e6f8b2842331578ed746b1ac27bea
SHA1 (patch-ad) = a43b4875a2ee4677b5f762abf3f9a623fd12cbb5
SHA1 (patch-src_include_GraphicsBase.h) = eed25eaca982ca76bf75d199dd8bf48be2a99ac5
SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
SHA1 (patch-src_main_character.c) = 1271cbd68ec57e28cf6a394398d21d6a18b6760b

127
math/R/patches/patch-ac
View File

@@ -1,12 +1,12 @@
$NetBSD: patch-ac,v 1.36 2015/08/14 12:40:19 wen Exp $
$NetBSD: patch-ac,v 1.39 2016/07/26 04:53:33 wen Exp $
Do not include system paths in R_LD_LIBRARY_PATH.
FreeBSD 10 is not FreeBSD 1.
Fix texi2any version check.
--- configure.orig 2015-08-14 19:37:48.000000000 +0000
--- configure.orig 2016-07-26 00:32:06.000000000 +0000
+++ configure
@@ -4012,7 +4012,7 @@ fi
@@ -3896,7 +3896,7 @@ fi
## As from R 3.2.0 split up -L... and -lR
if test "${want_R_shlib}" = yes; then
@@ -15,16 +15,7 @@ Fix texi2any version check.
LIBR1=-lR
else
LIBR0=
@@ -4078,7 +4078,7 @@ fi
if test "x${want_lto}" != xno; then
LTO=-flto
fi
-if test "x${want_lto}" == xyes; then
+if test "x${want_lto}" = xyes; then
LTOALL=-flto
fi
@@ -5272,7 +5272,7 @@ if test -z "${texi2any_version_maj}" \
@@ -5076,7 +5076,7 @@ if test -z "${texi2any_version_maj}" \
elif test ${texi2any_version_maj} -gt 5; then
r_cv_prog_texi2any_v5=yes
elif test ${texi2any_version_maj} -lt 5 \
@@ -33,28 +24,28 @@ Fix texi2any version check.
r_cv_prog_texi2any_v5=no
else
r_cv_prog_texi2any_v5=yes
@@ -20496,7 +20496,7 @@ case "${host_os}" in
## look-up sequence. Such automatic override has proven to break things
## like system frameworks (e.g. ImageIO or OpenGL framework).
@@ -22376,7 +22376,7 @@ case "${host_os}" in
## Not so bad in later versions of Darwin,
## where DYLD_FALLBACK_LIBRARY_PATH is used (see below).
;;
- *)
+ donotuse*)
for arg in ${LDFLAGS}; do
case "${arg}" in
-L*)
@@ -23170,6 +23170,11 @@ fi
@@ -24958,6 +24958,11 @@ fi
done
;;
-[lLR]*)
+ case $ac_arg in
+ -R*)
+ ac_arg="${wl}$ac_arg"
+ ;;
+ esac
+ case $ac_arg in
+ -R*)
+ ac_arg="${wl}$ac_arg"
+ ;;
+ esac
ac_exists=false
for ac_i in $ac_cv_f77_libs; do
if test x"$ac_arg" = x"$ac_i"; then
@@ -24135,6 +24140,9 @@ cat > conftest.c <<EOF
@@ -25923,6 +25928,9 @@ cat > conftest.c <<EOF
extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
@@ -64,7 +55,7 @@ Fix texi2any version check.
int main () {
int a[3] = {17, 237, 2000000000}, b[2], res = 0;
double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
@@ -24230,6 +24238,9 @@ typedef struct {
@@ -26018,6 +26026,9 @@ typedef struct {
extern void F77_SYMBOL(cftest)(Rcomplex *x);
@@ -74,39 +65,29 @@ Fix texi2any version check.
int main () {
Rcomplex z[3];
@@ -26434,12 +26445,12 @@ $as_echo "$as_me: WARNING: Use of flat n
SHLIB_LIBADD="-lcc_dynamic"
fi
@@ -28175,7 +28186,7 @@ $as_echo "$as_me: WARNING: Use of flat n
fpicflags="${darwin_pic}"
shlib_cxxldflags="${shlib_ldflags}"
;;
- freebsd*)
- main_ldflags="-export-dynamic"
+ freebsd*|dragonfly*)
+ main_ldflags="${wl}-export-dynamic"
shlib_ldflags="-shared"
;;
gnu*) # GNU Hurd
- main_ldflags="-export-dynamic"
+ main_ldflags="${wl}-export-dynamic"
;;
hpux*)
SHLIB_EXT=".sl"
@@ -26525,8 +26536,14 @@ $as_echo "$as_me: WARNING: Use of flat n
fcpicflags=
## maybe this needs to depend on the compiler:
## -export-dynamic used to work, but does not with clang.
## Seems FreeBSD has used the GNU linker since at least 3.0 (Oct 1998)
@@ -28271,6 +28282,12 @@ $as_echo "$as_me: WARNING: Use of flat n
;;
netbsd*)
+ fpicflags="-fPIC"
+ case "${host_cpu}" in
+ powerpc*)
+ cpicflags="-fPIC"
+ ;;
+ esac
## See the comments about FreeBSD
+ fpicflags="-fPIC"
+ case "${host_cpu}" in
+ powerpc*)
+ cpicflags="-fPIC"
+ ;;
+ esac
if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
- main_ldflags="-export-dynamic"
+ main_ldflags="${wl}-export-dynamic"
main_ldflags="-Wl,--export-dynamic"
shlib_ldflags="-shared"
else
shlib_ldflags="-Bshareable"
@@ -26548,22 +26565,22 @@ $as_echo "$as_me: WARNING: Use of flat n
@@ -28313,22 +28330,22 @@ $as_echo "$as_me: WARNING: Use of flat n
solaris*)
## SPARC has only an 8k global object table, 1024 entries on 64-bit,
## so need PIC not pic. They are the same on other Solaris platforms.
@@ -133,17 +114,31 @@ Fix texi2any version check.
cpicflags="-KPIC"
if test "`basename ${CXX}`" = "CC" ; then
## Forte version 7 needs -lCstd: Forte 6 does not.
@@ -26624,7 +26641,7 @@ fi
@@ -28389,7 +28406,7 @@ fi
: ${CPICFLAGS="${cpicflags}"}
if test -z "${CPICFLAGS}"; then
case "${host_os}" in
- aix*|cygwin*|irix*|mingw*|osf*)
+ aix*|cygwin*|irix*|mingw*|osf*|darwin*)
- aix*|irix*|mingw*|osf*)
+ aix*|irix*|mingw*|osf*|darwin*)
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine CPICFLAGS." >&5
@@ -27320,6 +27337,14 @@ _ACEOF
## Cygwin has rintl but not nearbyintl
@@ -28489,10 +28506,10 @@ case "${host_os}" in
DYLIB_EXT=".dylib"
dylib_ldflags="${darwin_dylib_ldflags}"
MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"`
- LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
- RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
+ LIBR_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
+ RLAPACK_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
## don't use version in libRblas so we can replace it with any BLAS implementation
- RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names"
+ RBLAS_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRblas.dylib -headerpad_max_install_names"
;;
hpux*)
## Needs to avoid embedding a relative path ../../../bin.
@@ -29106,6 +29123,14 @@ _ACEOF
## Cygwin had rintl but not nearbyintl
for ac_func in expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl
do
+case $ac_func in
@@ -157,7 +152,7 @@ Fix texi2any version check.
as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5
$as_echo_n "checking whether $ac_func exists and is declared... " >&6; }
@@ -27329,24 +27354,12 @@ else
@@ -29115,24 +29140,12 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <math.h>
@@ -180,15 +175,15 @@ Fix texi2any version check.
-
- ;
- return 0;
+ return $ac_func($args);;
+ return $ac_func($args);;;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -30256,6 +30269,15 @@ cat > conftest.c <<EOF
@@ -32092,6 +32105,14 @@ cat > conftest.c <<EOF
# define F77_SYMBOL(x) x
#endif
extern void F77_SYMBOL(test1)(int *iflag);
+#ifdef F77_DUMMY_MAIN
+ifdef F77_DUMMY_MAIN
+
+# ifdef __cplusplus
+ extern "C"
@@ -196,11 +191,10 @@ Fix texi2any version check.
+ int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+
int main () {
int iflag;
F77_SYMBOL(test1)(&iflag);
@@ -30320,6 +30342,14 @@ else
@@ -32157,6 +32178,15 @@ else
#else
# define F77_SYMBOL(x) x
#endif
@@ -212,15 +206,16 @@ Fix texi2any version check.
+ int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+
void F77_SYMBOL(xerbla)(char *srname, int *info)
{}
void blas_set () {
@@ -38927,7 +38957,7 @@ case "${host_os}" in
@@ -41516,7 +41546,7 @@ case "${host_os}" in
r_ld_library_defaults="/usr/lib64:/lib64:/usr/lib:/lib"
;;
solaris*)
- r_ld_library_defaults="/usr/lib:/lib"
+ r_ld_library_defaults="/usr/lib:/lib:/usr/lib/amd64:/lib/amd64:/usr/lib/64:/lib/64"
;;
darwin*)
r_ld_library_defaults="/usr/X11R6/lib"
*)
r_ld_library_defaults=

11
math/R/patches/patch-ad
View File

@@ -1,10 +1,11 @@
$NetBSD: patch-ad,v 1.18 2015/05/13 12:48:05 ryoon Exp $
$NetBSD: patch-ad,v 1.20 2016/07/26 04:53:33 wen Exp $
Adjust EXTRA_LIBS and @WANT_R_SHLIB_TRUE@R_bin_LDADD
--- src/main/Makefile.in.orig 2015-03-18 23:03:54.000000000 +0000
--- src/main/Makefile.in.orig 2016-07-26 01:55:40.000000000 +0000
+++ src/main/Makefile.in
@@ -103,13 +103,13 @@ EXTRA_STATIC_LIBS = \
$(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL) $(R_TZONE)
@@ -94,13 +94,13 @@ MAIN_OBJS = `ls ../unix/*.o ../appl/*.o
EXTRA_STATIC_LIBS = $(R_TRE) $(R_XDR) $(R_LIBINTL) $(R_TZONE)
STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
-EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS)
@@ -18,4 +19,4 @@ Adjust EXTRA_LIBS and @WANT_R_SHLIB_TRUE@R_bin_LDADD
+@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ ${COMPILER_RPATH_FLAG}$(Rexeclibdir) -lR @BLAS_SHLIB_TRUE@-lRblas
@BUILD_LTO_FALSE@R_bin_DEPENDENCIES =@WANT_R_SHLIB_FALSE@ libR.a @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
libR_la = libR$(DYLIB_EXT)
libR_la = libR$(R_DYLIB_EXT)

4
math/R/patches/patch-src_include_GraphicsBase.h
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-src_include_GraphicsBase.h,v 1.1 2015/05/26 13:38:20 jperkin Exp $
$NetBSD: patch-src_include_GraphicsBase.h,v 1.2 2016/07/26 04:53:33 wen Exp $
Fix symbol visibility.
--- src/include/GraphicsBase.h.orig 2015-03-18 23:02:13.000000000 +0000
--- src/include/GraphicsBase.h.orig 2015-08-25 22:15:17.000000000 +0000
+++ src/include/GraphicsBase.h
@@ -41,6 +41,6 @@ void unregisterBase(void); /* used in de

6
math/R/patches/patch-src_library_stats_src_Makefile.in
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-src_library_stats_src_Makefile.in,v 1.1 2014/11/29 22:04:51 joerg Exp $
$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 2014-11-29 20:35:23.000000000 +0000
--- 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 = ../../../..
@@ -11,4 +11,4 @@ ${R_INCLUDE_DIR} is used in the default compiler flags.
+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

8
math/R/patches/patch-src_main_character.c
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-src_main_character.c,v 1.2 2015/06/30 02:38:52 wen Exp $
$NetBSD: patch-src_main_character.c,v 1.3 2016/07/26 04:53:33 wen Exp $
--- src/main/character.c.orig 2015-06-29 21:44:13.000000000 +0000
--- src/main/character.c.orig 2016-06-01 22:15:06.000000000 +0000
+++ src/main/character.c
@@ -1360,7 +1360,7 @@ SEXP attribute_hidden do_strtrim(SEXP ca
@@ -1564,7 +1564,7 @@ SEXP attribute_hidden do_strtrim(SEXP ca
return s;
}
@@ -11,7 +11,7 @@ $NetBSD: patch-src_main_character.c,v 1.2 2015/06/30 02:38:52 wen Exp $
{
long int res;
char *endp;
@@ -1394,7 +1394,7 @@ SEXP attribute_hidden do_strtoi(SEXP cal
@@ -1598,7 +1598,7 @@ SEXP attribute_hidden do_strtoi(SEXP cal
PROTECT(ans = allocVector(INTSXP, n = LENGTH(x)));
for(i = 0; i < n; i++)