From nobody Fri Dec 30 09:18:46 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 4Nk07B6dmPz2khJ6; Fri, 30 Dec 2022 09:18:46 +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 4Nk07B3sw3z4bhm; Fri, 30 Dec 2022 09:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391926; 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=Uw3E52kfBKngb5fIo009smL3gMA0yFPoH2tBESpXiKA=; b=xT7qnRpB6v9GR+17dAjdE7gO3XgbNvXR/jeeYgxZ284WFB2ywb1jch7vognxN7vrV0qNq5 MLnsSNQ20L8m3KwJQuz7JZPnVpWRyjgqLfYVl7+sbXG3S6HX50NzZsvRRO5KzgJ0OGj312 TsL6IN2xlFou06JNEq0VoochP8ZKzpD1O/JaS01H5gEVgQ2x5zzRNbyRj1dwusyY4GPSo/ xM65i1siz9Dt7QhtlRnE5m58eCY+ffRpogtPabjDE7svyRi5GcqYYxhxj2ECDPFnYDAXAI NnSy/synYzHxUFiiSWsLBxY5V+jBHwi0L54WYBBZYAHbSaXQpU98pqXyBKGJbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391926; 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=Uw3E52kfBKngb5fIo009smL3gMA0yFPoH2tBESpXiKA=; b=COzNhofJIk/9EgSL2JmhMR/iFn4kfsLDugXkV9NibTfSmN096osq6cR49mtjbtjU5ti7EY +AsAC7egLt9cVbeX7waVLHhobLODYB0oBBxWYaLx0Qe/bnij92YShvfa0a44/wngZX6vo1 I+A4p080TLtCuTf4SvGk5RcbouahFDrpQq7P76R3o1UbI87A3E/HVMxdAGWSiaThsCwXpT l2DP+H6e8uaHFHhejuk1SsEwr3+veSa9RpYCi+meel8VfmcqWC2JCk1l3rdgSVHBsjY/+r QL9S7BxOK6zsIZ3TWN5aa0ykEgTzA3UayL/j9Vk785WqlE5sdcdS5VY++WQloQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391926; a=rsa-sha256; cv=none; b=LSrD0YxEK99Aw+NZLa221aVDVVFcEf67PyRl1XKRglFotR2ZcifPqtjtHYCxLfniIbcvOB eB3fPEEb+ubwB9X1o4mmZHiH8h8w3JyeJM/S5GOeBzUt4TnVfziAVYiKWEbILoc/2Xn+dr j+IGaR72M2DeIEtzazOSGV2cEKKm+zkFms3dnkIRaPeFaShSBUU2UObhgIsZNg6eY/z4+m liZNNxQfTTtdZUlumsemd1YtbQf/kZ8LAVL+OjB7cdYYTONpLD/WR5k9kLyonVk5y0sMPt EhxaeLrqdKKxxvdmq3p04kLsNlekQAERd1cHw2fTGTmYS6NEXqDLGQtaBXVLWw== 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 4Nk07B2yx6z13Lb; Fri, 30 Dec 2022 09:18:46 +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 2BU9Ik74027534; Fri, 30 Dec 2022 09:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU9IkSm027533; Fri, 30 Dec 2022 09:18:46 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:18:46 GMT Message-Id: <202212300918.2BU9IkSm027533@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 0e6cbfa14a8e - main - Mk/bsd.ruby.mk: Consolidate RUBY_PORTEPOCH 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e6cbfa14a8e8d9a2052f28dd6f7cf272cf7cc94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e6cbfa14a8e8d9a2052f28dd6f7cf272cf7cc94 commit 0e6cbfa14a8e8d9a2052f28dd6f7cf272cf7cc94 Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:55:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:06:32 +0000 Mk/bsd.ruby.mk: Consolidate RUBY_PORTEPOCH RUBY_PORTEPOCH is identical for all ruby ports (lang/rubyXX). --- Mk/bsd.ruby.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index dcb8b6e52b14..a9a6ce42574e 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -134,7 +134,6 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX} # RUBY_DISTVERSION= 2.7.7 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.0 # @@ -142,14 +141,12 @@ RUBY_PORTEPOCH= 1 # RUBY_DISTVERSION= 3.0.5 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.1 # # Ruby 3.1 # RUBY_DISTVERSION= 3.1.3 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 . elif ${RUBY_VER} == 3.2 # @@ -157,7 +154,6 @@ RUBY_PORTEPOCH= 1 # RUBY_DISTVERSION= 3.2.0 RUBY_PORTREVISION= 0 -RUBY_PORTEPOCH= 1 # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. @@ -168,6 +164,7 @@ RUBY_PORTEPOCH= 1 IGNORE= Only ruby 2.7, 3.0, 3.1 and 3.2 are supported _INVALID_RUBY_VER= 1 . endif +RUBY_PORTEPOCH= 1 RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} . endif # defined(RUBY_VER)