Update of math/R to 3.2.0 (released yesterday):
- Delete patches/patch-src_main_Rstrptime_h
This patch was processed upstream (in modified form) upon my request:
https://github.com/wch/r-source/commit/93efce2d8eb870b0554272f392d6a2343ba6ede8
- Remove PREFIX and INSTALL* in FAKE_FLAGS and MAKE_FLAGS
Builds and installs fine without.
- Remove all --with-* configure options which are true by default
- Add devel/libidn and net/curl in LIB_DEPENDS
(based on "make port-lib-depends-check")
and adapt WANTLIB accordingly
- Avoid setting ac_cv_path_TAR as it works without
- Remove non-working mirrors from MASTER_SITES
- Increase SHARED_LIBS R version number as the exported symbols changed
(checked by comparing old and new library with "nm -g").
Passes all tests and works with my personal R packages and scripts.
Tested on amd64.
Remarks:
- I have
LDFLAGS=-L/usr/local/lib
CFLAGS=-I/usr/local/include
in my .R/Makevars. This is very useful if you install packages which
need to compile some C code at installation. Should this info be
included in pkg/README?
- Moreover, I am willing to take MAINTAINERship just in case Rafael
Sadowski is no longer interested. I plan to provide updates in the
future as well as I need a current R version for my work/research.
Best regards,
Ingo
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile 13 Apr 2015 10:41:13 -0000 1.68
+++ Makefile 17 Apr 2015 15:10:48 -0000
@@ -3,10 +3,9 @@
SHARED_ONLY= Yes
COMMENT= powerful math/statistics/graphics language
-DISTNAME= R-3.1.3
-REVISION= 1
+DISTNAME= R-3.2.0
-SHARED_LIBS= R 3.0
+SHARED_LIBS= R 3.2
SHARED_LIBS+= Rlapack 31.2 # 31.2
SHARED_LIBS+= Rblas 31.2 # 31.2
@@ -18,27 +17,24 @@ MAINTAINER= Rafael Sadowski <rafael@size
# GPL
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= ICE SM X11 Xext Xmu Xss Xt bz2 c cairo \
- ereadline fontconfig freetype glib-2.0 \
- gobject-2.0 icui18n icuuc jpeg lzma m \
+WANTLIB= ICE SM X11 Xext Xmu Xss Xt bz2 c crypto curl \
+ cairo ereadline fontconfig freetype glib-2.0 \
+ gobject-2.0 icui18n icuuc idn jpeg lzma m \
ncurses pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pcre png pthread tiff z \
+ pangoft2-1.0 pcre png pthread ssl tiff z \
${MODFORTRAN_WANTLIB} ${MODTK_WANTLIB}
MASTER_SITES= http://cran.r-project.org/src/base/R-3/ \
ftp://cran.r-project.org/pub/R/src/base/R-3/ \
ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/R-3/ \
http://cran.at.r-project.org/src/base/R-3/ \
- http://cran.au.r-project.org/src/base/R-3/ \
http://cran.br.r-project.org/src/base/R-3/ \
http://cran.ch.r-project.org/src/base/R-3/ \
http://cran.dk.r-project.org/src/base/R-3/ \
http://cran.es.r-project.org/src/base/R-3/ \
- http://cran.hu.r-project.org/src/base/R-3/ \
http://cran.stat.ucla.edu/src/base/R-3/ \
http://cran.uk.r-project.org/src/base/R-3/ \
http://cran.us.r-project.org/src/base/R-3/ \
- http://cran.za.r-project.org/src/base/R-3/ \
http://lib.stat.cmu.edu/R/CRAN/src/base/R-3/ \
http://probability.ca/cran/src/base/R-3/
@@ -59,12 +55,14 @@ LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \
archivers/bzip2 \
archivers/xz \
devel/glib2 \
+ devel/libidn \
devel/pango \
devel/readline \
graphics/cairo \
graphics/jpeg \
graphics/png \
graphics/tiff \
+ net/curl \
textproc/icu4c
RUN_DEPENDS= archivers/gtar \
@@ -82,17 +80,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-BLAS-shlib \
--enable-R-shlib \
--enable-prebuilt-html \
- --with-ICU \
- --with-cairo \
- --with-jpeglib \
- --with-libpng \
- --with-libtiff \
- --with-readline \
- --with-system-bzlib \
- --with-system-pcre \
- --with-system-xz \
--with-tcl-config=${MODTCL_CONFIG} \
- --with-tcltk \
--with-tk-config=${MODTK_CONFIG}
CONFIGURE_ENV= FFLAGS="${FFLAGS}" \
@@ -100,21 +88,11 @@ CONFIGURE_ENV= FFLAGS="${FFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib/R/lib" \
LIBnn=lib \
ac_cv_path_PDFLATEX="" \
- ac_cv_path_TAR="${LOCALBASE}/bin/gtar" \
rdocdir="${PREFIX}/share/doc/R"
-MAKE_FLAGS= INSTALL_DATA='install -c -m 644' \
- INSTALL_PROGRAM='install -c -s -m 555' \
- INSTALL_SCRIPT='install -c -m 555' \
- DYLIB_EXT=".so.${LIBR_VERSION}" \
+MAKE_FLAGS= DYLIB_EXT=".so.${LIBR_VERSION}" \
Rblas_la="libRblas.so.${LIBRblas_VERSION}" \
Rlapack_la="libRlapack.so.$(LIBRlapack_VERSION)"
-
-FAKE_FLAGS= PREFIX=${PREFIX} \
- INSTALL="${INSTALL_DATA}" \
- INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}"
SEPARATE_BUILD= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/R/distinfo,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 distinfo
--- distinfo 12 Apr 2015 18:29:11 -0000 1.23
+++ distinfo 17 Apr 2015 15:10:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (R-3.1.3.tar.gz) = B+mDI5NbqjgHkgS/uUFKApcEu5wMpasxcCCuUho3cxI=
-SIZE (R-3.1.3.tar.gz) = 28942883
+SHA256 (R-3.2.0.tar.gz) = 9a6VPxi6bz1VtGVWu79zRBNQ+f0iYlQCtyOiuB/2TzU=
+SIZE (R-3.2.0.tar.gz) = 29124927
Index: patches/patch-src_main_Rstrptime_h
===================================================================
RCS file: patches/patch-src_main_Rstrptime_h
diff -N patches/patch-src_main_Rstrptime_h
--- patches/patch-src_main_Rstrptime_h 2 Sep 2014 14:55:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,160 +0,0 @@
-$OpenBSD: patch-src_main_Rstrptime_h,v 1.1 2014/09/02 14:55:37 dcoppa Exp $
-
-Fix stability/security issues.
-
---- src/main/Rstrptime.h.orig Mon Jul 14 21:49:54 2014
-+++ src/main/Rstrptime.h Mon Jul 14 22:07:08 2014
-@@ -42,6 +42,11 @@ static int locale_w_strings_set = 0;
- static void get_locale_strings(void);
- static void get_locale_w_strings(void);
-
-+#define WEEKDAY_SIZE 50
-+#define AB_WEEKDAY_SIZE 10
-+#define MONTH_SIZE 50
-+#define AB_MONTH_SIZE 10
-+#define AM_PM_SIZE 10
-
- #ifdef HAVE_STRINGS_H
- #include <strings.h> /* for strncasecmp */
-@@ -93,27 +98,27 @@ static void get_locale_w_strings(void);
- * hence the extra length of the fields.
- * Some OSes (e.g. glibc) have longer than 3-char abbreviations.
- */
--static char weekday_name[][50] =
-+static char weekday_name[][WEEKDAY_SIZE] =
- {
- "Sunday", "Monday", "Tuesday", "Wednesday",
- "Thursday", "Friday", "Saturday"
- };
--static char ab_weekday_name[][10] =
-+static char ab_weekday_name[][AB_WEEKDAY_SIZE] =
- {
- "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
- };
--static char month_name[][50] =
-+static char month_name[][MONTH_SIZE] =
- {
- "January", "February", "March", "April", "May", "June",
- "July", "August", "September", "October", "November", "December"
- };
--static char ab_month_name[][10] =
-+static char ab_month_name[][AB_MONTH_SIZE] =
- {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
-
--static char am_pm[][10] = {"AM", "PM"};
-+static char am_pm[][AM_PM_SIZE] = {"AM", "PM"};
-
-
- # define HERE_D_T_FMT "%a %b %e %H:%M:%S %Y"
-@@ -174,27 +179,27 @@ day_of_the_year (stm *tm)
- #include <wchar.h>
- #include <wctype.h>
-
--static wchar_t w_weekday_name[][50] =
-+static wchar_t w_weekday_name[][WEEKDAY_SIZE] =
- {
- L"Sunday", L"Monday", L"Tuesday", L"Wednesday",
- L"Thursday", L"Friday", L"Saturday"
- };
--static wchar_t w_ab_weekday_name[][10] =
-+static wchar_t w_ab_weekday_name[][AB_WEEKDAY_SIZE] =
- {
- L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat"
- };
--static wchar_t w_month_name[][50] =
-+static wchar_t w_month_name[][MONTH_SIZE] =
- {
- L"January", L"February", L"March", L"April", L"May", L"June",
- L"July", L"August", L"September", L"October", L"November", L"December"
- };
--static wchar_t w_ab_month_name[][10] =
-+static wchar_t w_ab_month_name[][AB_MONTH_SIZE] =
- {
- L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun",
- L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec"
- };
-
--static wchar_t w_am_pm[][10] = {L"AM", L"PM"};
-+static wchar_t w_am_pm[][AM_PM_SIZE] = {L"AM", L"PM"};
-
- /* Need case-insensitive version */
- static int Rwcsncasecmp(const wchar_t *cs1, const wchar_t *s2)
-@@ -1168,30 +1173,30 @@ static void get_locale_strings(void)
- {
- int i;
- struct tm tm;
-- char buff[4];
-+ char buff[AM_PM_SIZE];
-
- tm.tm_sec = tm.tm_min = tm.tm_hour = tm.tm_mday = tm.tm_mon
- = tm.tm_isdst = 0;
- tm.tm_year = 30;
- for(i = 0; i < 12; i++) {
- tm.tm_mon = i;
-- strftime(ab_month_name[i], 10, "%b", &tm);
-- strftime(month_name[i], 50, "%B", &tm);
-+ strftime(ab_month_name[i], AB_MONTH_SIZE, "%b", &tm);
-+ strftime(month_name[i], MONTH_SIZE, "%B", &tm);
- }
- tm.tm_mon = 0;
- for(i = 0; i < 7; i++) {
- tm.tm_mday = tm.tm_yday = i+1; /* 2000-1-2 was a Sunday */
- tm.tm_wday = i;
-- strftime(ab_weekday_name[i], 10, "%a", &tm);
-- strftime(weekday_name[i], 50, "%A", &tm);
-+ strftime(ab_weekday_name[i], AB_WEEKDAY_SIZE, "%a", &tm);
-+ strftime(weekday_name[i], WEEKDAY_SIZE, "%A", &tm);
- }
- tm.tm_hour = 1;
- /* in locales where these are unused, they may be empty:
- better not to reset them then */
-- strftime(buff, 10, "%p", &tm);
-+ strftime(buff, AM_PM_SIZE, "%p", &tm);
- if(strlen(buff)) strcpy(am_pm[0], buff);
- tm.tm_hour = 13;
-- strftime(buff, 10, "%p", &tm);
-+ strftime(buff, AM_PM_SIZE, "%p", &tm);
- if(strlen(buff)) strcpy(am_pm[1], buff);
- locale_strings_set = 1;
- }
-@@ -1201,30 +1206,30 @@ static void get_locale_w_strings(void)
- {
- int i;
- struct tm tm;
-- wchar_t buff[4];
-+ wchar_t buff[AM_PM_SIZE];
-
- tm.tm_sec = tm.tm_min = tm.tm_hour = tm.tm_mday = tm.tm_mon
- = tm.tm_isdst = 0;
- tm.tm_year = 30;
- for(i = 0; i < 12; i++) {
- tm.tm_mon = i;
-- wcsftime(w_ab_month_name[i], 10, L"%b", &tm);
-- wcsftime(w_month_name[i], 50, L"%B", &tm);
-+ wcsftime(w_ab_month_name[i], AB_MONTH_SIZE, L"%b", &tm);
-+ wcsftime(w_month_name[i], MONTH_SIZE, L"%B", &tm);
- }
- tm.tm_mon = 0;
- for(i = 0; i < 7; i++) {
- tm.tm_mday = tm.tm_yday = i+1; /* 2000-1-2 was a Sunday */
- tm.tm_wday = i;
-- wcsftime(w_ab_weekday_name[i], 10, L"%a", &tm);
-- wcsftime(w_weekday_name[i], 50, L"%A", &tm);
-+ wcsftime(w_ab_weekday_name[i], AB_WEEKDAY_SIZE, L"%a", &tm);
-+ wcsftime(w_weekday_name[i], WEEKDAY_SIZE, L"%A", &tm);
- }
- tm.tm_hour = 1;
- /* in locales where these are unused, they may be empty:
- better not to reset them then */
-- wcsftime(buff, 10, L"%p", &tm);
-+ wcsftime(buff, AM_PM_SIZE, L"%p", &tm);
- if(wcslen(buff)) wcscpy(w_am_pm[0], buff);
- tm.tm_hour = 13;
-- wcsftime(buff, 10, L"%p", &tm);
-+ wcsftime(buff, AM_PM_SIZE, L"%p", &tm);
- if(wcslen(buff)) wcscpy(w_am_pm[1], buff);
- locale_w_strings_set = 1;
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/R/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 PLIST
--- pkg/PLIST 12 Apr 2015 18:29:11 -0000 1.25
+++ pkg/PLIST 17 Apr 2015 15:10:49 -0000
@@ -370,6 +370,7 @@ lib/R/library/Matrix/Meta/nsInfo.rds
lib/R/library/Matrix/Meta/package.rds
lib/R/library/Matrix/Meta/vignette.rds
lib/R/library/Matrix/NAMESPACE
+lib/R/library/Matrix/NEWS.Rd
lib/R/library/Matrix/R/
lib/R/library/Matrix/R/Matrix
lib/R/library/Matrix/R/Matrix.rdb
@@ -454,6 +455,7 @@ lib/R/library/Matrix/html/atomicVector-c
lib/R/library/Matrix/html/band.html
lib/R/library/Matrix/html/bandSparse.html
lib/R/library/Matrix/html/bdiag.html
+lib/R/library/Matrix/html/boolean-matprod.html
lib/R/library/Matrix/html/cBind.html
lib/R/library/Matrix/html/chol.html
lib/R/library/Matrix/html/chol2inv-methods.html
@@ -536,6 +538,7 @@ lib/R/library/Matrix/html/sparseVector.h
lib/R/library/Matrix/html/symmetricMatrix-class.html
lib/R/library/Matrix/html/symmpart.html
lib/R/library/Matrix/html/triangularMatrix-class.html
+lib/R/library/Matrix/html/uniqTsparse.html
lib/R/library/Matrix/html/unpack.html
lib/R/library/Matrix/html/unused-classes.html
lib/R/library/Matrix/html/updown.html
@@ -558,6 +561,9 @@ lib/R/library/Matrix/po/fr/
lib/R/library/Matrix/po/fr/LC_MESSAGES/
lib/R/library/Matrix/po/fr/LC_MESSAGES/Matrix.mo
lib/R/library/Matrix/po/fr/LC_MESSAGES/R-Matrix.mo
+lib/R/library/Matrix/po/ko/
+lib/R/library/Matrix/po/ko/LC_MESSAGES/
+lib/R/library/Matrix/po/ko/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
@@ -724,6 +730,8 @@ lib/R/library/base/html/contributors.htm
lib/R/library/base/html/copyright.html
lib/R/library/base/html/crossprod.html
lib/R/library/base/html/cumsum.html
+lib/R/library/base/html/curlGetHeaders.html
+lib/R/library/base/html/curlVersion.html
lib/R/library/base/html/cut.POSIXt.html
lib/R/library/base/html/cut.html
lib/R/library/base/html/data.class.html
@@ -761,6 +769,7 @@ lib/R/library/base/html/eval.html
lib/R/library/base/html/exists.html
lib/R/library/base/html/expand.grid.html
lib/R/library/base/html/expression.html
+lib/R/library/base/html/extSoftVersion.html
lib/R/library/base/html/factor.html
lib/R/library/base/html/file.access.html
lib/R/library/base/html/file.choose.html
@@ -772,6 +781,7 @@ lib/R/library/base/html/files2.html
lib/R/library/base/html/find.package.html
lib/R/library/base/html/findInterval.html
lib/R/library/base/html/force.html
+lib/R/library/base/html/forceAndCall.html
lib/R/library/base/html/formals.html
lib/R/library/base/html/format.html
lib/R/library/base/html/format.info.html
@@ -823,6 +833,7 @@ lib/R/library/base/html/labels.html
lib/R/library/base/html/lapply.html
lib/R/library/base/html/lazyload.html
lib/R/library/base/html/length.html
+lib/R/library/base/html/lengths.html
lib/R/library/base/html/levels.html
lib/R/library/base/html/libPaths.html
lib/R/library/base/html/library.dynam.html
@@ -987,6 +998,7 @@ lib/R/library/base/html/trace.html
lib/R/library/base/html/traceback.html
lib/R/library/base/html/tracemem.html
lib/R/library/base/html/transform.html
+lib/R/library/base/html/trimws.html
lib/R/library/base/html/try.html
lib/R/library/base/html/typeof.html
lib/R/library/base/html/unique.html
@@ -1702,6 +1714,7 @@ lib/R/library/grDevices/html/embedFonts.
lib/R/library/grDevices/html/extendrange.html
lib/R/library/grDevices/html/getGraphicsEvent.html
lib/R/library/grDevices/html/grDevices-package.html
+lib/R/library/grDevices/html/grSoftVersion.html
lib/R/library/grDevices/html/gray.colors.html
lib/R/library/grDevices/html/gray.html
lib/R/library/grDevices/html/hcl.html
@@ -1825,6 +1838,7 @@ lib/R/library/graphics/html/plot.design.
lib/R/library/graphics/html/plot.factor.html
lib/R/library/graphics/html/plot.formula.html
lib/R/library/graphics/html/plot.html
+lib/R/library/graphics/html/plot.raster.html
lib/R/library/graphics/html/plot.table.html
lib/R/library/graphics/html/plot.window.html
lib/R/library/graphics/html/plot.xy.html
@@ -2310,8 +2324,10 @@ lib/R/library/mgcv/html/rTweedie.html
lib/R/library/mgcv/html/random.effects.html
lib/R/library/mgcv/html/residuals.gam.html
lib/R/library/mgcv/html/rig.html
+lib/R/library/mgcv/html/rmvn.html
lib/R/library/mgcv/html/s.html
lib/R/library/mgcv/html/scat.html
+lib/R/library/mgcv/html/single.index.html
lib/R/library/mgcv/html/slanczos.html
lib/R/library/mgcv/html/smooth.construct.ad.smooth.spec.html
lib/R/library/mgcv/html/smooth.construct.cr.smooth.spec.html
@@ -2342,6 +2358,31 @@ lib/R/library/mgcv/html/ziP.html
lib/R/library/mgcv/html/ziplss.html
lib/R/library/mgcv/libs/
lib/R/library/mgcv/libs/mgcv.so
+lib/R/library/mgcv/po/
+lib/R/library/mgcv/po/de/
+lib/R/library/mgcv/po/de/LC_MESSAGES/
+lib/R/library/mgcv/po/de/LC_MESSAGES/R-mgcv.mo
+lib/R/library/mgcv/po/de/LC_MESSAGES/mgcv.mo
+lib/R/library/mgcv/po/en@quot/
+lib/R/library/mgcv/po/en@quot/LC_MESSAGES/
+lib/R/library/mgcv/po/en@quot/LC_MESSAGES/R-mgcv.mo
+lib/R/library/mgcv/po/en@quot/LC_MESSAGES/mgcv.mo
+lib/R/library/mgcv/po/fr/
+lib/R/library/mgcv/po/fr/LC_MESSAGES/
+lib/R/library/mgcv/po/fr/LC_MESSAGES/R-mgcv.mo
+lib/R/library/mgcv/po/fr/LC_MESSAGES/mgcv.mo
+lib/R/library/mgcv/po/ko/
+lib/R/library/mgcv/po/ko/LC_MESSAGES/
+lib/R/library/mgcv/po/ko/LC_MESSAGES/R-mgcv.mo
+lib/R/library/mgcv/po/ko/LC_MESSAGES/mgcv.mo
+lib/R/library/mgcv/po/pl/
+lib/R/library/mgcv/po/pl/LC_MESSAGES/
+lib/R/library/mgcv/po/pl/LC_MESSAGES/R-mgcv.mo
+lib/R/library/mgcv/po/pl/LC_MESSAGES/mgcv.mo
+lib/R/library/mgcv/po/po/
+lib/R/library/mgcv/po/po/LC_MESSAGES/
+lib/R/library/mgcv/po/po/LC_MESSAGES/R-mgcv.mo
+lib/R/library/mgcv/po/po/LC_MESSAGES/mgcv.mo
lib/R/library/nlme/
lib/R/library/nlme/CITATION
lib/R/library/nlme/DESCRIPTION
@@ -3591,6 +3632,8 @@ lib/R/library/tools/Meta/nsInfo.rds
lib/R/library/tools/Meta/package.rds
lib/R/library/tools/NAMESPACE
lib/R/library/tools/R/
+lib/R/library/tools/R/sysdata.rdb
+lib/R/library/tools/R/sysdata.rdx
lib/R/library/tools/R/tools
lib/R/library/tools/R/tools.rdb
lib/R/library/tools/R/tools.rdx
@@ -3637,6 +3680,7 @@ lib/R/library/tools/html/find_gs_cmd.htm
lib/R/library/tools/html/getDepList.html
lib/R/library/tools/html/getVignetteInfo.html
lib/R/library/tools/html/installFoundDepends.html
+lib/R/library/tools/html/loadRdMacros.html
lib/R/library/tools/html/makeLazyLoading.html
lib/R/library/tools/html/make_translations_pkg.html
lib/R/library/tools/html/md5sum.html
@@ -3654,6 +3698,7 @@ lib/R/library/tools/html/testInstalledPa
lib/R/library/tools/html/texi2dvi.html
lib/R/library/tools/html/toHTML.html
lib/R/library/tools/html/toRd.html
+lib/R/library/tools/html/toTitleCase.html
lib/R/library/tools/html/tools-defunct.html
lib/R/library/tools/html/tools-deprecated.html
lib/R/library/tools/html/tools-package.html
@@ -4082,6 +4127,7 @@ lib/R/library/utils/html/help.html
lib/R/library/utils/html/help.request.html
lib/R/library/utils/html/help.search.html
lib/R/library/utils/html/help.start.html
+lib/R/library/utils/html/hsearch-utils.html
lib/R/library/utils/html/install.packages.html
lib/R/library/utils/html/installed.packages.html
lib/R/library/utils/html/localeToCharset.html
@@ -4152,7 +4198,6 @@ lib/R/modules/R_X11.so
lib/R/modules/R_de.so
lib/R/modules/internet.so
lib/R/modules/lapack.so
-lib/R/modules/vfonts.so
lib/R/share/
lib/R/share/R/
lib/R/share/R/REMOVE.R
@@ -4160,6 +4205,9 @@ lib/R/share/R/examples-footer.R
lib/R/share/R/examples-header.R
lib/R/share/R/nspackloader.R
lib/R/share/R/tests-startup.R
+lib/R/share/Rd/
+lib/R/share/Rd/macros/
+lib/R/share/Rd/macros/system.Rd
lib/R/share/dictionaries/
lib/R/share/dictionaries/en_stats.rds
lib/R/share/encodings/
@@ -4229,13 +4277,6 @@ share/doc/R/html/resources.html
share/doc/R/html/right.jpg
share/doc/R/html/up.jpg
share/doc/R/manual/
-share/doc/R/manual/R-FAQ.html
-share/doc/R/manual/R-admin.html
-share/doc/R/manual/R-data.html
-share/doc/R/manual/R-exts.html
-share/doc/R/manual/R-intro.html
-share/doc/R/manual/R-ints.html
-share/doc/R/manual/R-lang.html
share/doc/R/manual/images/
share/doc/R/manual/images/QQ.png
share/doc/R/manual/images/ecdf.png
