Fri Jan 17 14:16:26 2020 UTC ()
gnome-mplayer: Remove optional dependency on GNOME 2 nautilus.

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

Bump PKGREVISION


(nia)
diff -r1.72 -r1.73 pkgsrc/multimedia/gnome-mplayer/Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/gnome-mplayer/PLIST
diff -r1.6 -r1.7 pkgsrc/multimedia/gnome-mplayer/options.mk
cvs diff -r1.72 -r1.73 pkgsrc/multimedia/gnome-mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gnome-mplayer/Makefile 2020/01/12 20:20:35 1.72
+++ pkgsrc/multimedia/gnome-mplayer/Makefile 2020/01/17 14:16:26 1.73
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.72 2020/01/12 20:20:35 ryoon Exp $ 1# $NetBSD: Makefile,v 1.73 2020/01/17 14:16:26 nia Exp $
2 2
3DISTNAME= gnome-mplayer-1.0.9 3DISTNAME= gnome-mplayer-1.0.9
4PKGREVISION= 30 4PKGREVISION= 31
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= http://gnome-mplayer.googlecode.com/svn/packages/ 6MASTER_SITES= http://gnome-mplayer.googlecode.com/svn/packages/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://code.google.com/archive/p/gnome-mplayer/ 9HOMEPAGE= https://code.google.com/archive/p/gnome-mplayer/
10COMMENT= GNOME Frontend for MPlayer 10COMMENT= GNOME Frontend for MPlayer
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= mplayer-[0-9]*:../../multimedia/mplayer 13DEPENDS+= mplayer-[0-9]*:../../multimedia/mplayer
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18USE_TOOLS+= gmake pkg-config msgfmt 18USE_TOOLS+= gmake pkg-config msgfmt
19 19
20CONFIGURE_ARGS+= --disable-gtk3 20CONFIGURE_ARGS+= --disable-gtk3
 21CONFIGURE_ARGS+= --disable-nautilus
