diff options
| author | Tomoaki AOKI <junchoon@dec.sakura.ne.jp> | 2022-05-19 12:50:18 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-05-19 12:50:18 +0000 |
| commit | fd6622942cecb559358c5c44d4f9dddbf827ccb1 (patch) | |
| tree | 7b17da5dd9ce2332a4ecdd246f1b8b72b1fac0c7 | |
| parent | 03ff10027e28f1047a3057b5c3615a9a4d324276 (diff) | |
| download | ports-fd6622942cecb559358c5c44d4f9dddbf827ccb1.tar.gz ports-fd6622942cecb559358c5c44d4f9dddbf827ccb1.zip | |
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.
| -rw-r--r-- | shells/zsh/Makefile | 4 | ||||
| -rw-r--r-- | shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk | 18 |
2 files changed, 0 insertions, 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") - } |