CVS commit: pkgsrc/multimedia/gnome-mplayer

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jan 17 14:16:26 UTC 2020

Modified Files:
        pkgsrc/multimedia/gnome-mplayer: Makefile PLIST options.mk

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

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

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/gnome-mplayer/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/gnome-mplayer/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/gnome-mplayer/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gnome-mplayer/Makefile
diff -u pkgsrc/multimedia/gnome-mplayer/Makefile:1.72 pkgsrc/multimedia/gnome-mplayer/Makefile:1.73
--- pkgsrc/multimedia/gnome-mplayer/Makefile:1.72       Sun Jan 12 20:20:35 2020
+++ pkgsrc/multimedia/gnome-mplayer/Makefile    Fri Jan 17 14:16:26 2020
@@ -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_PKGLOCALEDIR=     yes
 USE_TOOLS+=            gmake pkg-config msgfmt
 
 CONFIGURE_ARGS+=       --disable-gtk3
+CONFIGURE_ARGS+=       --disable-nautilus
 
 GCONF_SCHEMAS+=        gnome-mplayer.schemas
 

Index: pkgsrc/multimedia/gnome-mplayer/PLIST
diff -u pkgsrc/multimedia/gnome-mplayer/PLIST:1.4 pkgsrc/multimedia/gnome-mplayer/PLIST:1.5
--- pkgsrc/multimedia/gnome-mplayer/PLIST:1.4   Fri Apr 13 13:04:20 2012
+++ pkgsrc/multimedia/gnome-mplayer/PLIST       Fri Jan 17 14:16:26 2020
@@ -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

Index: pkgsrc/multimedia/gnome-mplayer/options.mk
diff -u pkgsrc/multimedia/gnome-mplayer/options.mk:1.6 pkgsrc/multimedia/gnome-mplayer/options.mk:1.7
--- pkgsrc/multimedia/gnome-mplayer/options.mk:1.6      Wed Oct 16 10:39:05 2013
+++ pkgsrc/multimedia/gnome-mplayer/options.mk  Fri Jan 17 14:16:26 2020
@@ -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
 
-.include "../../mk/bsd.options.mk"
+PKG_OPTIONS_LEGACY_OPTS+=      gnome:libnotify
 
-PLIST_VARS+=   nautilus
+.include "../../mk/bsd.options.mk"
 
 #
-# 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