From owner-svn-ports-all@FreeBSD.ORG  Sat Dec  1 09:07:40 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 113B1238;
 Sat,  1 Dec 2012 09:07:40 +0000 (UTC)
 (envelope-from amdmi3@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 D174D8FC08;
 Sat,  1 Dec 2012 09:07:39 +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 qB197dcr070317;
 Sat, 1 Dec 2012 09:07:39 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB197dLB070315;
 Sat, 1 Dec 2012 09:07:39 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201212010907.qB197dLB070315@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 1 Dec 2012 09:07:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308066 - head/audio/audiere
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: Sat, 01 Dec 2012 09:07:40 -0000

Author: amdmi3
Date: Sat Dec  1 09:07:39 2012
New Revision: 308066
URL: http://svnweb.freebsd.org/changeset/ports/308066

Log:
  - OptionsNG
  - Trim header
  - Fix build WITHOUT_OGG
  
  PR:		173774
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
  Feature safe:	yes

Modified:
  head/audio/audiere/Makefile

Modified: head/audio/audiere/Makefile
==============================================================================
--- head/audio/audiere/Makefile	Sat Dec  1 08:21:19 2012	(r308065)
+++ head/audio/audiere/Makefile	Sat Dec  1 09:07:39 2012	(r308066)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	audiere
-# Date created:		12 Sep 2007
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	audiere
 PORTVERSION=	1.9.4
@@ -30,11 +26,13 @@ PORTDOCS=	changelog.txt cvs.txt dependen
 
 CONFIGURE_REPLACES='s|wx_config|no_&|'
 
-OPTIONS=	DUMB	"Enable DUMB support"	on \
-		CDAUDIO	"Enable libcdaudio support"	on \
-		VORBIS	"Enable ogg vorbis support"	on \
-		SPEEX	"Enable speex support"	on
-#		FLAC	"Enable FLAC support"	on
+#OPTIONS_DEFINE=	DUMB CDAUDIO VORBIS SPEEX FLAC
+#OPTIONS_DEFAULT=	DUMB CDAUDIO VORBIS SPEEX FLAC
+OPTIONS_DEFINE=		DUMB CDAUDIO VORBIS SPEEX
+OPTIONS_DEFAULT=	DUMB CDAUDIO VORBIS SPEEX
+
+DUMB_DESC=	DUMB support
+CDAUDIO_DESC=	libcdaudio support
 
 .include <bsd.port.pre.mk>
 
@@ -45,27 +43,29 @@ OPTIONS=	DUMB	"Enable DUMB support"	on \
 CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|FLAC|no_&|'
 #.endif
 
-.if !defined(WITHOUT_DUMB)
+.if ${PORT_OPTIONS:MDUMB}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
 .else
 CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|dumb|no_&|'
 .endif
 
-.if !defined(WITHOUT_CDAUDIO)
-LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
+.if ${PORT_OPTIONS:MCDAUDIO}
+LIB_DEPENDS+=	cdaudio:${PORTSDIR}/audio/libcdaudio
 .else
 CONFIGURE_REPLACES+='/AC_CHECK_LIB/ s|cdaudio|no_&|'
 .endif
 
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis \
+# since dumb is a static lib and it depends on ogg, we should
+# link audiere with ogg as well
+.if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MDUMB}
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis \
 		ogg:${PORTSDIR}/audio/libogg
 .else
 CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|vorbis|no_&|'
 .endif
 
-.if !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+.if ${PORT_OPTIONS:MSPEEX}
+LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
 .else
 CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s|speex|no_&|'
 .endif