From owner-svn-ports-all@FreeBSD.ORG  Sun Mar  3 15:00:44 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7A7A3ECD;
 Sun,  3 Mar 2013 15:00:44 +0000 (UTC) (envelope-from kwm@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 6C348A8E;
 Sun,  3 Mar 2013 15:00:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r23F0i6t072798;
 Sun, 3 Mar 2013 15:00:44 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r23F0i2g072797;
 Sun, 3 Mar 2013 15:00:44 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201303031500.r23F0i2g072797@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sun, 3 Mar 2013 15:00:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313355 - head/net/opal
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: Sun, 03 Mar 2013 15:00:44 -0000

Author: kwm
Date: Sun Mar  3 15:00:43 2013
New Revision: 313355
URL: http://svnweb.freebsd.org/changeset/ports/313355

Log:
  Assign to gnome@ [1], update Makefile header, OptionsNG.
  
  Approved by:	previous maintainer [1]

Modified:
  head/net/opal/Makefile

Modified: head/net/opal/Makefile
==============================================================================
--- head/net/opal/Makefile	Sun Mar  3 14:52:24 2013	(r313354)
+++ head/net/opal/Makefile	Sun Mar  3 15:00:43 2013	(r313355)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openh323
-# Date created:		Thu Feb 17 15:00:48 GMT 2000
-# Whom:			Roger Hardiman <roger@freebsd.org>
-#
+# Created by: Roger Hardiman <roger@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	opal
 PORTVERSION=	2.2.11
@@ -11,11 +7,13 @@ PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VoIP abstraction library
 
-OPTIONS=	FFMPEG	"Support H263 audio/video codec"	on \
-		SPEEX	"Use speex installed by audio/speex"	on
+OPTIONS_DEFINE=	FFMPEG SPEEX
+OPTIONS_DEFAULT=FFMPEG SPEEX
+FFMPEG_DESC=	H263 audio/video codec support
+SPEEX_DESC=	Use audio/speex instead of bundled version
 
 LIB_DEPENDS=	pt_r:${PORTSDIR}/devel/pwlib
 
@@ -42,18 +40,19 @@ CFLAGS+=	-fPIC
 BROKEN=		does not compile on 9.X
 .endif
 
-.if defined(WITHOUT_FFMPEG)
-CONFIGURE_ARGS+=--disable-h263avcodec
-.else
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=--enable-h263avcodec=${LOCALBASE}/include/ffmpeg
+.else
+CONFIGURE_ARGS+=--disable-h263avcodec
 .endif
 
-.if defined(WITHOUT_SPEEX)
-CONFIGURE_ARGS+=--enable-localspeex=no
-.else
+.if ${PORT_OPTIONS:MSPEEX}
 LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=--enable-localspeex=yes
+.else
+CONFIGURE_ARGS+=--enable-localspeex=no
 .endif
 
+
 .include <bsd.port.post.mk>