svn commit: r317525 - in head: audio/cmus audio/ecasound audio/lash audio/mous audio/ncmpcpp audio/ocp audio/pytone biology/avida cad/gnucap databases/cego databases/grass databases/sqsh deskutils/...

Baptiste Daroussin bapt at FreeBSD.org
Mon May 6 15:34:30 UTC 2013 

Author: bapt
Date: Mon May  6 15:34:17 2013
New Revision: 317525
URL: http://svnweb.freebsd.org/changeset/ports/317525

Log:
  Convert USE_NCURSES by USES=ncurses
  Convert USE_READLINE by USES=readline

Modified:
  head/audio/cmus/Makefile
  head/audio/ecasound/Makefile
  head/audio/lash/Makefile
  head/audio/mous/Makefile
  head/audio/ncmpcpp/Makefile
  head/audio/ocp/Makefile
  head/audio/pytone/Makefile
  head/biology/avida/Makefile
  head/cad/gnucap/Makefile
  head/databases/cego/Makefile
  head/databases/grass/Makefile
  head/databases/sqsh/Makefile
  head/deskutils/wyrd/Makefile
  head/devel/cdk/Makefile
  head/devel/directfb/Makefile
  head/devel/gdb/Makefile
  head/devel/hs-terminfo/Makefile
  head/devel/jtag/Makefile
  head/devel/libepp-nicbr/Makefile
  head/devel/omake/Makefile
  head/devel/piklab/Makefile
  head/devel/stfl/Makefile
  head/editors/emacs-devel/Makefile
  head/editors/emacs/Makefile
  head/editors/emacs23/Makefile
  head/editors/joe/Makefile
  head/editors/mp/Makefile
  head/emulators/bochs/Makefile
  head/emulators/hatari/Makefile
  head/ftp/hsftp/Makefile
  head/ftp/ncftp2/Makefile
  head/ftp/quftp/Makefile
  head/ftp/yafc/Makefile
  head/games/bastet/Makefile
  head/games/latrine/Makefile
  head/games/mangband/Makefile
  head/games/stonesoup/Makefile
  head/games/sudoku/Makefile
  head/graphics/aalib/Makefile
  head/irc/irssi/Makefile
  head/irc/scrollz/Makefile
  head/irc/weechat-devel/Makefile
  head/irc/weechat/Makefile
  head/lang/gcl/Makefile
  head/lang/ghc/Makefile
  head/lang/guile/Makefile
  head/lang/librep/Makefile
  head/lang/mdk/Makefile
  head/lang/nickle/Makefile
  head/mail/abook/Makefile
  head/mail/cone/Makefile
  head/mail/mixmaster/Makefile
  head/mail/mutt/Makefile
  head/mail/mutt14/Makefile
  head/misc/clex/Makefile
  head/misc/pinfo/Makefile
  head/misc/vifm/Makefile
  head/multimedia/mplayer/Makefile.shared
  head/multimedia/mplayer2/Makefile
  head/net-im/icb/Makefile
  head/net-im/mcabber/Makefile
  head/net-im/tmsnc/Makefile
  head/net-mgmt/argus3-clients/Makefile
  head/net-p2p/ncdc/Makefile
  head/net/sqtop/Makefile
  head/science/silo/Makefile
  head/security/authforce/Makefile
  head/security/metasploit/Makefile
  head/security/pinentry/Makefile
  head/shells/rc/Makefile
  head/sysutils/atop/Makefile
  head/sysutils/cdls/Makefile
  head/sysutils/htop/Makefile
  head/sysutils/libcdio/Makefile
  head/sysutils/logmon/Makefile
  head/textproc/hunspell/Makefile
  head/www/newsbeuter/Makefile
  head/x11/xrestop/Makefile

Modified: head/audio/cmus/Makefile
==============================================================================
--- head/audio/cmus/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/audio/cmus/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -10,10 +10,9 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	h.skuhra at 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 \

Modified: head/audio/ecasound/Makefile
==============================================================================
--- head/audio/ecasound/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/audio/ecasound/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -22,7 +22,7 @@ AUDIOFILE_DESC=	Enable libaudiofile supp
 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 \

Modified: head/audio/lash/Makefile
==============================================================================
--- head/audio/lash/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/audio/lash/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/audio/mous/Makefile
==============================================================================
--- head/audio/mous/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/audio/mous/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mous
-# Date created:			15 Jan 2012
-# Whom:					Yanhui Shen <shen.elf at gmail.com>
-#
+# Created by: Yanhui Shen <shen.elf at 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

Modified: head/audio/ncmpcpp/Makefile
==============================================================================
--- head/audio/ncmpcpp/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/audio/ncmpcpp/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -13,10 +13,9 @@ COMMENT=	A ncurses mpd client, clone of 
 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
 
 .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/fftw
 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>

Modified: head/audio/ocp/Makefile
==============================================================================
--- head/audio/ocp/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/audio/ocp/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/audio/pytone/Makefile
==============================================================================
--- head/audio/pytone/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/audio/pytone/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -16,8 +16,8 @@ LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/liba
 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
 

