svn commit: r431546 - branches/2017Q1/multimedia/mplayer

[Thomas Zander]

Author: riggs
Date: Sun Jan 15 11:29:26 2017
New Revision: 431546
URL: https://svnweb.freebsd.org/changeset/ports/431546

Log:
  MFH: r431457
  
  Convert GUI and SKINS to OPTION helpers; fix dependency: GUI implies ASS
  
  PR:		216030
  Reported by:	rjk at wintek.com
  
  Approved by:	ports-secteam (junovitch)

Modified:
  branches/2017Q1/multimedia/mplayer/Makefile
  branches/2017Q1/multimedia/mplayer/Makefile.optvars
  branches/2017Q1/multimedia/mplayer/pkg-plist
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/multimedia/mplayer/Makefile
==============================================================================
--- branches/2017Q1/multimedia/mplayer/Makefile	Sun Jan 15 11:27:00 2017	(r431545)
+++ branches/2017Q1/multimedia/mplayer/Makefile	Sun Jan 15 11:29:26 2017	(r431546)
@@ -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 <bsd.port.options.mk>
 
@@ -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: branches/2017Q1/multimedia/mplayer/Makefile.optvars
==============================================================================
--- branches/2017Q1/multimedia/mplayer/Makefile.optvars	Sun Jan 15 11:27:00 2017	(r431545)
+++ branches/2017Q1/multimedia/mplayer/Makefile.optvars	Sun Jan 15 11:29:26 2017	(r431546)
@@ -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: branches/2017Q1/multimedia/mplayer/pkg-plist
==============================================================================
--- branches/2017Q1/multimedia/mplayer/pkg-plist	Sun Jan 15 11:27:00 2017	(r431545)
+++ branches/2017Q1/multimedia/mplayer/pkg-plist	Sun Jan 15 11:29:26 2017	(r431546)
@@ -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