Convert USE_NCURSES by USES=ncurses

Convert USE_READLINE by USES=readline

78 files changed, 154 insertions, 237 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index f661156da0e9..0d7a226df96e 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -10,10 +10,9 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	h.skuhra@gmail.com
 COMMENT=	Console-based music player with really cool features
 
-USES=		pkgconfig iconv
+USES=		pkgconfig iconv ncurses
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	HOSTCC=${CC}
 CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 55b2bd708fa3..79fb6ff56304 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -22,7 +22,7 @@ AUDIOFILE_DESC=	Enable libaudiofile support
 LO_DESC=	Enable liblo support
 OIL_DESC=	Enable liboil support
 
-USE_READLINE=	yes
+USES=		readline
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-liblilv \
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index ead479fe4888..88f2a33abfd9 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
 OPTIONS_DEFINE=	READLINE DOCS
 OPTIONS_DEFAULT=READLINE
 
-USES=        pathfix
+USES=		pathfix
 USE_GNOME=	gtk20 libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -34,7 +34,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 PLIST_SUB+=	READLINE=""
 .else
 CONFIGURE_ENV+=	vl_cv_lib_readline=no
diff --git a/audio/mous/Makefile b/audio/mous/Makefile
index 38b9fd1d2bc4..6771fb21599d 100644
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mous
-# Date created:			15 Jan 2012
-# Whom:					Yanhui Shen <shen.elf@gmail.com>
-#
+# Created by: Yanhui Shen <shen.elf@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	mous
 PORTVERSION=	1.1a
@@ -42,10 +38,6 @@ PKGMESSAGE=	${WRKSRC}/pkg-message
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 800067
-BROKEN=		Does not compile on 7.x: Requires wcscasecmp(3)
-.endif
-
 .if ${PORT_OPTIONS:MSDK}
 CMAKE_ARGS+=	-DWithHeadFiles=1
 PLIST_SUB+=	SDK=""
@@ -62,7 +54,7 @@ CMAKE_ARGS+=	-DWithAssembly=0
 .endif
 
 .if ${PORT_OPTIONS:MNCURSES}
-USE_NCURSES=	yes
+USES+=		ncurses
 CMAKE_ARGS+=	-DWithFrontendNcurses=1
 PLIST_SUB+=	NCURSES=""
 .else
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index a345a90c2d29..84e9e33723d8 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -13,10 +13,9 @@ COMMENT=	A ncurses mpd client, clone of ncmpc with some new features
 LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient \
 		fftw3:${PORTSDIR}/math/fftw3
 
-USES=		iconv
+USES=		iconv ncurses
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_NCURSES=	yes
 USE_GNOME=	glib20
 USE_AUTOTOOLS=	automake aclocal libtool
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
@@ -36,11 +35,6 @@ VISUALIZER_DESC=	Enable music visualizer screen
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_NCURSES_BASE)
-# no need to use ncurses-config if we use ncurses from the base system
-CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
-.endif
-
 PLIST_FILES=	bin/ncmpcpp \
 		%%DOCSDIR%%/config \
 		%%DOCSDIR%%/keys \
@@ -86,6 +80,13 @@ BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
 CONFIGURE_ARGS+=	--enable-visualizer
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${NCURSESBASE} == /usr
+# no need to use ncurses-config if we use ncurses from the base system
+CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
+.endif
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${PREFIX}/bin/
 .if ${PORT_OPTIONS:MDOCS}
@@ -102,4 +103,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index f0ff29ff3ebf..143531e27e24 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_NCURSES=	yes
+USES=		ncurses
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index 1906d82f35f7..ab52be0edc5a 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 
+USES=		ncurses
 USE_PYTHON=	2.5+
-USE_NCURSES=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyTone
 
diff --git a/biology/avida/Makefile b/biology/avida/Makefile
index f166fb9b6515..89b9f44ddec5 100644
--- a/biology/avida/Makefile
+++ b/biology/avida/Makefile
@@ -14,8 +14,7 @@ LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	DOCS
 
-USE_NCURSES=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource ncurses
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	*
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index f35efcebf546..507667a007ab 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/gnucap bin/gnucap-modelgen
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 .else
 CONFIGURE_ARGS+=--with-readline=no
 .endif
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index 78d7ad60980e..bc36dc126e9f 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -21,8 +21,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf:env
 USE_RC_SUBR=	cego
 
-USE_NCURSES=	yes
-USE_READLINE=	yes
+USES=		ncurses readline
 
 USERS=	cego
 GROUPS=	cego
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 5c8ad8086ff6..20ccd9747473 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -32,8 +32,7 @@ LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_GMAKE=	yes
-USES=		gettext iconv
-USE_READLINE=	yes
+USES=		gettext iconv readline
 USE_PERL5=	yes
 USE_XORG=	sm ice xi x11 xt xmu xext
 USE_GL=		glut
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 84937f051458..74a125c0a483 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	ct:${PORTSDIR}/databases/freetds
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
-USE_READLINE=	yes
+USES=		readline
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SYBASE="${LOCALBASE}"
 CONFIGURE_ARGS=	--with-readline
