Index: head/devel/RStudio/Makefile =================================================================== --- head/devel/RStudio/Makefile (revision 514645) +++ head/devel/RStudio/Makefile (revision 514646) @@ -1,102 +1,102 @@ # $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 when ports-mgmt/poudriere-devel is used. PORTNAME= RStudio DISTVERSIONPREFIX= v -DISTVERSION= 1.2.1335 -PORTREVISION= 4 +DISTVERSION= 1.2.5001 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-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/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 33c2c42d40ad.patch:-p1 MAINTAINER= yuri@FreeBSD.org COMMENT= Integrated development environment (IDE) for R LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ant:devel/apache-ant \ ${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \ pandoc:textproc/hs-pandoc 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 pkgconfig qt:5 shared-mime-info ssl USE_QT= core dbus declarative gui location network opengl printsupport sensors \ 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: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+= -DRSTUDIO_BOOST_SIGNALS_VERSION=2 # until Boost 1.69 or RStudio 1.3 -CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE} +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} \ 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 ${WRKDIR}/javadoc ${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 ${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 514645) +++ head/devel/RStudio/distinfo (revision 514646) @@ -1,21 +1,21 @@ -TIMESTAMP = 1553970166 +TIMESTAMP = 1571188560 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.1335_GH0.tar.gz) = f124fbae68762d0a1fc9a7dc72ad290aebde768e262df87acda3883a07fdfd58 -SIZE (RStudio-rstudio-v1.2.1335_GH0.tar.gz) = 20440199 +SHA256 (RStudio-rstudio-v1.2.5001_GH0.tar.gz) = 0d1ec7aef62bda1ceec364e372fdbbcc4da502a3f03eddcddc700bdead6ee840 +SIZE (RStudio-rstudio-v1.2.5001_GH0.tar.gz) = 20458908 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 (33c2c42d40ad.patch) = d252111e28a7de8602b4df1f66b36dded260061f094b504895e5c789f8681091 SIZE (33c2c42d40ad.patch) = 4875 Index: head/devel/RStudio/files/patch-CMakeGlobals.txt =================================================================== --- head/devel/RStudio/files/patch-CMakeGlobals.txt (revision 514645) +++ head/devel/RStudio/files/patch-CMakeGlobals.txt (revision 514646) @@ -1,33 +1,19 @@ ---- CMakeGlobals.txt.orig 2019-02-18 00:38:08 UTC +--- CMakeGlobals.txt.orig 2019-09-19 13:59:21 UTC +++ CMakeGlobals.txt -@@ -74,17 +74,19 @@ endif() +@@ -82,7 +82,7 @@ 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) --if(NOT RSTUDIO_GIT_REVISION_HASH) -- find_program(GIT_EXECUTABLE git) -- if(GIT_EXECUTABLE) -- execute_process( -- COMMAND git rev-parse HEAD -- WORKING_DIRECTORY "${ROOT_SRC_DIR}" -- OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash") -- endif() --endif() -+#if(NOT RSTUDIO_GIT_REVISION_HASH) -+# find_program(GIT_EXECUTABLE git) -+# if(GIT_EXECUTABLE) -+# execute_process( -+# COMMAND git rev-parse HEAD -+# WORKING_DIRECTORY "${ROOT_SRC_DIR}" -+# OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH -+# OUTPUT_STRIP_TRAILING_WHITESPACE) -+# SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash") -+# endif() -+#endif() -+ +-if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) ++if(FALSE AND NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) + find_program(GIT_EXECUTABLE git) + if(GIT_EXECUTABLE) + execute_process( +@@ -93,6 +93,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS + 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") # record these from Jenkins if available if("$ENV{GIT_COMMIT}" STREQUAL "") Index: head/devel/RStudio/files/patch-CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-CMakeLists.txt (revision 514645) +++ head/devel/RStudio/files/patch-CMakeLists.txt (revision 514646) @@ -1,28 +1,19 @@ ---- CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +--- CMakeLists.txt.orig 2019-09-19 13:59:21 UTC +++ CMakeLists.txt -@@ -29,13 +29,18 @@ endif() +@@ -31,7 +31,7 @@ endif() + if (NOT RSTUDIO_SESSION_WIN32) + # dynamically configure SOURCE with the git revision hash + INSTALL(CODE " +- execute_process(COMMAND git rev-parse HEAD ++ execute_process(COMMAND printf ${FREEBSD_PORT_VERSION} + WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\" + OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH) + configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\" +@@ -40,6 +40,7 @@ if (NOT RSTUDIO_SESSION_WIN32) - # install root docs - # dynamically configure SOURCE with the git revision hash --INSTALL(CODE " -- execute_process(COMMAND git rev-parse HEAD -- WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\" -- OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH) -- configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\" -- \"${CMAKE_CURRENT_BINARY_DIR}/SOURCE\") --") -+#INSTALL(CODE " -+# execute_process(COMMAND git rev-parse HEAD -+# WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\" -+# OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH) -+# configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\" -+# \"${CMAKE_CURRENT_BINARY_DIR}/SOURCE\") -+#") -+ -+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in -+ ${CMAKE_CURRENT_BINARY_DIR}/SOURCE) -+ -+set(RSTUDIO_VERSION ${FREEBSD_RSTUDIO_VERSION}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/VERSION.in + ${CMAKE_CURRENT_BINARY_DIR}/VERSION) ++ set(RSTUDIO_VERSION ${FREEBSD_RSTUDIO_VERSION}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/VERSION.in - ${CMAKE_CURRENT_BINARY_DIR}/VERSION) + # install root docs + include(CMakeInstallDocs.txt) Index: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp (revision 514645) +++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp (revision 514646) @@ -1,137 +1,76 @@ ---- src/cpp/core/system/PosixSystem.cpp.orig 2019-02-16 02:00:24 UTC +--- src/cpp/core/system/PosixSystem.cpp.orig 2019-09-19 13:59:21 UTC +++ src/cpp/core/system/PosixSystem.cpp -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include - -@@ -46,13 +47,22 @@ +@@ -46,13 +46,18 @@ #include #endif -#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) #include #include #include #include #endif +#if defined(__FreeBSD__) -+#include -+#include -+#include -+#include -+#include -+#include ++#include ++#include +#endif + #include #include #include -@@ -575,7 +585,35 @@ Error getOpenFds(std::vector* - return getOpenFds(getpid(), pFds); - } +@@ -920,7 +925,7 @@ Error executablePath(const char * argv0, --#ifndef __APPLE__ -+#if defined(__FreeBSD__) -+Error getOpenFds(pid_t pid, std::vector* 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* pFds) - { - std::string pidStr = safe_convert::numberToString(pid); -@@ -920,7 +958,11 @@ Error executablePath(const char * argv0, - #elif defined(HAVE_PROCSELF) -+#if defined(__FreeBSD__) +- executablePath = std::string("/proc/self/exe"); + executablePath = std::string("/proc/curproc/file"); -+#else - executablePath = std::string("/proc/self/exe"); -+#endif #else -@@ -1395,7 +1437,7 @@ Error osResourceLimit(ResourceLimit limi +@@ -1429,7 +1434,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit case CpuLimit: *pLimit = RLIMIT_CPU; break; -#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) case NiceLimit: *pLimit = RLIMIT_NICE; break; -@@ -1468,7 +1510,7 @@ Error systemInformation(SysInfo* pSysInf +@@ -1502,7 +1507,7 @@ Error systemInformation(SysInfo* pSysInfo) { pSysInfo->cores = boost::thread::hardware_concurrency(); -#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) struct sysinfo info; if (::sysinfo(&info) == -1) return systemError(errno, ERROR_LOCATION); -@@ -1501,7 +1543,7 @@ void toPids(const std::vector* pPids) - { - // use pidof to capture pids -@@ -1908,7 +1950,7 @@ Error restrictCoreDumps() +@@ -1942,7 +1947,7 @@ Error restrictCoreDumps() return error; // no ptrace core dumps permitted -#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) int res = ::prctl(PR_SET_DUMPABLE, 0); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1919,7 +1961,7 @@ Error restrictCoreDumps() +@@ -1953,7 +1958,7 @@ Error restrictCoreDumps() Error enableCoreDumps() { -#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) int res = ::prctl(PR_SET_DUMPABLE, 1); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1945,7 +1987,7 @@ void printCoreDumpable(const std::string +@@ -1979,7 +1984,7 @@ void printCoreDumpable(const std::string& context) ostr << " hard limit: " << rLimitHard << std::endl; // ptrace -#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) int dumpable = ::prctl(PR_GET_DUMPABLE, NULL, NULL, NULL, NULL); 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 514645) +++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp (revision 514646) @@ -1,27 +1,27 @@ ---- src/cpp/desktop/DesktopMain.cpp.orig 2019-02-16 02:00:24 UTC +--- src/cpp/desktop/DesktopMain.cpp.orig 2019-09-19 13:59:21 UTC +++ src/cpp/desktop/DesktopMain.cpp @@ -41,6 +41,7 @@ #include "DesktopProgressActivator.hpp" #include "DesktopNetworkProxyFactory.hpp" #include "DesktopActivationOverlay.hpp" +#include "global-setenv.h" #ifdef _WIN32 - #include -@@ -324,7 +325,7 @@ QString inferDefaultRenderingEngine() + #include +@@ -367,7 +368,7 @@ QString inferDefaultRenderingEngine() #endif -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) QString inferDefaultRenderingEngine() { -@@ -383,6 +384,7 @@ void initializeRenderingEngine(std::vect +@@ -426,6 +427,7 @@ void initializeRenderingEngine(std::vector* pAr int main(int argc, char* argv[]) { + GLOBAL_SETENV core::system::initHook(); try Index: head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt (revision 514645) +++ head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt (revision 514646) @@ -1,10 +1,10 @@ ---- src/cpp/diagnostics/CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +--- src/cpp/diagnostics/CMakeLists.txt.orig 2019-09-19 13:59:21 UTC +++ src/cpp/diagnostics/CMakeLists.txt @@ -62,6 +62,7 @@ endif() # set link dependencies target_link_libraries(diagnostics rstudio-core + procstat ) - install(TARGETS diagnostics DESTINATION ${RSTUDIO_INSTALL_BIN}) - + if(NOT RSTUDIO_SESSION_WIN32) + install(TARGETS diagnostics DESTINATION ${RSTUDIO_INSTALL_BIN}) Index: head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 514645) +++ head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt (revision 514646) @@ -1,73 +1,74 @@ ---- src/cpp/session/CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +--- src/cpp/session/CMakeLists.txt.orig 2019-09-19 13:59:21 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)") 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 -@@ -39,18 +39,18 @@ endif() +@@ -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() -- -- 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() +#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*") -@@ -364,6 +364,9 @@ endif() + +@@ -366,6 +366,9 @@ endif() # define executable add_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) -@@ -486,11 +489,11 @@ else() - set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") - endif() +@@ -497,11 +500,11 @@ if (NOT RSTUDIO_SESSION_WIN32) + set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") + endif() --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) +- 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") + # install rmarkdown package + # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") Index: head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp =================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp (revision 514645) +++ head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp (revision 514646) @@ -1,15 +1,14 @@ ---- src/cpp/session/SessionMain.cpp.orig 2019-02-18 01:05:52 UTC +--- src/cpp/session/SessionMain.cpp.orig 2019-09-19 13:59:21 UTC +++ src/cpp/session/SessionMain.cpp -@@ -1620,8 +1620,12 @@ int main (int argc, char * const argv[]) +@@ -1633,7 +1633,11 @@ int main (int argc, char * const argv[]) // move to own process group #ifndef _WIN32 +#if defined(__FreeBSD__) + ::setpgrp(0, 0); +#else ::setpgrp(); - #endif +#endif + #endif // get main thread id (used to distinguish forks which occur - // from the main thread vs. child threads) 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 514645) +++ head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in (revision 514646) @@ -1,16 +1,16 @@ ---- src/cpp/session/session-config.h.in.orig 2018-06-07 06:52:22 UTC +--- src/cpp/session/session-config.h.in.orig 2019-08-17 19:37:09 UTC +++ src/cpp/session/session-config.h.in @@ -13,10 +13,9 @@ * */ -#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}" -#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_VERSION "${FREEBSD_RSTUDIO_VERSION}" +#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 - #cmakedefine RSTUDIO_UNVERSIONED_BUILD - #cmakedefine TRACE_PACKRAT_OUTPUT