Index: Makefile
===================================================================
--- Makefile	(révision 443525)
+++ Makefile	(copie de travail)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	garcon
-PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE
+MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -15,17 +14,27 @@
 # documentation is under GFDL 1.1.
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+	libfreetype.so:print/freetype2
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=	gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2
-USE_GNOME=	glib20 gtk20 intltool intlhack
+USES=	gettext-tools gmake libtool pathfix pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	glib20 gtk30 intltool cairo gdkpixbuf2
 USE_XFCE=	libmenu
 
 CONFIGURE_ARGS=--without-html-dir
 
-OPTIONS_DEFINE=		NLS
+OPTIONS_DEFINE=	GTK2 NLS
+OPTIONS_DEFAULT=	GTK2
+GTK2_USE=	gnome=gtk20
+GTK2_CONFIGURE_ENABLE=	gtk2
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 OPTIONS_SUB=	yes
 
+## https://bugzilla.xfce.org/show_bug.cgi?id=13635
+post-install-GTK2-off:
+	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/garcon-gtk2-1.pc
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(révision 443525)
+++ distinfo	(copie de travail)
@@ -1,2 +1,3 @@
-SHA256 (xfce4/garcon-0.4.0.tar.bz2) = 787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972
-SIZE (xfce4/garcon-0.4.0.tar.bz2) = 466118
+TIMESTAMP = 1497180847
+SHA256 (xfce4/garcon-0.6.1.tar.bz2) = 41c31ba0498c2cc39de4a8e0c2367510adbf4bc2104c17feee358e51e6acf603
+SIZE (xfce4/garcon-0.6.1.tar.bz2) = 511415
Index: files/patch-configure
===================================================================
--- files/patch-configure	(révision 443525)
+++ files/patch-configure	(copie de travail)
@@ -1,6 +1,6 @@
---- ./configure.orig	2013-05-05 16:32:02.000000000 +0000
-+++ ./configure	2013-05-05 21:17:24.000000000 +0000
-@@ -13632,7 +13632,7 @@
+--- configure.orig	2017-04-16 04:37:20 UTC
++++ configure
+@@ -14201,7 +14201,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
  
      fi
    fi
Index: pkg-descr
===================================================================
--- pkg-descr	(révision 443525)
+++ pkg-descr	(copie de travail)
@@ -1,6 +1,5 @@
 Garcon is an implementation of the freedesktop.org menu specification
 replacing the former Xfce menu library libxfce4menu. It is based on
-GLib/GIO only and aims at covering the entire specification except for
-legacy menus.
+GLib/GIO only and aims at covering the entire specification.
 
 WWW: http://www.xfce.org/
Index: pkg-plist
===================================================================
--- pkg-plist	(révision 443525)
+++ pkg-plist	(copie de travail)
@@ -4,6 +4,7 @@
 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,16 +15,22 @@
 include/garcon-1/garcon/garcon-menu-tree-provider.h
 include/garcon-1/garcon/garcon-menu.h
 include/garcon-1/garcon/garcon.h
-include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h
-include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h
+%%GTK2%%include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h
+%%GTK2%%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.so
 lib/libgarcon-1.so.0
 lib/libgarcon-1.so.0.0.0
-lib/libgarcon-gtk2-1.so
-lib/libgarcon-gtk2-1.so.0
-lib/libgarcon-gtk2-1.so.0.0.0
+%%GTK2%%lib/libgarcon-gtk2-1.so
+%%GTK2%%lib/libgarcon-gtk2-1.so.0
+%%GTK2%%lib/libgarcon-gtk2-1.so.0.0.0
+lib/libgarcon-gtk3-1.so
+lib/libgarcon-gtk3-1.so.0
+lib/libgarcon-gtk3-1.so.0.0.0
 libdata/pkgconfig/garcon-1.pc
-libdata/pkgconfig/garcon-gtk2-1.pc
+%%GTK2%%libdata/pkgconfig/garcon-gtk2-1.pc
+libdata/pkgconfig/garcon-gtk3-1.pc
 share/desktop-directories/xfce-accessories.directory
 share/desktop-directories/xfce-development.directory
 share/desktop-directories/xfce-education.directory
@@ -38,6 +45,7 @@
 share/desktop-directories/xfce-screensavers.directory
 share/desktop-directories/xfce-settings.directory
 share/desktop-directories/xfce-system.directory
+%%NLS%%share/locale/am/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo