From nobody Wed Nov 02 11:50:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N2QF22pfxz4gyVp; Wed, 2 Nov 2022 11:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N2QF22H5Cz40wc; Wed, 2 Nov 2022 11:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667389830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caAB2xG1XWQzte9YppgP1RWQXqVzKYCSQxrIsi9CKLw=; b=hR3E2+RL/gvxozxw1uXT+Td/P847cbJr1FAax+r871543v0UHW84GZVpW5ktRhCh47Qp9X QfoZS2c4FgLcQ5RjkJ2B48yplMxHNfUUb/lRTUQPvnzV5hANSY4TMzQ4n3+FbUARrYuV6p B25GFlz3bjXBRUA62fotZALVRKMTPxmlywM3ZZv2aPJGJPrmuSKmzjTParWHKvkg53/KY8 eNJwjdzaQhNlV08Ud6Xgz4BWe1yN3MIFZLkbqGXY494s4QczUgS1l62RHnafWPjX9yxDWm H8PLwiHvSqvUPzkW7o4A2PrSvyrQ/m3FQG68pGRjt+G5pEVr3SvuWiTmEfpfEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N2QF21DPWzvcd; Wed, 2 Nov 2022 11:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A2BoUZo019164; Wed, 2 Nov 2022 11:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2BoTo8019163; Wed, 2 Nov 2022 11:50:29 GMT (envelope-from git) Date: Wed, 2 Nov 2022 11:50:29 GMT Message-Id: <202211021150.2A2BoTo8019163@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: c943a5c42e03 - main - math/R: Update to 4.2.2; remove FLANG option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c943a5c42e03201411b8e9598b99a87da33c18c6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667389830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caAB2xG1XWQzte9YppgP1RWQXqVzKYCSQxrIsi9CKLw=; b=xeMIfi3Pk83MwYEy2RoJHr1Q35B46FzqIFgIL85kczCDvtrDCcfD48uPVqiX4IyhGlFdyO E5U0Nj2hbq/WQYZzZX1lT59YYZ2ltH0jvCVGqJ1rSvnbuE8RP9hdusQCVsGHxAn/GyE/VX qqTsWf469wtXINd6UNLNwiAC5XEHnPxr8c4nmNTJgPFLIPtkYTGkQsFcT+XotDhGOQ14K0 rBnGr/TiKMRgZqPnsdYFpUyOTbt+0aZ+HAe/05Ge3AkK4l//wn9wXOg2hOD5Ap8ncn/GCv n9MYkbw8n7mxGKNKt4RQtYeiPiU1aq587w/dTXYNDegGA65eKVtwQY49jzjwlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667389830; a=rsa-sha256; cv=none; b=XdKHPDaTYX8emoREgz4Guv2faQPeyRDe2TYd0z1dTOtDU4nCUQOg/EGEJQUpkh3VXrXc0c 59QEX9YkoSbDdpdhxzkI+ijReFThdai46U34ntn897wicHYFRdH3N+A7TI1+HkSQconNz0 T0PFDO+h8Znd0U6X7NIwOKssIHB+KVngYdq4Y9PAAPoOVp8Eel9a3leconUV3RDb4xBpkk VgCzdfsTJZX1JmVvDYlo8daCzPBYWRE1HVgN4XoxZRX0wicNNMEqpUmqQuymROBliZBvHp 7r0EWr5ZnB8D2ZNZijhDytxq+HA3Eok6q6cM3PupWD7lVw1tyNEVAHZgMTHbTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=c943a5c42e03201411b8e9598b99a87da33c18c6 commit c943a5c42e03201411b8e9598b99a87da33c18c6 Author: Joseph Mingrone AuthorDate: 2022-10-31 16:58:18 +0000 Commit: Joseph Mingrone CommitDate: 2022-11-02 11:49:57 +0000 math/R: Update to 4.2.2; remove FLANG option https://hypatia.math.ethz.ch/pipermail/r-announce/2022/000686.html Remove the FLANG option since lang/flang was removed from the tree on 2022-09-30. In the future, the option can be re-added to use flang that is part of devel/llvm13+. Sponsored by: The FreeBSD Foundation --- math/R/Makefile | 34 ++++++++-------------------------- math/R/distinfo | 6 +++--- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/math/R/Makefile b/math/R/Makefile index f320d47df220..e39f9caf161d 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,6 +1,5 @@ PORTNAME= R -DISTVERSION= 4.2.1 -PORTREVISION= 1 +DISTVERSION= 4.2.2 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} @@ -16,8 +15,8 @@ BUILD_DEPENDS= texi2any:print/texinfo LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre2-8.so:devel/pcre2 # R packages may require GNU make or cmake to build -RUN_DEPENDS= gmake:devel/gmake \ - cmake:devel/cmake-core +RUN_DEPENDS= cmake:devel/cmake-core \ + gmake:devel/gmake # possible TODO # - Use --with-recommended-packages=no by default @@ -25,8 +24,8 @@ RUN_DEPENDS= gmake:devel/gmake \ # - Create ports for each of the recommended packages # - Create a meta-port for the recommended packages -USES= compiler:c++11-lang cpe gmake iconv libtool localbase pathfix \ - perl5 readline +USES= compiler:c++11-lang cpe fortran gmake iconv libtool localbase \ + pathfix perl5 readline CPE_VENDOR= r-project USE_LDCONFIG= ${PREFIX}/lib/R/lib USE_PERL5= build @@ -40,17 +39,9 @@ INSTALL_TARGET= install-strip PLIST_SUB= FULLVER=${DISTVERSION} \ MAJORVER=${_MAJORVER} -OPTIONS_DEFINE= ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11 -OPTIONS_DEFINE_amd64= FLANG OPENMP -OPTIONS_DEFINE_i386= OPENMP -OPTIONS_DEFINE_powerpc64= OPENMP -OPTIONS_DEFINE_powerpc64le= OPENMP -OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE PNG RBLAS \ - RPROF TCLTK TIFF X11 -OPTIONS_DEFAULT_amd64= OPENMP -OPTIONS_DEFAULT_i386= OPENMP -OPTIONS_DEFAULT_powerpc64= OPENMP -OPTIONS_DEFAULT_powerpc64le= OPENMP +OPTIONS_DEFINE= ICU INFO LDOUBLE LETTER MEMPROF NLS OPENMP RPROF X11 +OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE OPENMP PNG \ + RBLAS RPROF TCLTK TIFF X11 OPTIONS_GROUP= NEEDX11 OPTIONS_GROUP_NEEDX11= CAIROPANGO GHOSTSCRIPT JPEG PNG TCLTK TEXDOCS TIFF OPTIONS_SINGLE= BLAS @@ -59,7 +50,6 @@ OPTIONS_SINGLE_BLAS= ATLAS NETLIB OPENBLAS RBLAS OPTIONS_SUB= YES CAIROPANGO_DESC= Cairo graphics device and Pango multi-language text -FLANG_DESC= Use experimental flang Fortran compiler GHOSTSCRIPT_DESC= Graphics device for bitmap files via Ghostscript JPEG_DESC= JPEG graphics device LDOUBLE_DESC= Long double data type @@ -80,9 +70,6 @@ CAIROPANGO_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz CAIROPANGO_USES= gettext gnome jpeg pkgconfig CAIROPANGO_USE= GNOME=cairo,pango CAIROPANGO_CONFIGURE_WITH= cairo -FLANG_PREVENTS= ATLAS NETLIB OPENBLAS -FLANG_LIB_DEPENDS= libpgmath.so:math/libpgmath -FLANG_USES= fortran:flang GHOSTSCRIPT_IMPLIES= X11 GHOSTSCRIPT_USES= ghostscript ICU_LIB_DEPENDS= libicui18n.so:devel/icu @@ -135,11 +122,6 @@ _MAJORVER= ${DISTVERSION:R:R} .include -## Cannot use FLANG_USES_OFF=fortran because the FLANG option is only for amd64 -.if ! ${PORT_OPTIONS:MFLANG} -USES+= fortran -.endif - post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure @${REINPLACE_CMD} \ diff --git a/math/R/distinfo b/math/R/distinfo index b9433988c5e4..090457509eb4 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656121127 -SHA256 (R-4.2.1.tar.gz) = 4d52db486d27848e54613d4ee977ad952ec08ce17807e1b525b10cd4436c643f -SIZE (R-4.2.1.tar.gz) = 37601544 +TIMESTAMP = 1667234600 +SHA256 (R-4.2.2.tar.gz) = 0ff62b42ec51afa5713caee7c4fde7a0c45940ba39bef8c5c9487fef0c953df5 +SIZE (R-4.2.2.tar.gz) = 33987014