devel/RStudio: Update 1.2.637 -> 1.2.679

Port changes:
* Remove PATCHFILES that are now applied upstream
* Add the bundled dependency on trestletech/plumber which is an
  R-specific project

Reported by:	portscout

5 files changed, 30 insertions, 26 deletions

diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index 28a83ea7a95b..0bd285b912d2 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	RStudio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.637
+DISTVERSION=	1.2.679
 CATEGORIES=	devel math java
 MASTER_SITES=	https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
@@ -14,11 +14,6 @@ DISTFILES=	core-dictionaries.zip:dictionaries \
 		gwt-${GWT_VERSION}.zip:buildtools \
 		mathjax-26.zip:buildtools
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${GH_PROJECT}/commit/
-PATCHFILES=	ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch:-p1 \
-		85896f38b7d25661dd29f76b2bbf1b64d5e34fa4.patch:-p1 \
-		8967d0e4979b81b4792093e869ae9a6bf6d96397.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Integrated development environment (IDE) for R
 
@@ -42,7 +37,8 @@ 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
+		rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect \
+		trestletech:plumber:v0.4.6:plumber/dependencies/common/plumber
 
 CMAKE_ARGS=	-DRSTUDIO_TARGET=Desktop \
 		-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
diff --git a/devel/RStudio/distinfo b/devel/RStudio/distinfo
index 0cf646cda831..9e197795aedc 100644
--- a/devel/RStudio/distinfo
+++ b/devel/RStudio/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1527743852
+TIMESTAMP = 1528355181
 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
 SIZE (core-dictionaries.zip) = 876339
 SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
@@ -7,17 +7,13 @@ SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d3723
 SIZE (gwt-2.8.1.zip) = 95650299
 SHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71
 SIZE (mathjax-26.zip) = 3061588
-SHA256 (RStudio-rstudio-v1.2.637_GH0.tar.gz) = 1197138a92bf541bb8e12b897543ffd4d1090c268edaaa9dfc121c6208a5717d
-SIZE (RStudio-rstudio-v1.2.637_GH0.tar.gz) = 20076660
+SHA256 (RStudio-rstudio-v1.2.679_GH0.tar.gz) = 23c22afd8451f6ab0f7d74310426f20a478d4f4daeaeeb6d74000b91330682fd
+SIZE (RStudio-rstudio-v1.2.679_GH0.tar.gz) = 20143262
 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 (ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch) = e00e0ba8bd342da7951d0f699d318d67cebd55436df6827ccf219b8d969e09a9
-SIZE (ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch) = 3096
-SHA256 (85896f38b7d25661dd29f76b2bbf1b64d5e34fa4.patch) = 9b69e25400b60d8fec22a9fd4655546f564ecfc315479cad1405825ba0fea80f
-SIZE (85896f38b7d25661dd29f76b2bbf1b64d5e34fa4.patch) = 974
-SHA256 (8967d0e4979b81b4792093e869ae9a6bf6d96397.patch) = 7b49ee51fb9ce78f079067cddb537965cf0356147a0dcdfbe3bd2dd5af796ebb
-SIZE (8967d0e4979b81b4792093e869ae9a6bf6d96397.patch) = 1279
+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-CMakeGlobals.txt b/devel/RStudio/files/patch-CMakeGlobals.txt
index 9f2c2fb08f81..2ee0106dd579 100644
--- a/devel/RStudio/files/patch-CMakeGlobals.txt
+++ b/devel/RStudio/files/patch-CMakeGlobals.txt
@@ -1,6 +1,6 @@
---- CMakeGlobals.txt.orig	2017-11-16 21:40:37 UTC
+--- CMakeGlobals.txt.orig	2018-06-07 06:50:17 UTC
 +++ CMakeGlobals.txt
-@@ -65,15 +65,7 @@ endif()
+@@ -84,14 +84,16 @@ endif()
  
  # record git revision hash (cache it since we don't use this in development
  # mode and we don't want it to force rebuilds there)
@@ -12,8 +12,16 @@
 -      SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash")
 -   endif()
 -endif()
--
++#if(NOT RSTUDIO_SESSION_WIN64 AND NOT RSTUDIO_GIT_REVISION_HASH)
++#   find_program(GIT_EXECUTABLE git)
++#   if(GIT_EXECUTABLE)
++#      exec_program(git ARGS rev-parse HEAD
++#                   OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH)
++#      SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash")
++#   endif()
++#endif()
++
 +SET(RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" CACHE STRING "FreeBSD RStudio version")
  
- # required R version
- set(RSTUDIO_R_MAJOR_VERSION_REQUIRED 2)
+ # record these from Jenkins if available
+ if("$ENV{GIT_COMMIT}" STREQUAL "")
diff --git a/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt b/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
index 4489c4023b74..9b948276b5b5 100644
--- a/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
+++ b/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
@@ -1,4 +1,4 @@
---- src/cpp/session/postback/CMakeLists.txt.orig	2018-05-30 18:06:27 UTC
+--- src/cpp/session/postback/CMakeLists.txt.orig	2018-05-31 21:11:21 UTC
 +++ src/cpp/session/postback/CMakeLists.txt
 @@ -43,6 +43,7 @@ endif()
  # set link dependencies
@@ -7,4 +7,4 @@
 +   procstat
  )
  
- # configure postback scripts for development mode
+ if (RSTUDIO_SERVER)
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 33a8ce608e0b..6419e896e26c 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,12 +1,16 @@
---- src/cpp/session/session-config.h.in.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/session/session-config.h.in.orig	2018-06-07 06:52:22 UTC
 +++ src/cpp/session/session-config.h.in
-@@ -13,8 +13,7 @@
+@@ -13,10 +13,9 @@
   *
   */
  
 -#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}"
 -#define RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}"
-+#define RSTUDIO_VERSION "${RSTUDIO_VERSION}"
+-#define RSTUDIO_GIT_COMMIT "${RSTUDIO_GIT_COMMIT}"
+-#define RSTUDIO_BUILD_ID "${RSTUDIO_BUILD_ID}"
++#define RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}"
++#define RSTUDIO_GIT_COMMIT "n/a"
++#define RSTUDIO_BUILD_ID "FreeBSD-port-version-${FREEBSD_RSTUDIO_VERSION}"
  #cmakedefine RSTUDIO_SERVER
  #cmakedefine RSTUDIO_UNVERSIONED_BUILD
  #cmakedefine TRACE_PACKRAT_OUTPUT