update to 11.8.16

changes:
-New Albumview
-Better fullscreen support
-Easycommand update
-GNOME Integrated Manual

6 files changed, 132 insertions, 64 deletions

diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index cf188d41801..225fc215518 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.64 2013/09/02 19:50:47 adam Exp $
+# $NetBSD: Makefile,v 1.65 2013/10/01 16:03:30 drochner Exp $
 #
 
-DISTNAME=		gmpc-0.20.0
-PKGREVISION=		25
+DISTNAME=		gmpc-11.8.16
 CATEGORIES=		audio
-MASTER_SITES=		http://download.sarine.nl/Programs/gmpc/0.20.0/ \
+MASTER_SITES=		http://download.sarine.nl/Programs/gmpc/11.8/ \
 			${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -20,19 +19,16 @@ REPLACE_SH=		remote/gmpc-remote-stream
 
 .include "options.mk"
 
-CONFIGURE_ARGS+=	--enable-system-libsexy
-CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl}
+CONFIGURE_ARGS+=	--disable-libspiff
 
 BUILDLINK_API_DEPENDS.libmpd+=	libmpd>=0.20.0
 .include "../../audio/libmpd/buildlink3.mk"
 .include "../../devel/gob2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libsexy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc/PLIST b/audio/gmpc/PLIST
index bcecabcbc48..1687218f293 100644
--- a/audio/gmpc/PLIST
+++ b/audio/gmpc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2010/06/15 21:20:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2013/10/01 16:03:30 drochner Exp $
 bin/gmpc
 bin/gmpc-remote
 bin/gmpc-remote-stream
@@ -19,7 +19,9 @@ include/gmpc/mpd-async-request.h
 include/gmpc/mpdinteraction.h
 include/gmpc/playlist3-messages.h
 include/gmpc/plugin.h
+include/gmpc/status_icon.h
 lib/pkgconfig/gmpc.pc
+man/man1/gmpc-remote-stream.1
 man/man1/gmpc-remote.1
 man/man1/gmpc.1
 share/applications/gmpc.desktop
@@ -203,10 +205,6 @@ share/gmpc/icons/Humanity/32x32/status/audio-volume-muted.png
 share/gmpc/icons/Humanity/32x32/status/emblem-favorite.png
 share/gmpc/icons/Humanity/32x32/status/fetching-artist.png
 share/gmpc/icons/Humanity/32x32/status/frame-artist.png
-share/gmpc/icons/Humanity/32x32/status/gmpc-tray-disconnected.png
-share/gmpc/icons/Humanity/32x32/status/gmpc-tray-pause.png
-share/gmpc/icons/Humanity/32x32/status/gmpc-tray-play.png
-share/gmpc/icons/Humanity/32x32/status/gmpc-tray.png
 share/gmpc/icons/Humanity/32x32/status/media-album.png
 share/gmpc/icons/Humanity/32x32/status/media-artist.png
 share/gmpc/icons/Humanity/32x32/status/media-codec.png
@@ -281,10 +279,6 @@ share/gmpc/icons/Humanity/64x64/status/audio-volume-muted.png
 share/gmpc/icons/Humanity/64x64/status/emblem-favorite.png
 share/gmpc/icons/Humanity/64x64/status/fetching-artist.png
 share/gmpc/icons/Humanity/64x64/status/frame-artist.png
-share/gmpc/icons/Humanity/64x64/status/gmpc-tray-disconnected.png
-share/gmpc/icons/Humanity/64x64/status/gmpc-tray-pause.png
-share/gmpc/icons/Humanity/64x64/status/gmpc-tray-play.png
-share/gmpc/icons/Humanity/64x64/status/gmpc-tray.png
 share/gmpc/icons/Humanity/64x64/status/media-album.png
 share/gmpc/icons/Humanity/64x64/status/media-artist.png
 share/gmpc/icons/Humanity/64x64/status/media-codec.png