diff --git a/deskutils/wyrd/Makefile b/deskutils/wyrd/Makefile
index 81d014b0ba81..dfb5e5753f28 100644
--- a/deskutils/wyrd/Makefile
+++ b/deskutils/wyrd/Makefile
@@ -17,8 +17,8 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	UTF8
 
 GNU_CONFIGURE=	yes
+USES=		ncurses
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 
 MAN1=	wyrd.1
 MAN5=	wyrdrc.5
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 0d42b15baf22..46e06fdea5bb 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Curses Development Kit for speedy development of full screen programs
 
 LICENSE=	BSD
 
+USES=		ncurses
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
 PORTDOCS=	COPYING EXPANDING INSTALL NOTES README TODO
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 8a8d27724fc6..f4ff3c623bd0 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -26,10 +26,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=	pathfix
+USES=	pathfix ncurses
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
-USE_NCURSES=	yes
 
 DIRECTFB_SHLIB=	5 # LT_CURRENT
 DIRECTFB_BIN=	5 # LT_BINARY
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index cf68b0447b44..7b908c12a1ae 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -65,11 +65,11 @@ CONFIGURE_ARGS+=	--with-system-readline
 
 .if ${PORT_OPTIONS:MBASE_READLINE}
 CFLAGS+=	-D_rl_echoing_p=readline_echoing_p
-USE_READLINE=	base
+USES+=		readline
 .endif
 
 .if ${PORT_OPTIONS:MPORT_READLINE}
-USE_READLINE=	port
+USES+=		readline:port
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
diff --git a/devel/hs-terminfo/Makefile b/devel/hs-terminfo/Makefile
index 73e23328f634..1c7744778961 100644
--- a/devel/hs-terminfo/Makefile
+++ b/devel/hs-terminfo/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Haskell bindings to the terminfo library
 
 LICENSE=	BSD
 
-USE_NCURSES=	yes
+USES=		ncurses
 
 CONFIGURE_ARGS+=	--configure-option=--with-curses-includes=${NCURSESINC} \
 			--configure-option=--with-curses-libraries=${NCURSESLIB}
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index fe20a90f7168..7619ad16a5ea 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	NLS DOCS
 
+USES=		readline
 USE_BZIP2=	yes
-USE_READLINE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/devel/libepp-nicbr/Makefile b/devel/libepp-nicbr/Makefile
index e9575817d156..380e8f8ac354 100644
--- a/devel/libepp-nicbr/Makefile
+++ b/devel/libepp-nicbr/Makefile
@@ -36,7 +36,7 @@ PLIST_SUB=	VER="${PORTVERSION}"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 PLIST_SUB+=	READLINE=""
 .else
 CONFIGURE_ENV+=	ac_cv_lib_readline_readline=no
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 038e4a2f6365..b2601e4d59b0 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -7,13 +7,12 @@ CATEGORIES=	devel
 MASTER_SITES=	http://main.metaprl.org/download/omake/
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	A flexible build system
+COMMENT=	Flexible build system
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C|-.*||}
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=yes
-USE_NCURSES=	yes
-USE_READLINE=	yes
+USES=		ncurses readline
 MAKE_JOBS_UNSAFE=	yes
 
 INFO=		omake-doc
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index fb17fbf1d97d..191b5ff48c39 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -18,9 +18,7 @@ USE_BZIP2=	yes
 USE_DOS2UNIX=	Piklab.cmake
 USE_QT4=	corelib gui qt3support qtestlib xml \
 		moc_build qmake_build rcc_build uic_build
-USE_NCURSES=	yes
-USE_READLINE=	yes
-USES=		cmake gettext
+USES=		cmake gettext readline
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		piklab-hex.1 piklab-prog.1
diff --git a/devel/stfl/Makefile b/devel/stfl/Makefile
index dc86dc1aa401..ec4c8d972838 100644
--- a/devel/stfl/Makefile
+++ b/devel/stfl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	stfl
-# Date created:		28 March 2007
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	stfl
 PORTVERSION=	0.22
@@ -18,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USES=		iconv
-USE_NCURSES=	yes
+USES=		iconv ncurses
 MAKE_JOBS_SAFE=	yes
 ALL_TARGET=	libstfl.so
 PLIST_FILES=	lib/libstfl.so.1 lib/libstfl.so include/stfl.h \
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 15ae01543bae..28fcc50205c1 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -25,8 +25,8 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 EMACS_VER=	24.3.50
 EMACS_REV=	112178
 GNU_CONFIGURE=	yes
