Update xfce4-garcon to 0.6.1:

0.6.0
=====
- Fix left-alignment of labels in menuitems
- garcon-gtk: Add an option to edit launchers
- Desktop actions custom icon support
- Show desktop actions in a submenu
- Added desktop actions support (bug #11268)
- Don't add a placeholder menu (Bug 11626)
- Fix assertion 'GTK_IS_WIDGET (widget)' failed.
- Fix missing menus when all items are in submenus (bug 11801)
- Translation updates: am, ast, bg, ca, cs, da, de, en_AU, eo, es, fi,
  fr, gl, he, hr, id, is, it, ja, kk, ko, lt, ms, nb, nn, oc, pl, pt,
  pt_BR, ro, ru, sr, sv, th, tr, uk, zh_CN, zh_TW

0.6.1
=====
- Remove extraneous libxfce4ui-1 check
- Fix garcon-2 reference Bug #13543
- Drop libgarcon-2
- Make building garcon-gtk2 optional
- Translation updates: el, sr, gl, sl

5 files changed, 19 insertions, 34 deletions

diff --git a/x11/xfce4-garcon/Makefile b/x11/xfce4-garcon/Makefile
index 0076181b982..40ff620756f 100644
--- a/x11/xfce4-garcon/Makefile
+++ b/x11/xfce4-garcon/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2017/02/12 06:25:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2017/06/18 21:03:06 youri Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=	garcon-0.5.0
-PKGNAME=	xfce4-garcon-0.5.0
+DISTNAME=	garcon-0.6.1
+PKGNAME=	xfce4-garcon-0.6.1
 CATEGORIES=	x11
-MASTER_SITES=	http://archive.xfce.org/src/xfce/garcon/0.5/
+MASTER_SITES=	http://archive.xfce.org/src/xfce/garcon/0.6/
 
 HOMEPAGE=	https://wiki.xfce.org/dev/garcon
 COMMENT=	Xfce menu library
diff --git a/x11/xfce4-garcon/PLIST b/x11/xfce4-garcon/PLIST
index 170938ebb4c..a08359731df 100644
--- a/x11/xfce4-garcon/PLIST
+++ b/x11/xfce4-garcon/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2015/07/02 14:13:29 youri Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/06/18 21:03:06 youri Exp $
 include/garcon-1/garcon/garcon-config.h
 include/garcon-1/garcon/garcon-environment.h
 include/garcon-1/garcon/garcon-marshal.h
 include/garcon-1/garcon/garcon-menu-directory.h
 include/garcon-1/garcon/garcon-menu-element.h
+include/garcon-1/garcon/garcon-menu-item-action.h
 include/garcon-1/garcon/garcon-menu-item-cache.h
 include/garcon-1/garcon/garcon-menu-item-pool.h
 include/garcon-1/garcon/garcon-menu-item.h
@@ -14,31 +15,14 @@ include/garcon-1/garcon/garcon-menu-separator.h
 include/garcon-1/garcon/garcon-menu-tree-provider.h
 include/garcon-1/garcon/garcon-menu.h
 include/garcon-1/garcon/garcon.h
-include/garcon-2/garcon/garcon-config.h
-include/garcon-2/garcon/garcon-environment.h
-include/garcon-2/garcon/garcon-marshal.h
-include/garcon-2/garcon/garcon-menu-directory.h
-include/garcon-2/garcon/garcon-menu-element.h
-include/garcon-2/garcon/garcon-menu-item-cache.h
-include/garcon-2/garcon/garcon-menu-item-pool.h
-include/garcon-2/garcon/garcon-menu-item.h
-include/garcon-2/garcon/garcon-menu-merger.h
-include/garcon-2/garcon/garcon-menu-node.h
-include/garcon-2/garcon/garcon-menu-parser.h
-include/garcon-2/garcon/garcon-menu-separator.h
-include/garcon-2/garcon/garcon-menu-tree-provider.h
-include/garcon-2/garcon/garcon-menu.h
-include/garcon-2/garcon/garcon.h
 include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h
 include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h
 include/garcon-gtk3-1/garcon-gtk/garcon-gtk-menu.h
 include/garcon-gtk3-1/garcon-gtk/garcon-gtk.h
 lib/libgarcon-1.la
-lib/libgarcon-2.la
 lib/libgarcon-gtk2-1.la
 lib/libgarcon-gtk3-1.la
 lib/pkgconfig/garcon-1.pc
-lib/pkgconfig/garcon-2.pc
 lib/pkgconfig/garcon-gtk2-1.pc
 lib/pkgconfig/garcon-gtk3-1.pc
 share/desktop-directories/xfce-accessories.directory
@@ -77,7 +61,6 @@ share/gtk-doc/html/garcon/garcon-parsing.html
 share/gtk-doc/html/garcon/garcon.devhelp2
 share/gtk-doc/html/garcon/home.png
 share/gtk-doc/html/garcon/index.html
-share/gtk-doc/html/garcon/index.sgml
 share/gtk-doc/html/garcon/left-insensitive.png
 share/gtk-doc/html/garcon/left.png
 share/gtk-doc/html/garcon/object-tree.html
@@ -87,6 +70,7 @@ share/gtk-doc/html/garcon/right.png
 share/gtk-doc/html/garcon/style.css
 share/gtk-doc/html/garcon/up-insensitive.png
 share/gtk-doc/html/garcon/up.png
+share/locale/am/LC_MESSAGES/garcon.mo
 share/locale/ar/LC_MESSAGES/garcon.mo
 share/locale/ast/LC_MESSAGES/garcon.mo
 share/locale/bg/LC_MESSAGES/garcon.mo
diff --git a/x11/xfce4-garcon/distinfo b/x11/xfce4-garcon/distinfo
index c483e58ea10..0e8d2b63a1a 100644
--- a/x11/xfce4-garcon/distinfo
+++ b/x11/xfce4-garcon/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:29:05 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/06/18 21:03:06 youri Exp $
 
-SHA1 (garcon-0.5.0.tar.bz2) = 87475d3f2a4ad81091dc5db4a0dda1af21628884
-RMD160 (garcon-0.5.0.tar.bz2) = 496b7d3128ff72c824594f635752f38102b317fa
-SHA512 (garcon-0.5.0.tar.bz2) = 9e360e71ae12dbfb5e948fd86c2ec3d6993e6ec68379adb588492386a4fe492480c365bd33f811c5cc7c8bf80044eff8bd942690b4dd4e0a9d4fc0c58dd29cf5
-Size (garcon-0.5.0.tar.bz2) = 456940 bytes
-SHA1 (patch-data_xfce_Makefile.in) = f4c247f103669e3b78bb58fe7775372a390af7c1
-SHA1 (patch-garcon-gtk_Makefile.in) = 182a1df29c27ec1b13e4892c259a009b45ad0058
-SHA1 (patch-garcon_Makefile.in) = f180fcd4e7991268017218cb3ce3964566861ec1
+SHA1 (garcon-0.6.1.tar.bz2) = 88fcaeca5fc42bb573ce7e6277bbf98a78967f57
+RMD160 (garcon-0.6.1.tar.bz2) = b693c45303fafc73b3bf764e3b67adae26e0b4aa
+SHA512 (garcon-0.6.1.tar.bz2) = 36c5b1ba3c91e613853cd5e986176c8cbd2a509fafde1b302334deda872b7f7073fd06ba341220b030d8d5728346b7339368190b225203f33c023dd96f3ed1a3
+Size (garcon-0.6.1.tar.bz2) = 511415 bytes
+SHA1 (patch-data_xfce_Makefile.in) = 80264dc6736b1be4ff64f135107b8dff9100a097
+SHA1 (patch-garcon-gtk_Makefile.am) = ae6cdcc1ac389333f53354b9c08b44985faf8f4c
+SHA1 (patch-garcon_Makefile.in) = 875699bf7dfa7138712caa93c2bf5be2f07841ed
diff --git a/x11/xfce4-garcon/patches/patch-data_xfce_Makefile.in b/x11/xfce4-garcon/patches/patch-data_xfce_Makefile.in
index cad3814788f..77053244a7f 100644
--- a/x11/xfce4-garcon/patches/patch-data_xfce_Makefile.in
+++ b/x11/xfce4-garcon/patches/patch-data_xfce_Makefile.in
@@ -1,6 +1,7 @@
-$NetBSD: patch-data_xfce_Makefile.in,v 1.1 2015/04/21 08:56:44 jperkin Exp $
+$NetBSD: patch-data_xfce_Makefile.in,v 1.2 2017/06/18 21:03:06 youri Exp $
 
 Adjust config path
+
 --- data/xfce/Makefile.in.orig	2015-02-28 15:11:27.000000000 +0000
 +++ data/xfce/Makefile.in
 @@ -354,7 +354,7 @@ target_vendor = @target_vendor@
diff --git a/x11/xfce4-garcon/patches/patch-garcon_Makefile.in b/x11/xfce4-garcon/patches/patch-garcon_Makefile.in
index ba36571e351..38ec31966ca 100644
--- a/x11/xfce4-garcon/patches/patch-garcon_Makefile.in
+++ b/x11/xfce4-garcon/patches/patch-garcon_Makefile.in
@@ -1,6 +1,7 @@
-$NetBSD: patch-garcon_Makefile.in,v 1.1 2015/04/21 08:56:44 jperkin Exp $
+$NetBSD: patch-garcon_Makefile.in,v 1.2 2017/06/18 21:03:06 youri Exp $
 
 Adjust config path.
+
 --- garcon/Makefile.in.orig	2015-02-28 15:11:27.000000000 +0000
 +++ garcon/Makefile.in
 @@ -436,7 +436,7 @@ AM_CPPFLAGS = \