Index: head/devel/RStudio/Makefile
===================================================================
--- head/devel/RStudio/Makefile (revision 467698)
+++ head/devel/RStudio/Makefile (revision 467699)
@@ -1,87 +1,88 @@
# $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.445
+PORTREVISION= 1
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/files/patch-boost-1.67
===================================================================
--- head/devel/RStudio/files/patch-boost-1.67 (nonexistent)
+++ head/devel/RStudio/files/patch-boost-1.67 (revision 467699)
@@ -0,0 +1,62 @@
+Regressed by https://github.com/boostorg/date_time/commit/f9f2aaf5216c
+
+src/cpp/core/DateTime.cpp:68:26: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::seconds'
+ return time_t_epoch + seconds(sec);
+ ^~~~~~~~~~~
+src/cpp/core/file_lock/FileLock.cpp:136:34: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::seconds'
+ FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+src/cpp/core/file_lock/FileLock.cpp:140:30: error: no matching conversion for functional-style cast from 'double' to 'boost::posix_time::seconds'
+ FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+src/cpp/core/file_lock/FileLock.cpp:215:38: error: no matching constructor for initialization of 'boost::posix_time::seconds'
+boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval);
+ ^ ~~~~~~~~~~~~~~~~~~~~~~~
+src/cpp/core/file_lock/FileLock.cpp:216:38: error: no matching constructor for initialization of 'boost::posix_time::seconds'
+boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate);
+ ^ ~~~~~~~~~~~~~~~~~~~
+/usr/local/include/boost/date_time/posix_time/posix_time_duration.hpp:53:30: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'double' to 'const boost::posix_time::seconds' for 1st argument
+ class BOOST_SYMBOL_VISIBLE seconds : public time_duration
+ ^
+/usr/local/include/boost/date_time/posix_time/posix_time_duration.hpp:58:37: note: candidate template ignored: disabled by 'enable_if' [with T = double]
+ typename boost::enable_if, void>::type* = 0) :
+ ^
+
+--- src/cpp/core/DateTime.cpp.orig 2018-04-16 22:26:34 UTC
++++ src/cpp/core/DateTime.cpp
+@@ -65,7 +65,7 @@ boost::posix_time::ptime timeFromSecondsSinceEpoch(dou
+ using namespace boost::posix_time;
+
+ ptime time_t_epoch(date(1970,1,1));
+- return time_t_epoch + seconds(sec);
++ return time_t_epoch + seconds(long(sec));
+ }
+
+ boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms)
+--- src/cpp/core/file_lock/FileLock.cpp.orig 2018-04-16 22:26:34 UTC
++++ src/cpp/core/file_lock/FileLock.cpp
+@@ -46,8 +46,8 @@ const char * const kLockTypeLinkBased = "linkbased";
+ #endif
+
+ const char * const kLocksConfPath = "/etc/rstudio/file-locks";
+-const double kDefaultRefreshRate = 20.0;
+-const double kDefaultTimeoutInterval = 30.0;
++const long kDefaultRefreshRate = 20;
++const long kDefaultTimeoutInterval = 30;
+
+ std::string lockTypeToString(FileLock::LockType type)
+ {
+@@ -132,11 +132,11 @@ void FileLock::initialize(const Settings& settings)
+ FileLock::s_defaultType = stringToLockType(settings.get("lock-type", kLockTypeDefault));
+
+ // timeout interval
+- double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval);
++ long timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval);
+ FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval);
+
+ // refresh rate
+- double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate);
++ long refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate);
+ FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate);
+
+ // logging
Property changes on: head/devel/RStudio/files/patch-boost-1.67
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property