Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 May 2018 07:29:12 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r471195 - in head/devel/RStudio: . files
Message-ID:  <201805310729.w4V7TC0n009052@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Thu May 31 07:29:11 2018
New Revision: 471195
URL: https://svnweb.freebsd.org/changeset/ports/471195

Log:
  devel/RStudio: Update 1.1.453 -> 1.2.637
  
  Port changes:
  * Add to PATCHFILES for corrections that the upstream made needed to build on FreeBSD
  * Add USES=ssl
  * Add USE_QT5=webengine
  * Update GWT_VERSION/GIN_VERSION - versions of side-projects needed to build RStudio
  * Implemented the FreeBSD-specific version of getOpenFds included in the PosixSystem.cpp patch
  * Added numerous corrections to the PosixSystem.cpp patch
  * Now rstudio and other related executables depend on libprocstat.so - corresponding patches were added
  
  Reported by:	portscout

Added:
  head/devel/RStudio/files/patch-src_cpp_desktop_DesktopDownloadItemHelper.cpp   (contents, props changed)
  head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt   (contents, props changed)
  head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt   (contents, props changed)
Deleted:
  head/devel/RStudio/files/patch-boost-1.67
  head/devel/RStudio/files/patch-src_cpp_CMakeLists.txt
Modified:
  head/devel/RStudio/Makefile
  head/devel/RStudio/distinfo
  head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
  head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
  head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt

Modified: head/devel/RStudio/Makefile
==============================================================================
--- head/devel/RStudio/Makefile	Thu May 31 05:24:29 2018	(r471194)
+++ head/devel/RStudio/Makefile	Thu May 31 07:29:11 2018	(r471195)
@@ -5,8 +5,7 @@
 
 PORTNAME=	RStudio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.453
-PORTREVISION=	1
+DISTVERSION=	1.2.637
 CATEGORIES=	devel math java
 MASTER_SITES=	https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
@@ -16,7 +15,9 @@ DISTFILES=	core-dictionaries.zip:dictionaries \
 		mathjax-26.zip:buildtools
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${GH_PROJECT}/commit/
-PATCHFILES=	ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch:-p1
+PATCHFILES=	ab3d4355ab5c7f4bc7af1f7aeabe62c3d1bbccec.patch:-p1 \
+		85896f38b7d25661dd29f76b2bbf1b64d5e34fa4.patch:-p1 \
+		8967d0e4979b81b4792093e869ae9a6bf6d96397.patch:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Integrated development environment (IDE) for R
@@ -32,14 +33,15 @@ LIB_DEPENDS=	libR.so:math/R \
 		libinotify.so:devel/libinotify \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		cmake:outsource desktop-file-utils fortran pkgconfig shared-mime-info
+USES=		cmake:outsource desktop-file-utils fortran pkgconfig shared-mime-info ssl
 USE_QT5=	core dbus gui location network opengl printsupport qml quick sensors \
-		sql svg webchannel webkit widgets xml xmlpatterns buildtools_build qmake_build
+		sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
 USE_JAVA=	yes
 JAVA_BUILD=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tl}
-GH_TUPLE=	rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \
+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
 
 CMAKE_ARGS=	-DRSTUDIO_TARGET=Desktop \
@@ -48,8 +50,8 @@ CMAKE_ARGS=	-DRSTUDIO_TARGET=Desktop \
 MAKE_ENV=	HOME=${WRKDIR} \
 		ANT_OPTS="-Duser.home=${WRKDIR}"
 
-GWT_VERSION=	2.7.0
-GIN_VERSION=	1.5
+GWT_VERSION=	2.8.1
+GIN_VERSION=	2.1.2
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/dependencies/common/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/common/dictionaries/
@@ -59,6 +61,7 @@ post-extract:
 
 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' \

Modified: head/devel/RStudio/distinfo
==============================================================================
--- head/devel/RStudio/distinfo	Thu May 31 05:24:29 2018	(r471194)
+++ head/devel/RStudio/distinfo	Thu May 31 07:29:11 2018	(r471195)
@@ -1,17 +1,23 @@
-TIMESTAMP = 1526611455
+TIMESTAMP = 1527743852
 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
 SIZE (core-dictionaries.zip) = 876339
