Index: head/Mk/Uses/ncurses.mk
===================================================================
--- head/Mk/Uses/ncurses.mk	(revision 520031)
+++ head/Mk/Uses/ncurses.mk	(revision 520032)
@@ -1,89 +1,93 @@
 # $FreeBSD$
 #
 # handle dependency on the ncurses port
 #
 # Feature:	ncurses
 # Usage:	USES=ncurses
 # Valid ARGS:	base port
 #
 # use/port can now set this options to the makefiles
 # NCURSES_RPATH= yes	- pass RFLAGS options to CFLAGS
 #
 # Overridable defaults:
 # NCURSES_PORT=	devel/ncurses
 #
 # The makefile sets the following variables:
 # NCURSESBASE		- "/usr" or ${LOCALBASE}
 # NCURSESLIB		- path to the libs
 # NCURSESINC		- path to the matching includes
 # NCURSESRPATH		- rpath for dynamic linker
 #
 # BUILD_DEPENDS		- are added if needed
 # RUN_DEPENDS		- are added if needed
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_NCURSES_MK)
 _INCLUDE_USES_NCURSES_MK=	yes
 
 .if empty(ncurses_ARGS)
 .  if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/lib/libncurses.so)
 ncurses_ARGS=	base
 .  else
 ncurses_ARGS=	port
 .  endif
 .endif
 
 .if ${ncurses_ARGS} == base
 NCURSESBASE=	/usr
 NCURSESINC=	${NCURSESBASE}/include
+.if !exists(/usr/lib/libncursesw.so)
+NCURSES_IMPL=	ncurses
+.endif
 
 .  if exists(${LOCALBASE}/lib/libncurses.so)
 _USES_sanity+=	400:check-depends-ncurses
 check-depends-ncurses:
 	@${ECHO_CMD} "Dependency error: this port wants the ncurses library from the FreeBSD"
 	@${ECHO_CMD} "base system. You can't build against it, while a newer"
 	@${ECHO_CMD} "version is installed by a port."
 	@${ECHO_CMD} "Please deinstall the port or undefine WITH_NCURSES_BASE."
 	@${FALSE}
 .  endif
 
 .elif ${ncurses_ARGS} == port
 NCURSESBASE=	${LOCALBASE}
 NCURSESINC=	${LOCALBASE}/include/ncurses
 
 .  if !defined(NCURSES_PORT) && exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so)
 PKG_DBDIR?=	${DESTDIR}/var/db/pkg
 .    if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
 .    endif
 PKGARGS?=
 NCURSES_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libncurses.so || :
 .  endif
 NCURSES_INSTALLED?=
 
 .if ${NCURSES_INSTALLED} != ""
 NCURSES_PORT=	${NCURSES_INSTALLED}
 NCURSES_SHLIBFILE!=	${PKG_INFO} -ql ${NCURSES_INSTALLED} | grep -m 1 "^`pkg query "%p" ${NCURSES_INSTALLED}`/lib/libncurses.so."
 NCURSES_SHLIBVER?=	${NCURSES_SHLIBFILE:E}
 .endif
 
 NCURSES_PORT?=		devel/ncurses
 NCURSES_SHLIBVER?=	6
 
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
 RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
 NCURSESRPATH=		${NCURSESBASE}/lib
 
 .if defined(NCURSES_RPATH)
 CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
 .endif
 LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
 
 .else
 .error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
 .endif
 
 NCURSESLIB=	${NCURSESBASE}/lib
+NCURSES_IMPL?=	ncursesw
 
 .endif
Index: head/textproc/aspell/Makefile
===================================================================
--- head/textproc/aspell/Makefile	(revision 520031)
+++ head/textproc/aspell/Makefile	(revision 520032)
@@ -1,50 +1,50 @@
 # Created by: Josh Gilliam <josh@quick.net>
 # $FreeBSD$
 
 PORTNAME=	aspell
 PORTVERSION=	0.60.8
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/aspell
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spelling checker with better suggestion logic than ispell
 
 LICENSE=	LGPL21
 
 USES=		cpe gmake iconv libtool ncurses perl5 shebangfix
 
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
 		--enable-docdir=${DOCSDIR}	\
