svn commit: r304328 - in head: Mk x11-wm/vtwm

[Eitan Adler]

Author: eadler
Date: Sun Sep 16 00:18:35 2012
New Revision: 304328
URL: http://svn.freebsd.org/changeset/ports/304328

Log:
  - Covert to OptionsNG
  - Add generally useful options to the global list
  
  Approved by:	ak (maintainer)

Modified:
  head/Mk/bsd.options.desc.mk
  head/x11-wm/vtwm/Makefile

Modified: head/Mk/bsd.options.desc.mk
==============================================================================
--- head/Mk/bsd.options.desc.mk	Sat Sep 15 21:25:33 2012	(r304327)
+++ head/Mk/bsd.options.desc.mk	Sun Sep 16 00:18:35 2012	(r304328)
@@ -255,6 +255,7 @@ SMB_DESC?=		SMB protocol support
 SNAPPY_DESC?=		Snappy compression library support
 SNDFILE_DESC?=		libsndfile support
 SNMP_DESC?=		SNMP protocol support
+SOUND_DESC?=		Sound support
 SPANDSP_DESC?=		Spandsp faxing support
 SPEEX_DESC?=		Speex audio format support
 SQL_DESC?=		SQL database backend

Modified: head/x11-wm/vtwm/Makefile
==============================================================================
--- head/x11-wm/vtwm/Makefile	Sat Sep 15 21:25:33 2012	(r304327)
+++ head/x11-wm/vtwm/Makefile	Sun Sep 16 00:18:35 2012	(r304328)
@@ -22,20 +22,20 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 MAN1=		vtwm.1
 
-OPTIONS=	SOUND "Sound support" on \
-		NLS "Native language support" on
+OPTIONS_DEFINE=	SOUND NLS
+OPTIONS_DEFAULT=	SOUND NLS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SOUND)
+.if ${PORT_OPTIONS:MSOUND}
 LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
 MAKE_ENV+=	SOUND=yes
 .else
 MAKE_ENV+=	SOUND=no
 .endif
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 CFLAGS+=	-DNO_I18N_SUPPORT
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>