diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index ae093c80c268..dd3bebd76b3e 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,115 +1,104 @@
 PORTNAME=	ncurses
-DISTVERSION=	6.3
+DISTVERSION=	6.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.invisible-island.net/${PORTNAME}/ \
 		https://invisible-mirror.net/archives/ncurses/
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Library for terminal-independent, full-screen output
 WWW=		https://invisible-island.net/ncurses/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_sparc64=	cannot build: coredump: illegal instruction
 
 USES=		cpe pkgconfig shebangfix
+CPE_VENDOR=	gnu
+USE_LDCONFIG=	yes
+
+SHEBANG_FILES=	test/tracemunch
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--datadir=${PREFIX}/share \
 			--with-terminfo-dirs="${PREFIX}/share/terminfo:${LOCALBASE}/share/site-terminfo" \
 			--disable-home-terminfo \
 			--disable-overwrite \
 			--disable-root-environ \
 			--disable-lib-suffixes \
 			--disable-db-install \
 			--enable-bsdpad \
 			--enable-colorfgbg \
 			--enable-getcap \
 			--enable-pc-files \
 			--enable-rpath \
 			--enable-termcap \
 			--enable-widec \
 			--includedir=${PREFIX}/include/ncurses \
 			--program-prefix= \
 			--without-hashed-db \
 			--with-manpage-format=gzip \
 			--with-pkg-config-libdir=${PREFIX}/libdata/pkgconfig \
 			--with-pkg-config=yes \
 			--with-shared \
 			--with-termlib \
 			--without-manpage-renames
+CONFIGURE_ENV=	gnat_exists="no" cf_cv_ld_searchpath="${LOCALBASE}/lib /usr/lib /lib"
+
+PLIST_SUB=	ABI_VER=6 \
+		REL_VER=${DISTVERSION}
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DOCS EXAMPLES MANPAGES PROFILE TRACE
 OPTIONS_DEFAULT=	DOCS EXAMPLES MANPAGES
+OPTIONS_SUB=	yes
 
 TRACE_DESC=	Add trace() function to all models of ncurses
 
-CONFIGURE_ENV=	gnat_exists="no" cf_cv_ld_searchpath="${LOCALBASE}/lib /usr/lib /lib"
-
-USE_LDCONFIG=	yes
-CPE_VENDOR=	gnu
-SHEBANG_FILES=	test/tracemunch
-
-PLIST_SUB+=	ABI_VER=6 \
-		REL_VER=${DISTVERSION}
-
-PORTDOCS=	*
-PORTEXAMPLES=	*
+MANPAGES_CONFIGURE_WITH=	manpages
+PROFILE_CONFIGURE_WITH=		profile
+TRACE_CONFIGURE_ON=		--with-trace
 
 DOCS=		ANNOUNCE doc/hackguide.doc doc/html/announce.html \
 		doc/html/hackguide.html doc/html/index.html \
 		doc/html/ncurses-intro.html doc/ncurses-intro.doc INSTALL NEWS \
 		README TO-DO
 EXAMPLES=	blue.c bs.6 bs.c cardfile.c cardfile.dat ditto.c dots.c \
 		filter.c firework.c firstlast.c gdc.6 gdc.c hanoi.c hashtest.c \
 		knight.c lrtest.c Makefile ncurses.c newdemo.c railroad.c \
 		rain.c README tclock.c test.priv.h testaddch.c testcurs.c \
 		testscanw.c view.c worm.c xmas.c
 EXAMPLES_CPP=	cursesapp.cc cursesapp.h cursesf.cc cursesf.h cursesm.cc \
 		cursesm.h cursesmain.cc cursesp.cc cursesp.h cursesw.cc \
 		cursesw.h cursslk.cc cursslk.h demo.cc etip.h internal.h \
 		Makefile NEWS PROBLEMS README-first
 
-TRACE_CONFIGURE_ON=		--with-trace
-PROFILE_CONFIGURE_WITH=		profile
-MANPAGES_CONFIGURE_WITH=	manpages
-
-OPTIONS_SUB=	yes
-
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--with-debug
 PLIST_SUB+=	DEBUG=""
 .else
 PLIST_SUB+=	DEBUG="@comment "
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMANPAGES}
-PLIST_SUB+=	MANPAGES=""
-.else
-PLIST_SUB+=	MANPAGES="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/misc/ncurses-config.in
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libncurses.so
 	${ECHO} "INPUT(libncurses.so.${PORTVERSION:R} AS_NEEDED(-ltinfo))" > ${STAGEDIR}${PREFIX}/lib/libncurses.so
 
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.${DISTVERSION}
 
 	# backwards compatibility, remove 2021-07-02
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libncurses.so ${STAGEDIR}${PREFIX}/lib/libncursesw.so
 	${RLN} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ncurses.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ncursesw.pc
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 5cde0817530f..551ce1226f79 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635337979
-SHA256 (ncurses/ncurses-6.3.tar.gz) = 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059
-SIZE (ncurses/ncurses-6.3.tar.gz) = 3583550
+TIMESTAMP = 1682187584
+SHA256 (ncurses/ncurses-6.4.tar.gz) = 6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159
+SIZE (ncurses/ncurses-6.4.tar.gz) = 3612591