From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 18 12:08:12 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7F6FB558;
 Thu, 18 Sep 2014 12:08:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B0399A2;
 Thu, 18 Sep 2014 12:08:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8IC8CZF096509;
 Thu, 18 Sep 2014 12:08:12 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8IC8CWe096508;
 Thu, 18 Sep 2014 12:08:12 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201409181208.s8IC8CWe096508@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Thu, 18 Sep 2014 12:08:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368445 - head/multimedia/mplayer
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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: Thu, 18 Sep 2014 12:08:12 -0000

Author: riggs
Date: Thu Sep 18 12:08:11 2014
New Revision: 368445
URL: http://svnweb.freebsd.org/changeset/ports/368445
QAT: https://qat.redports.org/buildarchive/r368445/

Log:
  - Make FONTCONFIG a default OPTION
    - improves compatibility with umplayer
    - does not require manual config modification for subtitle display
  - Bump PORTREVISION
  
  PR:		193675
  Submitted by:	loox@e-shell.net

Modified:
  head/multimedia/mplayer/Makefile

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Thu Sep 18 11:56:52 2014	(r368444)
+++ head/multimedia/mplayer/Makefile	Thu Sep 18 12:08:11 2014	(r368445)
@@ -3,14 +3,14 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
-		ENCA FRIBIDI GIF GSM GUI IPV6 JACK \
+		ENCA FONTCONFIG FRIBIDI GIF GSM GUI IPV6 JACK \
 		LADSPA LIBMNG LIRC LZO MEMALIGN NAS OCFLAGS \
 		OPENAL OPENGL OPENJPEG OPUS OTCHAIN PROFILE \
 		PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
@@ -20,7 +20,7 @@ OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLUR
 OPTIONS_RADIO=	RGCD
 OPTIONS_RADIO_RGCD=	CDIO CDPARANOIA
 
-OPTIONS_DEFAULT=FRIBIDI IPV6 OCFLAGS OPENGL RTCPU SKINS \
+OPTIONS_DEFAULT=FONTCONFIG FRIBIDI IPV6 OCFLAGS OPENGL RTCPU SKINS \
 		WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
 
 BLURAY_DESC?=	BluRay support
@@ -110,8 +110,7 @@ USE_XORG+=	xvmc
 CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
 .endif
 .else	#X11
-CONFIGURE_ARGS+=--disable-x11 \
-		--disable-fontconfig
+CONFIGURE_ARGS+=--disable-x11
 .endif
 
 pre-everything::