Index: head/devel/RStudio/Makefile =================================================================== --- head/devel/RStudio/Makefile (revision 536327) +++ head/devel/RStudio/Makefile (revision 536328) @@ -1,109 +1,105 @@ # $FreeBSD$ # 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.2.5042 -PORTREVISION= 1 +DISTVERSION= 1.3.959 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-26.zip:buildtools - -PATCH_SITES= https://github.com/rstudio/rstudio/commit/ -PATCHFILES+= 33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch:-p1 # https://github.com/rstudio/rstudio/commit/33c2c42d40ad97d97ca3907df51059cd2ce76fe3 + 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 \ 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 \ libuuid.so:misc/e2fsprogs-libuuid USES= cmake desktop-file-utils fortran localbase:ldflags pkgconfig qt:5 shared-mime-info ssl USE_QT= core dbus declarative gui location network opengl printsupport quickcontrols sensors \ sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build 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= -DRSTUDIO_TARGET=Desktop \ -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} 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 post-extract: @${MKDIR} ${WRKSRC}/dependencies/common/dictionaries && ${MV} ${WRKDIR}/en_* ${WRKSRC}/dependencies/common/dictionaries/ @${MV} ${WRKDIR}/mathjax-* ${WRKSRC}/dependencies/common/ @${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|||' \ ${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 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/rstudio/bin/rstudio \"$$@\"" \ ) > ${STAGEDIR}${PREFIX}/bin/rstudio @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/rstudio @${REINPLACE_CMD} -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/rstudio|' ${STAGEDIR}${PREFIX}/share/applications/rstudio.desktop # Some functions expect the pandoc symlink. @${MKDIR} ${STAGEDIR}${PREFIX}/lib/rstudio/bin/pandoc @cd ${STAGEDIR}${PREFIX}/lib/rstudio/bin/pandoc && ${LN} -s ../../../../bin/pandoc # There is a variability in .js file names due to the 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|' > ${TMPPLIST} .include Index: head/devel/RStudio/distinfo =================================================================== --- head/devel/RStudio/distinfo (revision 536327) +++ head/devel/RStudio/distinfo (revision 536328) @@ -1,21 +1,19 @@ -TIMESTAMP = 1588990554 +TIMESTAMP = 1590254502 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-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71 -SIZE (mathjax-26.zip) = 3061588 -SHA256 (RStudio-rstudio-v1.2.5042_GH0.tar.gz) = 2bcd1d525d92e9ce42f4c7a57383c025e10d34313f8ed245429f02980b47c1fc -SIZE (RStudio-rstudio-v1.2.5042_GH0.tar.gz) = 20456999 +SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176 +SIZE (mathjax-27.zip) = 3285230 +SHA256 (RStudio-rstudio-v1.3.959_GH0.tar.gz) = 5c89fe18e3d5ead0e7921c88e5fb42ed816823238e84135f5e9e3a364d35fcc1 +SIZE (RStudio-rstudio-v1.3.959_GH0.tar.gz) = 89639419 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 -SHA256 (33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch) = d252111e28a7de8602b4df1f66b36dded260061f094b504895e5c789f8681091 -SIZE (33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch) = 4875 Index: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp (revision 536327) +++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp (revision 536328) @@ -1,57 +1,20 @@ ---- src/cpp/core/system/PosixSched.cpp.orig 2020-04-01 16:16:24 UTC +--- src/cpp/core/system/PosixSched.cpp.orig 2020-05-18 18:11:10 UTC +++ src/cpp/core/system/PosixSched.cpp -@@ -15,8 +15,13 @@ +@@ -41,7 +41,7 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus) - #include - -+#define _GNU_SOURCE - #include -+#include -+#include // w/out this fails on i386 with error: use of undeclared identifier 'NBBY' -+#include - -+ - #include - - namespace rstudio { -@@ -41,9 +46,10 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus) Error getCpuAffinity(CpuAffinity* pCpus) { - #ifndef __APPLE__ -- cpu_set_t cs; -+/* -+ cpuset_t cs; +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + cpu_set_t cs; CPU_ZERO(&cs); -- if (::sched_getaffinity(0, sizeof(cs), &cs) == -1) -+ if (sched_getaffinity(0, sizeof(cs), &cs) == -1) - return systemError(errno, ERROR_LOCATION); + if (::sched_getaffinity(0, sizeof(cs), &cs) == -1) +@@ -66,7 +66,7 @@ Error getCpuAffinity(CpuAffinity* pCpus) - pCpus->clear(); -@@ -55,7 +61,7 @@ Error getCpuAffinity(CpuAffinity* pCpus) - else - pCpus->push_back(false); - } -- -+*/ - return Success(); - #else - return systemError(boost::system::errc::not_supported, ERROR_LOCATION); -@@ -66,7 +72,8 @@ Error getCpuAffinity(CpuAffinity* pCpus) Error setCpuAffinity(const CpuAffinity& cpus) { - #ifndef __APPLE__ -- cpu_set_t cs; -+/* -+ cpuset_t cs; +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + cpu_set_t cs; CPU_ZERO(&cs); - for (std::size_t i=0; i + +-#ifdef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #include #include + #include #endif -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) #include #include #include #include #endif +#if defined(__FreeBSD__) +#include +#include +#endif + #include #include #include -@@ -920,7 +925,7 @@ Error executablePath(const char * argv0, +@@ -917,7 +922,7 @@ Error executablePath(const char * argv0, #elif defined(HAVE_PROCSELF) - executablePath = std::string("/proc/self/exe"); + executablePath = std::string("/proc/curproc/file"); #else -@@ -1429,7 +1434,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit +@@ -1426,7 +1431,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit case CpuLimit: *pLimit = RLIMIT_CPU; break; -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) case NiceLimit: *pLimit = RLIMIT_NICE; break; -@@ -1502,7 +1507,7 @@ Error systemInformation(SysInfo* pSysInfo) +@@ -1499,7 +1504,7 @@ Error systemInformation(SysInfo* pSysInfo) { pSysInfo->cores = boost::thread::hardware_concurrency(); -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) struct sysinfo info; if (::sysinfo(&info) == -1) return systemError(errno, ERROR_LOCATION); -@@ -1942,7 +1947,7 @@ Error restrictCoreDumps() +@@ -1939,7 +1944,7 @@ Error restrictCoreDumps() return error; // no ptrace core dumps permitted -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) int res = ::prctl(PR_SET_DUMPABLE, 0); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1953,7 +1958,7 @@ Error restrictCoreDumps() +@@ -1950,7 +1955,7 @@ Error restrictCoreDumps() Error enableCoreDumps() { -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) int res = ::prctl(PR_SET_DUMPABLE, 1); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1979,7 +1984,7 @@ void printCoreDumpable(const std::string& context) +@@ -1976,7 +1981,7 @@ void printCoreDumpable(const std::string& context) ostr << " hard limit: " << rLimitHard << std::endl; // ptrace -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) - int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL); + int dumpable = ::prctl(PR_GET_DUMPABLE, nullptr, nullptr, nullptr, nullptr); if (dumpable == -1) LOG_ERROR(systemError(errno, ERROR_LOCATION)); Index: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp (revision 536327) +++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp (revision 536328) @@ -1,28 +1,28 @@ ---- src/cpp/desktop/DesktopMain.cpp.orig 2020-04-01 16:16:24 UTC +--- src/cpp/desktop/DesktopMain.cpp.orig 2020-05-18 18:11:10 UTC +++ src/cpp/desktop/DesktopMain.cpp -@@ -42,6 +42,8 @@ - #include "DesktopNetworkProxyFactory.hpp" +@@ -47,6 +47,8 @@ #include "DesktopActivationOverlay.hpp" + #include "DesktopSessionServersOverlay.hpp" +#include "global-setenv.h" + #ifdef _WIN32 #include #include -@@ -367,7 +369,7 @@ QString inferDefaultRenderingEngine() +@@ -372,7 +374,7 @@ QString inferDefaultRenderingEngine() #endif -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) QString inferDefaultRenderingEngine() { -@@ -426,6 +428,7 @@ void initializeRenderingEngine(std::vector* pAr +@@ -461,6 +463,7 @@ std::string getSessionUrl() int main(int argc, char* argv[]) { + GLOBAL_SETENV core::system::initHook(); try Index: head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 536327) +++ head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 536328) @@ -1,105 +1,105 @@ ---- src/cpp/session/CMakeLists.txt.orig 2020-04-01 16:16:24 UTC +--- src/cpp/session/CMakeLists.txt.orig 2020-05-18 18:11:10 UTC +++ src/cpp/session/CMakeLists.txt @@ -25,9 +25,9 @@ endif() - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") - message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") + if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27") + message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)") endif() -if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") - message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") -endif() +#if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") +# message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") +#endif() - # we often install embedded versions of these packages but don't do so currently + # verify embedded packages are available + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) +@@ -38,19 +38,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) + endforeach() -@@ -39,19 +39,19 @@ endif() - # endif() - # 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*") -@@ -366,6 +366,9 @@ endif() +@@ -391,6 +391,9 @@ endif() # define executable - add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES}) + add_stripped_executable(rsession ${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) -@@ -497,11 +500,11 @@ if (NOT RSTUDIO_SESSION_WIN32) - set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") - endif() +@@ -519,11 +522,11 @@ if (NOT RSTUDIO_SESSION_WIN32) + # install pandoc + set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version") - set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") - 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 "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") + #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) - # install rmarkdown package - # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") -@@ -534,18 +537,18 @@ if (NOT RSTUDIO_SESSION_WIN32) + # install embedded packages + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) +@@ -558,18 +561,18 @@ if (NOT RSTUDIO_SESSION_WIN32) 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) Index: head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in (revision 536327) +++ head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in (revision 536328) @@ -1,17 +1,17 @@ ---- src/cpp/session/session-config.h.in.orig 2020-04-01 16:16:24 UTC +--- src/cpp/session/session-config.h.in.orig 2020-05-18 18:11:10 UTC +++ src/cpp/session/session-config.h.in @@ -13,11 +13,11 @@ * */ -#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}" +#define RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" #define RSTUDIO_RELEASE_NAME "${RSTUDIO_RELEASE_NAME}" #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}" - #cmakedefine RSTUDIO_SERVER + #define RSTUDIO_PACKAGE_OS "${RSTUDIO_PACKAGE_OS}" Index: head/devel/RStudio/pkg-descr =================================================================== --- head/devel/RStudio/pkg-descr (revision 536327) +++ head/devel/RStudio/pkg-descr (revision 536328) @@ -1,6 +1,6 @@ RStudio is an integrated development environment (IDE) for R. It includes a console, syntax-highlighting editor that supports direct code execution, as well as tools for plotting, history, debugging and workspace management. -WWW: https://www.rstudio.com/ +WWW: https://rstudio.com/