@@ -319,10 +313,6 @@ share/gmpc/icons/Humanity/72x72/status/audio-volume-muted.png
 share/gmpc/icons/Humanity/72x72/status/emblem-favorite.png
 share/gmpc/icons/Humanity/72x72/status/fetching-artist.png
 share/gmpc/icons/Humanity/72x72/status/frame-artist.png
-share/gmpc/icons/Humanity/72x72/status/gmpc-tray-disconnected.png
-share/gmpc/icons/Humanity/72x72/status/gmpc-tray-pause.png
-share/gmpc/icons/Humanity/72x72/status/gmpc-tray-play.png
-share/gmpc/icons/Humanity/72x72/status/gmpc-tray.png
 share/gmpc/icons/Humanity/72x72/status/media-album.png
 share/gmpc/icons/Humanity/72x72/status/media-artist.png
 share/gmpc/icons/Humanity/72x72/status/media-codec.png
@@ -357,10 +347,6 @@ share/gmpc/icons/Humanity/96x96/status/audio-volume-muted.png
 share/gmpc/icons/Humanity/96x96/status/emblem-favorite.png
 share/gmpc/icons/Humanity/96x96/status/fetching-artist.png
 share/gmpc/icons/Humanity/96x96/status/frame-artist.png
-share/gmpc/icons/Humanity/96x96/status/gmpc-tray-disconnected.png
-share/gmpc/icons/Humanity/96x96/status/gmpc-tray-pause.png
-share/gmpc/icons/Humanity/96x96/status/gmpc-tray-play.png
-share/gmpc/icons/Humanity/96x96/status/gmpc-tray.png
 share/gmpc/icons/Humanity/96x96/status/media-album.png
 share/gmpc/icons/Humanity/96x96/status/media-artist.png
 share/gmpc/icons/Humanity/96x96/status/media-codec.png
@@ -397,10 +383,6 @@ share/gmpc/icons/Humanity/scalable/status/audio-volume-muted.svg
 share/gmpc/icons/Humanity/scalable/status/emblem-favorite.svg
 share/gmpc/icons/Humanity/scalable/status/fetching-artist.svg
 share/gmpc/icons/Humanity/scalable/status/frame-artist.svg
-share/gmpc/icons/Humanity/scalable/status/gmpc-tray-disconnected.svg
-share/gmpc/icons/Humanity/scalable/status/gmpc-tray-pause.svg
-share/gmpc/icons/Humanity/scalable/status/gmpc-tray-play.svg
-share/gmpc/icons/Humanity/scalable/status/gmpc-tray.svg
 share/gmpc/icons/Humanity/scalable/status/media-album.svg
 share/gmpc/icons/Humanity/scalable/status/media-artist.svg
 share/gmpc/icons/Humanity/scalable/status/media-codec.svg
@@ -609,9 +591,10 @@ share/gmpc/icons/media-stream.png
 share/gmpc/password-dialog.ui
 share/gmpc/playlist-message-window.ui
 share/gmpc/playlist-save-dialog.ui
-share/gmpc/playlist3.glade
+share/gmpc/playlist3.ui
 share/gmpc/preferences-connection.ui
 share/gmpc/preferences-esf-dialog.ui
+share/gmpc/preferences-metadata-appearance.ui
 share/gmpc/preferences-mmkeys.ui
 share/gmpc/preferences-playlist.ui
 share/gmpc/preferences-plugins.ui
@@ -620,6 +603,94 @@ share/gmpc/preferences-server.ui
 share/gmpc/preferences-trayicon.ui
 share/gmpc/preferences.ui
 share/gmpc/weblinks.list
