From nobody Thu May 19 09:13:18 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 5BE4A1AE9DDB for ; Thu, 19 May 2022 09:13:30 +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 4L3kfw62v5z519d; Thu, 19 May 2022 09:13:28 +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 24J9DJ1u058507; Thu, 19 May 2022 18:13:19 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) Date: Thu, 19 May 2022 18:13:18 +0900 From: Tomoaki AOKI To: dev-commits-ports-main@freebsd.org Cc: Baptiste Daroussin Subject: Re: git: e58369caf525 - main - shell/zsh: update to 5.9 Message-Id: <20220519181318.918354ce93a1aa99eeebc5f4@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: multipart/mixed; boundary="Multipart=_Thu__19_May_2022_18_13_18_+0900_W8kqFGr6tE.lkV.+" X-Rspamd-Queue-Id: 4L3kfw62v5z519d 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 [2.06 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; HAS_ATTACHMENT(0.00)[]; HAS_ORG_HEADER(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:7684, ipnet:153.125.128.0/18, country:JP]; MIME_TRACE(0.00)[0:+,1:+,2:+]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[123.1.111.80:received]; FAKE_REPLY(1.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.32)[-0.317]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-diff]; DMARC_NA(0.00)[sakura.ne.jp]; AUTH_NA(1.00)[]; NEURAL_SPAM_LONG(0.98)[0.978]; MLMMJ_DEST(0.00)[dev-commits-ports-main]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N This is a multi-part message in MIME format. --Multipart=_Thu__19_May_2022_18_13_18_+0900_W8kqFGr6tE.lkV.+ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit files/extra-patch-Src_Modules_curses__keys.awk is no longer needed and broke patch phase if ports ncurses is installed. The patch is already incorporated upstream, so doesn't apply. Below should fix build (patch phase). Note that deletion of extra patch is not contained. --- shells/zsh/Makefile.orig 2022-05-19 06:21:49.485073000 +0900 +++ shells/zsh/Makefile 2022-05-19 18:00:38.106827000 +0900 @@ -87,10 +87,6 @@ SUB_FILES= pkg-message CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif -.if ${ncurses_ARGS} == port -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Src_Modules_curses__keys.awk -.endif - post-patch: # FreeBSD's clock_gettime(2) is in libc, not librt; see PR 167857 @${REINPLACE_CMD} -e '/LIBS/s|-lrt||' ${WRKSRC}/configure > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=e58369caf5254790eab8496cf462991f5fc05601 > > commit e58369caf5254790eab8496cf462991f5fc05601 > Author: Baptiste Daroussin > AuthorDate: 2022-05-18 13:22:01 +0000 > Commit: Baptiste Daroussin > CommitDate: 2022-05-18 14:54:45 +0000 > > shell/zsh: update to 5.9 > > Stop supporting case with both utmp.h and utmpx.h the changed happened > more than 10 years ago > --- > shells/zsh/Makefile | 2 +- > shells/zsh/distinfo | 10 ++++---- > shells/zsh/files/patch-Src_watch.c | 15 ------------ > shells/zsh/pkg-plist | 49 +++++++++++++++++++++++++++++++ +++---- > 4 files changed, 51 insertions(+), 25 deletions(-) (snip remaining part) -- Tomoaki AOKI --Multipart=_Thu__19_May_2022_18_13_18_+0900_W8kqFGr6tE.lkV.+ Content-Type: text/x-diff; name="zfs_fix_patch.diff" Content-Disposition: attachment; filename="zfs_fix_patch.diff" Content-Transfer-Encoding: 7bit --- shells/zsh/Makefile.orig 2022-05-19 06:21:49.485073000 +0900 +++ shells/zsh/Makefile 2022-05-19 18:00:38.106827000 +0900 @@ -87,10 +87,6 @@ SUB_FILES= pkg-message CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif -.if ${ncurses_ARGS} == port -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Src_Modules_curses__keys.awk -.endif - post-patch: # FreeBSD's clock_gettime(2) is in libc, not librt; see PR 167857 @${REINPLACE_CMD} -e '/LIBS/s|-lrt||' ${WRKSRC}/configure --Multipart=_Thu__19_May_2022_18_13_18_+0900_W8kqFGr6tE.lkV.+--