From owner-svn-ports-all@FreeBSD.ORG  Sun Aug 19 00:03:18 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D0D4A1065672;
	Sun, 19 Aug 2012 00:03:18 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A29468FC12;
	Sun, 19 Aug 2012 00:03:18 +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 q7J03IC0098537;
	Sun, 19 Aug 2012 00:03:18 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7J03Ihc098535;
	Sun, 19 Aug 2012 00:03:18 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201208190003.q7J03Ihc098535@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sun, 19 Aug 2012 00:03:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302743 - head/net/freeswitch-devel
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sun, 19 Aug 2012 00:03:18 -0000

Author: jgh
Date: Sun Aug 19 00:03:18 2012
New Revision: 302743
URL: http://svn.freebsd.org/changeset/ports/302743

Log:
  - update to 1.2.1
  
  PR:	170319
  Submitted by:	maintainer, r.neese@gmail.com

Modified:
  head/net/freeswitch-devel/Makefile   (contents, props changed)

Modified: head/net/freeswitch-devel/Makefile
==============================================================================
--- head/net/freeswitch-devel/Makefile	Sat Aug 18 21:48:35 2012	(r302742)
+++ head/net/freeswitch-devel/Makefile	Sun Aug 19 00:03:18 2012	(r302743)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeswitch
-PORTVERSION=	1.2
+PORTVERSION=	1.2.1
 CATEGORIES=	net
 MASTER_SITES=	# none
 PKGNAMESUFFIX=	-devel
@@ -23,19 +23,24 @@ CONFLICTS=	freeswitch-core-[0-9]*
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-OPTIONS=	VANILLA		"Vanilla Dialplan Configs" off \
-		SBC		"Session Border Conroller configs" off \
-		INSIDEOUT	"Inside Out Basic Dialplan Configs" off \
-		CURL		"Curl dialplan configs" off \
-		SOUNDS		"Sound files for use with FreeSwitch PBX" off \
-		MUSIC		"Music on hold for use with FreeSwitch PBX" off \
-		PIZZADEMO	"Install Pizza Shop voice demo" off \
-		SCRIPTS		"Install Freeswitch various scripts" off
+OPTIONS_DEFINE=	VANILLA SBC INSIDEOUT CURL SOUNDS MUSIC PIZZADEMO SCRIPTS	
+
+VANILLA_DESC=		Vanilla Dialplan Configs
+SBC_DESC=		Session Border Conroller configs
+INSIDEOUT_DESC=		Inside Out Basic Dialplan Configs
+CURL_DESC=		Curl dialplan configs
+SOUNDS_DESC=		Sound files for use with FreeSwitch PBX
+MUSIC_DESC=		Music on hold for use with FreeSwitch PBX
+PIZZADEMO_DESC=		Install Pizza Shop voice demo
+SCRIPTS_DESC=		Install Freeswitch various scripts
+
+OPTIONS_DEFAULT=	VANILLA SOUNDS MUSIC
+NO_OPTIONS_SORT=        yes
 
 .include <bsd.port.options.mk>
 
 .for conf in vanilla sbc insideout curl
-.  if defined(WITH_${conf:U})
+.if ${PORT_OPTIONS:M${conf:U}}
 CNF?=	${conf}
 .    if ${CNF} == ${conf}
 RUN_DEPENDS+=	${LOCALBASE}/etc/freeswitch/conf/.${conf}:${PORTSDIR}/net/freeswitch-${conf}-devel
@@ -46,19 +51,19 @@ IGNORE=	will not allow multiple configur
 .endfor
 .undef CNF
 
-.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_PIZZADEMO)
+.if ${PORT_OPTIONS:MPIZZADEMO}
 RUN_DEPENDS+=	${LOCALBASE}/share/freeswitch/sounds/.pizza:${PORTSDIR}/misc/freeswitch-pizzademo-devel
 .endif
 
-.if defined(WITH_SCRIPTS)
+.if ${PORT_OPTIONS:MSCRIPTS}
 RUN_DEPENDS+=	${LOCALBASE}/etc/freeswitch/scripts/.freeswitch-scripts:${PORTSDIR}/misc/freeswitch-scripts-devel
 .endif