Update Xfce to 4.12.0.

This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major
Xfce releases since 4.6.2, our previous pkgsrc release.  For more information
about the thousands of changes in each major release since then, please see:

  Xfce 4.12 announcement:
    http://www.xfce.org/about/news

  Xfce 4.12 tour:
    http://www.xfce.org/about/tour

  Xfce 4.10 announcement:
    http://www.xfce.org/about/news/?post=1335571200

  Xfce 4.10 tour:
    http://www.xfce.org/about/tour410

  Xfce 4.8 announcement:
    http://www.xfce.org/about/news/?post=1295136000

  Xfce 4.8 tour:
    http://www.xfce.org/about/tour48

The pkgsrc changes since then are:

  New packages:
    archivers/xfce4-thunar-archive
    graphics/elementary-xfce-icon-theme
    mail/xfce4-mailwatch-plugin
    misc/xfce4-time-out-plugin
    multimedia/xfce4-thunar-media-tags
    sysutils/xfce4-mount-plugin
    sysutils/xfce4-taskmanager
    sysutils/xfce4-thunar-vcs
    sysutils/xfce4-verve-plugin
    x11/xfce4-garcon
    x11/xfce4-notifyd
    x11/xfce4-tumbler
    x11/xfce4-whiskermenu-plugin

  Renamed packages:
    devel/xfconf to devel/xfce4-conf
    x11/libxfce4menu to x11/libxfce4ui
    x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter

  Updated packages:
    audio/xfce4-mixer
    audio/xfce4-xmms-plugin
    devel/xfce4-dev-tools
    editors/xfce4-mousepad
    graphics/ristretto
    meta-pkgs/xfce4-extras
    meta-pkgs/xfce4
    misc/xfce4-weather-plugin
    multimedia/xfce4-mpc-plugin
    net/xfce4-wavelan-plugin
    sysutils/xfce4-appfinder
    sysutils/xfce4-battery-plugin
    sysutils/xfce4-cpugraph-plugin
    sysutils/xfce4-diskperf-plugin
    sysutils/xfce4-fsguard-plugin
    sysutils/xfce4-genmon-plugin
    sysutils/xfce4-netload-plugin
    sysutils/xfce4-quicklauncher-plugin
    sysutils/xfce4-systemload-plugin
    sysutils/xfce4-thunar
    sysutils/xfce4-xarchiver
    sysutils/xfce4-xkb-plugin
    textproc/xfce4-dict-plugin
    time/xfce4-datetime-plugin
    time/xfce4-orage
    time/xfce4-timer-plugin
    wm/xfce4-wm-themes
    wm/xfce4-wm
    x11/libxfce4gui
    x11/libxfce4util
    x11/xfce4-clipman-plugin
    x11/xfce4-desktop
    x11/xfce4-exo
    x11/xfce4-eyes-plugin
    x11/xfce4-gtk2-engine
    x11/xfce4-notes-plugin
    x11/xfce4-panel
    x11/xfce4-places-plugin
    x11/xfce4-session
    x11/xfce4-settings
    x11/xfce4-terminal

  Removed packages:
    sysutils/xfce4-volman
    x11/xfce4-utils

This is based on a huge amount of work by the NetBSDfr team and Youri Mouton,
who takes over as MAINTAINER, and has been tested by Youri on a large number
of platforms prior to commit.  A massive thanks to them.  Any issues with the
import are mine alone as the committer-by-proxy.

7 files changed, 65 insertions, 56 deletions

diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index cae64fb60da..503d1b1888e 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,33 +1,21 @@
-# $NetBSD: Makefile,v 1.50 2014/05/05 00:48:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2015/04/21 08:56:43 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=	libxfcegui4-${XFCE4_VERSION}
-PKGNAME=	libxfce4gui-${XFCE4_VERSION}
-PKGREVISION=	21
+VERSION=	4.10.0
+DISTNAME=	libxfcegui4-${VERSION}
+PKGNAME=	libxfce4gui-${VERSION}
 CATEGORIES=	x11
-COMMENT=	Xfce widget library
-
-PKGCONFIG_OVERRIDE=	libxfce4kbd-private/libxfce4kbd-private-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	libxfcegui4/libxfcegui4-1.0.pc.in
+MASTER_SITES=	http://archive.xfce.org/src/archive/libxfcegui4/4.10/
 
-CONFIGURE_ARGS+=	--disable-gladeui
+COMMENT=	Xfce widget library
 
