diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 28a83ea7a95b..0bd285b912d2 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -1,100 +1,96 @@ # $FreeBSD$ # This port opens too many files during build, more than the default setting. # Its build is known to succeed with MAX_FILES_RStudio=2048 in poudriere.conf when ports-mgmt/poudriere-devel is used. 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 DISTFILES= core-dictionaries.zip:dictionaries \ gin-${GIN_VERSION}.zip:buildtools \ 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 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: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 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 + 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 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/gcc6/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 diff --git a/devel/RStudio/distinfo b/devel/RStudio/distinfo index 0cf646cda831..9e197795aedc 100644 --- a/devel/RStudio/distinfo +++ b/devel/RStudio/distinfo @@ -1,23 +1,19 @@ -TIMESTAMP = 1527743852 +TIMESTAMP = 1528355181 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.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,19 +1,27 @@ ---- 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) -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() -- ++#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,10 +1,10 @@ ---- 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 target_link_libraries(rpostback rstudio-core + 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