From owner-svn-ports-all@FreeBSD.ORG  Tue Oct 30 15:27:04 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0319CD1A;
 Tue, 30 Oct 2012 15:27:04 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id C36AA8FC16;
 Tue, 30 Oct 2012 15:27:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9UFR3oa020018;
 Tue, 30 Oct 2012 15:27:03 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9UFR3NG020016;
 Tue, 30 Oct 2012 15:27:03 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201210301527.q9UFR3NG020016@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Tue, 30 Oct 2012 15:27:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306680 - head/emulators/zsnes
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Oct 2012 15:27:04 -0000

Author: jhale
Date: Tue Oct 30 15:27:03 2012
New Revision: 306680
URL: http://svn.freebsd.org/changeset/ports/306680

Log:
  - Convert to new options framework
  - Trim Makefile header
  
  PR:		ports/173203
  Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
  Approved by:	makc, avilla (mentors, implicit)
  Feature safe:	yes

Modified:
  head/emulators/zsnes/Makefile   (contents, props changed)

Modified: head/emulators/zsnes/Makefile
==============================================================================
--- head/emulators/zsnes/Makefile	Tue Oct 30 14:57:03 2012	(r306679)
+++ head/emulators/zsnes/Makefile	Tue Oct 30 15:27:03 2012	(r306680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	zsnes
-# Date created:				Fri May  4 13:10:11 CEST 2001
-# Whom:					Stijn Hoop <stijn@win.tue.nl>
-#
+# Created by: Stijn Hoop <stijn@win.tue.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	zsnes
 PORTVERSION=	1.51
@@ -25,11 +21,11 @@ ONLY_FOR_ARCHS_REASON=	non-portable, for
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/}/src
 
-OPTIONS=	X11 "Enable X11 video driver" on \
-		OPENGL "Enable OpenGL video driver" off \
-		DEBUGGER "Enable ZSNES debugger" off \
-		JMA "Enable JMA support" on \
-		LIBAO "Enable libao support" off
+NO_OPTIONS_SORT=yes
+OPTIONS_DEFINE=	X11 OPENGL DEBUGGER JMA AO
+OPTIONS_DEFAULT=X11 JMA
+DEBUGGER_DESC=	ZSNES Debugger
+JMA_DESC=	JMA support
 
 USE_BZIP2=	yes
 USE_SDL=	sdl
@@ -46,34 +42,34 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUGGER)
+.if ${PORT_OPTIONS:MDEBUGGER}
 CONFIGURE_ARGS+=	--enable-debugger
 .else
 CONFIGURE_ARGS+=	--disable-debugger
 .endif
 
-.if defined(WITH_JMA)
+.if ${PORT_OPTIONS:MJMA}
 CONFIGURE_ARGS+=	--enable-jma
 .else
 CONFIGURE_ARGS+=	--disable-jma
 .endif
 
-.if defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
+CONFIGURE_ARGS+=	--with-x
+.else
 CONFIGURE_ARGS+=	--without-x
 PKGNAMESUFFIX=	-nox11
-.else
-CONFIGURE_ARGS+=	--with-x
 .endif
 
-.if defined(WITH_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		yes
 CONFIGURE_ARGS+=	--enable-opengl
 .else
 CONFIGURE_ARGS+=	--disable-opengl
 .endif
 
-.if defined(WITH_LIBAO)
-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
+.if ${PORT_OPTIONS:MAO}
+LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
 CONFIGURE_ARGS+=	--enable-libao
 .else
 CONFIGURE_ARGS+=	--disable-libao