Hi @ports and R-users, attached is an maintainer-update for mathe/R. All test pass @amd64.
- Update 3.0.3 => 3.1.0 - SHARED_LIBS-syntax, okay? Comments? OKs? cheers, Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/math/R/Makefile,v retrieving revision 1.61 diff -u -p -u -r1.61 Makefile --- Makefile 24 Mar 2014 09:08:46 -0000 1.61 +++ Makefile 2 May 2014 20:57:15 -0000 @@ -3,11 +3,11 @@ SHARED_ONLY= Yes COMMENT= powerful math/statistics/graphics language -DISTNAME= R-3.0.3 +DISTNAME= R-3.1.0 -SHARED_LIBS= R 2.0 \ - Rlapack 31.1 \ - Rblas 31.0 +SHARED_LIBS= R 2.1 # 2.0 +SHARED_LIBS+= Rlapack 31.2 # 31.1 +SHARED_LIBS+= Rblas 31.1 # 31.0 CATEGORIES= math HOMEPAGE= http://www.r-project.org/ @@ -41,7 +41,10 @@ MASTER_SITES= http://cran.r-project.org/ http://cran.stat.ucla.edu/src/base/R-3/ \ http://probability.ca/cran/src/base/R-3/ -MODULES= fortran devel/gettext x11/tk +MODULES= fortran \ + devel/gettext \ + x11/tk + MODFORTRAN_COMPILER= gfortran BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS} \ Index: distinfo =================================================================== RCS file: /cvs/ports/math/R/distinfo,v retrieving revision 1.19 diff -u -p -u -r1.19 distinfo --- distinfo 12 Mar 2014 11:04:41 -0000 1.19 +++ distinfo 2 May 2014 20:57:15 -0000 @@ -1,2 +1,2 @@ -SHA256 (R-3.0.3.tar.gz) = uXz9lUDylKt4boRhU/PdhgVhDX4nYWv7QpZ5W8T95tY= -SIZE (R-3.0.3.tar.gz) = 28075821 +SHA256 (R-3.1.0.tar.gz) = imgDkPhMWMAdze/Wguqg6QOJ8J5tLy4JDHGvQAZfX+I= +SIZE (R-3.1.0.tar.gz) = 28469975 Index: patches/patch-Makeconf_in =================================================================== RCS file: patches/patch-Makeconf_in diff -N patches/patch-Makeconf_in --- patches/patch-Makeconf_in 12 Mar 2014 11:04:41 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-Makeconf_in,v 1.2 2014/03/12 11:04:41 dcoppa Exp $ ---- Makeconf.in.orig Wed Mar 6 00:02:46 2013 -+++ Makeconf.in Mon May 27 14:00:25 2013 -@@ -19,7 +19,6 @@ CPICFLAGS = @CPICFLAGS@ - CPPFLAGS = @CPPFLAGS@ - DEFS = @DEFS@ @R_DEFS@ - DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)" --exclude="*~" --DYLIB_EXT = @DYLIB_EXT@ - DYLIB_LD = @DYLIB_LD@ - DYLIB_LDFLAGS = @DYLIB_LDFLAGS@@BUILD_LTO_TRUE@ $(DYLIBS_LTO) - DYLIB_LINK = $(DYLIB_LD) $(DYLIB_LDFLAGS) $(LDFLAGS) Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-Makefile_in,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-Makefile_in --- patches/patch-Makefile_in 12 Mar 2014 11:04:41 -0000 1.3 +++ patches/patch-Makefile_in 2 May 2014 20:57:15 -0000 @@ -1,75 +1,20 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2014/03/12 11:04:41 dcoppa Exp $ +$OpenBSD$ Do not build PDF versions of the R manuals ---- Makefile.in.orig Tue Sep 10 00:05:05 2013 -+++ Makefile.in Tue Feb 4 09:15:53 2014 -@@ -95,7 +95,7 @@ install install-strip: installdirs svnonly - @for f in $(INSTFILES); do \ - $(INSTALL_DATA) $(srcdir)/$${f} "$(DESTDIR)$(rhome)"; \ - done -- @for f in NEWS NEWS.pdf $(NON_SVN_INSTFILES); do \ -+ @for f in NEWS $(NON_SVN_INSTFILES); do \ - $(INSTALL_DATA) $${f} "$(DESTDIR)$(rhome)"; \ - done - @WANT_R_FRAMEWORK_TRUE@ $(MAKE) -f $(srcdir)/Makefile.fw top_srcdir=$(top_srcdir) $@ -@@ -121,7 +121,7 @@ svnonly: - fi \ - fi - --libR_la = lib/libR$(DYLIB_EXT) -+libR_la = lib/libR.so.$(LIBR_VERSION) - install-libR: - @if test -f $(libR_la); then $(MAKE) install-libR-exists; fi - install-libR-exists: -@@ -133,13 +133,13 @@ installdirs: - uninstall: - @(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \ - for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done) -- @for f in NEWS NEWS.pdf $(INSTFILES) $(NON_SVN_INSTFILES); do \ -+ @for f in NEWS $(INSTFILES) $(NON_SVN_INSTFILES); do \ - rm -f "$(DESTDIR)$(rhome)/$${f}"; \ - done - @rm -rf "$(DESTDIR)$(Rexecbindir)" "$(DESTDIR)$(rhome)/lib" - @rmdir "$(DESTDIR)$(rhome)" 2>/dev/null \ - || $(ECHO) " dir $(DESTDIR)$(rhome) not removed" -- @rm -f "$(DESTDIR)${libdir}/libR$(DYLIB_EXT)" -+ @rm -f "$(DESTDIR)${libdir}/libR.so.$(LIBR_VERSION)" - - mostlyclean: clean - clean: -@@ -154,7 +154,7 @@ distclean: clean - @rm -f po/Makefile - -@rm -rf bin include lib library modules gnome - @if test -f non-tarball ; then \ -- rm -f $(NON_SVN_INSTFILES) NEWS NEWS.pdf non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html doc/html/NEWS.html; \ -+ rm -f $(NON_SVN_INSTFILES) NEWS non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html doc/html/NEWS.html; \ - fi - @if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \ - rm -f $(NON_SVN_INSTFILES); \ -@@ -192,7 +192,7 @@ distdir: $(DISTFILES) vignettes - || ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \ - || cp -p $(srcdir)/$${f} $(distdir)/$${f}; \ - done -- @for f in NEWS NEWS.pdf $(NON_SVN_INSTFILES) ; do \ -+ @for f in NEWS $(NON_SVN_INSTFILES) ; do \ - cp -p $${f} $(distdir)/$${f}; \ - done - @for d in $(SUBDIRS); do \ -@@ -210,16 +210,8 @@ distdir: $(DISTFILES) vignettes - done - @for d in grid parallel utils; do \ - mkdir -p $(distdir)/src/library/$${d}/inst/doc; \ -- cp library/$${d}/doc/*.pdf $(distdir)/src/library/$${d}/inst/doc; \ +--- Makefile.in.orig Fri May 2 11:06:24 2014 ++++ Makefile.in Fri May 2 11:08:33 2014 +@@ -214,13 +214,6 @@ distdir: $(DISTFILES) vignettes done @(cd $(distdir); tools/link-recommended) -- + -info pdf: - -@(cd doc && $(MAKE) $@) -install-info install-pdf: - -@(cd doc/manual && $(MAKE) $@) -uninstall-info uninstall-pdf: - -@(cd doc/manual && $(MAKE) $@) - +- install-tests: -@(cd tests && $(MAKE) $@) + -@(cd src/library && $(MAKE) $@) Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/math/R/patches/patch-configure,v retrieving revision 1.18 diff -u -p -u -r1.18 patch-configure --- patches/patch-configure 12 Mar 2014 11:04:41 -0000 1.18 +++ patches/patch-configure 2 May 2014 20:57:15 -0000 @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.18 2014/03/12 11:04:41 dcoppa Exp $ +$OpenBSD$ Use GNU readline instead of our base readline @@ -8,15 +8,13 @@ Fix "--export-dynamic" linker flag Fix linking with external libintl ---- configure.orig Thu Feb 27 00:06:14 2014 -+++ configure Wed Mar 12 10:01:47 2014 -@@ -20842,13 +20842,13 @@ done - LIBS= +--- configure.orig Fri May 2 11:10:27 2014 ++++ configure Fri May 2 11:20:00 2014 +@@ -20899,12 +20899,12 @@ done ## don't use the cached value as we need to rebuild LIBS unset ac_cv_lib_readline_rl_callback_read_char -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5 -$as_echo_n "checking for rl_callback_read_char in -lreadline... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lereadline" >&5 +$as_echo_n "checking for rl_callback_read_char in -lereadline... " >&6; } if ${ac_cv_lib_readline_rl_callback_read_char+:} false; then : $as_echo_n "(cached) " >&6 @@ -27,7 +25,7 @@ Fix linking with external libintl cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -20883,7 +20883,7 @@ if test "x$ac_cv_lib_readline_rl_callback_read_char" = +@@ -20939,7 +20939,7 @@ if test "x$ac_cv_lib_readline_rl_callback_read_char" = #define HAVE_LIBREADLINE 1 _ACEOF @@ -36,7 +34,7 @@ Fix linking with external libintl fi -@@ -21010,13 +21010,13 @@ fi +@@ -21066,13 +21066,13 @@ fi fi @@ -53,7 +51,7 @@ Fix linking with external libintl cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -21051,7 +21051,7 @@ if test "x$ac_cv_lib_readline_rl_callback_read_char" = +@@ -21107,7 +21107,7 @@ if test "x$ac_cv_lib_readline_rl_callback_read_char" = #define HAVE_LIBREADLINE 1 _ACEOF @@ -62,7 +60,7 @@ Fix linking with external libintl fi -@@ -26183,7 +26183,7 @@ if test "${GCC}" = yes; then +@@ -26240,7 +26240,7 @@ if test "${GCC}" = yes; then ## has 32k and so can use -fpic. ## However, although the gcc docs do not mention it, it seems s390/s390x ## also supports and needs -fPIC @@ -71,7 +69,7 @@ Fix linking with external libintl cpicflags="-fPIC" ;; *) -@@ -26194,7 +26194,7 @@ if test "${GCC}" = yes; then +@@ -26251,7 +26251,7 @@ if test "${GCC}" = yes; then fi if test "${G77}" = yes; then case "${host_cpu}" in @@ -80,7 +78,7 @@ Fix linking with external libintl fpicflags="-fPIC" ;; *) -@@ -26204,7 +26204,7 @@ if test "${G77}" = yes; then +@@ -26261,7 +26261,7 @@ if test "${G77}" = yes; then fi if test "${GXX}" = yes; then case "${host_cpu}" in @@ -89,7 +87,7 @@ Fix linking with external libintl cxxpicflags="-fPIC" ;; *) -@@ -26460,7 +26460,7 @@ $as_echo "$as_me: WARNING: Use of flat namespace is re +@@ -26517,7 +26517,7 @@ $as_echo "$as_me: WARNING: Use of flat namespace is re openbsd*) ## looks like ${wl} is not defined here. Perhaps in libtool code? if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then @@ -98,7 +96,7 @@ Fix linking with external libintl shlib_ldflags="-shared -fPIC" fi ;; -@@ -26663,13 +26663,6 @@ case "${host_os}" in +@@ -26720,13 +26720,6 @@ case "${host_os}" in LAPACK_LDFLAGS="+s" fi ;; @@ -112,7 +110,7 @@ Fix linking with external libintl esac if test -z "${DYLIB_LD}"; then -@@ -38081,7 +38074,7 @@ fi +@@ -38731,7 +38724,7 @@ fi ## use this to pick out gfortran (even though it is unreliable). if test "${ac_cv_fc_compiler_gnu}" = yes; then case "${host_cpu}" in @@ -121,16 +119,16 @@ Fix linking with external libintl fcpicflags="-fPIC" ;; *) -@@ -41835,7 +41828,7 @@ else +@@ -42485,7 +42478,7 @@ else gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" -+ LIBS="$LIBS $LTLIBINTL" ++ LIBS="$LIBS $LTLIBINTL" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> -@@ -41992,8 +41985,8 @@ $as_echo "$gt_source" >&6; } +@@ -42642,8 +42635,8 @@ $as_echo "$gt_source" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 $as_echo_n "checking how to link with libintl... " >&6; } Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-doc_Makefile_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 12 Mar 2014 11:04:41 -0000 1.2 +++ patches/patch-doc_Makefile_in 2 May 2014 20:57:15 -0000 @@ -1,19 +1,30 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.2 2014/03/12 11:04:41 dcoppa Exp $ +$OpenBSD$ Do not build PDF versions of the R manuals ---- doc/Makefile.in.orig Sat Jan 11 00:05:02 2014 -+++ doc/Makefile.in Wed Mar 12 10:10:05 2014 -@@ -35,7 +35,7 @@ R: Makefile svnonly +--- doc/Makefile.in.orig Fri May 2 11:20:17 2014 ++++ doc/Makefile.in Fri May 2 11:22:45 2014 +@@ -15,8 +15,8 @@ INSTFILES = AUTHORS COPYING COPYRIGHTS CRAN_mirrors.cs + KEYWORDS KEYWORDS.db THANKS NEWS.0 NEWS.1 NEWS.2 + DISTFILES = Makefile.in Makefile.win $(INSTFILES) R.aux Rscript.1 \ + NEWS.Rd NEWS.2.Rd +-INSTFILES2 = NEWS.rds NEWS NEWS.pdf +-NON_SVN_INSTFILES = FAQ RESOURCES NEWS NEWS.pdf ++INSTFILES2 = NEWS.rds NEWS ++NON_SVN_INSTFILES = FAQ RESOURCES NEWS + ## generated later. + SUBDIRS = html manual + +@@ -36,7 +36,7 @@ R: Makefile svnonly $(MAKE) rdocdir=$(top_builddir)/doc install-sources; \ fi --docs: R.1 NEWS.rds ../NEWS html/NEWS.html ../NEWS.pdf -+docs: R.1 NEWS.rds ../NEWS html/NEWS.html +-docs: R.1 NEWS.rds NEWS html/NEWS.html NEWS.pdf ++docs: R.1 NEWS.rds NEWS html/NEWS.html @(cd manual && $(MAKE) $@) R.1: -@@ -53,21 +53,9 @@ NEWS.rds: $(srcdir)/NEWS.Rd +@@ -54,20 +54,8 @@ NEWS: NEWS.rds html/NEWS.html: NEWS.rds @$(ECHO) 'options(warn=1);tools:::Rd2HTML_NEWS_in_Rd("NEWS.rds", "html/NEWS.html")' | $(R_EXE) @@ -21,22 +32,21 @@ Do not build PDF versions of the R manua -## needs pdflatex (and more) -## Need LC_COLLATE to work around the misuse of [A-z] in texi2dvi 1.135 -## (as reported by MM) --../NEWS.pdf: NEWS.rds +-NEWS.pdf: NEWS.rds - @if test -z "$(PDFLATEX)"; then \ - $(ECHO) "'pdflatex' is needed to make NEWS.pdf but is missing on your system."; \ - else \ - $(ECHO) "creating NEWS.pdf"; \ -- $(ECHO) 'options(warn=1);tools:::Rd2pdf_NEWS_in_Rd("NEWS.rds", "../NEWS.pdf")' | LC_COLLATE=C $(R_EXE); \ +- $(ECHO) 'options(warn=1);tools:::Rd2pdf_NEWS_in_Rd("NEWS.rds", "NEWS.pdf")' | LC_COLLATE=C $(R_EXE); \ - fi - ## NEWS.2.html ships as doc/html/NEWS.2.html in the sources. - ## This target allows it to be regenerated if necessary. -docs2: NEWS.2.rds NEWS.2.html NEWS.2.pdf +docs2: NEWS.2.rds NEWS.2.html NEWS.2.rds: $(srcdir)/NEWS.2.Rd @$(ECHO) "options(warn=1);saveRDS(tools:::prepare_Rd(tools::parse_Rd(\"$(srcdir)/NEWS.2.Rd\"), stages = 'install'), 'NEWS.2.rds')" | $(R_EXE) -@@ -76,15 +64,6 @@ NEWS.2.html: NEWS.2.rds +@@ -81,15 +69,6 @@ NEWS.2.html: NEWS.2.rds @$(ECHO) "creating NEWS.2.html" @$(ECHO) 'options(warn=1);tools:::Rd2HTML_NEWS_in_Rd("NEWS.2.rds", "NEWS.2.html")' | $(R_EXE) @@ -52,7 +62,7 @@ Do not build PDF versions of the R manua install: install-message installdirs install-sources install-sources2 install-man @for d in $(SUBDIRS); do \ (cd $${d} && $(MAKE) $@) || exit 1; \ -@@ -127,9 +106,6 @@ uninstall: +@@ -132,9 +111,6 @@ uninstall: || $(ECHO) " subdir $(DESTDIR)$(subdir) not removed"; \ fi @rm -f $(DESTDIR)$(mandir)/man1/R.1 $(DESTDIR)$(mandir)/man1/Rscript.1 Index: patches/patch-etc_Makeconf_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-etc_Makeconf_in,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-etc_Makeconf_in --- patches/patch-etc_Makeconf_in 12 Mar 2014 11:04:41 -0000 1.2 +++ patches/patch-etc_Makeconf_in 2 May 2014 20:57:15 -0000 @@ -1,10 +1,10 @@ -$OpenBSD: patch-etc_Makeconf_in,v 1.2 2014/03/12 11:04:41 dcoppa Exp $ ---- etc/Makeconf.in.orig Tue Mar 19 00:05:09 2013 -+++ etc/Makeconf.in Mon May 27 14:00:25 2013 -@@ -22,7 +22,6 @@ CXX = @CXX@ - CXXCPP = @CXXCPP0@ - CXXFLAGS = @CXXFLAGS@ $(LTO) - CXXPICFLAGS = @CXXPICFLAGS@ +$OpenBSD$ +--- etc/Makeconf.in.orig Fri May 2 11:24:27 2014 ++++ etc/Makeconf.in Fri May 2 11:24:39 2014 +@@ -26,7 +26,6 @@ CXX1X = @CXX1X@ + CXX1XFLAGS = @CXX1XFLAGS@ + CXX1XPICFLAGS = @CXX1XPICFLAGS@ + CXX1XSTD = @CXX1XSTD@ -DYLIB_EXT = @DYLIB_EXT@ DYLIB_LD = @DYLIB_LD@ DYLIB_LDFLAGS = @DYLIB_LDFLAGS@@BUILD_LTO_TRUE@ $(CFLAGS) $(CPICFLAGS) Index: patches/patch-src_appl_Makefile_in =================================================================== RCS file: patches/patch-src_appl_Makefile_in diff -N patches/patch-src_appl_Makefile_in --- patches/patch-src_appl_Makefile_in 12 Mar 2014 11:04:41 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_appl_Makefile_in,v 1.3 2014/03/12 11:04:41 dcoppa Exp $ ---- src/appl/Makefile.in.orig Fri Sep 27 00:05:07 2013 -+++ src/appl/Makefile.in Wed Mar 12 10:01:47 2014 -@@ -31,7 +31,7 @@ DISTFILES = \ - @WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(ALL_CFLAGS_LO) - @WANT_R_SHLIB_TRUE@ALL_FFLAGS = $(ALL_FFLAGS_LO) - --Rblas_la = libRblas$(DYLIB_EXT) -+Rblas_la = libRblas.so.$(LIBRblas_VERSION) - Rblas_la_LIBADD = @DYLIB_UNDEFINED_ALLOWED_FALSE@ -flat_namespace -undefined suppress - - all: R Index: patches/patch-src_extra_blas_Makefile_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_extra_blas_Makefile_in,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-src_extra_blas_Makefile_in --- patches/patch-src_extra_blas_Makefile_in 11 Mar 2009 08:21:33 -0000 1.1 +++ patches/patch-src_extra_blas_Makefile_in 2 May 2014 20:57:15 -0000 @@ -1,11 +1,11 @@ -$OpenBSD: patch-src_extra_blas_Makefile_in,v 1.1 2009/03/11 08:21:33 sthen Exp $ ---- src/extra/blas/Makefile.in.orig Wed Mar 11 01:06:21 2009 -+++ src/extra/blas/Makefile.in Wed Mar 11 01:06:58 2009 -@@ -10,6 +10,7 @@ subdir = src/extra/blas - R_HOME = $(top_builddir) +$OpenBSD$ +--- src/extra/blas/Makefile.in.orig Fri May 2 19:22:49 2014 ++++ src/extra/blas/Makefile.in Fri May 2 19:24:32 2014 +@@ -16,6 +16,7 @@ ALL_FFLAGS = $(ALL_FFLAGS_LO) - include $(top_builddir)/Makeconf -+DYLIB_EXT=.so.$(LIBRblas_VERSION) + SOURCES = blas00.c blas.f cmplxblas.f - ALL_CFLAGS = $(ALL_CFLAGS_LO) - ALL_FFLAGS = $(ALL_FFLAGS_LO) ++DYLIB_EXT=.so.$(LIBRblas_VERSION) + Rblas_la = libRblas$(DYLIB_EXT) + ## @RBLAS_LDFLAGS@ is used on Mac OS X + ## first for internal BLAS Index: patches/patch-src_include_R_ext_eventloop_h =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_include_R_ext_eventloop_h,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-src_include_R_ext_eventloop_h --- patches/patch-src_include_R_ext_eventloop_h 29 Oct 2012 11:07:29 -0000 1.3 +++ patches/patch-src_include_R_ext_eventloop_h 2 May 2014 20:57:15 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_include_R_ext_eventloop_h,v 1.3 2012/10/29 11:07:29 dcoppa Exp $ ---- src/include/R_ext/eventloop.h.orig Wed Aug 15 00:05:06 2012 -+++ src/include/R_ext/eventloop.h Fri Oct 26 10:05:45 2012 +$OpenBSD$ +--- src/include/R_ext/eventloop.h.orig Fri May 2 11:26:26 2014 ++++ src/include/R_ext/eventloop.h Fri May 2 11:26:56 2014 @@ -33,6 +33,7 @@ #endif /* NOTE: Needed at least on FreeBSD so that fd_set is defined. */ Index: patches/patch-src_main_CommandLineArgs_c =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_main_CommandLineArgs_c,v retrieving revision 1.7 diff -u -p -u -r1.7 patch-src_main_CommandLineArgs_c --- patches/patch-src_main_CommandLineArgs_c 29 Oct 2012 11:07:29 -0000 1.7 +++ patches/patch-src_main_CommandLineArgs_c 2 May 2014 20:57:15 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_main_CommandLineArgs_c,v 1.7 2012/10/29 11:07:29 dcoppa Exp $ ---- src/main/CommandLineArgs.c.orig Tue Aug 28 00:05:06 2012 -+++ src/main/CommandLineArgs.c Fri Oct 26 10:05:45 2012 +$OpenBSD$ +--- src/main/CommandLineArgs.c.orig Fri May 2 11:27:47 2014 ++++ src/main/CommandLineArgs.c Fri May 2 11:28:56 2014 @@ -191,7 +191,7 @@ R_common_command_line(int *pac, char **argv, Rstart Rp !strcmp(*av, "-V") || !strcmp(*av, "-n") || Index: patches/patch-src_main_Makefile_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_main_Makefile_in,v retrieving revision 1.7 diff -u -p -u -r1.7 patch-src_main_Makefile_in --- patches/patch-src_main_Makefile_in 12 Mar 2014 11:04:41 -0000 1.7 +++ patches/patch-src_main_Makefile_in 2 May 2014 20:57:15 -0000 @@ -1,19 +1,8 @@ -$OpenBSD: patch-src_main_Makefile_in,v 1.7 2014/03/12 11:04:41 dcoppa Exp $ - -Fix linking with external libintl - ---- src/main/Makefile.in.orig Wed Mar 6 00:02:40 2013 -+++ src/main/Makefile.in Mon May 27 14:00:25 2013 -@@ -11,6 +11,7 @@ subdir = src/main - R_HOME=$(top_builddir) - - include $(top_builddir)/Makeconf -+DYLIB_EXT=.so.$(LIBR_VERSION) - - SOURCES_C = \ - CommandLineArgs.c \ -@@ -95,7 +96,7 @@ EXTRA_STATIC_LIBS = \ - $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL) +$OpenBSD$ +--- src/main/Makefile.in.orig Thu Mar 13 00:03:13 2014 ++++ src/main/Makefile.in Fri May 2 17:53:30 2014 +@@ -98,7 +98,7 @@ EXTRA_STATIC_LIBS = \ + $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL) $(R_TZONE) STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS) -EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS) @@ -21,3 +10,11 @@ Fix linking with external libintl R_binary = R.bin R_bin_OBJECTS = Rmain.o @WANT_R_SHLIB_FALSE@$(OBJECTS) +@@ -107,6 +107,7 @@ R_bin_OBJECTS = Rmain.o @WANT_R_SHLIB_FALSE@$(OBJECTS) + @WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ -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 + ++DYLIB_EXT=.so.$(LIBR_VERSION) + libR_la = libR$(DYLIB_EXT) + libR_la_OBJECTS = $(OBJECTS) + libR_la_LIBADD = $(MAIN_OBJS) $(EXTRA_STATIC_LIBS) $(EXTRA_LIBS) @WANT_R_SHLIB_TRUE@ @USE_EXPORTFILES_TRUE@ -Wl,-bE:$(top_builddir)/etc/R.exp Index: patches/patch-src_main_connections_c =================================================================== RCS file: patches/patch-src_main_connections_c diff -N patches/patch-src_main_connections_c --- patches/patch-src_main_connections_c 12 Mar 2014 11:04:41 -0000 1.12 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_main_connections_c,v 1.12 2014/03/12 11:04:41 dcoppa Exp $ ---- src/main/connections.c.orig Thu Feb 20 00:05:04 2014 -+++ src/main/connections.c Wed Mar 12 10:01:47 2014 -@@ -2675,7 +2675,7 @@ static int text_vfprintf(Rconnection con, const char * - b = R_alloc(res + already + 1, sizeof(char)); - strcpy(b, this->lastline); - p = b + already; -- vsprintf(p, format, ap); -+ vsnprintf(p, res + already + 1, format, ap); - } else if(res < 0) { /* just a failure indication */ - #define NBUFSIZE (already + 100*BUFSIZE) - vmax = vmaxget(); -@@ -4928,7 +4928,8 @@ static Rboolean gzcon_open(Rconnection con) - - if(con->canread) { - /* read header */ -- char c, ccc, method, flags, dummy[6]; -+ signed char c; -+ char ccc, method, flags, dummy[6]; - unsigned char head[2]; - uInt len; - Index: patches/patch-src_main_gram_y =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_main_gram_y,v retrieving revision 1.8 diff -u -p -u -r1.8 patch-src_main_gram_y --- patches/patch-src_main_gram_y 12 Mar 2014 11:04:41 -0000 1.8 +++ patches/patch-src_main_gram_y 2 May 2014 20:57:15 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_main_gram_y,v 1.8 2014/03/12 11:04:41 dcoppa Exp $ ---- src/main/gram.y.orig Wed Mar 6 00:02:40 2013 -+++ src/main/gram.y Mon May 27 14:00:25 2013 -@@ -204,7 +204,7 @@ static PROTECT_INDEX srindex; +$OpenBSD$ +--- src/main/gram.y.orig Fri May 2 11:46:48 2014 ++++ src/main/gram.y Fri May 2 11:47:10 2014 +@@ -205,7 +205,7 @@ static PROTECT_INDEX srindex; static int mbcs_get_next(int c, wchar_t *wc) { Index: patches/patch-src_main_main_c =================================================================== RCS file: patches/patch-src_main_main_c diff -N patches/patch-src_main_main_c --- patches/patch-src_main_main_c 12 Mar 2014 11:04:41 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_main_main_c,v 1.6 2014/03/12 11:04:41 dcoppa Exp $ - -OpenBSD always returns EINVAL when trying to disable an active stack - ---- src/main/main.c.orig Tue Jul 16 00:05:04 2013 -+++ src/main/main.c Tue Feb 4 09:15:53 2014 -@@ -28,6 +28,8 @@ - #include <ctype.h> - #include <stdlib.h> - #include <string.h> -+#include <errno.h> -+#include <sys/errno.h> - - #define __MAIN__ - #define R_USE_SIGNALS 1 -@@ -619,7 +621,8 @@ static void init_signal_handlers(void) - sigstk.ss_size = SIGSTKSZ + R_USAGE; - sigstk.ss_flags = 0; - if(sigaltstack(&sigstk, NULL) < 0) -- warning("failed to set alternate signal stack"); -+ if (errno != EINVAL) /* OpenBSD always returns EINVAL */ -+ warning("failed to set alternate signal stack"); - } else - warning("failed to allocate alternate signal stack"); - sa.sa_sigaction = sigactionSegv; Index: patches/patch-src_main_platform_c =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_main_platform_c,v retrieving revision 1.7 diff -u -p -u -r1.7 patch-src_main_platform_c --- patches/patch-src_main_platform_c 12 Mar 2014 11:04:41 -0000 1.7 +++ patches/patch-src_main_platform_c 2 May 2014 20:57:15 -0000 @@ -1,18 +1,16 @@ -$OpenBSD: patch-src_main_platform_c,v 1.7 2014/03/12 11:04:41 dcoppa Exp $ +$OpenBSD$ Allow building with USE_SYSTRACE=Yes ---- src/main/platform.c.orig Thu Jan 16 00:05:05 2014 -+++ src/main/platform.c Wed Mar 12 10:01:47 2014 -@@ -2153,18 +2153,24 @@ SEXP attribute_hidden do_dircreate(SEXP call, SEXP op, - +--- src/main/platform.c.orig Fri May 2 11:47:39 2014 ++++ src/main/platform.c Fri May 2 11:50:07 2014 +@@ -2147,17 +2147,22 @@ SEXP attribute_hidden do_dircreate(SEXP call, SEXP op, /* Solaris 10 returns ENOSYS on automount, PR#13834 EROFS is allowed by POSIX, so we skip that too */ -+ /* EPERM added for systrace builds */ serrno = errno; - if (res && serrno != EEXIST && serrno != ENOSYS && serrno != EROFS) + if (res && serrno != EEXIST && serrno != ENOSYS && -+ serrno != EROFS && serrno != EPERM) ++ serrno != EROFS && serrno != EPERM) goto end; *p = '/'; } Index: patches/patch-src_modules_lapack_Makefile_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_modules_lapack_Makefile_in,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-src_modules_lapack_Makefile_in --- patches/patch-src_modules_lapack_Makefile_in 4 Jul 2012 12:38:06 -0000 1.3 +++ patches/patch-src_modules_lapack_Makefile_in 2 May 2014 20:57:15 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_modules_lapack_Makefile_in,v 1.3 2012/07/04 12:38:06 dcoppa Exp $ ---- src/modules/lapack/Makefile.in.orig Fri Jun 22 09:56:42 2012 -+++ src/modules/lapack/Makefile.in Fri Jun 22 09:57:47 2012 +$OpenBSD$ +--- src/modules/lapack/Makefile.in.orig Fri May 2 11:50:32 2014 ++++ src/modules/lapack/Makefile.in Fri May 2 11:50:55 2014 @@ -10,6 +10,7 @@ subdir = src/modules/lapack R_HOME = $(top_builddir) Index: patches/patch-src_nmath_standalone_Makefile_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_nmath_standalone_Makefile_in,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-src_nmath_standalone_Makefile_in --- patches/patch-src_nmath_standalone_Makefile_in 4 Jul 2012 12:38:06 -0000 1.1 +++ patches/patch-src_nmath_standalone_Makefile_in 2 May 2014 20:57:15 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_nmath_standalone_Makefile_in,v 1.1 2012/07/04 12:38:06 dcoppa Exp $ ---- src/nmath/standalone/Makefile.in.orig Thu Jun 28 13:19:58 2012 -+++ src/nmath/standalone/Makefile.in Thu Jun 28 13:21:05 2012 +$OpenBSD$ +--- src/nmath/standalone/Makefile.in.orig Fri May 2 11:51:17 2014 ++++ src/nmath/standalone/Makefile.in Fri May 2 11:51:34 2014 @@ -9,6 +9,7 @@ top_builddir = ../../.. subdir = src/nmath/standalone Index: patches/patch-src_scripts_config =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_scripts_config,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-src_scripts_config --- patches/patch-src_scripts_config 12 Mar 2014 11:04:41 -0000 1.2 +++ patches/patch-src_scripts_config 2 May 2014 20:57:15 -0000 @@ -1,18 +1,18 @@ -$OpenBSD: patch-src_scripts_config,v 1.2 2014/03/12 11:04:41 dcoppa Exp $ ---- src/scripts/config.orig Sun Jun 2 00:05:05 2013 -+++ src/scripts/config Mon Feb 10 13:11:12 2014 -@@ -58,7 +58,6 @@ Variables: - CXXFLAGS C++ compiler flags - CXXPICFLAGS special flags for compiling C++ code to be turned into a - shared library +$OpenBSD$ +--- src/scripts/config.orig Fri May 2 11:52:04 2014 ++++ src/scripts/config Fri May 2 11:52:40 2014 +@@ -64,7 +64,6 @@ Variables: + CXX1XXPICFLAGS + special flags for compiling C++11 code to be turned into + a shared library - DYLIB_EXT file extension (including '.') for dynamic libraries DYLIB_LD command for linking dynamic libraries which contain object files from a C or Fortran compiler only DYLIB_LDFLAGS -@@ -233,7 +232,7 @@ query="${MAKE} -s ${makefiles} print R_HOME=${R_HOME}" +@@ -243,7 +242,7 @@ query="${MAKE} -s ${makefiles} print R_HOME=${R_HOME}" ok_c_vars="CC CFLAGS CPICFLAGS CPP CPPFLAGS" - ok_cxx_vars="CXX CXXCPP CXXFLAGS CXXPICFLAGS" + ok_cxx_vars="CXX CXXCPP CXXFLAGS CXXPICFLAGS CXX1X CXX1XSTD CXX1XFLAGS CXX1XPICFLAGS" -ok_dylib_vars="DYLIB_EXT DYLIB_LD DYLIB_LDFLAGS" +ok_dylib_vars="DYLIB_LD DYLIB_LDFLAGS" ok_objc_vars="OBJC OBJCFLAGS" Index: patches/patch-src_scripts_javareconf_in =================================================================== RCS file: /cvs/ports/math/R/patches/patch-src_scripts_javareconf_in,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-src_scripts_javareconf_in --- patches/patch-src_scripts_javareconf_in 12 Mar 2014 11:04:41 -0000 1.1 +++ patches/patch-src_scripts_javareconf_in 2 May 2014 20:57:15 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_scripts_javareconf_in,v 1.1 2014/03/12 11:04:41 dcoppa Exp $ ---- src/scripts/javareconf.in.orig Mon Sep 9 00:05:04 2013 -+++ src/scripts/javareconf.in Tue Feb 4 09:19:17 2014 +$OpenBSD$ +--- src/scripts/javareconf.in.orig Fri May 2 11:53:06 2014 ++++ src/scripts/javareconf.in Fri May 2 11:55:35 2014 @@ -6,7 +6,7 @@ fi ## pick up configure-time settings . "${R_HOME}/etc${R_ARCH}/javaconf" @@ -9,8 +9,8 @@ $OpenBSD: patch-src_scripts_javareconf_i +SHLIB_EXT=`${R_HOME}/bin/R CMD config SHLIB_EXT` tools_classpath=${R_SHARE_DIR}/java - revision='$Rev: 63872 $' -@@ -218,29 +218,17 @@ if test "${JAVA_LIBS}" = "~autodetect~"; then + revision='$Rev: 63871 $' +@@ -218,30 +218,18 @@ if test "${JAVA_LIBS}" = "~autodetect~"; then LD_LIBRARY_PATH= export LD_LIBRARY_PATH # remove trailing/leading : (if any) @@ -29,17 +29,17 @@ $OpenBSD: patch-src_scripts_javareconf_i - # Then try some heuristics using sun.boot.library.path - if test ${has_libjvm} = no; then - boot_path=`"$JAVA" -classpath "${tools_classpath}" getsp sun.boot.library.path| ${SED-sed} -e 's/:$//' -e 's/^://'` -- if test -n "${boot_path}"; then -+ if test -n "${boot_path}"; then + if test -n "${boot_path}"; then for dir in "${boot_path}" "${boot_path}/client" "${boot_path}/server"; do - if test -f "$dir/libjvm${DYLIB_EXT}"; then -+ if test -f "$dir/libjvm${SHLIB_EXT}"; then ++ if test -f "$dir/libjvm${SHLIB_EXT}"; then has_libjvm=yes java_library_path="${dir}" break fi done -- fi - fi + fi +- fi IFS=${save_IFS} # replace occurrences of JAVA_HOME with $(JAVA_HOME) + # If JAVA_HOME was a link, it will be the canonical path we Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/math/R/pkg/PLIST,v retrieving revision 1.21 diff -u -p -u -r1.21 PLIST --- pkg/PLIST 12 Mar 2014 11:04:41 -0000 1.21 +++ pkg/PLIST 2 May 2014 20:57:16 -0000 @@ -1,12 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.21 2014/03/12 11:04:41 dcoppa Exp $ +@comment $OpenBSD$ bin/R @bin bin/Rscript lib/R/ lib/R/COPYING -lib/R/NEWS -lib/R/NEWS.0 -lib/R/NEWS.1 -lib/R/NEWS.2 lib/R/SVN-REVISION lib/R/bin/ lib/R/bin/BATCH @@ -43,6 +39,10 @@ lib/R/doc/CRAN_mirrors.csv lib/R/doc/FAQ lib/R/doc/KEYWORDS lib/R/doc/KEYWORDS.db +lib/R/doc/NEWS +lib/R/doc/NEWS.0 +lib/R/doc/NEWS.1 +lib/R/doc/NEWS.2 lib/R/doc/NEWS.rds lib/R/doc/RESOURCES lib/R/doc/THANKS @@ -99,6 +99,7 @@ lib/R/include/R_ext/Error.h lib/R/include/R_ext/GetX11Image.h lib/R/include/R_ext/GraphicsDevice.h lib/R/include/R_ext/GraphicsEngine.h +lib/R/include/R_ext/Itermacros.h lib/R/include/R_ext/Lapack.h lib/R/include/R_ext/Linpack.h lib/R/include/R_ext/MathThreads.h @@ -110,6 +111,7 @@ lib/R/include/R_ext/QuartzDevice.h lib/R/include/R_ext/R-ftp-http.h lib/R/include/R_ext/RS.h lib/R/include/R_ext/RStartup.h +lib/R/include/R_ext/Rallocators.h lib/R/include/R_ext/Random.h lib/R/include/R_ext/Rdynload.h lib/R/include/R_ext/Riconv.h @@ -171,6 +173,9 @@ lib/R/library/KernSmooth/po/de/LC_MESSAG lib/R/library/KernSmooth/po/en@quot/ lib/R/library/KernSmooth/po/en@quot/LC_MESSAGES/ lib/R/library/KernSmooth/po/en@quot/LC_MESSAGES/R-KernSmooth.mo +lib/R/library/KernSmooth/po/fr/ +lib/R/library/KernSmooth/po/fr/LC_MESSAGES/ +lib/R/library/KernSmooth/po/fr/LC_MESSAGES/R-KernSmooth.mo lib/R/library/KernSmooth/po/ko/ lib/R/library/KernSmooth/po/ko/LC_MESSAGES/ lib/R/library/KernSmooth/po/ko/LC_MESSAGES/R-KernSmooth.mo @@ -595,6 +600,9 @@ lib/R/library/Matrix/po/en@quot/ lib/R/library/Matrix/po/en@quot/LC_MESSAGES/ lib/R/library/Matrix/po/en@quot/LC_MESSAGES/Matrix.mo lib/R/library/Matrix/po/en@quot/LC_MESSAGES/R-Matrix.mo +lib/R/library/Matrix/po/fr/ +lib/R/library/Matrix/po/fr/LC_MESSAGES/ +lib/R/library/Matrix/po/fr/LC_MESSAGES/R-Matrix.mo lib/R/library/Matrix/po/pl/ lib/R/library/Matrix/po/pl/LC_MESSAGES/ lib/R/library/Matrix/po/pl/LC_MESSAGES/Matrix.mo @@ -782,6 +790,7 @@ lib/R/library/base/html/difftime.html lib/R/library/base/html/dim.html lib/R/library/base/html/dimnames.html lib/R/library/base/html/do.call.html +lib/R/library/base/html/dontCheck.html lib/R/library/base/html/double.html lib/R/library/base/html/dput.html lib/R/library/base/html/drop.html @@ -1062,6 +1071,7 @@ lib/R/library/boot/R/ lib/R/library/boot/R/boot lib/R/library/boot/R/boot.rdb lib/R/library/boot/R/boot.rdx +lib/R/library/boot/bd.q lib/R/library/boot/data/ lib/R/library/boot/data/Rdata.rdb lib/R/library/boot/data/Rdata.rds @@ -1332,6 +1342,10 @@ lib/R/library/cluster/po/de/LC_MESSAGES/ lib/R/library/cluster/po/en@quot/ lib/R/library/cluster/po/en@quot/LC_MESSAGES/ lib/R/library/cluster/po/en@quot/LC_MESSAGES/R-cluster.mo +lib/R/library/cluster/po/en@quot/LC_MESSAGES/cluster.mo +lib/R/library/cluster/po/fr/ +lib/R/library/cluster/po/fr/LC_MESSAGES/ +lib/R/library/cluster/po/fr/LC_MESSAGES/R-cluster.mo lib/R/library/cluster/po/pl/ lib/R/library/cluster/po/pl/LC_MESSAGES/ lib/R/library/cluster/po/pl/LC_MESSAGES/R-cluster.mo @@ -1577,6 +1591,10 @@ lib/R/library/grDevices/R/grDevices lib/R/library/grDevices/R/grDevices.rdb lib/R/library/grDevices/R/grDevices.rdx lib/R/library/grDevices/afm/ +lib/R/library/grDevices/afm/ArialMT-Bold.afm.gz +lib/R/library/grDevices/afm/ArialMT-BoldItalic.afm.gz +lib/R/library/grDevices/afm/ArialMT-Italic.afm.gz +lib/R/library/grDevices/afm/ArialMT.afm.gz lib/R/library/grDevices/afm/CM_boldx_10.afm.gz lib/R/library/grDevices/afm/CM_boldx_italic_10.afm.gz lib/R/library/grDevices/afm/CM_italic_10.afm.gz @@ -1728,7 +1746,6 @@ lib/R/library/grDevices/html/devAskNewPa lib/R/library/grDevices/html/embedFonts.html lib/R/library/grDevices/html/extendrange.html lib/R/library/grDevices/html/getGraphicsEvent.html -lib/R/library/grDevices/html/grDevices-defunct.html lib/R/library/grDevices/html/grDevices-package.html lib/R/library/grDevices/html/gray.colors.html lib/R/library/grDevices/html/gray.html @@ -1895,6 +1912,7 @@ lib/R/library/grid/R/grid lib/R/library/grid/R/grid.rdb lib/R/library/grid/R/grid.rdx lib/R/library/grid/doc/ +lib/R/library/grid/doc/DivByZero.txt lib/R/library/grid/doc/changes.txt lib/R/library/grid/doc/displaylist.pdf lib/R/library/grid/doc/frame.pdf @@ -1922,25 +1940,25 @@ lib/R/library/grid/html/R.css lib/R/library/grid/html/absolute.size.html lib/R/library/grid/html/arrow.html lib/R/library/grid/html/calcStringMetric.html -lib/R/library/grid/html/convertNative.html lib/R/library/grid/html/current.viewport.html lib/R/library/grid/html/dataViewport.html +lib/R/library/grid/html/depth.html lib/R/library/grid/html/drawDetails.html lib/R/library/grid/html/editDetails.html +lib/R/library/grid/html/explode.html lib/R/library/grid/html/gEdit.html lib/R/library/grid/html/gPath.html lib/R/library/grid/html/getNames.html lib/R/library/grid/html/gpar.html +lib/R/library/grid/html/grid-defunct.html lib/R/library/grid/html/grid-internal.html lib/R/library/grid/html/grid-package.html lib/R/library/grid/html/grid.DLapply.html lib/R/library/grid/html/grid.add.html -lib/R/library/grid/html/grid.arrows.html lib/R/library/grid/html/grid.bezier.html lib/R/library/grid/html/grid.cap.html lib/R/library/grid/html/grid.circle.html lib/R/library/grid/html/grid.clip.html -lib/R/library/grid/html/grid.collection.html lib/R/library/grid/html/grid.convert.html lib/R/library/grid/html/grid.copy.html lib/R/library/grid/html/grid.curve.html @@ -1953,6 +1971,7 @@ lib/R/library/grid/html/grid.frame.html lib/R/library/grid/html/grid.function.html lib/R/library/grid/html/grid.get.html lib/R/library/grid/html/grid.grab.html +lib/R/library/grid/html/grid.grep.html lib/R/library/grid/html/grid.grill.html lib/R/library/grid/html/grid.grob.html lib/R/library/grid/html/grid.layout.html @@ -1987,10 +2006,10 @@ lib/R/library/grid/html/grid.yaxis.html lib/R/library/grid/html/grobName.html lib/R/library/grid/html/grobWidth.html lib/R/library/grid/html/grobX.html +lib/R/library/grid/html/legendGrob.html lib/R/library/grid/html/makeContent.html lib/R/library/grid/html/plotViewport.html -lib/R/library/grid/html/pop.viewport.html -lib/R/library/grid/html/push.viewport.html +lib/R/library/grid/html/resolveRasterSize.html lib/R/library/grid/html/showGrob.html lib/R/library/grid/html/showViewport.html lib/R/library/grid/html/stringWidth.html @@ -2124,9 +2143,9 @@ lib/R/library/lattice/po/fr/LC_MESSAGES/ lib/R/library/lattice/po/ko/ lib/R/library/lattice/po/ko/LC_MESSAGES/ lib/R/library/lattice/po/ko/LC_MESSAGES/R-lattice.mo -lib/R/library/lattice/po/pl_PL/ -lib/R/library/lattice/po/pl_PL/LC_MESSAGES/ -lib/R/library/lattice/po/pl_PL/LC_MESSAGES/R-lattice.mo +lib/R/library/lattice/po/pl/ +lib/R/library/lattice/po/pl/LC_MESSAGES/ +lib/R/library/lattice/po/pl/LC_MESSAGES/R-lattice.mo lib/R/library/methods/ lib/R/library/methods/DESCRIPTION lib/R/library/methods/INDEX @@ -2562,7 +2581,6 @@ lib/R/library/nlme/html/lme.html lib/R/library/nlme/html/lme.lmList.html lib/R/library/nlme/html/lmeControl.html lib/R/library/nlme/html/lmeObject.html -lib/R/library/nlme/html/lmeScale.html lib/R/library/nlme/html/lmeStruct.html lib/R/library/nlme/html/logDet.corStruct.html lib/R/library/nlme/html/logDet.html @@ -3617,6 +3635,7 @@ lib/R/library/tools/html/SweaveTeXFilter lib/R/library/tools/html/add_datalist.html lib/R/library/tools/html/assertCondition.html lib/R/library/tools/html/bibstyle.html +lib/R/library/tools/html/buildVignette.html lib/R/library/tools/html/buildVignettes.html lib/R/library/tools/html/charsets.html lib/R/library/tools/html/checkFF.html @@ -3633,6 +3652,7 @@ lib/R/library/tools/html/delimMatch.html lib/R/library/tools/html/dependsOnPkgs.html lib/R/library/tools/html/encoded.html lib/R/library/tools/html/fileutils.html +lib/R/library/tools/html/find_gs_cmd.html lib/R/library/tools/html/getDepList.html lib/R/library/tools/html/getVignetteInfo.html lib/R/library/tools/html/installFoundDepends.html @@ -3647,7 +3667,6 @@ lib/R/library/tools/html/print.via.forma lib/R/library/tools/html/pskill.html lib/R/library/tools/html/psnice.html lib/R/library/tools/html/read.00Index.html -lib/R/library/tools/html/readNEWS.html lib/R/library/tools/html/showNonASCII.html lib/R/library/tools/html/startDynamicHelp.html lib/R/library/tools/html/testInstalledPackage.html @@ -3719,6 +3738,7 @@ lib/R/library/translations/de/LC_MESSAGE lib/R/library/translations/de/LC_MESSAGES/stats.mo lib/R/library/translations/de/LC_MESSAGES/tcltk.mo lib/R/library/translations/de/LC_MESSAGES/tools.mo +lib/R/library/translations/de/LC_MESSAGES/utils.mo lib/R/library/translations/en/ lib/R/library/translations/en/LC_MESSAGES/ lib/R/library/translations/en/LC_MESSAGES/R.mo @@ -4043,6 +4063,7 @@ lib/R/library/utils/html/browseURL.html lib/R/library/utils/html/browseVignettes.html lib/R/library/utils/html/bug.report.html lib/R/library/utils/html/capture.output.html +lib/R/library/utils/html/changedFiles.html lib/R/library/utils/html/chooseBioCmirror.html lib/R/library/utils/html/chooseCRANmirror.html lib/R/library/utils/html/citEntry.html @@ -4211,4 +4232,4 @@ share/texmf-local/tex/latex/omscmtt.fd share/texmf-local/tex/latex/ts1aer.fd share/texmf-local/tex/latex/ts1aett.fd @exec %D/bin/mktexlsr > /dev/null 2>&1 -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1 +@unexec-delete %D/bin/mktexlsr > /dev/null 2>&
