From nobody Thu May 19 12:52:55 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 0A4BE1B3F01D; Thu, 19 May 2022 12:52:56 +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 4L3qX76r3nz3mqh; Thu, 19 May 2022 12:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652964776; 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=Hdej3D2v8AlEp/I/kwLgvzfh3vdosO9XaJ20pvav9dM=; b=PGvXcThAw/dTQDt02eUn3aXxXCYoiVkCPyshu7mLcgtSu+Rr87FrGziUISOKLDTRD/jqHK 544I3c1BrIXAOZBxkY+Rm+6XPlepT3+FeB2evsAkr64ykwEogL9RmlvEkg0SHbN1cWJJ2x 8D2XIYv5oGKNr8ft/xsfCGvUaq3W/+FNR57h7GSnhIjWnggK8T7pAAwM3L2u1mteAcjo6h gxX4mNJD0kBjnnnpesGl/8WxH+dgzR3Ofj1XBdcWgfWNSJ9BFPvboub2w8/2ddoOZ7w+ZZ Fwn/RO/HYYwEHyoj3/+kmxripi86E5KgqV7FauyUin8bwlF6XFFi5W/JktNgAQ== 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 CB0301E0C1; Thu, 19 May 2022 12:52:55 +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 24JCqtYg032300; Thu, 19 May 2022 12:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JCqtsi032299; Thu, 19 May 2022 12:52:55 GMT (envelope-from git) Date: Thu, 19 May 2022 12:52:55 GMT Message-Id: <202205191252.24JCqtsi032299@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: fd6622942cec - main - shell/zsh: remove unnneeded patch 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd6622942cecb559358c5c44d4f9dddbf827ccb1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652964776; 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=Hdej3D2v8AlEp/I/kwLgvzfh3vdosO9XaJ20pvav9dM=; b=q7uClZeYoNhzo3WnzWwiOSyFLsmQOHOT3tvtUvhrovfTUAto2QW9vWYiJuGxeiEVfPJs4w IaCvQGhvOzKxW9ZHovwreGaE/FXTHRjC+tW/9T6woPOINlHHH4nLkafIn7ycyf17xkWXe4 fOoLjcX/5AJo1NKZoIRwqisf+J1zvES0SVaoUDAaBAmK7490L4C5OlynZwyp3e9Yn/xjd+ pVDdCn8IQjfqFzJDf4JOOglYy7LyRIQ6K3qOj3HLAXLPSZp2T0VqZob9oU31uiyfLKOviF Jkz0Ux1SHv48n6l1sSyr2jZ/YpUSKATHpJDnW1SyLjn3+OMdZD7+JdG8X32a0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652964776; a=rsa-sha256; cv=none; b=FHx7ee4DLzwPFYSHbM1mTia0Uw0pV9I2Nk1ktrPL2bG9t0h8wD+bsR3RQcGBCDZEmKprHB 8vgX8HbgPxr0Zzrul930fLVnFIuaGho+0DN4rbEUDwPWpTK2CNfJqEhjgA6I54gFIcPnmE NFwcv91a7slaVgZFH6+JcK4061rUP/u1oGTQBfyHYhYfvv1bH7JeDT3aGTWd1EWIb7T0m3 jyOD3pXN7RizN/lJ/dm1eU4rZCWJOOzmAFkmYcRC3/U9J4drUxIijJUucyshV+mNxoXvT1 7HGW5vDa8LX4Ba3toeYVXzPxQu6hm7L4uYIOd7XENI0gAbv+zmBHB/zVpBTu+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd6622942cecb559358c5c44d4f9dddbf827ccb1 commit fd6622942cecb559358c5c44d4f9dddbf827ccb1 Author: Tomoaki AOKI AuthorDate: 2022-05-19 12:50:18 +0000 Commit: Baptiste Daroussin CommitDate: 2022-05-19 12:50:18 +0000 shell/zsh: remove unnneeded patch 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. --- shells/zsh/Makefile | 4 ---- .../zsh/files/extra-patch-Src_Modules_curses__keys.awk | 18 ------------------ 2 files changed, 22 deletions(-) diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 54dad7a2fa07..7c235d5cb748 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -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 diff --git a/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk b/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk deleted file mode 100644 index 4fb2b5aa27b9..000000000000 --- a/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk +++ /dev/null @@ -1,18 +0,0 @@ -https://sourceforge.net/p/zsh/code/ci/c6a85163619ed1cee89ab047a0d98108ed46828d/ ---- Src/Modules/curses_keys.awk.orig 2017-12-04 14:09:36 UTC -+++ Src/Modules/curses_keys.awk -@@ -12,8 +12,13 @@ BEGIN {nkeydefs = 0} - - END { - printf("static const struct zcurses_namenumberpair keypad_names[] = {\n") -- for (i = 0; i < 0 + nkeydefs; i++) -+ for (i = 0; i < 0 + nkeydefs; i++) { -+ if (name[i] == "EVENT") -+ printf("#ifdef KEY_EVENT\n") - printf(" {\"%s\", KEY_%s},\n", name[i], name[i]) -+ if (name[i] == "EVENT") -+ printf("#endif\n") -+ } - printf(" {NULL, 0}\n") - printf("};\n") - }