diff options
| author | riggs <riggs@FreeBSD.org> | 2017-01-14 15:58:31 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2017-01-14 15:58:31 +0800 |
| commit | 0512338e02ceef39af357cefb011b4c4e542c068 (patch) | |
| tree | f914e3bceeb387423e87130909d928e755d8d0a5 | |
| parent | 8b561473068b975e534bafe17fb07ea77c2f743f (diff) | |
| download | freebsd-ports-gnome-0512338e02ceef39af357cefb011b4c4e542c068.tar.gz freebsd-ports-gnome-0512338e02ceef39af357cefb011b4c4e542c068.tar.zst freebsd-ports-gnome-0512338e02ceef39af357cefb011b4c4e542c068.zip | |
Convert GUI and SKINS to OPTION helpers; fix dependency: GUI implies ASS
PR: 216030
Reported by: rjk@wintek.com
MFH: 2017Q1
| -rw-r--r-- | multimedia/mplayer/Makefile | 16 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.optvars | 8 | ||||
| -rw-r--r-- | multimedia/mplayer/pkg-plist | 6 |
3 files changed, 13 insertions, 17 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index fddbd9a8523c..3ffb2758d289 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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} diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 14ab14ec1869..1ba455582d4b 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -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 diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist index bc6c353f2828..98ee19b68b51 100644 --- a/multimedia/mplayer/pkg-plist +++ b/multimedia/mplayer/pkg-plist @@ -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 |