-SHA256 (gin-1.5.zip) = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
-SIZE (gin-1.5.zip) = 1055663
-SHA256 (gwt-2.7.0.zip) = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
-SIZE (gwt-2.7.0.zip) = 108818328
+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-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71
 SIZE (mathjax-26.zip) = 3061588
-SHA256 (RStudio-rstudio-v1.1.453_GH0.tar.gz) = aec3f20594e57e46cfcd98a64e675c1934e53195738a908ec652f720129fa81e
-SIZE (RStudio-rstudio-v1.1.453_GH0.tar.gz) = 20200360
+SHA256 (RStudio-rstudio-v1.2.637_GH0.tar.gz) = 1197138a92bf541bb8e12b897543ffd4d1090c268edaaa9dfc121c6208a5717d
+SIZE (RStudio-rstudio-v1.2.637_GH0.tar.gz) = 20076660
+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

Modified: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp	Thu May 31 05:24:29 2018	(r471194)
+++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp	Thu May 31 07:29:11 2018	(r471195)
@@ -1,4 +1,4 @@
---- src/cpp/core/system/PosixSystem.cpp.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/core/system/PosixSystem.cpp.orig	2018-05-16 18:21:36 UTC
 +++ src/cpp/core/system/PosixSystem.cpp
 @@ -36,6 +36,7 @@
  #include <ifaddrs.h>
@@ -8,70 +8,130 @@
  
  #include <uuid/uuid.h>
  
-@@ -46,9 +47,9 @@
+@@ -45,13 +46,22 @@
+ #include <libproc.h>
  #endif
  
- #ifndef __APPLE__
--#include <sys/prctl.h>
-+//#include <sys/prctl.h>
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <sys/prctl.h>
  #include <sys/sysinfo.h>
--#include <linux/kernel.h>
-+//#include <linux/kernel.h>
+ #include <linux/kernel.h>
  #include <dirent.h>
  #endif
  
