From nobody Sat Apr 06 23:53:21 2024 X-Original-To: dev-commits-ports-branches@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 4VBscw2jMpz5FdQD; Sat, 6 Apr 2024 23:53:36 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBscv3QtZz4sWd; Sat, 6 Apr 2024 23:53:35 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-56e2e09fc27so3584213a12.0; Sat, 06 Apr 2024 16:53:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712447613; x=1713052413; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1sE+F7T2mGJKLln77D4E98v53k40xy3Iux5/kgL0Tjs=; b=AUSHnAN5ANLLqUHKuJPH5tgWE0AqHzPb/c93Ey2QKmQiFGq+0bouHkyWd3AKqkWGq0 SqZfknsbiVzz8u9OGbl3oxyKkXvSb7CZV4t45K9EoRTsVWTo/iEu3KPXvPyjbN2uzJZ0 xfY24e2TVT+Vl7thO24DxURTJ77gcJex5j9+2laEzC+OFtQP+Cls+P0hgUch9dD7kBJW 7b0NzJf6jw7ifIwawX8w9jhSFrXR46U9E/QiXmClhg/RkZGOHtuYbrs310J2JZr8UXDs hUREVs4zYdnNquhjtZJszGZjVjKa/8ZO7/imkg883IEzZRXVTtQyYM0lJ7K+I6MwwxGc KTAg== X-Forwarded-Encrypted: i=1; AJvYcCVjTEN+mPMQxR4P5zIlzeq71LtQzDgdDHeaz5kKUXYDVYUJaAEbGizxpJEUyAtC7dhZwDaYIP74XKO/Li402tLO9vOyeSLIvbtkHx0tSlTrzGfreQpo3bPoRX6J/jYWsemw45cFFErwuQ6RcTGvxitGOx0stn7LkgTD/voDG9QjLB9vnOCXw++04faIDXAy5ukQsW7cFu6X X-Gm-Message-State: AOJu0YwvB3ZH0hNPx2LA8pIZWk3fPUJmrQ8ICyNZTnZiu9mjfbROSlxx jQoIUXKU/4/3Hnxzn2cpdf+NrJ0kQ6an7A/DCmghmcUZP8LaY4PPsPL0iFoQ+YksP9tkwAf606u YfU8wVfPqRaCeVg7Xwx86hoMwJu7gqNIwcr8= X-Google-Smtp-Source: AGHT+IFllHEB2DvwZjpxRulL8Vz3I9c/LwkSHlrA2F6z2KaYFVs18VpH6ph0S1f0re+CXk3oIuYOk462ywjj7/rOV68= X-Received: by 2002:a05:6402:1f4b:b0:566:6a9d:6147 with SMTP id 11-20020a0564021f4b00b005666a9d6147mr6071623edz.0.1712447612874; Sat, 06 Apr 2024 16:53:32 -0700 (PDT) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> <86jzlbmdae.fsf@phe.ftfl.ca> In-Reply-To: <86jzlbmdae.fsf@phe.ftfl.ca> From: "Jason E. Hale" Date: Sat, 6 Apr 2024 19:53:21 -0400 Message-ID: Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update To: Joseph Mingrone Cc: "Jason E. Hale" , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VBscv3QtZz4sWd On Fri, Apr 5, 2024 at 10:32=E2=80=AFPM Joseph Mingrone w= rote: > > On Fri, 2024-04-05 at 19:13, "Jason E. Hale" wrote: > > > On Tue, Mar 26, 2024 at 7:57=E2=80=AFPM Joseph Mingrone wrote: > > >> The branch 2024Q1 has been updated by jrm: > > >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D082542e6c694d58c24d1c= 425c9f06441c6a16db7 > > >> commit 082542e6c694d58c24d1c425c9f06441c6a16db7 > >> Author: Joseph Mingrone > >> AuthorDate: 2024-01-26 14:13:34 +0000 > >> Commit: Joseph Mingrone > >> CommitDate: 2024-03-26 23:41:02 +0000 > > >> */*: Chase editors/emacs update > > >> - Bump Emacs version in Mk/Uses/emacs.mk to update version-specifi= c > >> paths > > >> - Bump PORTREVISION of ports with USES=3Demacs. This is required = for two > >> reasons. Emacs lisp files need to be byte compiled for the new = Emacs > >> version, and files installed under, e.g., EMACS_VERSION_SITE_LIS= PDIR > >> need to be relocated. > > >> Reviewed by: ashish > >> Sponsored by: The FreeBSD Foundation > >> Differential Revision: https://reviews.freebsd.org/D43615 > > >> (cherry picked from commit ab463bdca9c29ec22be0c7e6d7aa27bb2a980b4= 8) > >> --- > > > Hi, > > > You bumped more than PORTREVISION on several ports with this cherry > > pick, leading to breakage in the 2024Q1 branch since the > > (POR|DIS)TVERSIONs no longer match distinfo. > > > - Jason > > My apologies if I messed up the resolution of some of the many merge > conflicts. I'll take a closer look this weekend, but since we're now in > Q2, from a user perspective, isn't this now moot? > > J. Considering the delay in cutting the 2024Q2 branch, I don't think it's moot to fix errors in the current quarterly branch which is still 2024Q1 at time of writing. Had the Q2 branch already been cut, I wouldn't have received the numerous pkg-fallout emails that caused me to investigate this in the first place, so I'm not pointing this out just to be petty. :) I'm not sure how much longer we'll be on Q1, so I think the responsible thing to do would be to revert the PORTVERSION/DISTVERSION changes for audio/emms, devel/clojure-cider, and mail/anubis. For mail/anubis, the PORTREVISION should then be 18, because it was 17 before this change. - Jason