Update gnome-mplayer to 1.0.5.

Development
    Rework key handler to be more correct with respect to shift/ctrl/alt modifiers
    Only use dark theme if not embedded, otherwise use the default theme
    Prefer the dark theme when running on gnome 3.2, similar to totem
    Updated Polish translation to match the reworded source text
    Reword 50% larger as gettext is stupid about the % sign
    Translated the missing string into Polish
1.0.5b2
    Add 150% display of video
    Use icon named gnome-mplayer-panel for status icon if present in theme
    Remove configure option --with-gpm-new-method as this is default now
        if you have an old gnome-power-manager < 2.26 add the configure flag
        --with-gpm-old-method
    Try to detect the right screensaver api to use in Gnome 3.2 (Fedora 16)
    Updated German translation
    Fix warning when accelerator keys have not been set
    Updated Japanese translation
    Fix the speed multipliers and speed reset Issue 566 & 567
1.0.5b1
    Rephrased some strings in Polish translation
    Updated Portuguese translation
    Updated Polish translation
    Fix problem with visual seeking while using the tracker, requires gmtk svn r48
    Add in command line option --vo (this disables hardware codecs as a safety measure)
    Add in command line option --dvd_device
    Fix Issue #560, ATTRIBUTE_FORCE_CACHE not being processed
    Printout gmtk version in verbose mode
    Switch from AM_MAINTAINER_MODE to AM_MAINTAINER_MODE([enable]) in configure.in
    Make cursor reappear when not in fullscreen mode
    Hide mouse/panel in fullscreen mode when mouse is above the panel area.
    Only make the fullscreen controls reappear when the mouse is at the bottom of the screen
    Fix keyboard shortcut capture to only detect CTRL, ALT or SHIFT modifiers
    Set CDDB to TYPE CD
    Fix typo on keyscreen
    Add tooltop for "Enable Video Hardware"
    Remove fuzzy and obsolete translations from po files
    Make Normal and Double size hotkeys work
    Fix saving and loading of preferred VO
    Fix 'f' not going to/returning from fullscreen
    Remove the use of mplayer profiles, as they are no longer needed
    Fix Issue 544, minor spelling issue
    Allow customization of some of the keyboard hotkeys, more to be done
    Replace get_window, get_visible, and get_allocation with gmtk versions
    Build foundation for customized hotkeys
    Add checkboxes for hardware and crystalhd codec support
    Conversion to using libgmtk as separate library
    Fix Issue #538
    Autodetect gtk3 at configure time
    Raise event on incomplete QuickTime file, and mark it for retry
    Fix compile issue when alsa is not being used

6 files changed, 15 insertions, 70 deletions

diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 4902096a096..4364c9e5835 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/11/01 06:02:11 sbd Exp $
+# $NetBSD: Makefile,v 1.7 2012/01/08 05:47:47 obache Exp $
 #
 
-DISTNAME=	gnome-mplayer-1.0.4
-PKGREVISION=	2
+DISTNAME=	gnome-mplayer-1.0.5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gnome-mplayer.googlecode.com/files/
 
@@ -18,9 +17,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		pkg-config msgfmt
+USE_TOOLS+=		gmake pkg-config msgfmt
 
-CONFIGURE_ARGS+=	--with-gconf
 CONFIGURE_ARGS+=	--disable-gtk3
 
 GCONF_SCHEMAS+=	gnome-mplayer.schemas
@@ -29,6 +27,7 @@ GCONF_SCHEMAS+=	gnome-mplayer.schemas
 
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gmtk/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/multimedia/gnome-mplayer/distinfo b/multimedia/gnome-mplayer/distinfo
index ae9aebd09c2..6933cca9c0c 100644
--- a/multimedia/gnome-mplayer/distinfo
+++ b/multimedia/gnome-mplayer/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/07/12 14:09:39 obache Exp $
+$NetBSD: distinfo,v 1.4 2012/01/08 05:47:47 obache Exp $
 
-SHA1 (gnome-mplayer-1.0.4.tar.gz) = 15c329573692e97bb550063854ddc6404309b265
-RMD160 (gnome-mplayer-1.0.4.tar.gz) = d2c42caa22b66b94e98d72b8c53074aa61e8485c
-Size (gnome-mplayer-1.0.4.tar.gz) = 1069389 bytes
-SHA1 (patch-Makefile.in) = d6c1c4d7bf7199087379d554d5d2cc1d5e60b860
-SHA1 (patch-configure) = e45b8517cb85b03ba5097453902ac631f23b6b28
-SHA1 (patch-configure.in) = c0f22d923945347d7b01738c6d206a3f37f8bb73
+SHA1 (gnome-mplayer-1.0.5.tar.gz) = 780750f10b1b759bf638a34018ebb39bcd104bbb
+RMD160 (gnome-mplayer-1.0.5.tar.gz) = 3353d3a66d452d170b7dada9a24dae0d4ca64d17
+Size (gnome-mplayer-1.0.5.tar.gz) = 1004154 bytes
+SHA1 (patch-Makefile.in) = 4714b03dbdba43ca293a7d1eceb1cc892f6ec094
diff --git a/multimedia/gnome-mplayer/options.mk b/multimedia/gnome-mplayer/options.mk
index d4dcae17410..d6595139787 100644
--- a/multimedia/gnome-mplayer/options.mk
+++ b/multimedia/gnome-mplayer/options.mk
@@ -1,24 +1,14 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/04/10 08:43:32 obache Exp $
+# $NetBSD: options.mk,v 1.2 2012/01/08 05:47:47 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-mplayer
-PKG_SUPPORTED_OPTIONS=	alsa gnome musicbrainz pulseaudio libgpod
-PKG_SUGGESTED_OPTIONS=	gnome musicbrainz pulseaudio
+PKG_SUPPORTED_OPTIONS=	gnome musicbrainz libgpod
+PKG_SUGGESTED_OPTIONS=	gnome musicbrainz
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=	nautilus
 
 #
