diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index 9189621674aa..85991a3985e4 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -1,148 +1,146 @@
 # This port opens too many files during build, more than the default setting.
 # Its build is known to succeed with MAX_FILES_RStudio=4096 in poudriere.conf
 
 PORTNAME=	RStudio
-DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.1717
-PORTREVISION=	2
+DISTVERSION=	2021.09.0+351
 CATEGORIES=	devel math java
 MASTER_SITES=	https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
 DISTFILES=	core-dictionaries.zip:dictionaries \
 		gin-${GIN_VERSION}.zip:buildtools \
 		gwt-${GWT_VERSION}.zip:buildtools \
 		mathjax-27.zip:buildtools
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Integrated development environment (IDE) for R
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	[ERROR] Line 101: Failed to resolve 'org.rstudio.studio.client.workbench.views.vcs.common.diff.LineActionButtonRenderer.GrayResources' via deferred binding
 
 BUILD_DEPENDS=	ant:devel/apache-ant \
 		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
 		node:www/node \
 		pandoc:textproc/hs-pandoc \
 		R-cran-rstudioapi>0:devel/R-cran-rstudioapi
 LIB_DEPENDS=	libR.so:math/R \
 		libboost_thread.so:devel/boost-libs \
 		libinotify.so:devel/libinotify \
 		libsoci_core.so:databases/soci \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libyaml-cpp.so:devel/yaml-cpp
 
 FLAVORS=	desktop server
 FLAVOR?=	${FLAVORS:[1]}
 server_PKGNAMESUFFIX=	-server
 
 USES=		cmake fortran localbase:ldflags pgsql pkgconfig sqlite ssl
 USE_JAVA=	yes
 JAVA_VERSION=	8
 JAVA_BUILD=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tl}
 GH_TUPLE=	rstudio:r2d3:v0.2.0:r2d3/dependencies/common/r2d3 \
 		rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \
 		rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect \
 		trestletech:plumber:v0.4.6:plumber/dependencies/common/plumber
 
 CMAKE_ARGS=	-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
 		-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib
 CMAKE_ARGS+=	-DQT_QMAKE_EXECUTABLE:STRING=${QMAKE}
 CMAKE_ARGS+=	-DRSTUDIO_BOOST_SIGNALS_VERSION=2
 CMAKE_ARGS+=	-DFREEBSD_PORT_VERSION:STRING=${DISTVERSION}
 CMAKE_ARGS+=	-DFREEBSD_LOCALBASE:STRING=${LOCALBASE} # SOCI package is looked up here, see patch patch-src_cpp_CMakeLists.txt
 CMAKE_ON=	RSTUDIO_USE_SYSTEM_YAML_CPP \
 		RSTUDIO_USE_SYSTEM_SOCI
 MAKE_ENV=	HOME=${WRKDIR} \
 		JAVA_HOME=${JAVA_HOME} \
 		PATH=${JAVA_HOME}/bin:${PATH} \
 		ANT_OPTS="-Duser.home=${WRKDIR}"
 
 GWT_VERSION=	2.8.1
 GIN_VERSION=	2.1.2
 
 .if ${FLAVOR:U} == desktop
 DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
 EXPIRATION_DATE=2021-06-23
 COMMENT+=	(desktop UI version)
 USES+=		desktop-file-utils qt:5 shared-mime-info
 USE_QT=		core dbus declarative gui location network opengl printsupport quickcontrols sensors \
 		sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
 CMAKE_ARGS+=	-DRSTUDIO_TARGET=Desktop
 INSTALL_SUBDIR=	${PORTNAME:tl}
 EXECUTABLE=	${PORTNAME:tl}
 .endif
 
 .if ${FLAVOR:U} == server
 COMMENT+=	(web UI version)
 CMAKE_ARGS+=	-DRSTUDIO_TARGET=Server
 LDFLAGS+=	-linotify
 INSTALL_SUBDIR=	${PORTNAME:tl}-server
 EXECUTABLE=	rserver
 USER=		nobody
 SUB_LIST=	USER=${USER}
 USE_RC_SUBR=	${PORTNAME:tl}-server
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/dependencies/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/dictionaries/
 	@${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/
 	@${MKDIR} ${WRKSRC}/src/gwt/lib/gwt && ${MV} ${WRKDIR}/gwt-${GWT_VERSION} ${WRKSRC}/src/gwt/lib/gwt/${GWT_VERSION}
 	@${MKDIR} ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION} && ${MV} ${WRKDIR}/*.jar ${WRKSRC}/src/gwt/lib/gin/${GIN_VERSION}/
 
 post-patch:
 	@${REINPLACE_CMD} -e ' \
 		s|target_link_libraries(rstudio|target_link_libraries(rstudio procstat|; \
 		s|get_filename_component|#get_filename_component|; \
 		s|set(CMAKE_PREFIX_PATH "$${QT_BIN_DIR}//..//lib//cmake")|set(CMAKE_PREFIX_PATH "${LOCALBASE}/lib/cmake")|; \
 		s|/usr/share/|${PREFIX}/share/|g' \
 		${WRKSRC}/src/cpp/desktop/CMakeLists.txt
 	@${REINPLACE_CMD} -e ' \
 		s|</java>|<jvmarg value="-Duser.home=${WRKDIR}"/></java>|' \
 		${WRKSRC}/src/gwt/build.xml
 	@${REINPLACE_CMD} -e ' \
 		s|rHomePaths.push_back|//rHomePaths.push_back|; \
 		s|//rHomePaths.push_back(FilePath("/usr/local/lib/|rHomePaths.push_back(FilePath("${PREFIX}/lib/|' \
 		${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp
 	@${REINPLACE_CMD} -e ' \
 		s|<condition property="node.bin" value="../../../$${node.dir}/bin/node">|<condition property="node.bin" value="${LOCALBASE}/bin/node">|' \
 		${WRKSRC}/src/gwt/build.xml
 
 pre-build:
 	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h
 
 post-install:
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "if ! [ -d /proc/curproc ]; then"; \
 	  echo "  echo \"${PORTNAME} needs /proc to be mounted as procfs\" >&2"; \
 	  echo "  exit 1"; \
 	  echo "fi"; \
 	  echo ""; \
 	  echo "# workaround for the problem that RStudio passes /lib with LD_LIBRARY_PATH that causes the /lib/libgcc_s.so.1 conflict with gcc"; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so JAVA_HOME=${JAVA_HOME} ${PREFIX}/lib/${INSTALL_SUBDIR}/bin/${EXECUTABLE} \"$$"@"\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE}
 .if ${FLAVOR:U} == desktop
 	${REINPLACE_CMD} -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/${EXECUTABLE}|' ${STAGEDIR}${PREFIX}/share/applications/${EXECUTABLE}.desktop
 .endif
 .if ${FLAVOR:U} == server
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/${INSTALL_SUBDIR}/bin/rstudio-server # not compatible with FreeBSD
 .endif
 	# Some functions expect the pandoc symlink.
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc
 	@cd ${STAGEDIR}${PREFIX}/lib/${INSTALL_SUBDIR}/bin/pandoc && ${LN} -s ../../../../bin/pandoc
 	# Add $LOCALBASE/bin to PATH to allow RStudio-server to run gmake (R_HOME/etc/Renviron.site is installed, see https://stat.ethz.ch/R-manual/R-devel/library/base/html/Startup.html)
 .if ${FLAVOR:U} == server
 	#@${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/R/etc
 	#@${ECHO} "PATH=\"${LOCALBASE}/bin:\$$PATH\"" > ${STAGEDIR}${LOCALBASE}/lib/R/etc/Renviron.site # it should be this way, but this fails: https://github.com/rstudio/rstudio/issues/9815
 	@${LN} -s ${LOCALBASE}/bin/${GMAKE} ${STAGEDIR}${PREFIX}/lib/rstudio-server/bin/postback/${GMAKE} # hack, should be as above, but at least gmake is in the path now
 .endif
 	# There is a variability in .js file names due to use of random numbers, so we use the automatic plist.
 	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio| ; s|%%CMAKE_BUILD_TYPE%%|${CMAKE_BUILD_TYPE:tl}|' > ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/RStudio/distinfo b/devel/RStudio/distinfo
index caf142ce08d5..e632b0f64c46 100644
--- a/devel/RStudio/distinfo
+++ b/devel/RStudio/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1623197060
+TIMESTAMP = 1634620511
 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
 SIZE (core-dictionaries.zip) = 876339
 SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
 SIZE (gin-2.1.2.zip) = 1341053
 SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
 SIZE (gwt-2.8.1.zip) = 95650299
 SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176
 SIZE (mathjax-27.zip) = 3285230
-SHA256 (RStudio-rstudio-v1.4.1717_GH0.tar.gz) = 3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261
-SIZE (RStudio-rstudio-v1.4.1717_GH0.tar.gz) = 96928031
+SHA256 (RStudio-rstudio-2021.09.0+351_GH0.tar.gz) = 1fd0c40e9064501a276e0c9a64c1d54bed2957bf4f93174436e309b138222d2d
+SIZE (RStudio-rstudio-2021.09.0+351_GH0.tar.gz) = 96590178
 SHA256 (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 6355a7632134c8c9487056019a9c458db2c98d10388cf66b018d5461d0a947af
 SIZE (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 21977747
 SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b
 SIZE (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = 2087615
 SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61aee258f2fbf45a43c006f9e0a726bcea6
 SIZE (rstudio-rsconnect-03c379b_GH0.tar.gz) = 220711
 SHA256 (trestletech-plumber-v0.4.6_GH0.tar.gz) = 7bcbfdf5a8a2e3a051d2c673ac5ac51a483ed888afe73116cba7741dbb5f63a6
 SIZE (trestletech-plumber-v0.4.6_GH0.tar.gz) = 83332
diff --git a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
index a0ed7d4a0034..12c21b25b0d8 100644
--- a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
+++ b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
@@ -1,124 +1,125 @@
---- src/cpp/session/CMakeLists.txt.orig	2021-05-24 22:22:25 UTC
+--- src/cpp/session/CMakeLists.txt.orig	2021-09-22 13:58:50 UTC
 +++ src/cpp/session/CMakeLists.txt
-@@ -24,7 +24,7 @@ set(PANDOC_VERSION "2.11.4" CACHE INTERNAL "Pandoc ver
+@@ -23,7 +23,7 @@ add_subdirectory(workers)
  if(WIN32)
     set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries")
     set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR      "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
 -   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR       "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
 +   #set(RSTUDIO_DEPENDENCIES_PANDOC_DIR       "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
  else()
  
     # indirection to help build machine find these libraries?
-@@ -40,17 +40,18 @@ else()
+@@ -39,18 +39,19 @@ else()
        set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27")
     endif()
  
 -   if(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
 -      set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
 -   else()
 -      set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}")
 -   endif()
 +   #if(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
 +   #   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
 +   #else()
 +   #   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}")
 +   #endif()
  
  endif()
  
- foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
-             "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}"
--            "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}")
-+            #"${RSTUDIO_DEPENDENCIES_PANDOC_DIR}"
+ # validate our dependencies exist
+ foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
+             RSTUDIO_DEPENDENCIES_MATHJAX_DIR
+-            RSTUDIO_DEPENDENCIES_PANDOC_DIR)
++            #RSTUDIO_DEPENDENCIES_PANDOC_DIR
 +)
-    if(NOT EXISTS "${DEP}")
-       message(FATAL_ERROR "${DEP} not found (re-run install-dependencies script to install")
-    endif()
-@@ -65,19 +66,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
+ 
+    # validate existence
+    if(NOT EXISTS "${${VAR}}")
+@@ -71,19 +72,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
  endforeach()
  
  # verify libclang is installed (Windows only)
 -if(WIN32)
 -   set(LIBCLANG_VERSION "5.0.2")
 -   set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
 -   if(NOT EXISTS "${LIBCLANG_DIR}")
 -      message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
 -   endif()
 +#if(WIN32)
 +#   set(LIBCLANG_VERSION "5.0.2")
 +#   set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
 +#   if(NOT EXISTS "${LIBCLANG_DIR}")
 +#      message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
 +#   endif()
 +#
 +#   set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
 +#   if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
 +#      message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
 +#   endif()
 +#endif()
  
 -   set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
 -   if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
 -      message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
 -   endif()
 -endif()
 -
  # include files
  file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
  
-@@ -444,6 +445,9 @@ add_stripped_executable(
+@@ -457,6 +458,9 @@ add_stripped_executable(
     ${SESSION_SOURCE_FILES}
     ${SESSION_HEADER_FILES})
  
 +# additional libraries
 +target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat)
 +
  # skip libR RPATH at development time
  if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE)
     set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE)
-@@ -579,10 +583,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT
+@@ -592,10 +596,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT
             DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
  
     # install pandoc
 -   file(GLOB PANDOC_FILES "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/pandoc*")
 -   install(FILES ${PANDOC_FILES}
 -           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 -           DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc")
 +   #file(GLOB PANDOC_FILES "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/pandoc*")
 +   #install(FILES ${PANDOC_FILES}
 +   #        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 +   #        DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc")
  
     # install embedded packages
     foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
-@@ -622,18 +626,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT
+@@ -635,18 +639,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT
        DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
  
     # install libclang
 -   if(WIN32)
 -      file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*")
 -      install(PROGRAMS ${LIBCLANG_32_FILES}
 -              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86)
 -      file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*")
 -      install(PROGRAMS ${LIBCLANG_64_FILES}
 -              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
 -
 -      # install libclang builtin-headers
 -      install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
 -              DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
 -   endif()
 +#   if(WIN32)
 +#      file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*")
 +#      install(PROGRAMS ${LIBCLANG_32_FILES}
 +#              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86)
 +#      file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*")
 +#      install(PROGRAMS ${LIBCLANG_64_FILES}
 +#              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
 +#
 +#      # install libclang builtin-headers
 +#      install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
 +#              DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
 +#   endif()
  
     # install winpty on windows
     if(WIN32)
diff --git a/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp b/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp
index efd9c4070f7c..fa7b7da86ea8 100644
--- a/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp
+++ b/devel/RStudio/files/patch-src_cpp_session_SessionHttpMethods.cpp
@@ -1,11 +1,11 @@
---- src/cpp/session/SessionHttpMethods.cpp.orig	2020-01-23 23:30:24 UTC
+--- src/cpp/session/SessionHttpMethods.cpp.orig	2021-09-22 13:58:50 UTC
 +++ src/cpp/session/SessionHttpMethods.cpp
-@@ -397,7 +397,7 @@ std::string clientVersion()
+@@ -437,7 +437,7 @@ std::string clientVersion()
        return std::string();
  
     // clientVersion is the git revision hash
 -   return RSTUDIO_GIT_REVISION_HASH;
 +   return RSTUDIO_VERSION;
  }
  
- void waitForMethodInitFunction(const ClientEvent& initEvent)
+ bool protocolDebugEnabled()
diff --git a/devel/RStudio/files/patch-src_cpp_session_session-config.h.in b/devel/RStudio/files/patch-src_cpp_session_session-config.h.in
index 0085fa4e2794..7ab9ac4d3580 100644
--- a/devel/RStudio/files/patch-src_cpp_session_session-config.h.in
+++ b/devel/RStudio/files/patch-src_cpp_session_session-config.h.in
@@ -1,17 +1,22 @@
---- src/cpp/session/session-config.h.in.orig	2020-05-18 18:11:10 UTC
+--- src/cpp/session/session-config.h.in.orig	2021-09-22 13:58:50 UTC
 +++ src/cpp/session/session-config.h.in
-@@ -13,11 +13,11 @@
+@@ -13,7 +13,7 @@
   *
   */
  
 -#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}"
 +#define RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}"
+ #define RSTUDIO_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}"
+ #define RSTUDIO_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}"
+ #define RSTUDIO_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}"
+@@ -21,8 +21,8 @@
  #define RSTUDIO_RELEASE_NAME "${RSTUDIO_RELEASE_NAME}"
+ #define RSTUDIO_BUILD_TYPE "${RSTUDIO_BUILD_TYPE}"
  #define RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}"
 -#define RSTUDIO_GIT_COMMIT "${RSTUDIO_GIT_COMMIT}"
 -#define RSTUDIO_BUILD_ID "${RSTUDIO_BUILD_ID}"
 +#define RSTUDIO_GIT_COMMIT "n/a"
 +#define RSTUDIO_BUILD_ID "FreeBSD-port-version-${FREEBSD_RSTUDIO_VERSION}"
  #define RSTUDIO_BUILD_DATE "${CPACK_BUILD_DATE}"
  #define RSTUDIO_COPYRIGHT_YEAR "${CPACK_COPYRIGHT_YEAR}"
  #define RSTUDIO_PACKAGE_OS "${RSTUDIO_PACKAGE_OS}"