+USES=		ncurses
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 USE_XZ=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index aaa5ccd17b10..5df92d86ceb9 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -22,8 +22,8 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 
 EMACS_VER=	24.3
 GNU_CONFIGURE=	yes
+USES=		ncurses
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 USE_XZ=		yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 8588452be88f..194b068e0708 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -24,9 +24,9 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-24.* \
 
 EMACS_VER=	23.4
 GNU_CONFIGURE=	yes
+USES=		ncurses
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_NCURSES=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 81d1eee2bfa5..e44535aa14a8 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	joe
-# Date created:		01 Jul 1995
-# Whom:			torstenb@FreeBSD.org
-#
+# Created by: torstenb@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	joe
 PORTVERSION=	3.7
@@ -22,8 +18,7 @@ CONFLICTS=	joe-2.*
 
 LICENSE=	GPLv1
 USE_GMAKE=	yes
-USES=		iconv
-USE_NCURSES=	yes
+USES=		iconv ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -35,7 +30,7 @@ MANLANG=	"" ru
 
 .include <bsd.port.pre.mk>
 
-.ifdef NOPORTDOCS
+.if ! ${PORT_OPTIONS:MDOCS}
 post-patch:
 	${REINPLACE_CMD} 's,install-data-am: install-data_charmapsDATA install-data_docDATA,install-data-am: install-data_charmapsDATA,' \
 		${WRKSRC}/Makefile.in
diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index fc3256809a74..96128c52e3ae 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -16,8 +16,7 @@ OPTIONS_RADIO=	GUI
 OPTIONS_RADIO_GUI=	GTK3 GTK2 QT4
 OPTIONS_DEFAULT=	PCRE
 
-USE_NCURSES=	yes
-USES=		iconv
+USES=		iconv ncurses
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config.sh
 CONFIGURE_ARGS=	--prefix=${PREFIX} --without-win32 --without-kde4
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index aedbb18a687e..37e6911e86f1 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -273,7 +273,7 @@ CONFIGURE_ARGS+=--disable-raw-serial
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 CONFIGURE_ARGS+=--enable-readline
 .else
 CONFIGURE_ARGS+=--disable-readline
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index ec391411bb8a..12e999315f5d 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -21,8 +21,7 @@ OPTIONS_DEFINE=	DOCS
 USE_BZIP2=	yes
 USE_GNOME=	pygtk2
 USE_SDL=	sdl
-USE_READLINE=	yes
-USES=		cmake
+USES=		cmake readline
 CMAKE_ARGS=	-DPORTAUDIO_INCLUDE_DIR:STRING="${PA2_INCLUDE_DIR}" \
 		-DPORTAUDIO_LIBRARY:STRING="${PA2_LIBRARY}" \
 		-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile
index 84272e97fde9..4419d68d760e 100644
--- a/ftp/hsftp/Makefile
+++ b/ftp/hsftp/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-openssh
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=			readline
 CONFIGURE_ARGS+=	--with-readline
 .endif
 
diff --git a/ftp/ncftp2/Makefile b/ftp/ncftp2/Makefile
index 3c4b79cf7ee8..461c5e712ebd 100644
--- a/ftp/ncftp2/Makefile
+++ b/ftp/ncftp2/Makefile
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=	READLINE
 OPTIONS_DEFAULT=READLINE
 READLINE_DESC=	Enable readline support
 
-USE_NCURSES=	yes
+USES=		ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_func_getmaxyx=yes
 MAKE_JOBS_SAFE=	yes
@@ -27,7 +27,7 @@ PLIST_FILES=	bin/${LATEST_LINK}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 .else
 CONFIGURE_ARGS+=--disable-readline
 .endif
diff --git a/ftp/quftp/Makefile b/ftp/quftp/Makefile
index c7044bf0b796..eec348d6c4be 100644
--- a/ftp/quftp/Makefile
+++ b/ftp/quftp/Makefile
@@ -12,8 +12,7 @@ COMMENT=	A scriptable FTP client
 
 LICENSE=	GPLv2
 
-USE_NCURSES=	yes
-USE_READLINE=	yes
+USES=		ncurses readline
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index 88c25ebeb90a..84266c1f141a 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--without-gettext
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 .else
 CONFIGURE_ARGS+=	--without-readline
 .endif
diff --git a/games/bastet/Makefile b/games/bastet/Makefile
index 27ca408adbf9..d1080ed5d62b 100644
--- a/games/bastet/Makefile
+++ b/games/bastet/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv3 # (or later)
 
 LIB_DEPENDS=	boost_program_options:${PORTSDIR}/devel/boost-libs
 
