From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 17 19:24:45 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 3ABED7C;
 Mon, 17 Dec 2012 19:24:45 +0000 (UTC) (envelope-from wxs@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 1FEA08FC0C;
 Mon, 17 Dec 2012 19:24:45 +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 qBHJOj6O051212;
 Mon, 17 Dec 2012 19:24:45 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHJOigu051211;
 Mon, 17 Dec 2012 19:24:44 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201212171924.qBHJOigu051211@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Mon, 17 Dec 2012 19:24:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309122 - head/audio/akode
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: Mon, 17 Dec 2012 19:24:45 -0000

Author: wxs
Date: Mon Dec 17 19:24:44 2012
New Revision: 309122
URL: http://svnweb.freebsd.org/changeset/ports/309122

Log:
  Conver to new options.
  
  PR:		ports/173777
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
  Approved by:	swhetzel@gmail.com (maintainer)

Modified:
  head/audio/akode/Makefile   (contents, props changed)

Modified: head/audio/akode/Makefile
==============================================================================
--- head/audio/akode/Makefile	Mon Dec 17 19:20:56 2012	(r309121)
+++ head/audio/akode/Makefile	Mon Dec 17 19:24:44 2012	(r309122)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mpeglib_artsplug
-# Date created:				July 09 2004
-# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
-#
+# Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	akode
 PORTVERSION=	2.0.2
@@ -17,18 +13,18 @@ DISTNAME=	30375-${PORTNAME}-${PORTVERSIO
 
 MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Default KDE audio backend
+
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-OPTIONS=	FFMPEG "FFMPEG decoder plugin" off \
-		JACK "Jack output plugin" off \
-		MPC "Monkey's Audio decoder plugin" on \
-		MPEG "MPEG Audio (including mp3) plugin" on \
-		OSS "OSS output plugin" on \
-		RESAMPLER "Resampler processing plugin" on \
-		XIPH "FLAC/Speex/Vorbis decoder plugin" on
+OPTIONS_DEFINE=	FFMPEG JACK MPC MPEG OSS RESAMPLER XIPH
+OPTIONS_DEFAULT=	MPC MPEG OSS RESAMPLER XIP
+
+MPC_DESC=	Monkey's Audio decoder plugin
+RESAMPLER_DESC=	Resampler processing plugin
+XIPH_DESC=	FLAC/Speex/Vorbis decoder plugin
 
 USE_AUTOTOOLS=	libltdl libtool
 USE_BZIP2=	yes
@@ -41,33 +37,33 @@ CONFIGURE_ARGS+=--program-transform-name
 		--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_ffmpeg_decoder.so:${PORTSDIR}/audio/akode-plugins-ffmpeg
 .endif
 
-.if defined(WITH_JACK)
+.if ${PORT_OPTIONS:MJACK}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_jack_sink.so:${PORTSDIR}/audio/akode-plugins-jack
 .endif
 
-.if !defined(WITHOUT_MPC)
+.if ${PORT_OPTIONS:MMPC}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_mpc_decoder.so:${PORTSDIR}/audio/akode-plugins-mpc
 .endif
 
-.if !defined(WITHOUT_MPEG)
+.if ${PORT_OPTIONS:MMPEG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_mpeg_decoder.so:${PORTSDIR}/audio/akode-plugins-mpeg
 .endif
 
-.if !defined(WITHOUT_OSS)
+.if ${PORT_OPTIONS:MOSS}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_oss_sink.so:${PORTSDIR}/audio/akode-plugins-oss
 .endif
 
-.if !defined(WITHOUT_RESAMPLER)
+.if ${PORT_OPTIONS:MRESAMPLER}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_src_resampler.so:${PORTSDIR}/audio/akode-plugins-resampler
 .endif
 
-.if !defined(WITHOUT_XIPH)
+.if ${PORT_OPTIONS:MXIPH}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_xiph_decoder.so:${PORTSDIR}/audio/akode-plugins-xiph
 .endif
 
@@ -78,4 +74,4 @@ post-patch:
 	$$(all_libraries) ${PTHREAD_LIBS}|g' \
 		${WRKSRC}/akode/akodeplay/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>