[pkgsrc/trunk]: pkgsrc/multimedia/gnome-mplayer gnome-mplayer: Remove optiona...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/37ee850cbe56
branches:  trunk
changeset: 421698:37ee850cbe56
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Jan 17 14:16:26 2020 +0000

description:
gnome-mplayer: Remove optional dependency on GNOME 2 nautilus.

This replaces the 'gnome' option with a 'libnotify' option.

Bump PKGREVISION

diffstat:

 multimedia/gnome-mplayer/Makefile   |   5 +++--
 multimedia/gnome-mplayer/PLIST      |   3 +--
 multimedia/gnome-mplayer/options.mk |  18 +++++++-----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diffs (67 lines):

diff -r fab73ac62cc3 -r 37ee850cbe56 multimedia/gnome-mplayer/Makefile
--- a/multimedia/gnome-mplayer/Makefile Fri Jan 17 13:38:35 2020 +0000
+++ b/multimedia/gnome-mplayer/Makefile Fri Jan 17 14:16:26 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2020/01/12 20:20:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2020/01/17 14:16:26 nia Exp $
 
 DISTNAME=      gnome-mplayer-1.0.9
-PKGREVISION=   30
+PKGREVISION=   31
 CATEGORIES=    multimedia
 MASTER_SITES=  http://gnome-mplayer.googlecode.com/svn/packages/
 
@@ -18,6 +18,7 @@
 USE_TOOLS+=            gmake pkg-config msgfmt
 
 CONFIGURE_ARGS+=       --disable-gtk3
+CONFIGURE_ARGS+=       --disable-nautilus
 
 GCONF_SCHEMAS+=        gnome-mplayer.schemas
 
diff -r fab73ac62cc3 -r 37ee850cbe56 multimedia/gnome-mplayer/PLIST
--- a/multimedia/gnome-mplayer/PLIST    Fri Jan 17 13:38:35 2020 +0000
+++ b/multimedia/gnome-mplayer/PLIST    Fri Jan 17 14:16:26 2020 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2012/04/13 13:04:20 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/01/17 14:16:26 nia Exp $
 bin/gnome-mplayer
-${PLIST.nautilus}lib/nautilus/extensions-2.0/libgnome-mplayer-properties-page.so
 man/man1/gnome-mplayer.1
 share/applications/gnome-mplayer.desktop
 share/doc/gnome-mplayer/AUTHORS
diff -r fab73ac62cc3 -r 37ee850cbe56 multimedia/gnome-mplayer/options.mk
--- a/multimedia/gnome-mplayer/options.mk       Fri Jan 17 13:38:35 2020 +0000
+++ b/multimedia/gnome-mplayer/options.mk       Fri Jan 17 14:16:26 2020 +0000
@@ -1,24 +1,20 @@
-# $NetBSD: options.mk,v 1.6 2013/10/16 10:39:05 obache Exp $
+# $NetBSD: options.mk,v 1.7 2020/01/17 14:16:26 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnome-mplayer
-PKG_SUPPORTED_OPTIONS= gnome musicbrainz libgpod
-PKG_SUGGESTED_OPTIONS= gnome
+PKG_SUPPORTED_OPTIONS= libnotify musicbrainz libgpod
+PKG_SUGGESTED_OPTIONS= libnotify
+
+PKG_OPTIONS_LEGACY_OPTS+=      gnome:libnotify
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   nautilus
-
 #
-# Compile the nautilus plugin
+# Add support for libnotify
 #
-.if !empty(PKG_OPTIONS:Mgnome)
+.if !empty(PKG_OPTIONS:Mlibnotify)
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../sysutils/nautilus/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-nautilus
 CONFIGURE_ARGS+=       --with-libnotify
-PLIST.nautilus=                yes
 .else
-CONFIGURE_ARGS+=       --disable-nautilus
 CONFIGURE_ARGS+=       --with-libnotify=no
 .endif