Index: head/devel/RStudio/Makefile =================================================================== --- head/devel/RStudio/Makefile (revision 463279) +++ head/devel/RStudio/Makefile (revision 463280) @@ -1,84 +1,87 @@ # $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.1.434 +DISTVERSION= 1.1.436 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 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 USE_QT5= core dbus gui location network opengl printsupport qml quick sensors \ sql svg webchannel 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 \ rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect 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.7.0 GIN_VERSION= 1.5 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|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 "# 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 Index: head/devel/RStudio/distinfo =================================================================== --- head/devel/RStudio/distinfo (revision 463279) +++ head/devel/RStudio/distinfo (revision 463280) @@ -1,15 +1,15 @@ -TIMESTAMP = 1519621145 +TIMESTAMP = 1519862398 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 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71 SIZE (mathjax-26.zip) = 3061588 -SHA256 (RStudio-rstudio-v1.1.434_GH0.tar.gz) = 0c78c2ac1072b4e3dbc3397e84a2f2cb20bd78a96d484d18868d9778f3198e07 -SIZE (RStudio-rstudio-v1.1.434_GH0.tar.gz) = 20197399 +SHA256 (RStudio-rstudio-v1.1.436_GH0.tar.gz) = 244c3956144772e9fdbbf13b25c0b197ff868092f4021ae9ace04699489cfba1 +SIZE (RStudio-rstudio-v1.1.436_GH0.tar.gz) = 20197115 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