21 22
22GCONF_SCHEMAS+= gnome-mplayer.schemas 23GCONF_SCHEMAS+= gnome-mplayer.schemas
23 24
24.include "options.mk" 25.include "options.mk"
25 26
26.include "../../devel/GConf/schemas.mk" 27.include "../../devel/GConf/schemas.mk"
27.include "../../devel/glib2/buildlink3.mk" 28.include "../../devel/glib2/buildlink3.mk"
28.include "../../devel/gmtk/buildlink3.mk" 29.include "../../devel/gmtk/buildlink3.mk"
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 30.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../sysutils/desktop-file-utils/desktopdb.mk" 31.include "../../sysutils/desktop-file-utils/desktopdb.mk"
31BUILDLINK_API_DEPENDS.dbus+= dbus>=0.95 32BUILDLINK_API_DEPENDS.dbus+= dbus>=0.95
32.include "../../sysutils/dbus/buildlink3.mk" 33.include "../../sysutils/dbus/buildlink3.mk"
33BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 34BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/gnome-mplayer/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/gnome-mplayer/PLIST 2012/04/13 13:04:20 1.4
+++ pkgsrc/multimedia/gnome-mplayer/PLIST 2020/01/17 14:16:26 1.5
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1@comment $NetBSD: PLIST,v 1.4 2012/04/13 13:04:20 obache Exp $ 1@comment $NetBSD: PLIST,v 1.5 2020/01/17 14:16:26 nia Exp $
2bin/gnome-mplayer 2bin/gnome-mplayer
3${PLIST.nautilus}lib/nautilus/extensions-2.0/libgnome-mplayer-properties-page.so 
4man/man1/gnome-mplayer.1 3man/man1/gnome-mplayer.1
5share/applications/gnome-mplayer.desktop 4share/applications/gnome-mplayer.desktop
6share/doc/gnome-mplayer/AUTHORS 5share/doc/gnome-mplayer/AUTHORS
7share/doc/gnome-mplayer/COPYING 6share/doc/gnome-mplayer/COPYING
8share/doc/gnome-mplayer/ChangeLog 7share/doc/gnome-mplayer/ChangeLog
9share/doc/gnome-mplayer/INSTALL 8share/doc/gnome-mplayer/INSTALL
10share/doc/gnome-mplayer/NEWS 9share/doc/gnome-mplayer/NEWS
11share/doc/gnome-mplayer/README 10share/doc/gnome-mplayer/README
12share/doc/gnome-mplayer/dbus.txt 11share/doc/gnome-mplayer/dbus.txt
13share/doc/gnome-mplayer/keyboard_shortcuts.txt 12share/doc/gnome-mplayer/keyboard_shortcuts.txt
14share/doc/gnome-mplayer/plugin-interaction.txt 13share/doc/gnome-mplayer/plugin-interaction.txt
15share/gconf/schemas/gnome-mplayer.schemas 14share/gconf/schemas/gnome-mplayer.schemas
16share/gnome-control-center/default-apps/gnome-mplayer.xml 15share/gnome-control-center/default-apps/gnome-mplayer.xml
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/gnome-mplayer/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/gnome-mplayer/options.mk 2013/10/16 10:39:05 1.6
+++ pkgsrc/multimedia/gnome-mplayer/options.mk 2020/01/17 14:16:26 1.7
@@ -1,34 +1,30 @@ @@ -1,34 +1,30 @@
1# $NetBSD: options.mk,v 1.6 2013/10/16 10:39:05 obache Exp $ 1# $NetBSD: options.mk,v 1.7 2020/01/17 14:16:26 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-mplayer 3PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-mplayer
4PKG_SUPPORTED_OPTIONS= gnome musicbrainz libgpod 4PKG_SUPPORTED_OPTIONS= libnotify musicbrainz libgpod
5PKG_SUGGESTED_OPTIONS= gnome 5PKG_SUGGESTED_OPTIONS= libnotify
6 6
7.include "../../mk/bsd.options.mk" 7PKG_OPTIONS_LEGACY_OPTS+= gnome:libnotify
8 8
9PLIST_VARS+= nautilus 9.include "../../mk/bsd.options.mk"
10 10
11# 11#
12# Compile the nautilus plugin 12# Add support for libnotify
13# 13#
14.if !empty(PKG_OPTIONS:Mgnome) 14.if !empty(PKG_OPTIONS:Mlibnotify)
15.include "../../sysutils/libnotify/buildlink3.mk" 15.include "../../sysutils/libnotify/buildlink3.mk"
16.include "../../sysutils/nautilus/buildlink3.mk" 
17CONFIGURE_ARGS+= --enable-nautilus 
18CONFIGURE_ARGS+= --with-libnotify 16CONFIGURE_ARGS+= --with-libnotify
19PLIST.nautilus= yes 
20.else 17.else
21CONFIGURE_ARGS+= --disable-nautilus 
22CONFIGURE_ARGS+= --with-libnotify=no 18CONFIGURE_ARGS+= --with-libnotify=no
23.endif 19.endif
24 20
25# 21#
26# Add support for libmusicbrainz3 22# Add support for libmusicbrainz3
27# 23#
28.if !empty(PKG_OPTIONS:Mmusicbrainz) 24.if !empty(PKG_OPTIONS:Mmusicbrainz)
29.include "../../audio/libmusicbrainz/buildlink3.mk" 25.include "../../audio/libmusicbrainz/buildlink3.mk"
30.include "../../www/curl/buildlink3.mk" 26.include "../../www/curl/buildlink3.mk"
31CONFIGURE_ARGS+= --with-libmusicbrainz3 27CONFIGURE_ARGS+= --with-libmusicbrainz3
32.else 28.else
33CONFIGURE_ARGS+= --with-libmusicbrainz3=no 29CONFIGURE_ARGS+= --with-libmusicbrainz3=no
34.endif 30.endif