Convert USE_NCURSES by USES=ncurses

Convert USE_READLINE by USES=readline

5 files changed, 22 insertions, 31 deletions

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