Index: head/devel/RStudio/Makefile
===================================================================
--- head/devel/RStudio/Makefile (revision 517199)
+++ head/devel/RStudio/Makefile (revision 517200)
@@ -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.5001
+DISTVERSION= 1.2.5019
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+= -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 517199)
+++ head/devel/RStudio/distinfo (revision 517200)
@@ -1,21 +1,21 @@
-TIMESTAMP = 1571188560
+TIMESTAMP = 1572714000
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.5001_GH0.tar.gz) = 0d1ec7aef62bda1ceec364e372fdbbcc4da502a3f03eddcddc700bdead6ee840
-SIZE (RStudio-rstudio-v1.2.5001_GH0.tar.gz) = 20458908
+SHA256 (RStudio-rstudio-v1.2.5019_GH0.tar.gz) = 8c108d2bd086db77df128ff267bfd20de0910d2495ebcb128a1829b2202dc6c9
+SIZE (RStudio-rstudio-v1.2.5019_GH0.tar.gz) = 20455572
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-src_cpp_session_session-config.h.in
===================================================================
--- head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in (revision 517199)
+++ head/devel/RStudio/files/patch-src_cpp_session_session-config.h.in (revision 517200)
@@ -1,16 +1,17 @@
---- src/cpp/session/session-config.h.in.orig 2019-08-17 19:37:09 UTC
+--- src/cpp/session/session-config.h.in.orig 2019-10-25 22:16:29 UTC
+++ src/cpp/session/session-config.h.in
-@@ -13,10 +13,9 @@
+@@ -13,11 +13,11 @@
*
*/
-#define RSTUDIO_VERSION "${CPACK_PACKAGE_VERSION}"
--#define RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}"
++#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_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