Thursday, April 27, 2023

Re: [proposal] math/rstudio - depend on net/curl as default download method

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/rstudio/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 24 Apr 2023 11:41:22 -0000 1.12
+++ Makefile 27 Apr 2023 20:30:04 -0000
@@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = ${LP64_ARCHS}
V = 1.3.959
COMMENT = Integrated Development Environment (IDE) for R
PKGNAME = rstudio-${V}
-REVISION = 8
+REVISION = 9
CATEGORIES = math x11

HOMEPAGE = https://www.rstudio.com/
@@ -62,7 +62,8 @@ LIB_DEPENDS = devel/boost \

RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
- x11/gtk+4,-guic
+ x11/gtk+4,-guic \
+ net/curl

CONFIGURE_ARGS = -DBoost_INCLUDE_DIR="${LOCALBASE}/include" \
-DQT_QMAKE_EXECUTABLE="${LOCALBASE}/bin/qmake-qt5" \
Index: patches/patch-src_cpp_session_modules_SessionPackages_R
===================================================================
RCS file: patches/patch-src_cpp_session_modules_SessionPackages_R
diff -N patches/patch-src_cpp_session_modules_SessionPackages_R
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_cpp_session_modules_SessionPackages_R 27 Apr 2023 20:30:04 -0000
@@ -0,0 +1,16 @@
+Index: src/cpp/session/modules/SessionPackages.R
+--- src/cpp/session/modules/SessionPackages.R.orig
++++ src/cpp/session/modules/SessionPackages.R
+@@ -1252,7 +1252,11 @@ if (identical(as.character(Sys.info()["sysname"]), "Da
+ else if (identical(sysName, "Darwin")) {
+ posixMethod("curl")
+ }
+-
++
++ else if (identical(sysName, "OpenBSD")) {
++ posixMethod("curl")
++ }
++
+ else if (identical(sysName, "Linux")) {
+ method <- posixMethod("wget")
+ if (!nzchar(method))
Oh crap... forgot a REVISION bump, and let a broken experiment slip through.

Sorry! Working diff is attached.

On 4/27/23 18:38, Volker Schlecht wrote:
> Ping, patch updated against the recently bumped version in tree.
>
> * adds a RUN_DEPENDS on net/curl
> That's already a transitory dependency via math/R, so in effect no new
> dependency
>
> * adds a patch for RStudio to default to curl as default download method
> Required for RStudio to realize that it can use libcurl to pull packages
> from CRAN, and thus avoids an unneccesary warning message at startuo.
>
> On 4/17/23 20:42, Volker Schlecht wrote:
>> Ping - patch reattached.

No comments:

Post a Comment