From owner-svn-ports-all@freebsd.org Sat Jan 14 07:58:32 2017 Return-Path: Delivered-To: svn-ports-all@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 73A46CAFEAF; Sat, 14 Jan 2017 07:58:32 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 370041F2B; Sat, 14 Jan 2017 07:58:32 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0E7wVaf037883; Sat, 14 Jan 2017 07:58:31 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0E7wVh1037880; Sat, 14 Jan 2017 07:58:31 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201701140758.v0E7wVh1037880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 14 Jan 2017 07:58:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431457 - 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2017 07:58:32 -0000 Author: riggs Date: Sat Jan 14 07:58:31 2017 New Revision: 431457 URL: https://svnweb.freebsd.org/changeset/ports/431457 Log: Convert GUI and SKINS to OPTION helpers; fix dependency: GUI implies ASS PR: 216030 Reported by: rjk@wintek.com MFH: 2017Q1 Modified: head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.optvars head/multimedia/mplayer/pkg-plist Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sat Jan 14 04:05:35 2017 (r431456) +++ head/multimedia/mplayer/Makefile Sat Jan 14 07:58:31 2017 (r431457) @@ -46,6 +46,8 @@ CONFLICTS= mplayer2-2.* CONFFILES= example.conf input.conf menu.conf dvb-menu.conf USES+= iconv pkgconfig +OPTIONS_SUB= yes + .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars" .include @@ -63,20 +65,6 @@ CONFIGURE_ARGS+= --disable-arts \ --disable-musepack \ --disable-theora -.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} -PLIST_SUB+= GMPLAYER="" -DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false -.if ${PORT_OPTIONS:MSKINS} -RUN_DEPENDS+= mplayer-skins>=0:multimedia/mplayer-skins -.endif - -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --enable-gui - -.else -PLIST_SUB+= GMPLAYER="@comment " -.endif #GUI && X11 - .if ${PORT_OPTIONS:MX11} USE_XORG= x11 xext xproto xscrnsaver .if ${PORT_OPTIONS:MXVIDEO} Modified: head/multimedia/mplayer/Makefile.optvars ============================================================================== --- head/multimedia/mplayer/Makefile.optvars Sat Jan 14 04:05:35 2017 (r431456) +++ head/multimedia/mplayer/Makefile.optvars Sat Jan 14 07:58:31 2017 (r431457) @@ -52,6 +52,11 @@ GNUTLS_CONFIGURE_OFF= --disable-gnutls GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_OFF= --disable-libgsm +GUI_CONFIGURE_ENABLE= gui +GUI_USE= GNOME=gtk20 +GUI_DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false +GUI_IMPLIES= ASS X11 + IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_OFF= --disable-inet6 @@ -104,6 +109,9 @@ SDL_CONFIGURE_OFF= --disable-sdl SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_OFF= --disable-sndio +SKINS_RUN_DEPENDS= mplayer-skins>=0:multimedia/mplayer-skins +SKINS_IMPLIES= GUI + SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient SMB_CONFIGURE_OFF= --disable-smb Modified: head/multimedia/mplayer/pkg-plist ============================================================================== --- head/multimedia/mplayer/pkg-plist Sat Jan 14 04:05:35 2017 (r431456) +++ head/multimedia/mplayer/pkg-plist Sat Jan 14 07:58:31 2017 (r431457) @@ -1,8 +1,8 @@ bin/mplayer man/man1/mplayer.1.gz -%%GMPLAYER%%bin/gmplayer -%%GMPLAYER%%man/man1/gmplayer.1.gz -%%GMPLAYER%%share/pixmaps/mplayer.png +%%GUI%%bin/gmplayer +%%GUI%%man/man1/gmplayer.1.gz +%%GUI%%share/pixmaps/mplayer.png %%DATADIR%%/examples/etc/example.conf %%DATADIR%%/examples/etc/input.conf %%DATADIR%%/examples/etc/menu.conf