-USE_NCURSES=	yes
+USES=		ncurses
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/games/latrine/Makefile b/games/latrine/Makefile
index 1b5c0ce4f526..75baa3886b94 100644
--- a/games/latrine/Makefile
+++ b/games/latrine/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	latrine
-# Date created:		Sun Feb 18 01:13:42 CET 2007
-# Whom:			Juergen Lock <nox@FreeBSD.org>
-#
+# Created by: Juergen Lock <nox@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	latrine
 PORTVERSION=	1.0.0
@@ -22,8 +18,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_CSTD=	gnu89
 USE_SQLITE=	3
 USE_PERL5_BUILD=yes
-USE_NCURSES=	yes
-USES=		gettext
+USES=		gettext ncurses
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index e43ac7ea8e78..e1b2782e31eb 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   mangband
-# Date created:         Thu Jun 11 11:40:54 UTC 2009
-# Whom:                 driedfruit
-#
+# Created by: driedfruit
 # $FreeBSD$
-#
 
 PORTNAME=	mangband
 PORTVERSION=	1.1.2
@@ -16,31 +12,34 @@ COMMENT=	Free online multiplayer real-time roguelike game
 ALL_TARGET=	mangclient mangband
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	yes
+USES=		ncurses
 USE_GMAKE=	yes
 USE_NCURSES=	yes
 
 MAKE_ARGS=	"DATADIR=${DATADIR}"
 
-OPTIONS=	GCU "Display module GCU" On \
-		X11 "Display module X11" Off \
-		SDL "Display module SDL" Off \
+OPTIONS_DEFINE=	GCU X11 SDL
+OPTIONS_DEFAULT=	GCU X11 SDL
+GCU_DESC=	Display module GCU
+X11_DESC=	Display module X11
+SDL_DESC=	Display module SDL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GCU)
+.if ${PORT_OPTIONS:MGCU}
 CONFIGURE_ARGS+=	--with-gcu
 .else
 CONFIGURE_ARGS+=	--without-gcu
 .endif
 
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/libX11
 CONFIGURE_ARGS+=	--with-x11
 .else
 CONFIGURE_ARGS+=	--without-x11
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 LIB_DEPENDS+=	SDL-1.2:${PORTSDIR}/devel/sdl12
 CONFIGURE_ARGS+=	--with-sdl
 .else
