From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 13 10:32:52 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 2C8E6D46;
 Thu, 13 Dec 2012 10:32:52 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EB95A8FC15;
 Thu, 13 Dec 2012 10:32:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDAWpnT010752;
 Thu, 13 Dec 2012 10:32:51 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDAWpOG010751;
 Thu, 13 Dec 2012 10:32:51 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212131032.qBDAWpOG010751@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 13 Dec 2012 10:32:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308841 - head/net/freeswitch
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: Thu, 13 Dec 2012 10:32:52 -0000

Author: bapt
Date: Thu Dec 13 10:32:51 2012
New Revision: 308841
URL: http://svnweb.freebsd.org/changeset/ports/308841

Log:
  Convert to new option framework

Modified:
  head/net/freeswitch/Makefile

Modified: head/net/freeswitch/Makefile
==============================================================================
--- head/net/freeswitch/Makefile	Thu Dec 13 10:28:44 2012	(r308840)
+++ head/net/freeswitch/Makefile	Thu Dec 13 10:32:51 2012	(r308841)
@@ -19,26 +19,28 @@ RUN_DEPENDS=	${LOCALBASE}/bin/freeswitch
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-OPTIONS=	SOUNDS	"Sound files for use with FreeSwitch PBX" on \
-		MUSIC	"Music on hold for use with FreeSwitch PBX" on \
-		PIZZA	"Install Pizza Shop voice demo" off \
-		SCRIPTS	"Install Freeswitch various scripts" off \
+OPTIONS_DEFINE=	SOUNDS MUSIC PIZZA SCRIPTS
+OPTIONS_DEFAULT=	SOUNDS MUSIC
+SOUNDS_DESC=	Sound files for use with FreeSwitch PBX
+MUSIC_DESC=	Music on hold for use with FreeSwitch PBX
+PIZZA_DESC=	Pizza Shop voice demo
+SCRIPTS_DESC=	Freeswitch various scripts
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SOUNDS)
+.if ${PORT_OPTIONS:MSOUNDS}
 RUN_DEPENDS+=	${LOCALBASE}/share/freeswitch/sounds/.freeswitch-sounds:${PORTSDIR}/audio/freeswitch-sounds
 .endif
 
-.if defined(WITH_MUSIC)
+.if ${PORT_OPTIONS:MMUSIC}
 RUN_DEPENDS+=	${LOCALBASE}/share/freeswitch/sounds/.freeswitch-music:${PORTSDIR}/audio/freeswitch-music
 .endif
 
-.if defined(WITH_PIZZA)
+.if ${PORT_OPTIONS:MPIZZA}
 RUN_DEPENDS+=	${LOCALBASE}/share/freeswitch/sounds/.pizza:${PORTSDIR}/misc/freeswitch-pizzademo
 .endif
 
-.if defined(WITH_SCRIPTS)
+.if ${PORT_OPTIONS:MSCRIPTS}
 RUN_DEPENDS+=	${LOCALBASE}/etc/freeswitch/scripts/.freeswitch-scripts:${PORTSDIR}/misc/freeswitch-scripts
 .endif