diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 54dad7a2fa07..7c235d5cb748 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,134 +1,130 @@
 # Created by: torstenb
 
 PORTNAME=	zsh
 DISTVERSION=	5.9
 CATEGORIES=	shells
 MASTER_SITES=	https://www.zsh.org/pub/ \
 		SF \
 		https://www.zsh.org/pub/:doc \
 		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	The Z shell
 
 LICENSE=	ZSH
 LICENSE_NAME=	ZSH license
 LICENSE_FILE=	${WRKSRC}/LICENCE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		autoreconf cpe iconv localbase:ldflags ncurses shebangfix tar:xz
 
 SHEBANG_LANG=	zsh
 zsh_OLD_CMD=	zsh	# shebang appears as /bin/zsh and just zsh
 SHEBANG_FILES=	Functions/Calendar/* \
 		Functions/Misc/*
 
 CONFIGURE_ARGS=	--with-tcsetpgrp \
 		--enable-function-subdirs \
 		--enable-maildir-support \
 		--enable-multibyte \
 		--enable-zsh-secure-free \
 		--sysconfdir=${PREFIX}/etc
 
 # fix PREFIX != LOCALBASE
 CONFIGURE_ARGS+=--disable-site-fndir \
 		--enable-additional-fpath=${DATADIR}/site-functions
 
 CONFIGURE_ENV+=	zsh_cv_sys_path_dev_fd=no \
 		ac_cv_header_sys_capability_h=no
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-DBOOL_DEFINED
 LDFLAGS+=	-Wl,--as-needed
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	DEBUG ETCDIR GDBM MEM PCRE STATIC \
 		DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 ETCDIR_DESC=	System-wide defaults in /etc (instead of $${PREFIX}/etc)
 GDBM_DESC=	Enable GDBM support (GPL)
 MEM_DESC=	Enable zsh-mem options
 
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 DEBUG_CONFIGURE_ENABLE=	zsh-debug
 ETCDIR_CONFIGURE_OFF=	--enable-etcdir=${PREFIX}/etc
 GDBM_CONFIGURE_ENABLE=	gdbm
 MEM_CONFIGURE_ENABLE=	zsh-mem
 PCRE_CONFIGURE_ENABLE=	pcre
 
 ## Some modules can only be built as a shared library.
 ## If you enable STATIC, you may get strange errors if you, a script,
 ## or a plugin tries to use the regex module.
 STATIC_LDFLAGS=		-static
 STATIC_CONFIGURE_ON=	--disable-dynamic --with-term-lib="tinfow tinfo"
 STATIC_CONFIGURE_OFF=	--enable-dynamic  --with-term-lib="ncursesw ncurses"
 
 DOCS=		LICENCE META-FAQ README \
 		Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ Etc/completion-style-guide \
 		Doc/zsh*.html Doc/zsh.dvi
 DOCS_DISTFILES=	${DISTNAME}-doc${EXTRACT_SUFX}:doc
 
 PORTDOCS=	*
 PORTEXAMPLES=	zlogin zshenv zshrc
 
 ZSH_VER=	${PORTVERSION}
 PLIST_SUB+=	ZSH_VER="${ZSH_VER}"
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
 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
 	@${REINPLACE_CMD} -e "s|/etc/|${LOCALBASE}/etc/|" \
 		${WRKSRC}/Functions/MIME/zsh-mime-setup
 	${RM} ${WRKSRC}/Doc/help.txt
 
 post-patch-STATIC-on:
 	@${REINPLACE_CMD} -e "s|link=dynamic|link=either|" \
 		${WRKSRC}/Src/Modules/*.mdd
 
 post-build:
 # Fix ".so" macro problem by using "soelim" command.
 # soelim needs the manpages in man1/
 	${LN} -sf ${WRKSRC}/Doc ${WRKSRC}/man1
 	${MV} ${WRKSRC}/Doc/zshall.1 ${WRKSRC}/Doc/zshall.1.source
 	(cd ${WRKSRC} && ${SOELIM} -r ${WRKSRC}/Doc/zshall.1.source > \
 		${WRKSRC}/Doc/zshall.1)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/site-functions
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/zsh ${STAGEDIR}${PREFIX}/bin/rzsh
 # Precompile completions and functions
 	(${STAGEDIR}${PREFIX}/bin/zsh -fc ' \
 		setopt extendedglob nomark_dirs; \
 		cd ${STAGEDIR}/${DATADIR}/${ZSH_VER} ; \
 		rm -f functions/**/*.orig ; \
 		for i in functions/**/*(/) ; do \
 			zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; \
 			${CHMOD} 644 $$i.zwc ; \
 		done')
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
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")
- }