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>

4 files changed, 40 insertions, 108 deletions

diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 45b186244e70..b04b9d89f99c 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.10.1
-PORTREVISION=	3
+PORTVERSION=	4.12.0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -17,39 +15,27 @@ LICENSE_COMB=	multi
 LICENSE_DISTFILES=	${WRKSRC}/COPYING \
 	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USES=		desktop-file-utils gmake libtool:keepla pathfix perl5 \
+USES=		desktop-file-utils gmake libtool pathfix gettext-tools perl5 \
 		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	glib20 gtk20 intltool intlhack libwnck
+USE_GNOME=	glib20 gtk20 intltool intlhack libwnck cairo
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
+USE_XFCE=	garcon libexo
 USE_XORG=	x11 sm
 
-CONFIGURE_ARGS+=--enable-gio-unix
-
-OPTIONS_DEFINE=		NLS DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
+CONFIGURE_ARGS+=--enable-gio-unix --without-html-dir
+
+OPTIONS_DEFINE=		GTK3 NLS
+OPTIONS_DEFAULT=	GTK3 NLS
+GTK3_USES=	xfce:gtk3
+GTK3_USE=	gnome=gtk30
+GTK3_CONFIGURE_ENABLE=	gtk3
+GTK3_USES_OFF=	xfce
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 89f2375f58ab..0080c07a106e 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-panel-4.10.1.tar.bz2) = 573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6
-SIZE (xfce4/xfce4-panel-4.10.1.tar.bz2) = 1061090
+SHA256 (xfce4/xfce4-panel-4.12.0.tar.bz2) = 30920fc2e2fc26279a82b5261a155c2cc15ab2aa1ced2275684a6ff8261b97b0
+SIZE (xfce4/xfce4-panel-4.12.0.tar.bz2) = 1107470
diff --git a/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c b/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c
deleted file mode 100644
index 58384b8c5593..000000000000
--- a/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c
+++ /dev/null
@@ -1,23 +0,0 @@
-'system-hibernate' and 'system-suspend' icons don't exist when Gnome or
-Adwaita are default icons theme.
-
---- plugins/actions/actions.c.orig	2013-05-05 15:47:07 UTC
-+++ plugins/actions/actions.c
-@@ -181,7 +181,7 @@ static ActionEntry action_entries[] =
-     N_("_Hibernate"),
-     N_("Do you want to suspend to disk?"),
-     N_("Hibernating computer in %d seconds."),
--    "system-hibernate"
-+    "xfsm-hibernate"
-   },
-   { ACTION_TYPE_SUSPEND,
-     "suspend",
-@@ -189,7 +189,7 @@ static ActionEntry action_entries[] =
-     N_("Sus_pend"),
-     N_("Do you want to suspend to RAM?"),
-     N_("Suspending computer in %d seconds."),
--    "system-suspend"
-+    "xfsm-suspend"
-   },
-   { ACTION_TYPE_RESTART,
-     "restart",
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index aab1dcb54c24..b0d981fdffb4 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -15,64 +15,41 @@ include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h
 include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h
 include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h
 include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h
-lib/libxfce4panel-1.0.la
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-config.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enum-types.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enums.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros-46.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h
+%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h
 lib/libxfce4panel-1.0.so
 lib/libxfce4panel-1.0.so.4
 lib/libxfce4panel-1.0.so.4.0.0
+%%GTK3%%lib/libxfce4panel-2.0.so
+%%GTK3%%lib/libxfce4panel-2.0.so.4
+%%GTK3%%lib/libxfce4panel-2.0.so.4.0.0
 lib/xfce4/panel/migrate
-lib/xfce4/panel/plugins/libactions.la
 lib/xfce4/panel/plugins/libactions.so
-lib/xfce4/panel/plugins/libapplicationsmenu.la
 lib/xfce4/panel/plugins/libapplicationsmenu.so
-lib/xfce4/panel/plugins/libclock.la
 lib/xfce4/panel/plugins/libclock.so
-lib/xfce4/panel/plugins/libdirectorymenu.la
 lib/xfce4/panel/plugins/libdirectorymenu.so
-lib/xfce4/panel/plugins/liblauncher.la
 lib/xfce4/panel/plugins/liblauncher.so
-lib/xfce4/panel/plugins/libpager.la
 lib/xfce4/panel/plugins/libpager.so
-lib/xfce4/panel/plugins/libseparator.la
 lib/xfce4/panel/plugins/libseparator.so
-lib/xfce4/panel/plugins/libshowdesktop.la
 lib/xfce4/panel/plugins/libshowdesktop.so
-lib/xfce4/panel/plugins/libsystray.la
 lib/xfce4/panel/plugins/libsystray.so
-lib/xfce4/panel/plugins/libtasklist.la
 lib/xfce4/panel/plugins/libtasklist.so
-lib/xfce4/panel/plugins/libwindowmenu.la
 lib/xfce4/panel/plugins/libwindowmenu.so
-lib/xfce4/panel/wrapper
+lib/xfce4/panel/wrapper-1.0
+%%GTK3%%lib/xfce4/panel/wrapper-2.0
 libdata/pkgconfig/libxfce4panel-1.0.pc
+%%GTK3%%libdata/pkgconfig/libxfce4panel-2.0.pc
 share/applications/panel-desktop-handler.desktop
 share/applications/panel-preferences.desktop
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelImage.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelPlugin.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-6.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-8.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-deprecated.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-full.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/home.png
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.sgml
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/left.png
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-GObject-Oriented-Panel-Plugin-Registers-Macros.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros-(4.6-Style).html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Standard-Enumerations.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Version-Information.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-fundamentals.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-miscelleanous.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-plugins.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/right.png
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/style.css
-%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/up.png
 share/icons/hicolor/16x16/apps/xfce4-panel-menu.png
 share/icons/hicolor/16x16/apps/xfce4-panel.png
 share/icons/hicolor/22x22/apps/xfce4-panel-menu.png
@@ -87,49 +64,39 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg
 %%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/az/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/be/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/et/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/he/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/hy/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/is/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-panel.mo
@@ -138,11 +105,12 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/te/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-panel.mo
@@ -150,6 +118,7 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
 share/xfce4/panel/plugins/actions.desktop
 share/xfce4/panel/plugins/applicationsmenu.desktop