Convert USE_NCURSES by USES=ncurses

Convert USE_READLINE by USES=readline

7 files changed, 17 insertions, 25 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