-EGDIR=			${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml
-PKG_SYSCONFSUBDIR=	xdg
-CONF_FILES=		${EGDIR}/xfce4-keyboard-shortcuts.xml \
-	${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+PKGCONFIG_OVERRIDE=	libxfcegui4/libxfcegui4-1.0.pc.in
 
-MAKE_DIRS+=	${PKG_SYSCONFDIR} ${PREFIX}/include/xfce4
-MAKE_DIRS+=	${XFCE4_EGBASE} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR}
-OWN_DIRS+=	${PKG_SYSCONFDIR}/xfce4 ${PKG_SYSCONFDIR}/xfce4/xfconf
-OWN_DIRS+=	${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml
+HOMEPAGE=	http://archive.xfce.org/src/archive/libxfcegui4/4.10/
+COMMENT=	Xfce widget library
 
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/xfconf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libxfce4util/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST
index 9d404a343f2..f0f80af1910 100644
--- a/x11/libxfce4gui/PLIST
+++ b/x11/libxfce4gui/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.21 2009/09/16 01:15:34 reed Exp $
-include/xfce4/libxfce4kbd-private/xfce-shortcut-dialog.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts-grabber.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts-provider.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts.h
+@comment $NetBSD: PLIST,v 1.22 2015/04/21 08:56:43 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.22 2015/04/21 08:56:43 jperkin Exp $
 include/xfce4/libxfcegui4/dialogs.h
 include/xfce4/libxfcegui4/gtk_style.h
 include/xfce4/libxfcegui4/gtktoxevent.h
@@ -49,11 +46,8 @@ include/xfce4/libxfcegui4/xfce_systemtray.h
 include/xfce4/libxfcegui4/xfce_togglebutton.h
 include/xfce4/libxfcegui4/xinerama.h
 lib/libglade/2.0/libxfce4.la
-lib/libxfce4kbd-private.la
 lib/libxfcegui4.la
-lib/pkgconfig/libxfce4kbd-private-1.0.pc
 lib/pkgconfig/libxfcegui4-1.0.pc
-share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
 share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
 share/gtk-doc/html/libxfcegui4/XfceFramebox.html
@@ -73,7 +67,6 @@ share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html
 share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
 share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
 share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
 share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2
 share/gtk-doc/html/libxfcegui4/reference.html
 share/gtk-doc/html/libxfcegui4/right.png
@@ -95,6 +88,7 @@ share/icons/hicolor/48x48/apps/xfce-utils.png
 share/icons/hicolor/scalable/apps/xfce-filemanager.svg
 share/locale/am/LC_MESSAGES/libxfcegui4.mo
 share/locale/ar/LC_MESSAGES/libxfcegui4.mo
+share/locale/ast/LC_MESSAGES/libxfcegui4.mo
 share/locale/be/LC_MESSAGES/libxfcegui4.mo
 share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo
 share/locale/ca/LC_MESSAGES/libxfcegui4.mo
@@ -115,12 +109,15 @@ share/locale/fr/LC_MESSAGES/libxfcegui4.mo
 share/locale/gl/LC_MESSAGES/libxfcegui4.mo
 share/locale/gu/LC_MESSAGES/libxfcegui4.mo
 share/locale/he/LC_MESSAGES/libxfcegui4.mo
+share/locale/hr/LC_MESSAGES/libxfcegui4.mo
 share/locale/hu/LC_MESSAGES/libxfcegui4.mo
 share/locale/hy/LC_MESSAGES/libxfcegui4.mo
 share/locale/id/LC_MESSAGES/libxfcegui4.mo
+share/locale/is/LC_MESSAGES/libxfcegui4.mo
 share/locale/it/LC_MESSAGES/libxfcegui4.mo
 share/locale/ja/LC_MESSAGES/libxfcegui4.mo
 share/locale/ka/LC_MESSAGES/libxfcegui4.mo
+share/locale/kk/LC_MESSAGES/libxfcegui4.mo
 share/locale/ko/LC_MESSAGES/libxfcegui4.mo
 share/locale/ku/LC_MESSAGES/libxfcegui4.mo
 share/locale/lt/LC_MESSAGES/libxfcegui4.mo
@@ -129,6 +126,7 @@ share/locale/mk/LC_MESSAGES/libxfcegui4.mo
 share/locale/mr/LC_MESSAGES/libxfcegui4.mo
 share/locale/nb/LC_MESSAGES/libxfcegui4.mo
 share/locale/nl/LC_MESSAGES/libxfcegui4.mo
+share/locale/nn/LC_MESSAGES/libxfcegui4.mo
 share/locale/pa/LC_MESSAGES/libxfcegui4.mo
 share/locale/pl/LC_MESSAGES/libxfcegui4.mo
 share/locale/pt/LC_MESSAGES/libxfcegui4.mo
@@ -140,8 +138,12 @@ share/locale/sk/LC_MESSAGES/libxfcegui4.mo
 share/locale/sq/LC_MESSAGES/libxfcegui4.mo
 share/locale/sv/LC_MESSAGES/libxfcegui4.mo
 share/locale/ta/LC_MESSAGES/libxfcegui4.mo
+share/locale/te/LC_MESSAGES/libxfcegui4.mo
+share/locale/tl_PH/LC_MESSAGES/libxfcegui4.mo
 share/locale/tr/LC_MESSAGES/libxfcegui4.mo
+share/locale/ug/LC_MESSAGES/libxfcegui4.mo
 share/locale/uk/LC_MESSAGES/libxfcegui4.mo
 share/locale/ur/LC_MESSAGES/libxfcegui4.mo
+share/locale/ur_PK/LC_MESSAGES/libxfcegui4.mo
 share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo
 share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 703a8b8da43..f41a382ddfa 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,19 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.48 2014/05/05 00:48:31 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2015/04/21 08:56:43 jperkin Exp $
 
 BUILDLINK_TREE+=	libxfce4gui
 
 .if !defined(LIBXFCE4GUI_BUILDLINK3_MK)
 LIBXFCE4GUI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.6.0
-BUILDLINK_ABI_DEPENDS.libxfce4gui+=	libxfce4gui>=4.6.1nb21
+BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.10.0
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/xfconf/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../x11/libxfce4util/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.endif # LIBXFCE4GUI_BUILDLINK3_MK
+.endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libxfce4gui
diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo
index fa98d38db15..013efdf6438 100644
--- a/x11/libxfce4gui/distinfo
+++ b/x11/libxfce4gui/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.18 2009/09/16 01:15:34 reed Exp $
+$NetBSD: distinfo,v 1.19 2015/04/21 08:56:43 jperkin Exp $
 
-SHA1 (libxfcegui4-4.6.1.tar.bz2) = 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696
-RMD160 (libxfcegui4-4.6.1.tar.bz2) = 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568
-Size (libxfcegui4-4.6.1.tar.bz2) = 650666 bytes
-SHA1 (patch-aa) = c054345fcb2aa5c516009d0740ac0abc3ba15706
+SHA1 (libxfcegui4-4.10.0.tar.bz2) = 6d6f24a7f69dfee359b96bd2867fbe9e3262549f
+RMD160 (libxfcegui4-4.10.0.tar.bz2) = d9385ced0254e37caf3445725663f56bf95a3083
+Size (libxfcegui4-4.10.0.tar.bz2) = 691012 bytes
+SHA1 (patch-libxfcegui4_dialogs.c) = 60632a4ca1119a17f36ff0f2909ea3ab43dceb94
+SHA1 (patch-libxfcegui4_xfce-exec.c) = d38a0fb348560df9c4415c17963d84766d8eabe5
diff --git a/x11/libxfce4gui/patches/patch-aa b/x11/libxfce4gui/patches/patch-aa
deleted file mode 100644
index 2531cce5a9e..00000000000
--- a/x11/libxfce4gui/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/09/16 01:15:33 reed Exp $
-
---- libxfce4kbd-private/Makefile.in.orig	2009-03-08 20:41:51.000000000 +0000
-+++ libxfce4kbd-private/Makefile.in
-@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@
- @ENABLE_KEYBOARD_LIBRARY_TRUE@	$(LIBXFCE4UTIL_LIBS)						\
- @ENABLE_KEYBOARD_LIBRARY_TRUE@	$(XFCONF_LIBS)
- 
--@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
-+@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml
- @ENABLE_KEYBOARD_LIBRARY_TRUE@settings_DATA = xfce4-keyboard-shortcuts.xml
- @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfigdir = $(libdir)/pkgconfig
- @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = libxfce4kbd-private-1.0.pc
diff --git a/x11/libxfce4gui/patches/patch-libxfcegui4_dialogs.c b/x11/libxfce4gui/patches/patch-libxfcegui4_dialogs.c
new file mode 100644
index 00000000000..5e74b6aced2
--- /dev/null
+++ b/x11/libxfce4gui/patches/patch-libxfcegui4_dialogs.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-libxfcegui4_dialogs.c,v 1.1 2015/04/21 08:56:43 jperkin Exp $
+
+Fix build for OS X.
+--- libxfcegui4/dialogs.c.orig	2012-04-28 20:10:43.000000000 +0000
++++ libxfcegui4/dialogs.c
+@@ -64,6 +64,7 @@
+ 
+ #ifdef HAVE__NSGETENVIRON
+ /* for support under apple/darwin */
++#include <crt_externs.h>
+ #define environ (*_NSGetEnviron())
+ #elif !HAVE_DECL_ENVIRON
+ /* try extern if environ is not defined in unistd.h */
diff --git a/x11/libxfce4gui/patches/patch-libxfcegui4_xfce-exec.c b/x11/libxfce4gui/patches/patch-libxfcegui4_xfce-exec.c
new file mode 100644
index 00000000000..0f5879e495a
--- /dev/null
+++ b/x11/libxfce4gui/patches/patch-libxfcegui4_xfce-exec.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-libxfcegui4_xfce-exec.c,v 1.1 2015/04/21 08:56:43 jperkin Exp $
+
+Fixes compiling with libxfce4util 4.11+
+--- libxfcegui4/xfce-exec.c.orig	2012-04-28 20:10:43.000000000 +0000
++++ libxfcegui4/xfce-exec.c
+@@ -59,6 +59,7 @@
+ 
+ #ifdef HAVE__NSGETENVIRON
+ /* for support under apple/darwin */
++#include <crt_externs.h>
+ #define environ (*_NSGetEnviron())
+ #elif !HAVE_DECL_ENVIRON
+ /* try extern if environ is not defined in unistd.h */
+@@ -79,7 +80,7 @@ child_setup_sync(gpointer user_data)
+ #ifndef G_OS_WIN32
+     gchar *dpyname = user_data;
+     
+-    xfce_setenv ("DISPLAY", dpyname, TRUE);
++    g_setenv ("DISPLAY", dpyname, TRUE);
+ #endif
+ }
+