+share/gnome/help/gmpc/C/AboutThisDocument.page
+share/gnome/help/gmpc/C/BrowserArtistBrowser.page
+share/gnome/help/gmpc/C/BrowserDatabase.page
+share/gnome/help/gmpc/C/BrowserGenreBrowser.page
+share/gnome/help/gmpc/C/BrowserMetadataBrowser.page
+share/gnome/help/gmpc/C/BrowserNowPlaying.page
+share/gnome/help/gmpc/C/BrowserPlayQueue.page
+share/gnome/help/gmpc/C/BrowserPlaylistEditor.page
+share/gnome/help/gmpc/C/BrowserSearch.page
+share/gnome/help/gmpc/C/Browsers.page
+share/gnome/help/gmpc/C/BuildInstallInstructions.page
+share/gnome/help/gmpc/C/EasyCommand.page
+share/gnome/help/gmpc/C/Images/Gmpc-easy-command.png
+share/gnome/help/gmpc/C/Images/browser-artist-browser.png
+share/gnome/help/gmpc/C/Images/browser-database.png
+share/gnome/help/gmpc/C/Images/browser-genre-browser.png
+share/gnome/help/gmpc/C/Images/browser-metadata-browser.png
+share/gnome/help/gmpc/C/Images/browser-nowplaying.png
+share/gnome/help/gmpc/C/Images/browser-pane-double.png
+share/gnome/help/gmpc/C/Images/browser-pane-single.png
+share/gnome/help/gmpc/C/Images/browser-playlist-editor.png
+share/gnome/help/gmpc/C/Images/browser-playqueue.png
+share/gnome/help/gmpc/C/Images/browser-search.png
+share/gnome/help/gmpc/C/Images/database-columns.png
+share/gnome/help/gmpc/C/Images/database.png
+share/gnome/help/gmpc/C/Images/easy-command.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_10.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_11.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_12.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_13.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_14.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_15.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_16.png
+share/gnome/help/gmpc/C/Images/gmpc-dev-install-guidestep_9.png
+share/gnome/help/gmpc/C/Images/main-view-collapsed2.png
+share/gnome/help/gmpc/C/Images/main-window-collapsed1.png
+share/gnome/help/gmpc/C/Images/main-window.png
+share/gnome/help/gmpc/C/Images/menu-bar.png
+share/gnome/help/gmpc/C/Images/message-bar.png
+share/gnome/help/gmpc/C/Images/meta-data-selector-artist.png
+share/gnome/help/gmpc/C/Images/meta-data-selector-lyrics.png
+share/gnome/help/gmpc/C/Images/nowplaying.png
+share/gnome/help/gmpc/C/Images/pc-cover-plain.png
+share/gnome/help/gmpc/C/Images/pc-cover.png
+share/gnome/help/gmpc/C/Images/pc-favorite-hl.png
+share/gnome/help/gmpc/C/Images/pc-favorite-nhl.png
+share/gnome/help/gmpc/C/Images/pc-playback-control.png
+share/gnome/help/gmpc/C/Images/pc-seek-bar.png
+share/gnome/help/gmpc/C/Images/pc-song-info.png
+share/gnome/help/gmpc/C/Images/play-queue-rightclick.png
+share/gnome/help/gmpc/C/Images/play-queue.png
+share/gnome/help/gmpc/C/Images/playback-control.png
+share/gnome/help/gmpc/C/Images/preferences-connection.png
+share/gnome/help/gmpc/C/Images/preferences-interface.png
+share/gnome/help/gmpc/C/Images/preferences-internal-extra-playlist-view.png
+share/gnome/help/gmpc/C/Images/preferences-metadata-appearance.png
+share/gnome/help/gmpc/C/Images/preferences-metadata-browser.png
+share/gnome/help/gmpc/C/Images/preferences-metadata-handler.png
+share/gnome/help/gmpc/C/Images/preferences-multimedia-keys.png
+share/gnome/help/gmpc/C/Images/preferences-notification.png
+share/gnome/help/gmpc/C/Images/preferences-plugins.png
+share/gnome/help/gmpc/C/Images/preferences-proxy.png
+share/gnome/help/gmpc/C/Images/preferences-server-settings.png
+share/gnome/help/gmpc/C/Images/preferences-tag-based-browser.png
+share/gnome/help/gmpc/C/Images/server-information.png
+share/gnome/help/gmpc/C/Images/sidebar-hori1.png
+share/gnome/help/gmpc/C/Images/sidebar-hori2.png
+share/gnome/help/gmpc/C/Images/sidebar.png
+share/gnome/help/gmpc/C/Images/status-bar.png
+share/gnome/help/gmpc/C/Images/status-icons.png
+share/gnome/help/gmpc/C/MainInterface.page
+share/gnome/help/gmpc/C/Preferences.page
+share/gnome/help/gmpc/C/PreferencesConnection.page
+share/gnome/help/gmpc/C/PreferencesInterface.page
+share/gnome/help/gmpc/C/PreferencesInternalExtraPlaylistView.page
+share/gnome/help/gmpc/C/PreferencesMetadataAppearance.page
+share/gnome/help/gmpc/C/PreferencesMetadataHandler.page
+share/gnome/help/gmpc/C/PreferencesMultimediaKeys.page
+share/gnome/help/gmpc/C/PreferencesNotification.page
+share/gnome/help/gmpc/C/PreferencesPlugins.page
+share/gnome/help/gmpc/C/PreferencesProxy.page
+share/gnome/help/gmpc/C/PreferencesServerSettings.page
+share/gnome/help/gmpc/C/PreferencesTagBasedBrowser.page
+share/gnome/help/gmpc/C/ProblemSolving.page
+share/gnome/help/gmpc/C/QuickStartGuide.page
+share/gnome/help/gmpc/C/TipsAndTricks.page
+share/gnome/help/gmpc/C/index.page
+share/gnome/help/gmpc/C/legal.xml
 share/icons/Humanity/128x128/apps/gmpc.png
 share/icons/Humanity/16x16/apps/gmpc.png
 share/icons/Humanity/22x22/apps/gmpc.png