Modified: head/biology/avida/Makefile
==============================================================================
--- head/biology/avida/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/biology/avida/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -14,8 +14,7 @@ LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	DOCS
 
-USE_NCURSES=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource ncurses
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	*

Modified: head/cad/gnucap/Makefile
==============================================================================
--- head/cad/gnucap/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/cad/gnucap/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/gnucap bin/gnucap-model
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 .else
 CONFIGURE_ARGS+=--with-readline=no
 .endif

Modified: head/databases/cego/Makefile
==============================================================================
--- head/databases/cego/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/databases/cego/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/databases/grass/Makefile
==============================================================================
--- head/databases/grass/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/databases/grass/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -32,8 +32,7 @@ LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/g
 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

Modified: head/databases/sqsh/Makefile
==============================================================================
--- head/databases/sqsh/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/databases/sqsh/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -16,7 +16,7 @@ LIB_DEPENDS=	ct:${PORTSDIR}/databases/fr
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
-USE_READLINE=	yes
+USES=		readline
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SYBASE="${LOCALBASE}"
 CONFIGURE_ARGS=	--with-readline

Modified: head/deskutils/wyrd/Makefile
==============================================================================
--- head/deskutils/wyrd/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/deskutils/wyrd/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/devel/cdk/Makefile
==============================================================================
--- head/devel/cdk/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/cdk/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -16,8 +16,8 @@ COMMENT=	Curses Development Kit for spee
 
 LICENSE=	BSD
 
+USES=		ncurses
 USE_GMAKE=	yes
-USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
 PORTDOCS=	COPYING EXPANDING INSTALL NOTES README TODO
 MAKE_JOBS_UNSAFE=	yes

Modified: head/devel/directfb/Makefile
==============================================================================
--- head/devel/directfb/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/directfb/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -26,10 +26,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LO
 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

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/gdb/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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}

Modified: head/devel/hs-terminfo/Makefile
==============================================================================
--- head/devel/hs-terminfo/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/hs-terminfo/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -10,7 +10,7 @@ COMMENT=	Haskell bindings to the terminf
 
 LICENSE=	BSD
 
-USE_NCURSES=	yes
+USES=		ncurses
 
 CONFIGURE_ARGS+=	--configure-option=--with-curses-includes=${NCURSESINC} \
 			--configure-option=--with-curses-libraries=${NCURSESLIB}

Modified: head/devel/jtag/Makefile
==============================================================================
--- head/devel/jtag/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/jtag/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 

Modified: head/devel/libepp-nicbr/Makefile
==============================================================================
--- head/devel/libepp-nicbr/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/libepp-nicbr/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/devel/omake/Makefile
==============================================================================
--- head/devel/omake/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/omake/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -7,13 +7,12 @@ CATEGORIES=	devel
 MASTER_SITES=	http://main.metaprl.org/download/omake/
 
 MAINTAINER=	bf at 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

Modified: head/devel/piklab/Makefile
==============================================================================
--- head/devel/piklab/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/piklab/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/devel/stfl/Makefile
==============================================================================
--- head/devel/stfl/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/devel/stfl/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	stfl
-# Date created:		28 March 2007
-# Whom:			Andrew Pantyukhin <infofarmer at FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer at 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 \

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/editors/emacs-devel/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -25,8 +25,8 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-2
 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

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/editors/emacs/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -22,8 +22,8 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-2
 
 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

Modified: head/editors/emacs23/Makefile
==============================================================================
--- head/editors/emacs23/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/editors/emacs23/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -24,9 +24,9 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-2
 
 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

Modified: head/editors/joe/Makefile
==============================================================================
--- head/editors/joe/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/editors/joe/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	joe
-# Date created:		01 Jul 1995
-# Whom:			torstenb at FreeBSD.org
-#
+# Created by: torstenb at 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

Modified: head/editors/mp/Makefile
==============================================================================
--- head/editors/mp/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/editors/mp/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/emulators/bochs/Makefile
==============================================================================
--- head/emulators/bochs/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/emulators/bochs/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/emulators/hatari/Makefile
==============================================================================
--- head/emulators/hatari/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/emulators/hatari/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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" \

Modified: head/ftp/hsftp/Makefile
==============================================================================
--- head/ftp/hsftp/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/ftp/hsftp/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-openssh
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=			readline
 CONFIGURE_ARGS+=	--with-readline
 .endif
 

Modified: head/ftp/ncftp2/Makefile
==============================================================================
--- head/ftp/ncftp2/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/ftp/ncftp2/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/ftp/quftp/Makefile
==============================================================================
--- head/ftp/quftp/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/ftp/quftp/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 

Modified: head/ftp/yafc/Makefile
==============================================================================
--- head/ftp/yafc/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/ftp/yafc/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--without-gettext
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
-USE_READLINE=	yes
+USES+=		readline
 .else
 CONFIGURE_ARGS+=	--without-readline
 .endif

Modified: head/games/bastet/Makefile
==============================================================================
--- head/games/bastet/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/games/bastet/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 

