Attachment #206786 for bug #236603

View | Details | Raw Unified | Return to bug 236603
Collapse All | Expand All




CATEGORIES=	devel math java
MASTER_SITES=	https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
DISTFILES=	boost_1_63_0.tar.bz2:buildtools \
		core-dictionaries.zip:dictionaries \
		gin-${GIN_VERSION}.zip:buildtools \
		gwt-${GWT_VERSION}.zip:buildtools \
		mathjax-26.zip:buildtools

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

#BROKEN=		fails to build with boost 1.70, see bug 236603

BUILD_DEPENDS=	ant:devel/apache-ant \
		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \

		-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
		-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib
CMAKE_ARGS+=	-DRSTUDIO_BOOST_SIGNALS_VERSION=2 # until Boost 1.69 or RStudio 1.3
CMKAE_ARGS+=	-DRSTUDIO_USE_SYSTEM_BOOST="Yes"
CMAKE_ARGS+=    -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE}
MAKE_ENV=	HOME=${WRKDIR} \
		ANT_OPTS="-Duser.home=${WRKDIR}"

		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
	@${REINPLACE_CMD} -e 's|/opt/rstudio-tools/boost/boost_1_63_0|${WRKDIR}/boost_1_63_0|g' \
		${WRKSRC}/src/cpp/CMakeLists.txt
	@${REINPLACE_CMD} -e 's|/opt/rstudio-tools/boost/|${STAGEDIR}${PREFIX}/lib/rstudio/resources/|g' \
		${WRKSRC}/dependencies/common/install-boost

pre-build:
	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/

Lines 1-4 Link Here

(-)RStudio_patched-rstudio-boost/distinfo (-1 / +3 lines)
1	TIMESTAMP = 1553970166	1	TIMESTAMP = 1566392761
		2	SHA256 (boost_1_63_0.tar.bz2) = beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0
		3	SIZE (boost_1_63_0.tar.bz2) = 81984414
2	SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494	4	SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
3	SIZE (core-dictionaries.zip) = 876339	5	SIZE (core-dictionaries.zip) = 876339
4	SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a	6	SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a

Return to bug 236603

Lines 10-16 Link Here

(-)RStudio_patched-rstudio-boost/Makefile (-2 / +8 lines)
10	CATEGORIES= devel math java	10	CATEGORIES= devel math java
11	MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \	11	MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
12	https://s3.amazonaws.com/rstudio-buildtools/:buildtools	12	https://s3.amazonaws.com/rstudio-buildtools/:buildtools
13	DISTFILES= core-dictionaries.zip:dictionaries \	13	DISTFILES= boost_1_63_0.tar.bz2:buildtools \
		14	core-dictionaries.zip:dictionaries \
14	gin-${GIN_VERSION}.zip:buildtools \	15	gin-${GIN_VERSION}.zip:buildtools \
15	gwt-${GWT_VERSION}.zip:buildtools \	16	gwt-${GWT_VERSION}.zip:buildtools \
16	mathjax-26.zip:buildtools	17	mathjax-26.zip:buildtools
Lines 21-27 Link Here
21	LICENSE= GPLv3	22	LICENSE= GPLv3
22	LICENSE_FILE= ${WRKSRC}/COPYING	23	LICENSE_FILE= ${WRKSRC}/COPYING
23		24
24	BROKEN= fails to build with boost 1.70, see bug 236603	25	#BROKEN= fails to build with boost 1.70, see bug 236603
25		26
26	BUILD_DEPENDS= ant:devel/apache-ant \	27	BUILD_DEPENDS= ant:devel/apache-ant \
27	${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \	28	${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
Lines 47-52 Link Here
47	-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \	48	-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
48	-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib	49	-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib
49	CMAKE_ARGS+= -DRSTUDIO_BOOST_SIGNALS_VERSION=2 # until Boost 1.69 or RStudio 1.3	50	CMAKE_ARGS+= -DRSTUDIO_BOOST_SIGNALS_VERSION=2 # until Boost 1.69 or RStudio 1.3
		51	CMKAE_ARGS+= -DRSTUDIO_USE_SYSTEM_BOOST="Yes"
50	CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE}	52	CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE}
51	MAKE_ENV= HOME=${WRKDIR} \	53	MAKE_ENV= HOME=${WRKDIR} \
52	ANT_OPTS="-Duser.home=${WRKDIR}"	54	ANT_OPTS="-Duser.home=${WRKDIR}"
Lines 74-79 Link Here
74	s\|rHomePaths.push_back\|//rHomePaths.push_back\|; \	76	s\|rHomePaths.push_back\|//rHomePaths.push_back\|; \
75	s\|//rHomePaths.push_back(FilePath("/usr/local/lib/\|rHomePaths.push_back(FilePath("${PREFIX}/lib/\|' \	77	s\|//rHomePaths.push_back(FilePath("/usr/local/lib/\|rHomePaths.push_back(FilePath("${PREFIX}/lib/\|' \
76	${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp	78	${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp
		79	@${REINPLACE_CMD} -e 's\|/opt/rstudio-tools/boost/boost_1_63_0\|${WRKDIR}/boost_1_63_0\|g' \
		80	${WRKSRC}/src/cpp/CMakeLists.txt
		81	@${REINPLACE_CMD} -e 's\|/opt/rstudio-tools/boost/\|${STAGEDIR}${PREFIX}/lib/rstudio/resources/\|g' \
		82	${WRKSRC}/dependencies/common/install-boost
77		83
78	pre-build:	84	pre-build:
79	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/	85	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/