-		--enable-curses=ncursesw \
+		--enable-curses=${NCURSES_IMPL} \
 		--enable-static
 
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/aspell-import
 CPE_VENDOR=	gnu
 
 INSTALL_TARGET=	install-strip
 VERINST=	${PORTVERSION:R}
 SUB_FILES=	aspell.ver
 PLIST_SUB=	VER=${VERINST}
 SUB_LIST=	VERINST=${VERINST}
 INFO=	aspell-dev aspell
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.options.mk>
 
 # Does not link without at least -O
 .if !defined(CFLAGS) || ${CFLAGS:M-O*} == ""
 CFLAGS+=		-O
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/aspell.ver ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
Index: head/www/lynx-current/Makefile
===================================================================
--- head/www/lynx-current/Makefile	(revision 520031)
+++ head/www/lynx-current/Makefile	(revision 520032)
@@ -1,61 +1,61 @@
 # Created by: ache
 # $FreeBSD$
 
 PORTNAME=	lynx
 PORTVERSION=	2.9.0d4
 CATEGORIES=	www
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/ \
 		ftp://invisible-island.net/lynx/tarballs/
 PKGNAMESUFFIX=	-current
 DISTNAME=	${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./}
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Console-based web browser (current/development version)
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 CONFLICTS_INSTALL=	lynx-2.8.[0-8].* ja-lynx-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USES=		cpe iconv ncurses shebangfix tar:bzip2
 SHEBANG_FILES=	samples/mailto-form.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-zlib --libdir="${PREFIX}/etc" \
 		--enable-nsl-fork --with-bzlib --with-zlib \
 		--enable-nested-tables --enable-default-colors \
 		--enable-addrlist-page \
 		--enable-gzip-help \
 		--enable-idna \
 		--enable-ipv6 \
 		--with-mime-libdir=${PREFIX}/etc \
 		${ICONV_CONFIGURE_ARG} \