@@ -650,6 +721,7 @@ share/locale/el/LC_MESSAGES/gmpc.mo
 share/locale/en_CA/LC_MESSAGES/gmpc.mo
 share/locale/en_GB/LC_MESSAGES/gmpc.mo
 share/locale/es/LC_MESSAGES/gmpc.mo
+share/locale/et/LC_MESSAGES/gmpc.mo
 share/locale/fi/LC_MESSAGES/gmpc.mo
 share/locale/fr/LC_MESSAGES/gmpc.mo
 share/locale/gl/LC_MESSAGES/gmpc.mo
@@ -667,6 +739,7 @@ share/locale/ms/LC_MESSAGES/gmpc.mo
 share/locale/nb/LC_MESSAGES/gmpc.mo
 share/locale/ne/LC_MESSAGES/gmpc.mo
 share/locale/nl/LC_MESSAGES/gmpc.mo
+share/locale/oc/LC_MESSAGES/gmpc.mo
 share/locale/pl/LC_MESSAGES/gmpc.mo
 share/locale/pt/LC_MESSAGES/gmpc.mo
 share/locale/pt_BR/LC_MESSAGES/gmpc.mo
diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo
index 76b8bba0b63..c1d6fa42f77 100644
--- a/audio/gmpc/distinfo
+++ b/audio/gmpc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2010/09/24 06:28:46 obache Exp $
+$NetBSD: distinfo,v 1.18 2013/10/01 16:03:30 drochner Exp $
 
