From nobody Thu Mar 31 14:38:53 2022 X-Original-To: dev-commits-ports-all@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 29D861A4973F; Thu, 31 Mar 2022 14:38:54 +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 4KTmC20bT3z3qbF; Thu, 31 Mar 2022 14:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648737534; 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=i1VCC8lGSukRyPMIFeDjQ1T7zYGiuSwFHOOIcdXiGdw=; b=kylF3+emV1fGx3BFVLre5NBAC/VsAaI7XZSeD5E+vikiegW0usBQW773BLcdzbTVA3hZuR jUs3czJUz9eqDxNoDvpvGxtyVxV7KCjvBqTqAgdAEHw252rwwiRx2UYwu5zyXMqNvLSFLI EGhlEGyfqx78Lau2Rq4sfKpMg8TpY/SCkdHegCOQvm4BclrQm5/0JPTVIXB7VG9wn594CW Pcl62tC+KWdle4Z3CturzNnYB3Y71M9MoTNgxPtcj1Y4DB/XduJkpl4yx6bqKWrd/qGQ7y 3IG4brUWQzC0aKtRPxSe5X5ldBgvcKt3h/7fDcYCVqp8IAwnjKobyOgT3JTGGg== 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 E8E2F29886; Thu, 31 Mar 2022 14:38:53 +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 22VEcrdo072755; Thu, 31 Mar 2022 14:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VEcrhj072754; Thu, 31 Mar 2022 14:38:53 GMT (envelope-from git) Date: Thu, 31 Mar 2022 14:38:53 GMT Message-Id: <202203311438.22VEcrhj072754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 63ff13713ef5 - main - Mk: unregister expired NodeJS 10 and Ruby 2.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63ff13713ef542d7ee39b62169163309744e7ff7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648737534; 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=i1VCC8lGSukRyPMIFeDjQ1T7zYGiuSwFHOOIcdXiGdw=; b=ipi1K+9njUS1F4csYdPQrN0mn/UubVnrRI2gaPUByk2QGWymo7HbJW51D7SuTTEFFEBK/x 7nXHoN2G5h1EERfe8ZQSpWFVJglk5FRFwrFwwYHQRQhJJQRFHr/YBTptmktq6//VMNrfL/ pTwqgStFhzbR0jHvprKvnArbYTsPgjXyKjtJPNqwIzfWwSwaBy1N/FSnt9zBJVnZ7YJV+u PwQ6cng5yZPkBZAW5R1PUsospBpdCtf6IL7PXPMIkbYVhPktowRzMk3g0cKLCUMHAky5KP v8+urkhC++DgJrfie5SvWDXOTLPpXPUdeqUyFbBXNUmG2sNH1DnkY112gEHBBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648737534; a=rsa-sha256; cv=none; b=VhxKQ1TPXUMzZ3IGVfAHt6kS0R90Rs+38oP4qzWV0cPj4B9NTdv9DImyyJVCHL4rMGALiF bKL5d0aphfy0I10685SZVcskRByN1zENzqkFvUleqsE3JC1hJC69829H9vKjNI2S24OITP Xayexow0H1MdKIkA2SaOdrBy//aQfxOA6Ej5SQptTxeYJ9Qfay8qv0emigCJm6hqfmbS2o SVgG+zARYTKNBK8KPX2mwuBqmp7fhZwzLeN81eicGzMrhfz4Hm/sk5LJTly3l+h3LlkND1 hFbJ2IPeCZiLWFgBSycsRGdvYFUgqXz3g1DVjgWok83W7wsVqlwcuiXzkiwbMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=63ff13713ef542d7ee39b62169163309744e7ff7 commit 63ff13713ef542d7ee39b62169163309744e7ff7 Author: Rene Ladan AuthorDate: 2022-03-31 14:38:19 +0000 Commit: Rene Ladan CommitDate: 2022-03-31 14:38:38 +0000 Mk: unregister expired NodeJS 10 and Ruby 2.6 --- Mk/Uses/nodejs.mk | 8 +++----- Mk/bsd.default-versions.mk | 4 ++-- Mk/bsd.ruby.mk | 15 ++------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk index af38aba78e55..23aad97fa580 100644 --- a/Mk/Uses/nodejs.mk +++ b/Mk/Uses/nodejs.mk @@ -3,7 +3,7 @@ # Feature: nodejs # Usage: USES=nodejs or USES=nodejs:args # Valid ARGS: build and/or run -# version: lts, current, 10, 14, 16, 17 +# version: lts, current, 14, 16, 17 # Default is: build,run # Note: if you define a version, you must provide run and/or build # @@ -12,7 +12,7 @@ .if !defined(_INCLUDE_USES_NODEJS_MK) _INCLUDE_USES_NODEJS_MK= yes -_VALID_NODEJS_VERSION= 10 14 16 17 lts current +_VALID_NODEJS_VERSION= 14 16 17 lts current _NODEJS_VERSION_SUFFIX= ${NODEJS_DEFAULT} .if ! ${_VALID_NODEJS_VERSION:M${_NODEJS_VERSION_SUFFIX}} @@ -23,9 +23,7 @@ IGNORE= Invalid nodejs default version ${_NODEJS_VERSION_SUFFIX}; valid versions nodejs_ARGS= build,run .endif -. if ${nodejs_ARGS:M10} -_NODEJS_VERSION_SUFFIX= 10 -. elif ${nodejs_ARGS:M14} +. if ${nodejs_ARGS:M14} _NODEJS_VERSION_SUFFIX= 14 . elif ${nodejs_ARGS:M16} _NODEJS_VERSION_SUFFIX= 16 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index c4a56a4337ac..1f991e608c70 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -115,7 +115,7 @@ PYTHON_DEFAULT?= 3.8 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.7, 3.8, 3.9, 3.10, 3.11 PYTHON3_DEFAULT?= 3.8 -# Possible values: 2.6, 2.7, 3.0, 3.1 +# Possible values: 2.7, 3.0, 3.1 RUBY_DEFAULT?= 2.7 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust @@ -163,7 +163,7 @@ TCLTK_DEFAULT?= 8.6 # Possible values: 4, 6 VARNISH_DEFAULT?= 4 -# Possible value: 10, 14, 16, 17, lts, current +# Possible value: 14, 16, 17, lts, current NODEJS_DEFAULT?= lts .endif diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 83bb14174b2a..82bff4d01783 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -131,16 +131,7 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} .if defined(RUBY_VER) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -. if ${RUBY_VER} == 2.6 -# -# Ruby 2.6 -# -RUBY_DISTVERSION= 2.6.9 -RUBY_PORTREVISION= 1 -RUBY_PORTEPOCH= 1 -RUBY26= "" # PLIST_SUB helpers - -. elif ${RUBY_VER} == 2.7 +. if ${RUBY_VER} == 2.7 # # Ruby 2.7 # @@ -172,7 +163,7 @@ RUBY31= "" # PLIST_SUB helpers # # Other versions # -IGNORE= Only ruby 2.6, 2.7, 3.0 and 3.1 are supported +IGNORE= Only ruby 2.7, 3.0 and 3.1 are supported _INVALID_RUBY_VER= 1 . endif RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} @@ -180,7 +171,6 @@ RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} .if !defined(_INVALID_RUBY_VER) -RUBY26?= "@comment " RUBY27?= "@comment " RUBY30?= "@comment " RUBY31?= "@comment " @@ -291,7 +281,6 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \ RUBY_ARCH="${RUBY_ARCH}" \ RUBY_SUFFIX="${RUBY_SUFFIX}" \ RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \ - RUBY26=${RUBY26} \ RUBY27=${RUBY27} \ RUBY30=${RUBY30} \ RUBY31=${RUBY31}