diff --git a/textproc/R-cran-readxl/Makefile b/textproc/R-cran-readxl/Makefile index c6e740084ab2..df92aed4ba11 100644 --- a/textproc/R-cran-readxl/Makefile +++ b/textproc/R-cran-readxl/Makefile @@ -1,27 +1,27 @@ PORTNAME= readxl -DISTVERSION= 1.3.1 -PORTREVISION= 2 +DISTVERSION= 1.4.1 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Read Excel Files WWW= https://readxl.tidyverse.org -LICENSE= GPLv3 +LICENSE= MIT BUILD_DEPENDS= R-cran-knitr>0:print/R-cran-knitr \ + R-cran-cpp11>=0.4.0:devel/R-cran-cpp11 \ R-cran-progress>0:devel/R-cran-progress -RUN_DEPENDS= R-cran-Rcpp>=0.12.18:devel/R-cran-Rcpp \ +RUN_DEPENDS= R-cran-cpp11>=0.4.0:devel/R-cran-cpp11 \ R-cran-tibble>=1.3.1:devel/R-cran-tibble \ R-cran-cellranger>0:textproc/R-cran-cellranger \ R-cran-progress>0:devel/R-cran-progress TEST_DEPENDS= R-cran-covr>0:devel/R-cran-covr \ R-cran-rprojroot>=1.1:devel/R-cran-rprojroot \ R-cran-testthat>0:devel/R-cran-testthat \ R-cran-knitr>0:print/R-cran-knitr \ R-cran-rmarkdown>0:textproc/R-cran-rmarkdown USES= cran:auto-plist,compiles .include diff --git a/textproc/R-cran-readxl/distinfo b/textproc/R-cran-readxl/distinfo index 548a5fff8aca..173ac66e66df 100644 --- a/textproc/R-cran-readxl/distinfo +++ b/textproc/R-cran-readxl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554053523 -SHA256 (readxl_1.3.1.tar.gz) = 24b441713e2f46a3e7c6813230ad6ea4d4ddf7e0816ad76614f33094fbaaaa96 -SIZE (readxl_1.3.1.tar.gz) = 2056165 +TIMESTAMP = 1672253240 +SHA256 (readxl_1.4.1.tar.gz) = f6bebb7f940fb21baacd60345b7075c77eb1d026466c55e6a36148de680da1fa +SIZE (readxl_1.4.1.tar.gz) = 2090383 diff --git a/textproc/R-cran-readxl/files/patch-src_ColSpec.h b/textproc/R-cran-readxl/files/patch-src_ColSpec.h deleted file mode 100644 index 9e50bd74bda1..000000000000 --- a/textproc/R-cran-readxl/files/patch-src_ColSpec.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ColSpec.h.orig 2019-09-24 16:05:20 UTC -+++ src/ColSpec.h -@@ -1,6 +1,7 @@ - #ifndef READXL_COLSPEC_ - #define READXL_COLSPEC_ - -+#include - #include - #include - #include "StringSet.h" diff --git a/textproc/R-cran-readxl/pkg-descr b/textproc/R-cran-readxl/pkg-descr index 503a66b5bf48..c69f62e39216 100644 --- a/textproc/R-cran-readxl/pkg-descr +++ b/textproc/R-cran-readxl/pkg-descr @@ -1,4 +1,6 @@ Import excel files into R. Supports '.xls' via the embedded 'libxls' C library and '.xlsx' via the embedded 'RapidXML' C++ library . Works on Windows, Mac and Linux without external dependencies. + +See also .