-SHA1 (gmpc-0.20.0.tar.gz) = 3b160bb1e196760b0148faa6493c66083e1fe53d
-RMD160 (gmpc-0.20.0.tar.gz) = fd1278dbec1eb7ca2efd1e0545b0e37ff1fad34f
-Size (gmpc-0.20.0.tar.gz) = 3093720 bytes
-SHA1 (patch-ai) = a579bdfd548526461e6586fb49cb22bdbe8f37a4
-SHA1 (patch-aj) = b71828e7c3084de3c0fd942c15b73e0d9a9554da
+SHA1 (gmpc-11.8.16.tar.gz) = f61845cb8d9a1c1970ecb65565bd4eefc73b0c0a
+RMD160 (gmpc-11.8.16.tar.gz) = b11662d4b01790a06fe586ab2fa20161d37ecbc5
+Size (gmpc-11.8.16.tar.gz) = 7082909 bytes
+SHA1 (patch-ai) = 7d9463c9646e9dda0a62f9c2ed33b42e99a85e7e
+SHA1 (patch-aj) = cd29b26df0058a1e323918b0025c80761bcc0c30
diff --git a/audio/gmpc/options.mk b/audio/gmpc/options.mk
index 8b39108295d..fa9596b791f 100644
--- a/audio/gmpc/options.mk
+++ b/audio/gmpc/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2009/05/30 01:25:19 obache Exp $
+# $NetBSD: options.mk,v 1.2 2013/10/01 16:03:30 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gmpc
-PKG_SUPPORTED_OPTIONS=	mac
+PKG_SUPPORTED_OPTIONS=	mac xspf
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,10 +17,10 @@ CONFIGURE_ARGS+=	--disable-macige
 
 ###
 ### libspiff support
-### XXX: code not support libspiff>=1.0.
-#.if !empty(PKG_OPTIONS:Mlibspiff)
-#.include "../../audio/libspiff/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-libspiff
-#.else
-#CONFIGURE_ARGS+=	--disable-libspiff
-#.endif
+###
+.if !empty(PKG_OPTIONS:Mxspf)
+.include "../../audio/libxspf/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-libxspf
+.else
+CONFIGURE_ARGS+=	--disable-libxspf
+.endif
diff --git a/audio/gmpc/patches/patch-ai b/audio/gmpc/patches/patch-ai
index 727c78ea6dc..2b47a4dbd23 100644
--- a/audio/gmpc/patches/patch-ai
+++ b/audio/gmpc/patches/patch-ai
@@ -1,18 +1,18 @@
-$NetBSD: patch-ai,v 1.3 2010/09/24 06:28:46 obache Exp $
+$NetBSD: patch-ai,v 1.4 2013/10/01 16:03:30 drochner Exp $
 
 Vala is not required to build from released tarball.
 
---- configure.orig	2010-03-22 03:18:50.000000000 +0000
+--- configure.orig	2012-05-27 10:45:03.000000000 +0000
 +++ configure
-@@ -15584,11 +15584,6 @@ fi
+@@ -15522,11 +15522,6 @@ esac
+ fi
  fi
  
- 
+-
 -if test x${VALAC} = x""; then
--    exit 0;
+-    exit 1;
 -fi
 -
--
- # Check whether --enable-shave was given.
- if test "${enable_shave+set}" = set; then :
-   enableval=$enable_shave;  case "${enableval}" in
+ APPINDICATOR_REQUIRED=0.3
+ 
+ # Check whether --enable-appindicator was given.
diff --git a/audio/gmpc/patches/patch-aj b/audio/gmpc/patches/patch-aj
index 720d0497ca1..ec16fb2e48c 100644
--- a/audio/gmpc/patches/patch-aj
+++ b/audio/gmpc/patches/patch-aj
@@ -1,18 +1,17 @@
-$NetBSD: patch-aj,v 1.1 2010/09/24 06:28:46 obache Exp $
+$NetBSD: patch-aj,v 1.2 2013/10/01 16:03:30 drochner Exp $
 
 Vala is not required to build from released tarball.
 
---- configure.ac.orig	2010-03-22 03:18:47.000000000 +0000
+--- configure.ac.orig	2011-08-17 03:09:58.000000000 +0000
 +++ configure.ac
-@@ -366,11 +366,6 @@ fi
+@@ -357,10 +357,6 @@ fi
  
- AM_PROG_VALAC([0.7.10])
+ AM_PROG_VALAC([0.11.0])
  
 -if test x${VALAC} = x""; then
--    exit 0;
+-    exit 1;
 -fi
 -
--
- AC_ARG_ENABLE([shave],
-             [  --disable-shave			Use shave output cleaner when building.],
-               [ case "${enableval}" in
+ APPINDICATOR_REQUIRED=0.3
+ 
+ AC_ARG_ENABLE(appindicator,