-@@ -670,7 +671,7 @@ Error executablePath(const char * argv0,
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#include <sys/queue.h>
++#include <sys/socket.h>
++#include <libprocstat.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
+ #include <boost/thread.hpp>
+ #include <boost/format.hpp>
+ #include <boost/lexical_cast.hpp>
+@@ -569,7 +579,35 @@ Error getOpenFds(std::vector<unsigned in
+    return getOpenFds(getpid(), pFds);
+ }
  
+-#ifndef __APPLE__
++#if defined(__FreeBSD__)
++Error getOpenFds(pid_t pid, std::vector<unsigned int>* pFds)
++{
++   struct procstat *prstat;
++   struct kinfo_proc *kipp, *p;
++   struct filestat_list *head;
++   struct filestat *fst;
++   unsigned i, cnt;
++
++   prstat = procstat_open_sysctl();
++   p = procstat_getprocs(prstat, KERN_PROC_PROC, pid, &cnt);
++
++   for (i = 0; i < cnt; i++) {
++      kipp = &p[i];
++      if (kipp->ki_pid == pid) {
++         head = procstat_getfiles(prstat, kipp, 0);
++         if (head != NULL)
++            STAILQ_FOREACH(fst, head, next)
++               if (fst->fs_fd >= 0)
++                  pFds->push_back(fst->fs_fd);
++      }
++   }
++
++   procstat_freeprocs(prstat, p);
++   procstat_close(prstat);
++
++   return Success();
++}
++#elif !defined(__APPLE__)
+ Error getOpenFds(pid_t pid, std::vector<unsigned int>* pFds)
+ {
+    std::string pidStr = safe_convert::numberToString(pid);
+@@ -859,7 +897,11 @@ Error executablePath(const char * argv0,
+ 
  #elif defined(HAVE_PROCSELF)
  
--   executablePath = std::string("/proc/self/exe");
++#if defined(__FreeBSD__)
 +   executablePath = std::string("/proc/curproc/file");
++#else
+    executablePath = std::string("/proc/self/exe");
++#endif
  
  #else
  
-@@ -1102,7 +1103,7 @@ Error osResourceLimit(ResourceLimit limi
+@@ -1296,7 +1338,7 @@ Error osResourceLimit(ResourceLimit limi
        case CpuLimit:
           *pLimit = RLIMIT_CPU;
           break;
 -#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
        case NiceLimit:
           *pLimit = RLIMIT_NICE;
           break;
-@@ -1175,7 +1176,7 @@ Error systemInformation(SysInfo* pSysInf
+@@ -1369,7 +1411,7 @@ Error systemInformation(SysInfo* pSysInf
  {
     pSysInfo->cores = boost::thread::hardware_concurrency();
  
 -#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
     struct sysinfo info;
     if (::sysinfo(&info) == -1)
        return systemError(errno, ERROR_LOCATION);
-@@ -1495,9 +1496,9 @@ Error restrictCoreDumps()
+@@ -1402,7 +1444,7 @@ void toPids(const std::vector<std::strin
  
+ } // anonymous namespace
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ core::Error pidof(const std::string& process, std::vector<PidType>* pPids)
+ {
+    // use pidof to capture pids
+@@ -1711,7 +1753,7 @@ Error restrictCoreDumps()
+       return error;
+ 
     // no ptrace core dumps permitted
- #ifndef __APPLE__
--   int res = ::prctl(PR_SET_DUMPABLE, 0);
--   if (res == -1)
--      return systemError(errno, ERROR_LOCATION);
-+//   int res = ::prctl(PR_SET_DUMPABLE, 0);
-+//   if (res == -1)
-+//      return systemError(errno, ERROR_LOCATION);
- #endif
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+    int res = ::prctl(PR_SET_DUMPABLE, 0);
+    if (res == -1)
+       return systemError(errno, ERROR_LOCATION);
+@@ -1722,7 +1764,7 @@ Error restrictCoreDumps()
  
-    return Success();
-@@ -1521,10 +1522,10 @@ void printCoreDumpable(const std::string
+ Error enableCoreDumps()
+ {
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+    int res = ::prctl(PR_SET_DUMPABLE, 1);
+    if (res == -1)
+       return systemError(errno, ERROR_LOCATION);
+@@ -1748,7 +1790,7 @@ void printCoreDumpable(const std::string
+    ostr << "  hard limit: " << rLimitHard << std::endl;
  
     // ptrace
- #ifndef __APPLE__
--   int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
--   if (dumpable == -1)
--      LOG_ERROR(systemError(errno, ERROR_LOCATION));
--   ostr << "  pr_get_dumpable: " << dumpable << std::endl;
-+//   int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
-+//   if (dumpable == -1)
-+//      LOG_ERROR(systemError(errno, ERROR_LOCATION));
-+//   ostr << "  pr_get_dumpable: " << dumpable << std::endl;
- #endif
- 
-    std::cerr << ostr.str();
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+    int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL);
+    if (dumpable == -1)
+       LOG_ERROR(systemError(errno, ERROR_LOCATION));

Added: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopDownloadItemHelper.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopDownloadItemHelper.cpp	Thu May 31 07:29:11 2018	(r471195)
@@ -0,0 +1,15 @@
+--- src/cpp/desktop/DesktopDownloadItemHelper.cpp.orig	2018-05-30 17:56:35 UTC
++++ src/cpp/desktop/DesktopDownloadItemHelper.cpp
+@@ -37,9 +37,9 @@ DownloadHelper::DownloadHelper(QWebEngin
+    
+    connect(item, &QWebEngineDownloadItem::finished,
+            this, &DownloadHelper::onFinished);
+-   
+-   connect(item, &QWebEngineDownloadItem::isPausedChanged,
+-           this, &DownloadHelper::onPausedChanged);
++   // exists from 5.10, while FreeBSD kept qt5-webengine at 5.9.5, the handler is empty anyway
++   //connect(item, &QWebEngineDownloadItem::isPausedChanged,
++   //        this, &DownloadHelper::onPausedChanged);
+    
+    connect(item, &QWebEngineDownloadItem::stateChanged,
+            this, &DownloadHelper::onStateChanged);

Modified: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp	Thu May 31 05:24:29 2018	(r471194)
+++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp	Thu May 31 07:29:11 2018	(r471195)
@@ -1,14 +1,14 @@
---- src/cpp/desktop/DesktopMain.cpp.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/desktop/DesktopMain.cpp.orig	2018-05-16 18:21:36 UTC
 +++ src/cpp/desktop/DesktopMain.cpp
-@@ -42,6 +42,7 @@
- #include "DesktopSessionLauncher.hpp"
+@@ -40,6 +40,7 @@
  #include "DesktopProgressActivator.hpp"
  #include "DesktopNetworkProxyFactory.hpp"
+ #include "DesktopActivationOverlay.hpp"
 +#include "global-setenv.h"
  
  QProcess* pRSessionProcess;
  QString sharedSecret;
-@@ -198,6 +199,7 @@ bool isNonProjectFilename(QString filena
+@@ -262,6 +263,7 @@ bool useChromiumDevtools()
  
  int main(int argc, char* argv[])
  {

Added: head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt	Thu May 31 07:29:11 2018	(r471195)
@@ -0,0 +1,10 @@
+--- src/cpp/diagnostics/CMakeLists.txt.orig	2018-05-30 06:20:49 UTC
++++ src/cpp/diagnostics/CMakeLists.txt
+@@ -62,6 +62,7 @@ endif()
+ # set link dependencies
+ target_link_libraries(diagnostics
+    rstudio-core
++   procstat
+ )
+ if(NOT RSTUDIO_SESSION_WIN64)
+    install(TARGETS diagnostics DESTINATION ${RSTUDIO_INSTALL_BIN})

Modified: head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
==============================================================================
--- head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt	Thu May 31 05:24:29 2018	(r471194)
+++ head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt	Thu May 31 07:29:11 2018	(r471195)
@@ -1,4 +1,4 @@
---- src/cpp/session/CMakeLists.txt.orig	2017-11-16 21:40:37 UTC
+--- src/cpp/session/CMakeLists.txt.orig	2018-05-16 18:21:36 UTC
 +++ src/cpp/session/CMakeLists.txt
 @@ -25,9 +25,9 @@ endif()
  if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
@@ -13,8 +13,8 @@
  
  # we often install embedded versions of these packages but don't do so currently
  
-@@ -39,19 +39,19 @@ endif()
- # endif()
+@@ -42,19 +42,19 @@ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DI
+ endif()
  
  # verify libclang is installed
 -if(WIN32)
@@ -46,26 +46,26 @@
  
  
  # include files
-@@ -360,6 +360,9 @@ endif()
+@@ -362,6 +362,9 @@ endif()
  # define executable
  add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
  
 +# additional libraries
-+target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify)
++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)
-@@ -466,11 +469,11 @@ if (NOT RSTUDIO_SESSION_WIN64)
+@@ -474,11 +477,11 @@ if (NOT RSTUDIO_SESSION_WIN64)
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
  
     # install pandoc
--   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1")
+-   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.2.1")
 -   file(GLOB PANDOC_FILES "${PANDOC_BIN}/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)
-+   #set(PANDOC_BIN "${}/common/pandoc/1.19.2.1")
++   #set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.2.1")
 +   #file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
 +   #install(FILES ${PANDOC_FILES}
 +   #        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
@@ -73,7 +73,7 @@
  
     # install rmarkdown package
     # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
-@@ -511,14 +514,14 @@ if (NOT RSTUDIO_SESSION_WIN64)
+@@ -524,14 +527,14 @@ if (NOT RSTUDIO_SESSION_WIN64)
        install(PROGRAMS ${LIBCLANG_64_FILES}
                DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
     else()

Added: head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/RStudio/files/patch-src_cpp_session_postback_CMakeLists.txt	Thu May 31 07:29:11 2018	(r471195)
@@ -0,0 +1,10 @@
+--- src/cpp/session/postback/CMakeLists.txt.orig	2018-05-30 18:06:27 UTC
++++ src/cpp/session/postback/CMakeLists.txt
+@@ -43,6 +43,7 @@ endif()
+ # set link dependencies
+ target_link_libraries(rpostback
+    rstudio-core
++   procstat
+ )
+ 
+ # configure postback scripts for development mode



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805310729.w4V7TC0n009052>