-		--with-screen=ncursesw
+		--with-screen=${NCURSES_IMPL}
 CPE_VERSION=	${PORTVERSION:C/[pd].+//}
 CPE_UPDATE=	${PORTVERSION:E:C/[0-9]+//:S/p/pre./:S/d/dev./}
 
 MAKE_JOBS_UNSAFE=	yes
 
 MAKE_FLAGS=	helpdir="${PREFIX}/share/lynx_help" docdir="${DOCSDIR}" -f
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
 
 DOCSDIR=	${PREFIX}/share/doc/lynx
 
 OPTIONS_DEFINE=	GNUTLS IDN NLS DOCS
 OPTIONS_DEFAULT=IDN
 OPTIONS_SUB=	yes
 
 IDN_CONFIGURE_ENABLE=	idna
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 
 GNUTLS_CONFIGURE_ON=	--with-gnutls --without-ssl
 GNUTLS_CONFIGURE_OFF=	--with-ssl=${OPENSSLBASE} --without-gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES_OFF=	ssl
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 .include <bsd.port.mk>
Index: head/www/newsboat/Makefile
===================================================================
--- head/www/newsboat/Makefile	(revision 520031)
+++ head/www/newsboat/Makefile	(revision 520032)
@@ -1,154 +1,154 @@
 # Created by: arved
 # $FreeBSD$
 
 PORTNAME=	newsboat
 PORTVERSION=	2.17.1
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://newsboat.org/releases/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mt@markoturk.info
 COMMENT=	RSS feed reader for the text console
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	a2x:textproc/asciidoc
 LIB_DEPENDS=	libstfl.so:devel/stfl \
 		libcurl.so:ftp/curl \
 		libjson-c.so:devel/json-c
 
 USES=		cargo compiler:c++11-lang gettext gmake gnome iconv:translit \
 		ncurses pkgconfig shebangfix sqlite ssl tar:xz
 USE_CXXSTD=	gnu++11
 USE_GNOME=	libxml2
 
 SHEBANG_FILES=	contrib/bookmark-evernote.sh contrib/feedgrabber.rb \
 		contrib/getpocket.com/send-to-pocket.sh contrib/heise.rb \
 		contrib/slashdot.rb
 
 MAKE_ARGS=	CARGO=${CARGO_CARGO_BIN} mandir=${PREFIX}/man prefix=${PREFIX}
 MAKE_ENV=	${CARGO_ENV}
 
 CARGO_BUILD=		no
 CARGO_INSTALL=		no
 CARGO_TARGET_DIR=	${WRKSRC}/target
 CARGO_CRATES=	aho-corasick-0.6.9 \
 		argon2rs-0.2.5 \
 		arrayvec-0.4.10 \
 		autocfg-0.1.2 \
 		backtrace-0.3.13 \
 		backtrace-sys-0.1.28 \
 		bit-set-0.5.1 \
 		bit-vec-0.5.1 \
 		bitflags-1.0.4 \
 		blake2-rfc-0.2.18 \
 		cc-1.0.29 \
 		cfg-if-0.1.6 \
 		chrono-0.4.6 \
 		clap-2.33.0 \
 		cloudabi-0.0.3 \
 		constant_time_eq-0.1.3 \
 		curl-sys-0.4.5 \
 		dirs-1.0.4 \
 		failure-0.1.5 \
 		failure_derive-0.1.5 \
 		fnv-1.0.6 \
 		fuchsia-cprng-0.1.1 \
 		gettext-rs-0.4.1 \
 		gettext-sys-0.19.8 \
 		idna-0.1.5 \
 		kernel32-sys-0.2.2 \
 		lazy_static-0.2.11 \
 		lazy_static-1.2.0 \
 		libc-0.2.50 \
 		libz-sys-1.0.17 \
 		locale_config-0.2.2 \
 		lock_api-0.1.5 \
 		matches-0.1.8 \
 		memchr-2.1.3 \
 		natord-1.0.9 \
 		nodrop-0.1.13 \
 		nom-4.2.3 \
 		num-integer-0.1.39 \
 		num-traits-0.2.6 \
 		once_cell-0.1.8 \
 		openssl-sys-0.9.46 \
 		parking_lot-0.7.1 \
 		parking_lot_core-0.4.0 \
 		percent-encoding-1.0.1 \
 		pkg-config-0.3.14 \
 		proc-macro2-0.4.27 \
 		proptest-0.7.2 \
 		quick-error-1.2.2 \
 		quote-0.6.11 \
 		rand-0.4.6 \
 		rand-0.5.6 \
 		rand-0.6.5 \
 		rand_chacha-0.1.1 \
 		rand_core-0.3.1 \
 		rand_core-0.4.0 \
 		rand_hc-0.1.0 \
 		rand_isaac-0.1.1 \
 		rand_jitter-0.1.3 \
 		rand_os-0.1.2 \
 		rand_pcg-0.1.1 \
 		rand_xorshift-0.1.1 \
 		rdrand-0.4.0 \
 		redox_syscall-0.1.51 \
 		redox_users-0.2.0 \
 		regex-0.2.11 \
 		regex-1.1.0 \
 		regex-syntax-0.4.2 \
 		regex-syntax-0.5.6 \
 		regex-syntax-0.6.5 \
 		remove_dir_all-0.5.1 \
 		rustc-demangle-0.1.13 \
 		rustc_version-0.2.3 \
 		rusty-fork-0.2.1 \
 		scoped_threadpool-0.1.9 \
 		scopeguard-0.3.3 \
 		section_testing-0.0.4 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		smallvec-0.6.8 \
 		syn-0.15.26 \
 		synstructure-0.10.1 \
 		tempfile-3.0.6 \
 		textwrap-0.11.0 \
 		thread_local-0.3.6 \
 		time-0.1.42 \
 		ucd-util-0.1.3 \
 		unicode-bidi-0.3.4 \
 		unicode-normalization-0.1.8 \
 		unicode-segmentation-1.2.1 \
 		unicode-width-0.1.5 \
 		unicode-xid-0.1.0 \
 		unreachable-1.0.0 \
 		url-1.7.2 \
 		utf8-ranges-1.0.2 \
 		vcpkg-0.2.6 \
 		version_check-0.1.5 \
 		void-1.0.2 \
 		wait-timeout-0.1.5 \
 		winapi-0.2.8 \
 		winapi-0.3.6 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		xdg-2.2.0
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,fail "ncursesw",true,; s,fail "libcrypto",true,' \
 		-e 's,fail "libssl",true,' \
 		${WRKSRC}/config.sh
-	@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB} -lcrypto -lncursesw|;s|-Werror||' \
+	@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB} -lcrypto -l${NCURSES_IMPL}|;s|-Werror||' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*boat
 
 .include <bsd.port.mk>