From owner-svn-ports-head@FreeBSD.ORG  Sat Aug  9 16:55:01 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8D9BB3F9
 for <svn-ports-head@freebsd.org>; Sat,  9 Aug 2014 16:55:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62A76206E
 for <svn-ports-head@freebsd.org>; Sat,  9 Aug 2014 16:55:01 +0000 (UTC)
Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 2474
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sat, 09 Aug 2014 16:55:01 +0000
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 9 Aug 2014 16:55:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364454 - head/multimedia/gmerlin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e65265.2474.6aad608f@svn.freebsd.org>
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2014 16:55:01 -0000

Author: antoine
Date: Sat Aug  9 16:55:00 2014
New Revision: 364454
URL: http://svnweb.freebsd.org/changeset/ports/364454
QAT: https://qat.redports.org/buildarchive/r364454/

Log:
  Remove CDIO from OPTIONS_DEFAULT and mark it BROKEN

Modified:
  head/multimedia/gmerlin/Makefile

Modified: head/multimedia/gmerlin/Makefile
==============================================================================
--- head/multimedia/gmerlin/Makefile	Sat Aug  9 16:09:28 2014	(r364453)
+++ head/multimedia/gmerlin/Makefile	Sat Aug  9 16:55:00 2014	(r364454)
@@ -35,7 +35,7 @@ INFO=		gmerlin
 
 OPTIONS_DEFINE= 	ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \
 			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF DOCS
-OPTIONS_DEFAULT=	CDDB CDIO JACK JPEG LIBVISUAL \
+OPTIONS_DEFAULT=	CDDB JACK JPEG LIBVISUAL \
 			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
 OPTIONS_SUB=		yes
 
@@ -63,6 +63,12 @@ QUICKTIME_CONFIGURE_OFF=--disable-lqt
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 TIFF_CONFIGURE_OFF=	--disable-libtiff
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCDIO}
+BROKEN=	Fails to build with new libcdio
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/LIBS/s|-ldl || ; \