Index: Makefile
===================================================================
--- Makefile	(revision 26628)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # Only builds on Solaris 10
 
 NAME = R
-VERSION = 3.3.0
+VERSION = 4.0.0
 GARTYPE = v2
 
 DESCRIPTION = A language and environment for statistical computing and graphics
@@ -32,11 +32,12 @@
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibpangocairo1-0-0
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWr-base += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibpcre2
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibpng16-16
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n56
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc56
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibfreetype6
 #Needed to install addons
 RUNTIME_DEP_PKGS_CSWr-base += CSWgcc5g++
 CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWgcc5g++
@@ -88,10 +89,12 @@
 
 BUILD64 = 1
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS) --with-internal-tzcode
 
 TEST_TARGET = check-recommended
 
+PATCHFILES += 0000-Solaris-does-not-have-a-good-utimensat.patch
+
 INTERNET_LIBS = -lsocket -lnsl
 
 EXTRA_COMMON_EXPORTS = INTERNET_LIBS
Index: checksums
===================================================================
--- checksums	(revision 26628)
+++ checksums	(working copy)
@@ -1 +1 @@
-5a7506c8813432d1621c9725e86baf7a  R-3.3.0.tar.gz
+48c487c68112cb3191f3015c6277a50b  R-4.0.0.tar.gz
Index: files/0000-Solaris-does-not-have-a-good-utimensat.patch
===================================================================
--- files/0000-Solaris-does-not-have-a-good-utimensat.patch	(nonexistent)
+++ files/0000-Solaris-does-not-have-a-good-utimensat.patch	(working copy)
@@ -0,0 +1,27 @@
+From 7beb847809276ab94b62ed43c75a20f35b19ed6c Mon Sep 17 00:00:00 2001
+From: Gabor Csardi <csardi.gabor@gmail.com>
+Date: Fri, 24 Apr 2020 15:21:47 +0100
+Subject: [PATCH] Solaris does not have a good utimensat
+
+---
+ src/main/platform.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/main/platform.c b/src/main/platform.c
+index 726af2e..5d4bf1f 100644
+--- a/src/main/platform.c
++++ b/src/main/platform.c
+@@ -2500,6 +2500,10 @@ SEXP attribute_hidden do_filecopy(SEXP call, SEXP op, SEXP args, SEXP rho)
+ # undef HAVE_UTIMENSAT
+ #endif
+ 
++#if defined(__sun)
++# undef HAVE_UTIMENSAT
++#endif
++
+ #if defined(HAVE_UTIMENSAT)
+ # include <fcntl.h>
+ # include <sys/stat.h>
+-- 
+2.3.1
+