The FreeBSD Xfce team proudly presents Xfce 4.12.

Announce: http://www.xfce.org/about/news/?post=1425081600

Global changes:
- Switch to USES= xfce (D677)
- Reorganize options helper
- Fix USES= gettext-* when NLS option is not set [1], [2]
- Add LICENSE (when missing)

Update:
- to 4.12 (core components)
- audio/xfce4-mpc-plugin to 0.4.5
- deskutils/xfce4-tumbler to 0.1.31
- deskutils/xfce4-xkb-plugin to 0.7.1
- editors/mousepad to 0.4.0
- graphics/ristretto to 0.8.0
- multimedia/xfce4-parole to 0.8.0
- sysutils/garcon to 0.4.0
- sysutils/xfce4-diskperf-plugin to 2.5.5 [3]
- sysutils/xfce4-fsguard-plugin to 1.0.2
- sysutils/xfce4-power-manager to 1.4.3
- sysutils/xfce4-wavelan-plugin to 0.5.12
- x11/libexo to 0.10.3
- x11-fm/thunar to 1.6.6
- x11-themes/gtk-xfce-engine to 3.2.0

PR:		196003 [1], 197251 [2], 198132
Differential Revision:	https://reviews.freebsd.org/D677
Submitted by:	Kamil Szczesny [1], amdmi3@ [2], myself
Exp-run by:	antoine@
Approved by:	danilo@ (maintainer) [3]
Tested by:	Ivan <enitarzi@gmail.com>

3 files changed, 30 insertions, 45 deletions

diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 0ce5ee9e2e18..987416021d96 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -2,28 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	garcon
-PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTVERSION=	0.4.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce 4 essential utilities and scripts
+COMMENT=	Freedesktop compliant menu library
+
+# garcon's source code is licensed under GPLv2, while its
+# documentation is under GFDL 1.1.
+LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
-USE_GNOME=	glib20 intltool intlhack
-USE_XFCE=	configenv libutil
-
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
+USES=	gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2
+USE_GNOME=	glib20 gtk20 intltool intlhack
+USE_XFCE=	libmenu
 
-DOCS_CONFIGURE_ENABLE=	gtk-doc-html
+CONFIGURE_ARGS=--without-html-dir
 
+OPTIONS_DEFINE=		NLS
+NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/garcon/distinfo b/sysutils/garcon/distinfo
index 431e59852388..11dc61ea9e2b 100644
--- a/sysutils/garcon/distinfo
+++ b/sysutils/garcon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/garcon-0.2.1.tar.bz2) = 48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7
-SIZE (xfce4/garcon-0.2.1.tar.bz2) = 454321
+SHA256 (xfce4/garcon-0.4.0.tar.bz2) = 787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972
+SIZE (xfce4/garcon-0.4.0.tar.bz2) = 466118
diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist
index fb4a98d7e172..b1496d19ff16 100644
--- a/sysutils/garcon/pkg-plist
+++ b/sysutils/garcon/pkg-plist
@@ -14,10 +14,16 @@ 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-gtk2-1/garcon-gtk/garcon-gtk-menu.h
+include/garcon-gtk2-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
 libdata/pkgconfig/garcon-1.pc
+libdata/pkgconfig/garcon-gtk2-1.pc
 share/desktop-directories/xfce-accessories.directory
 share/desktop-directories/xfce-development.directory
 share/desktop-directories/xfce-education.directory
@@ -32,35 +38,8 @@ share/desktop-directories/xfce-personal.directory
 share/desktop-directories/xfce-screensavers.directory
 share/desktop-directories/xfce-settings.directory
 share/desktop-directories/xfce-system.directory
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenu.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuDirectory.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuElement.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuItem.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuItemCache.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuMerger.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuParser.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuSeparator.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuTreeProvider.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/api-index-full.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-Desktop-Environment-Configuration.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-Version-Information.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-garcon-menu-item-pool.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-garcon-menu-node.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-garcon.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-menus.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-miscellaneous.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-parsing.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/garcon.devhelp2
-%%PORTDOCS%%share/gtk-doc/html/garcon/home.png
-%%PORTDOCS%%share/gtk-doc/html/garcon/index.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/index.sgml
-%%PORTDOCS%%share/gtk-doc/html/garcon/left.png
-%%PORTDOCS%%share/gtk-doc/html/garcon/object-tree.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/pt01.html
-%%PORTDOCS%%share/gtk-doc/html/garcon/right.png
-%%PORTDOCS%%share/gtk-doc/html/garcon/style.css
-%%PORTDOCS%%share/gtk-doc/html/garcon/up.png
 %%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/garcon.mo
@@ -68,9 +47,11 @@ share/desktop-directories/xfce-system.directory
 %%NLS%%share/locale/da/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/de/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/el/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/es/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/et/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/garcon.mo
@@ -86,15 +67,15 @@ share/desktop-directories/xfce-system.directory
 %%NLS%%share/locale/ko/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/garcon.mo
-%%NLS%%share/locale/nb_NO/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/garcon.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/garcon.mo
@@ -103,9 +84,12 @@ share/desktop-directories/xfce-system.directory
 %%NLS%%share/locale/sr/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/te/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/th/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/garcon.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/uz@Latn/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/garcon.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/garcon.mo