Modified: head/games/latrine/Makefile
==============================================================================
--- head/games/latrine/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/games/latrine/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	latrine
-# Date created:		Sun Feb 18 01:13:42 CET 2007
-# Whom:			Juergen Lock <nox at FreeBSD.org>
-#
+# Created by: Juergen Lock <nox at 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

Modified: head/games/mangband/Makefile
==============================================================================
--- head/games/mangband/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/games/mangband/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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-ti
 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>

Modified: head/games/stonesoup/Makefile
==============================================================================
--- head/games/stonesoup/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/games/stonesoup/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -72,7 +72,7 @@ LIB_DEPENDS+=	png15:${PORTSDIR}/graphics
 		freetype:${PORTSDIR}/print/freetype2
 USE_SDL=	sdl image
 .else
-USE_NCURSES=	yes
+USES+=		ncurses
 CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
 PLIST_SUB+=	SDL="@comment "
 .endif

Modified: head/games/sudoku/Makefile
==============================================================================
--- head/games/sudoku/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/games/sudoku/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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 at 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

Modified: head/graphics/aalib/Makefile
==============================================================================
--- head/graphics/aalib/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/graphics/aalib/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r
 MAINTAINER=	eadler at 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

Modified: head/irc/irssi/Makefile
==============================================================================
--- head/irc/irssi/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/irc/irssi/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -13,11 +13,10 @@ LIB_DEPENDS=	glib-2:${PORTSDIR}/devel/gl
 
 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

Modified: head/irc/scrollz/Makefile
==============================================================================
--- head/irc/scrollz/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/irc/scrollz/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ScrollZ
-# Date created:		10 Aug 1999
-# Whom:			Will Andrews <andrews at technologist.com>
-#
+# Created by: Will Andrews <andrews at technologist.com>
 # $FreeBSD$
-#
 
 PORTNAME=	scrollz
 PORTVERSION=	2.2.2
@@ -16,11 +12,10 @@ DISTNAME=	ScrollZ-${PORTVERSION}
 MAINTAINER=	mdv at 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"
 

Modified: head/irc/weechat-devel/Makefile
==============================================================================
--- head/irc/weechat-devel/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/irc/weechat-devel/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 .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

Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/irc/weechat/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 

Modified: head/lang/gcl/Makefile
==============================================================================
--- head/lang/gcl/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/lang/gcl/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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} \

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/lang/ghc/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -30,10 +30,9 @@ LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gm
 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

Modified: head/lang/guile/Makefile
==============================================================================
--- head/lang/guile/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/lang/guile/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 

Modified: head/lang/librep/Makefile
==============================================================================
--- head/lang/librep/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/lang/librep/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -20,8 +20,7 @@ RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/
 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 \

Modified: head/lang/mdk/Makefile
==============================================================================
--- head/lang/mdk/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/lang/mdk/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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

Modified: head/lang/nickle/Makefile
==============================================================================
--- head/lang/nickle/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/lang/nickle/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 OPTIONS_DEFINE=	EXAMPLES
 
-USE_NCURSES=	yes
+USES=		ncurses
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes

Modified: head/mail/abook/Makefile
==============================================================================
--- head/mail/abook/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/mail/abook/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 

Modified: head/mail/cone/Makefile
==============================================================================
--- head/mail/cone/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/mail/cone/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -1,9 +1,5 @@
-# ports collection Makefile for: cone
-# Whom:		Matthias Andree <matthias.andree at gmx.de>
-# Date created:	2003-06-19
-#
+# Created by: Matthias Andree <matthias.andree at gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	cone
 PORTVERSION=	0.90
@@ -23,13 +19,12 @@ BUILD_DEPENDS=	gpgv:${PORTSDIR}/security
 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}

Modified: head/mail/mixmaster/Makefile
==============================================================================
--- head/mail/mixmaster/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/mail/mixmaster/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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 anon
 
 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

Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/mail/mutt/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -168,7 +168,7 @@ LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/
 .endif
 
 .if ${PORT_OPTIONS:NCURSES}
-USE_NCURSES=	yes
+USES=		ncurses
 .endif
 
 .if ! ${PORT_OPTIONS:MSGMLFORMAT} || ! ${PORT_OPTIONS:MXML} || !defined(XML_USED) \

Modified: head/mail/mutt14/Makefile
==============================================================================
--- head/mail/mutt14/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/mail/mutt14/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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)

Modified: head/misc/clex/Makefile
==============================================================================
--- head/misc/clex/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/misc/clex/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	CLEX File Manager
-# Date created:				Tue Oct 30, 2002
-# Whom:			Michael L. Hostbaek <mich at freebsdcluster.org>
-#
+# Created by: Michael L. Hostbaek <mich at 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}

Modified: head/misc/pinfo/Makefile
==============================================================================
--- head/misc/pinfo/Makefile	Mon May  6 15:33:07 2013	(r317524)
+++ head/misc/pinfo/Makefile	Mon May  6 15:34:17 2013	(r317525)
@@ -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
 
 .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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list