svn commit: r518990 - head/devel/RStudio
Yuri Victorovich
yuri at FreeBSD.org
Wed Dec 4 06:21:42 UTC 2019
Author: yuri
Date: Wed Dec 4 06:21:42 2019
New Revision: 518990
URL: https://svnweb.freebsd.org/changeset/ports/518990
Log:
devel/RStudio: Add JAVA_HOME to MAKE_ENV and the executable to eliminate potential ambiguity
Suggested by: Rainer Hurling <rhurlin at gwdg.de>
Modified:
head/devel/RStudio/Makefile
Modified: head/devel/RStudio/Makefile
==============================================================================
--- head/devel/RStudio/Makefile Wed Dec 4 05:50:51 2019 (r518989)
+++ head/devel/RStudio/Makefile Wed Dec 4 06:21:42 2019 (r518990)
@@ -6,6 +6,7 @@
PORTNAME= RStudio
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.5019
+PORTREVISION= 1
CATEGORIES= devel math java
MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
https://s3.amazonaws.com/rstudio-buildtools/:buildtools
@@ -50,6 +51,7 @@ 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} \
+ JAVA_HOME=${JAVA_HOME} \
ANT_OPTS="-Duser.home=${WRKDIR}"
GWT_VERSION= 2.8.1
@@ -89,7 +91,7 @@ post-install:
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 \"$$@\"" \
+ echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so JAVA_HOME=${JAVA_HOME} ${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
More information about the svn-ports-head
mailing list