From nobody Sun May 1 09:47:08 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 C486C1AA8C50 for ; Sun, 1 May 2022 09:47:13 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from www121.sakura.ne.jp (www121.sakura.ne.jp [153.125.133.21]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4KrhG84c3qz3FGr; Sun, 1 May 2022 09:47:12 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from kalamity.joker.local (123-1-111-80.area1b.commufa.jp [123.1.111.80]) (authenticated bits=0) by www121.sakura.ne.jp (8.16.1/8.16.1/[SAKURA-WEB]/20201212) with ESMTPA id 2419l8Hi025102; Sun, 1 May 2022 18:47:08 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) Date: Sun, 1 May 2022 18:47:08 +0900 From: Tomoaki AOKI To: Ashish SHUKLA Cc: dev-commits-ports-main@freebsd.org Subject: Re: git: 90de298b222a - main - Mk/bsd.java.mk: Fix JAVA_VERSION matching Message-Id: <20220501184708.fbe1840f250781c96859f51b@dec.sakura.ne.jp> Organization: Junchoon corps X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) 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=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4KrhG84c3qz3FGr X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of junchoon@dec.sakura.ne.jp has no SPF policy when checking 153.125.133.21) smtp.mailfrom=junchoon@dec.sakura.ne.jp X-Spamd-Result: default: False [-0.60 / 15.00]; FAKE_REPLY(1.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[sakura.ne.jp]; AUTH_NA(1.00)[]; HAS_ORG_HEADER(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[dev-commits-ports-main]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:7684, ipnet:153.125.128.0/18, country:JP]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[123.1.111.80:received] X-ThisMailContainsUnwantedMimeParts: N This broke INDEX. make_index: /usr/ports/x11-fm/mucommander: no entry for /bin/java: Done. failed to generate INDEX! As x11-fm/mucommander doesn't modified after previous successful INDEX build (for me, ports main git: 2786eb3dc3bf), and reverting this fixed the issue, this commit should be reconsidered. > The branch main has been updated by ashish: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=90de298b222ab8b74c707c26af21d59547898ab5 > > commit 90de298b222ab8b74c707c26af21d59547898ab5 > Author: Ashish SHUKLA > AuthorDate: 2022-05-01 06:53:06 +0000 > Commit: Ashish SHUKLA > CommitDate: 2022-05-01 06:55:55 +0000 > > Mk/bsd.java.mk: Fix JAVA_VERSION matching > > Anchor the matched patterns to be at the beginning of each word to > prevent unexpected surprises > > e.g. with JAVA_VERSION= 17+ it results in _JAVA_VERSION set to > unexpected "17 8 11 12 13 14 15 16 17 18", instead of "17 18" > > PR: 263483 > Reported by: jrm > Reviewed by: glewis > Approved by: glewis > --- > Mk/bsd.java.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk > index 4833fab43c8a..a88204514650 100644 > --- a/Mk/bsd.java.mk > +++ b/Mk/bsd.java.mk > _at__at_ -285,7 +285,7 _at__at_ JAVA_RUN= jre > . undef _JAVA_PORTS_INSTALLED > . undef _JAVA_PORTS_POSSIBLE > . if defined(JAVA_VERSION) > -_JAVA_VERSION= ${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13 14+/:S/14+/14 15+/:S/15+/15 16+/:S/16+/16 17+/:S/17+/17 18+/:S/18+/18/} > +_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 12+/:S/^12+/12 13+/:S/^13+/13 14+/:S/^14+/14 15+/:S/^15+/15 16+/:S/^16+/16 17+/:S/^17+/17 18+/:S/^18+/18/} > . else > _JAVA_VERSION= ${__JAVA_VERSION_LIST} > . endif -- Tomoaki AOKI