From owner-svn-ports-branches@freebsd.org Sat Aug 29 21:58:28 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FD9D9C4AE3; Sat, 29 Aug 2015 21:58:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.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 27959DED; Sat, 29 Aug 2015 21:58:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7TLwROM039309; Sat, 29 Aug 2015 21:58:27 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7TLwRwd039308; Sat, 29 Aug 2015 21:58:27 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201508292158.t7TLwRwd039308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 29 Aug 2015 21:58:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r395575 - branches/2015Q3/multimedia/mplayer2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2015 21:58:28 -0000 Author: jbeich Date: Sat Aug 29 21:58:27 2015 New Revision: 395575 URL: https://svnweb.freebsd.org/changeset/ports/395575 Log: MFH: r395434 multimedia/mplayer2: slightly improve options - Make CACA=on actually work - Convert PULSE and LIBCDIO to standard spelling - Drop option descriptions where standardized PR: 202404 Submitted by: Carlos J Puga Medina (maintainer) Approved by: ports-secteam (delphij) Modified: branches/2015Q3/multimedia/mplayer2/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/multimedia/mplayer2/Makefile ============================================================================== --- branches/2015Q3/multimedia/mplayer2/Makefile Sat Aug 29 21:48:58 2015 (r395574) +++ branches/2015Q3/multimedia/mplayer2/Makefile Sat Aug 29 21:58:27 2015 (r395575) @@ -2,7 +2,7 @@ PORTNAME= mplayer2 PORTVERSION= ${MPLAYER2_PORT_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= multimedia audio MASTER_SITES= LOCAL/gblach/ @@ -44,8 +44,8 @@ MPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SN OPTIONS_DEFINE= DEBUG RTC IPV6 SMB LIBBLURAY DV THEORA \ X11 XINERAMA OPENGL SDL VDPAU GIF CACA \ - MAD SPEEX LIBCDIO LADSPA REALPLAYER \ - JACK PULSE PORTAUDIO ASS LIRC + MAD SPEEX CDIO LADSPA REALPLAYER \ + JACK PULSEAUDIO PORTAUDIO ASS LIRC OPTIONS_DEFAULT=X11 ASS .if !defined(PACKAGE_BUILDING) @@ -54,14 +54,9 @@ OPTIONS_DEFAULT+= WIN32 .endif RTC_DESC= Enable kernel realtime clock timing -PULSE_DESC= Enable PulseAudio support -THEORA_DESC= Enable ogg theora video support ASS_DESC= Enable ASS/SSA subtitle rendering WIN32_DESC= Enable win32 codec set on the IA32 arch REALPLAYER_DESC=Enable realplayer plugin -LIRC_DESC= Enable lirc support -LIBCDIO_DESC= Enable libcdio support -V4L_DESC= Enable Video4Linux TV support SUB_FILES= pkg-message @@ -132,7 +127,7 @@ LIB_DEPENDS+= libjack.so:${PORTSDIR}/au CONFIGURE_ARGS+= --disable-jack .endif -.if ${PORT_OPTIONS:MPULSE} +.if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio .else CONFIGURE_ARGS+= --disable-pulse @@ -157,7 +152,7 @@ LIB_DEPENDS+= libsmbclient.so:${PORTSDI CONFIGURE_ARGS+= --disable-smb .endif -.if ${PORT_OPTIONS:MLIBCDIO} +.if ${PORT_OPTIONS:MCDIO} LIB_DEPENDS+= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia .else CONFIGURE_ARGS+= --disable-libcdio @@ -237,7 +232,7 @@ CONFIGURE_ARGS+= --enable-rtc CONFIGURE_ARGS+= --disable-rtc .endif -.if ${PORT_OPTIONS:MLIBCACA} +.if ${PORT_OPTIONS:MCACA} LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca .else CONFIGURE_ARGS+= --disable-caca