From owner-svn-ports-all@freebsd.org Mon Sep 14 05:52:54 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 24F563F3B72; Mon, 14 Sep 2020 05:52:54 +0000 (UTC) (envelope-from loader@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bqb9y068kz4GqS; Mon, 14 Sep 2020 05:52:54 +0000 (UTC) (envelope-from loader@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB0AF1297B; Mon, 14 Sep 2020 05:52:53 +0000 (UTC) (envelope-from loader@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08E5qrrH066345; Mon, 14 Sep 2020 05:52:53 GMT (envelope-from loader@FreeBSD.org) Received: (from loader@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08E5qrux066343; Mon, 14 Sep 2020 05:52:53 GMT (envelope-from loader@FreeBSD.org) Message-Id: <202009140552.08E5qrux066343@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: loader set sender to loader@FreeBSD.org using -f From: Fukang Chen Date: Mon, 14 Sep 2020 05:52:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r548588 - in branches/2020Q3/shells/zsh: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: loader X-SVN-Commit-Paths: in branches/2020Q3/shells/zsh: . files X-SVN-Commit-Revision: 548588 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2020 05:52:54 -0000 Author: loader Date: Mon Sep 14 05:52:53 2020 New Revision: 548588 URL: https://svnweb.freebsd.org/changeset/ports/548588 Log: MFH: r548445 shells/zsh: Fix build with devel/ncurses 6.2 When devel/ncurses is installed in the system, the Zsh configure script detects and uses ${LOCALBASE}/include/ncurses/ncurses.h instead. The patch is obtained from this commit: https://sourceforge.net/p/zsh/code/ci/c6a85163619ed1cee89ab047a0d98108ed46828d/ cc -c -I. -I../../Src -I../../Src -I../../Src/Zle -I. -I/usr/local/include -DBOOL_DEFINED -DLIBICONV_PLUG -DHAVE_CONFIG_H -DMODULE -O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing -fPIC -o curses..o curses.c In file included from curses.c:210: ./curses_keys.h:93:15: error: use of undeclared identifier 'KEY_EVENT' {"EVENT", KEY_EVENT}, ^ 1 error generated. *** Error code 1 Reviewed by: koobs Approved by: koobs (ports, mentor) Differential Revision: https://reviews.freebsd.org/D26355 Approved by: ports-secteam (fluffy) Added: branches/2020Q3/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk - copied unchanged from r548445, head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk Modified: branches/2020Q3/shells/zsh/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/shells/zsh/Makefile ============================================================================== --- branches/2020Q3/shells/zsh/Makefile Mon Sep 14 05:47:50 2020 (r548587) +++ branches/2020Q3/shells/zsh/Makefile Mon Sep 14 05:52:53 2020 (r548588) @@ -88,6 +88,10 @@ 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 Copied: branches/2020Q3/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk (from r548445, head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk Mon Sep 14 05:52:53 2020 (r548588, copy of r548445, head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk) @@ -0,0 +1,18 @@ +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") + }