-# PulseAudio device and volume support
-#
-.if !empty(PKG_OPTIONS:Mpulseaudio)
-.include "../../audio/pulseaudio/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pulseaudio=yes
-.else
-CONFIGURE_ARGS+=	--with-pulseaudio=no
-.endif
-
-#
 # Compile the nautilus plugin
 # Use gnome-power-manager below 2.26 inhibit methods
 # Send notifications of new media
@@ -29,13 +19,11 @@ DEPENDS+=		gnome-power-manager-[0-9]*:../../sysutils/gnome-power-manager
 .include "../../sysutils/nautilus/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-nautilus
 CONFIGURE_ARGS+=	--with-gpm-old-method
-CONFIGURE_ARGS+=	--with-gpm-new-method=no
 CONFIGURE_ARGS+=	--with-libnotify
 PLIST.nautilus=		yes
 .else
 CONFIGURE_ARGS+=	--disable-nautilus
 CONFIGURE_ARGS+=	--with-gpm-old-method=no
-CONFIGURE_ARGS+=	--with-gpm-new-method=no
 CONFIGURE_ARGS+=	--with-libnotify=no
 .endif
 
@@ -51,16 +39,6 @@ CONFIGURE_ARGS+=	--with-libmusicbrainz3=no
 .endif
 
 #
-# Read volume from alsa devices
-#
-.if !empty(PKG_OPTIONS:Malsa)
-.include "../../audio/alsa-lib/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-alsa
-.else
-CONFIGURE_ARGS+=	--with-alsa=no
-.endif
-
-#
 # Add support for libgpod
 #
 .if !empty(PKG_OPTIONS:Mlibgpod)
diff --git a/multimedia/gnome-mplayer/patches/patch-Makefile.in b/multimedia/gnome-mplayer/patches/patch-Makefile.in
index 5e715b36105..18f34a26c5d 100644
--- a/multimedia/gnome-mplayer/patches/patch-Makefile.in
+++ b/multimedia/gnome-mplayer/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.2 2011/07/12 14:09:39 obache Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2012/01/08 05:47:47 obache Exp $
 
 Always install schema files (but not install-schemas).
 
---- Makefile.in.orig	2011-07-01 16:37:42.000000000 +0000
+--- Makefile.in.orig	2011-12-29 14:31:01.000000000 +0000
 +++ Makefile.in
-@@ -335,8 +335,8 @@ gnome_mplayerdoc_DATA = \
+@@ -331,8 +331,8 @@ gnome_mplayerdoc_DATA = \
  	DOCS/tech/dbus.txt \
  	DOCS/tech/plugin-interaction.txt
  
diff --git a/multimedia/gnome-mplayer/patches/patch-configure b/multimedia/gnome-mplayer/patches/patch-configure
deleted file mode 100644
index e6f83eab3d3..00000000000
--- a/multimedia/gnome-mplayer/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2011/07/12 14:09:39 obache Exp $
-
-* portability fix (already fixed in upstream repo).
-
---- configure.orig	2011-07-12 09:10:02.000000000 +0000
-+++ configure
-@@ -7474,7 +7474,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: gtk3 is $ENABLE_GTK3" >&5
- $as_echo "$as_me: gtk3 is $ENABLE_GTK3" >&6;}
- 
--if test "x$ENABLE_GTK3" == "xyes"; then :
-+if test "x$ENABLE_GTK3" = "xyes"; then :
- 
- 
- 
diff --git a/multimedia/gnome-mplayer/patches/patch-configure.in b/multimedia/gnome-mplayer/patches/patch-configure.in
deleted file mode 100644
index 3bb1b496ab7..00000000000
--- a/multimedia/gnome-mplayer/patches/patch-configure.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2011/07/12 14:09:39 obache Exp $
-
-* portability fix (already fixed in upstream repo).
-
---- configure.in.orig	2011-07-01 16:37:33.000000000 +0000
-+++ configure.in
-@@ -64,7 +64,7 @@ AC_ARG_ENABLE(gtk3,
- 
- AC_MSG_NOTICE([gtk3 is $ENABLE_GTK3])
-     
--AS_IF([test "x$ENABLE_GTK3" == "xyes"],   
-+AS_IF([test "x$ENABLE_GTK3" = "xyes"],   
-     [
-     
-     PKG_CHECK_MODULES(GTK, [gtk+-3.0 glib-2.0 gthread-2.0])