@@ -70,4 +69,4 @@ do-install:
 	@${CHOWN} -R root:games ${DATADIR}/*
 	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 2f9d6b259b1e..c1f02bf1671a 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -72,7 +72,7 @@ LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 USE_SDL=	sdl image
 .else
-USE_NCURSES=	yes
+USES+=		ncurses
 CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
 PLIST_SUB+=	SDL="@comment "
 .endif
diff --git a/games/sudoku/Makefile b/games/sudoku/Makefile
index 6e691f2b8450..7f7362c33d73 100644
--- a/games/sudoku/Makefile
+++ b/games/sudoku/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	sudoku
-# Date created:			Feb 27, 2006
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	sudoku
 PORTVERSION=	1.0.2
@@ -16,14 +11,16 @@ MAINTAINER=	sterling@camdensoftware.com
 COMMENT=	Console based Sudoku games
 
 USE_BZIP2=	yes
-USE_NCURSES=	yes
+USES=		ncurses
 PLIST_FILES=	bin/sudoku \
 		share/sudoku/template
 PLIST_DIRS=	share/sudoku
 
 MAN6=	sudoku.6
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
@@ -39,7 +36,7 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/template ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/sudoku.html ${DOCSDIR}
 .endif
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 260f28e2eb36..4444e7c65aed 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 MAINTAINER=	eadler@FreeBSD.org
 COMMENT=	ASCII art library
 
+USES=		ncurses
 USE_AUTOTOOLS=	libtool
-USE_NCURSES=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 59f2671f9531..0900e994d9e8 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -13,11 +13,10 @@ LIB_DEPENDS=	glib-2:${PORTSDIR}/devel/glib20
 
 CONFLICTS=	irssi-devel-[0-9]* zh-irssi-[0-9]*
 
-USES=		pkgconfig
+USES=		pkgconfig ncurses
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 WANT_PERL=	yes
 
 MAN1=		irssi.1
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index 67c84d31d234..85a70df00d1f 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ScrollZ
-# Date created:		10 Aug 1999
-# Whom:			Will Andrews <andrews@technologist.com>
-#
+# Created by: Will Andrews <andrews@technologist.com>
 # $FreeBSD$
-#
 
 PORTNAME=	scrollz
 PORTVERSION=	2.2.2
@@ -16,11 +12,10 @@ DISTNAME=	ScrollZ-${PORTVERSION}
 MAINTAINER=	mdv@unsavoury.net
 COMMENT=	Enhanced ircII client that supports scripts, colors, and more
 
-USES=		iconv
+USES=		iconv ncurses
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-ipv6 --enable-regexp --enable-iconv
-USE_NCURSES=	yes
 
 MAKE_ENV+=	IRCLIB="${PREFIX}/share/scrollz"
 
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 0dee0ac8bd01..a46941dd70f1 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -18,7 +18,6 @@ LICENSE=	GPLv3
 CONFLICTS=	weechat-0.3*
 
 USE_LDCONFIG=	yes
-USE_NCURSES=	yes
 USES=		cmake iconv
 CMAKE_ARGS+=	-DENABLE_GUILE=no
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -145,8 +144,10 @@ LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
 .endif
 
 .if ${PORT_OPTIONS:MCOLOR256}
-WITH_NCURSES_PORT=	yes
+USES+=		ncurses:port
 CMAKE_ARGS+=	-DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
+.else
+USES+=		ncurses
 .endif
 
 MAN1=	weechat-curses.1
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index f826f289ca19..db3a73f40290 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv3
 CONFLICTS=	weechat-devel-0.*
 
 USE_LDCONFIG=	yes
-USE_NCURSES=	yes
 USES=		cmake iconv
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 WANT_PERL=	yes
@@ -139,10 +138,12 @@ PLIST_SUB+=	DOCUMENTATION="@comment "
 LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
 .endif
 
-.if ${PORT_OPTIONS:MCOLOR256}                                      
-WITH_NCURSES_PORT=	yes                                        
+.if ${PORT_OPTIONS:MCOLOR256}
+USES+=	ncurses:port
 CMAKE_ARGS+=	-DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
-.endif                                                             
+.else
+USES+=	ncurses
+.endif
 
 MAN1=	weechat-curses.1
 
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 416c070f4086..394282ccc95e 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -14,12 +14,12 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
 
 ONLY_FOR_ARCHS=	i386
 
+USES=		readline
 USE_XORG=	x11
 USE_TCL_BUILD=	yes
 USE_TCL=	yes
 USE_TK_BUILD=	yes
 USE_TK=		yes
-USE_READLINE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--prefix=${PREFIX} \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 10f62cba38d0..69dde180d91b 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -30,10 +30,9 @@ LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 USE_AUTOTOOLS=		autoconf autoheader
 USE_PERL5_BUILD=	yes
 USE_GMAKE=		yes
-USES=			iconv
+USES=			iconv ncurses
 USE_BINUTILS=		yes
 USE_GCC=		4.6+
-USE_NCURSES=		yes
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 63ec4f1128df..29f69d24bd55 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -15,10 +15,9 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
 
 USE_AUTOTOOLS=	autoconf libltdl
 USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext ncurses
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_NCURSES=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 130f8a6888b0..97c1e12d2b7b 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
 USE_CSTD=	gnu89
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_READLINE=	yes
+USES=		gettext pathfix pkgconfig readline
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal \
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 2697ba1758b2..fb2abad31437 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -15,9 +15,7 @@ OPTIONS_DEFINE=	GLADE GUILE
 OPTIONS_DEFAULT=GLADE GUILE
 
 USE_GNOME=	glib20 intltool
-USE_NCURSES=	yes
-USE_READLINE=	yes
-USES=		gettext
+USES=		gettext ncurses readline
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile
index 673f58c9d169..7ba14e998b53 100644
--- a/lang/nickle/Makefile
+++ b/lang/nickle/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 OPTIONS_DEFINE=	EXAMPLES
 
-USE_NCURSES=	yes
+USES=		ncurses
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 55ae421b6935..35257cd66d12 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	NLS DOCS
 
-USE_NCURSES=	yes
-USE_READLINE=	yes
+USES=		ncurses readline
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 9ba1522c5f92..3218273e1966 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,9 +1,5 @@
-# ports collection Makefile for: cone
-# Whom:		Matthias Andree <matthias.andree@gmx.de>
-# Date created:	2003-06-19
-#
+# Created by: Matthias Andree <matthias.andree@gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	cone
 PORTVERSION=	0.90
@@ -23,13 +19,12 @@ BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_FAM=	yes
-USES=		gettext iconv
+USES=		gettext iconv ncurses
 USE_GNOME=	libxml2
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	-C --without-db --with-certdb=${PREFIX}/share/cone/rootcerts --prefix=${PREFIX} --exec-prefix=${PREFIX}
diff --git a/mail/mixmaster/Makefile b/mail/mixmaster/Makefile
index 5ecc83cb815c..44b2c7d265da 100644
--- a/mail/mixmaster/Makefile
+++ b/mail/mixmaster/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 	mixmaster
-# Date created:		27 November 2003
-# Whom:                 Meyer Wolfsheim
-#
+# Created by: Meyer Wolfsheim
 # $FreeBSD$
-#
 
 PORTNAME=	mixmaster
 PORTVERSION=	2.9.1
@@ -20,8 +16,8 @@ COMMENT=	A cryptographically secure anonymous remailer
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
+USES=		ncurses
 USE_PERL5=	yes
-USE_NCURSES=	yes
 USE_OPENSSL=	yes
 .if !exists(/usr/include/openssl/idea.h)
 WITH_OPENSSL_PORT=	yes
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index eba4c86a101f..6dbceeb437e2 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -168,7 +168,7 @@ LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 .endif
 
 .if ${PORT_OPTIONS:NCURSES}
-USE_NCURSES=	yes
+USES=		ncurses
 .endif
 
 .if ! ${PORT_OPTIONS:MSGMLFORMAT} || ! ${PORT_OPTIONS:MXML} || !defined(XML_USED) \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 9ff2753b263a..aad298ad4c95 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -73,7 +73,9 @@ USES+=	iconv
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
 .elif defined(WITH_NCURSES)
-WITH_NCURSES_PORT=	yes
+USES+=	ncurses:port
+.else
+USES+=	ncurses
 .endif
 .if !defined (MUTT_LITE)
 .if defined(WITH_MUTT_CYRUS_SASL)
diff --git a/misc/clex/Makefile b/misc/clex/Makefile
index 56eb1013e533..021f086792e2 100644
--- a/misc/clex/Makefile
+++ b/misc/clex/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	CLEX File Manager
-# Date created:				Tue Oct 30, 2002
-# Whom:			Michael L. Hostbaek <mich@freebsdcluster.org>
-#
+# Created by: Michael L. Hostbaek <mich@freebsdcluster.org>
 # $FreeBSD$
-#
 
 PORTNAME=	clex
 PORTVERSION=	4.6.4
@@ -16,8 +12,8 @@ COMMENT=	A command line file manager
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
+USES=		ncurses
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -30,7 +26,9 @@ post-patch:
 	@${REINPLACE_CMD} -e '18s,^,#include <stdio.h>,' \
 		${WRKSRC}/src/preview.c
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 9c4f00dc3706..5c8625b7deb7 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -16,8 +16,7 @@ OPTIONS_DEFAULT=READLINE
 READLINE_DESC=	Enable readline support
 
 USE_BZIP2=	yes
-USE_NCURSES=	yes
-USES=		gettext
+USES=		gettext ncurses
 USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
 LIBTOOLIZE_ARGS=--force
 ACLOCAL_ARGS=	-I macros
@@ -31,13 +30,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		pinfo.1
 INFO=		pinfo
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.endif
+.include <bsd.port.options.mk>
 
 PLIST_FILES=	bin/pinfo etc/pinforc
 .for lang in cs de eu ja nl pl pt_BR ro ru sv vi
@@ -46,8 +39,17 @@ PLIST_FILES+=	%%NLS%%share/locale/${lang}/LC_MESSAGES/pinfo.mo
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES=		readline
 .else
 CONFIGURE_ARGS+=--without-readline
 .endif
diff --git a/misc/vifm/Makefile b/misc/vifm/Makefile
index e61261114d07..336bf437f04c 100644
--- a/misc/vifm/Makefile
+++ b/misc/vifm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: vifm
-# Date created:                      09 August 2002
-# Whom:                              Stefan Walter <swalter@lettermax.de>
-#
+# Created by: Stefan Walter <swalter@lettermax.de>
 # $FreeBSD$
-#
 
 PORTNAME=	vifm
 PORTVERSION=	0.6.3
@@ -16,10 +12,11 @@ COMMENT=	Ncurses based file manager with vi like keybindings
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	VIFM_SCREEN "Use vifm with the screen program" off
+OPTIONS_DEFINE=	VIFM_SCREEN
+VIFM_SCREEN_DESC=	Use vifm with the screen program
 
+USES=		ncurses
 USE_BZIP2=	yes
-USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gtk
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
@@ -35,20 +32,20 @@ PLIST_FILES=	bin/vifm \
 		%%DATADIR%%/vifmrc
 PLIST_DIRS=	%%DATADIR%%
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_VIFM_SCREEN)
+.if ${PORT_OPTIONS:MVIFM_SCREEN}
 RUN_DEPENDS=	screen:${PORTSDIR}/sysutils/screen
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/resize_term/resizeterm/g' \
 		${WRKSRC}/src/ui.c
-.if defined(WITH_VIFM_SCREEN)
+.if ${PORT_OPTIONS:MVIFM_SCREEN}
 	@${REINPLACE_CMD} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \
 		${WRKSRC}/src/config.c
 	@${REINPLACE_CMD} -e "s/USE_SCREEN=0/USE_SCREEN=1/" \
 		${WRKSRC}/src/vifmrc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index 38df00112178..ace48e7e3fb8 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -22,10 +22,9 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
 
-USES=		iconv
+USES=		iconv ncurses
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile
index 5055298fb060..fbc78a30dd3b 100644
--- a/multimedia/mplayer2/Makefile
+++ b/multimedia/mplayer2/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	ffmpeg1:${PORTSDIR}/multimedia/ffmpeg1
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_PYTHON=	3.1+
-USES=		iconv
-USE_NCURSES=	yes
+USES=		iconv ncurses
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/net-im/icb/Makefile b/net-im/icb/Makefile
index 06a4bfa8c9e8..f57f67dfdd0c 100644
--- a/net-im/icb/Makefile
+++ b/net-im/icb/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	c${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Internet CB - a mostly-defunct chat client
 
+USES=		readline
 USE_TK_BUILD=	yes
 USE_TK=		yes
-USE_READLINE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tcllib=${LOCALBASE}/lib
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 48587b940e09..ad413fe3bb0c 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sigwinch --libdir=${PREFIX}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		pkgconfig gettext iconv
+USES=		pkgconfig gettext iconv ncurses
 USE_LDCONFIG=	yes
-USE_NCURSES=	yes
 USE_GNOME=	glib20
 
 MAN1=		mcabber.1
diff --git a/net-im/tmsnc/Makefile b/net-im/tmsnc/Makefile
index 41b3920e936b..28a481279b3f 100644
--- a/net-im/tmsnc/Makefile
+++ b/net-im/tmsnc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tmsnc
-# Date created:				4 Apr 2007
-# Whom:					Tsung-Han Yeh <snowfly@yuntech.edu.tw>
-#
+# Created by: Tsung-Han Yeh <snowfly@yuntech.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	tmsnc
 PORTVERSION=	0.3.2
@@ -14,7 +10,7 @@ MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	A textbased (console) MSN client
 
 GNU_CONFIGURE=	yes
-USE_NCURSES=	yes
+USES=		ncurses
 
 PLIST_FILES=	bin/tmsnc
 
diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index 97b3ccc274b9..f5dd8bc70ee2 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -17,12 +17,11 @@ CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
 OPTIONS_DEFINE=	GEOIP MANPAGES MYSQL SASL
 OPTIONS_DEFAULT=MANPAGES MYSQL SASL
 
-USES=		bison
+USES=		bison ncurses
 
 .include <bsd.port.options.mk>
 
 GNU_CONFIGURE=	true
-USE_NCURSES=	yes
 USE_PERL5=	yes
 
 .if ${PORT_OPTIONS:MSASL}
diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile
index b4404dd7168d..4ff23fe785d0 100644
--- a/net-p2p/ncdc/Makefile
+++ b/net-p2p/ncdc/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3 \
 		nettle:${PORTSDIR}/security/nettle \
 		p11-kit:${PORTSDIR}/security/p11-kit
 
-USES=		pkgconfig
-USE_NCURSES=	yes
+USES=		pkgconfig ncurses
 USE_GNOME=	glib20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/sqtop/Makefile b/net/sqtop/Makefile
index 66dca5e3484a..2d0d186660f4 100644
--- a/net/sqtop/Makefile
+++ b/net/sqtop/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sqtop
-# Date created:		2010-09-05
-# Whom:			Marco Steinbach <coco@webdev.c0c0.intra>
-#
+# Created by: Marco Steinbach <coco@webdev.c0c0.intra>
 # $FreeBSD$
-#
 
 PORTNAME=	sqtop
 DISTVERSION=	2011-11-01
@@ -22,7 +18,6 @@ PLIST_FILES=	bin/sqtop
 MAN1=		sqtop.1
 
 GNU_CONFIGURE=	yes
-USE_NCURSES=	yes
 
 OPTIONS_DEFINE=		NCURSES
 OPTIONS_DEFAULT=	NCURSES
@@ -31,6 +26,8 @@ OPTIONS_DEFAULT=	NCURSES
 
 .if ! ${PORT_OPTIONS:MNCURSES}
 CONFIGURE_ARGS=	--disable-ui
+.else
+USES+=		ncurses
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 0aca829fa779..884b2ba1d03d 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -20,7 +20,7 @@ OPTIONS_DEFAULT=	QT4
 
 NO_LATEST_LINK=	yes
 
-USE_READLINE=	yes
+USES=		readline
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index dfa0bb6d8858..e504b58767d3 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	CURL NLS
 
-USE_NCURSES=	yes
+USES=		ncurses
 #USE_READLINE=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index ba8e0393f699..1602bed49f94 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -20,11 +20,10 @@ SCRIPTS=	msfcli msfconsole msfd msfelfscan msfencode msfmachscan \
 OPTIONS_DEFINE=	SVN
 
 NO_BUILD=	yes
+USES=		ncurses:port
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	iconv
 USE_BZIP2=	yes
-USE_NCURSES=	yes
-WITH_NCURSES_PORT=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index bc4880f9a9bb..6864efd4112b 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -78,7 +78,7 @@ PLIST_SUB+=	WITH_GTK2="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNCURSES}
-USE_NCURSES=	yes
+USES+=		ncurses
 PLIST_SUB+=	WITH_NCURSES=""
 .else
 CONFIGURE_ARGS+=--disable-pinentry-curses
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 5f5630779f52..dbe672053dad 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	READLINE
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 CONFIGURE_ARGS+=	--with-readline
 .else
 MAKE_ARGS+=	CFLAGS="$(CFLAGS) -static"
diff --git a/sysutils/atop/Makefile b/sysutils/atop/Makefile
index 6640fe40318b..d0c4d380f1eb 100644
--- a/sysutils/atop/Makefile
+++ b/sysutils/atop/Makefile
@@ -16,7 +16,7 @@ GH_PROJECT=	atop-freebsd
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION:C|b|fbsd.beta|}
 GH_COMMIT=	f9357ca
 
-USE_NCURSES=	yes
+USES=		ncurses
 MAKEFILE=	BSDmakefile
 MAN1=		atop.1 atopsar.1
 MAN5=		atoprc.5
diff --git a/sysutils/cdls/Makefile b/sysutils/cdls/Makefile
index fc7f25030a1f..8941fd96e829 100644
--- a/sysutils/cdls/Makefile
+++ b/sysutils/cdls/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cdls
-# Date created:	13 april 2012
-# Whom:		Hans de Hartog <hans@dehartog.nl>
-#
+# Created by: Hans de Hartog <hans@dehartog.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	cdls
 PORTVERSION=	4.2
@@ -15,9 +11,11 @@ COMMENT=	A curses based file manager for system managers
 
 PLIST_FILES=	bin/cdls
 
-USE_NCURSES=	yes
+USES=		ncurses
 
-.if defined(WITH_NCURSES_BASE)
+.include <bsd.port.pre.mk>
+
+.if ${NCURSESBASE} == /usr
 # no need to use ncurses-config if we use ncurses from the base system
 CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
 .endif
@@ -25,4 +23,4 @@ CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index a6def425cd84..7be57bac99d7 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -23,8 +23,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	LIBS="-lexecinfo"
 
 CONFIGURE_ARGS=	--with-proc=/compat/linux/proc --enable-unicode
+USES=		ncurses
 USE_AUTOTOOLS=	autoconf aclocal automake libtool
-USE_NCURSES=	yes
 ACLOCAL_ARGS=	-I ${ACLOCAL_DIR}
 
 USE_PYTHON_BUILD=	yes
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index 0528ee5047d1..ccff32c1ac3a 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	libcdio
-# Date created:				2004-04-04
-# Whom:					arved
-#
+# Created by: arved
 # $FreeBSD$
 
 PORTNAME=	libcdio
@@ -22,10 +19,9 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig iconv
+USES=		pathfix pkgconfig iconv ncurses
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_NCURSES=	yes
 CONFIGURE_ARGS+=	--with-libpopt-prefix=${LOCALBASE} \
 			--with-libiconv-prefix=${LOCALBASE} \
 USE_PERL5_BUILD=yes
diff --git a/sysutils/logmon/Makefile b/sysutils/logmon/Makefile
index a4e659966a2d..9c82571ca401 100644
--- a/sysutils/logmon/Makefile
+++ b/sysutils/logmon/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ncurses-based split window log monitoring program
 
 LICENSE=	ART10
 
+USES=		ncurses
 USE_BZIP2=	yes
-USE_NCURSES=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index e5a254127d9a..7291a541c679 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -17,9 +17,8 @@ LICENSE_COMB=	dual
 CONFIGURE_ARGS=	--disable-nls --with-libiconv-prefix=${LOCALBASE} --with-readline --with-ui
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
-USES=		pathfix iconv
+USES=		pathfix iconv ncurses readline
 USE_LDCONFIG=	yes
-USE_NCURSES=	yes
 
 MANLANG=	"" hu
 MAN1_EN=	hunspell.1 hunzip.1 hzip.1
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index e090c461435c..daaed820b9cf 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -18,11 +18,10 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext ncurses
 USE_PERL5_BUILD=yes
 USE_SQLITE=	yes
 USE_GNOME=	libxml2
-USE_NCURSES=	yes
 
 MAN1=	newsbeuter.1 podbeuter.1
 
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index b9f255461f15..d460d65bf2fd 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xrestop
-# Date created:         25 Dec 2003
-# Whom:                 Alexander Nedotsukov <bland@FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xrestop
 PORTVERSION=	0.4
@@ -14,10 +10,9 @@ MASTER_SITES=	http://projects.o-hand.com/sources/${PORTNAME}/
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	X11 server side resource usage statistics monitor
 
+USES=		pkgconfig ncurses
 USE_XORG=	x11 xext xrender xt xres xproto
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
-USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	XLIBS="-L${LOCALBASE}/lib -lX11"