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.

12 files changed, 71 insertions, 63 deletions

diff --git a/devel/Makefile b/devel/Makefile
index f68843ed0ef..a38f5a09368 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2082 2015/04/20 19:38:03 alnsn Exp $
+# $NetBSD: Makefile,v 1.2083 2015/04/21 08:56:37 jperkin Exp $
 #
 
 COMMENT=	Development utilities
@@ -1967,8 +1967,8 @@ SUBDIR+=	wide
 SUBDIR+=	xa65
 SUBDIR+=	xdelta
 SUBDIR+=	xdelta3
+SUBDIR+=	xfce4-conf
 SUBDIR+=	xfce4-dev-tools
-SUBDIR+=	xfconf
 SUBDIR+=	xmake
 SUBDIR+=	xorg-util-macros
 SUBDIR+=	xsd
diff --git a/devel/xfconf/DESCR b/devel/xfce4-conf/DESCR
index dedc11110b5..dedc11110b5 100644
--- a/devel/xfconf/DESCR
+++ b/devel/xfce4-conf/DESCR
diff --git a/devel/xfconf/Makefile b/devel/xfce4-conf/Makefile
index a9584d3c322..8a57251a3d8 100644
--- a/devel/xfconf/Makefile
+++ b/devel/xfce4-conf/Makefile
@@ -1,33 +1,24 @@
-# $NetBSD: Makefile,v 1.25 2014/05/29 23:36:30 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:37 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfconf-${XFCE4_VERSION}
-PKGREVISION=	22
+PKGNAME=	xfce4-conf-${XFCE4_VERSION}
 CATEGORIES=	devel
+
+HOMEPAGE=	http://docs.xfce.org/xfce/xfconf/start
 COMMENT=	Xfce client-server configuration storage and query system
 
 PKGCONFIG_OVERRIDE=	xfconf/libxfconf-0.pc.in
 
-PERL5_CONFIGURE=	no
-PERL5_PACKLIST=		auto/Xfce4/Xfconf/.packlist
-
-CONFIGURE_ARGS+=	--with-perl-options=${MAKE_PARAMS}
+CONFIGURE_ARGS+=	--disable-perl-bindings
 
 MAKE_DIRS+=	${PREFIX}/include/xfce4
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-visibility
-.endif
-
 BUILDLINK_API_DEPENDS.dbus+=		dbus>=1.0.0
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.72
 
-.include "../../devel/p5-glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/libxfce4util/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/xfconf/PLIST b/devel/xfce4-conf/PLIST
index 20c7fbd6edd..e2555b0c40e 100644
--- a/devel/xfconf/PLIST
+++ b/devel/xfce4-conf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/16 01:06:30 reed Exp $
+@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:37 jperkin Exp $
 bin/xfconf-query
 include/xfce4/xfconf-0/xfconf/xfconf-binding.h
 include/xfce4/xfconf-0/xfconf/xfconf-channel.h
@@ -7,7 +7,7 @@ include/xfce4/xfconf-0/xfconf/xfconf-types.h
 include/xfce4/xfconf-0/xfconf/xfconf.h
 lib/libxfconf-0.la
 lib/pkgconfig/libxfconf-0.pc
-libexec/xfconfd
+lib/xfce4/xfconf/xfconfd
 share/dbus-1/services/org.xfce.Xfconf.service
 share/gtk-doc/html/xfconf/ch01.html
 share/gtk-doc/html/xfconf/ch02.html
@@ -15,9 +15,12 @@ share/gtk-doc/html/xfconf/ch03.html
 share/gtk-doc/html/xfconf/home.png
 share/gtk-doc/html/xfconf/index.html
 share/gtk-doc/html/xfconf/index.sgml
+share/gtk-doc/html/xfconf/left-insensitive.png
 share/gtk-doc/html/xfconf/left.png
+share/gtk-doc/html/xfconf/right-insensitive.png
 share/gtk-doc/html/xfconf/right.png
 share/gtk-doc/html/xfconf/style.css
+share/gtk-doc/html/xfconf/up-insensitive.png
 share/gtk-doc/html/xfconf/up.png
 share/gtk-doc/html/xfconf/xfconf-xfconf-backend.html
 share/gtk-doc/html/xfconf/xfconf-xfconf-binding.html
@@ -25,29 +28,56 @@ share/gtk-doc/html/xfconf/xfconf-xfconf-channel.html
 share/gtk-doc/html/xfconf/xfconf-xfconf-errors.html
 share/gtk-doc/html/xfconf/xfconf-xfconf-types.html
 share/gtk-doc/html/xfconf/xfconf-xfconf.html
-share/gtk-doc/html/xfconf/xfconf.devhelp
 share/gtk-doc/html/xfconf/xfconf.devhelp2
+share/locale/ar/LC_MESSAGES/xfconf.mo
+share/locale/ast/LC_MESSAGES/xfconf.mo
+share/locale/bg/LC_MESSAGES/xfconf.mo
+share/locale/bn/LC_MESSAGES/xfconf.mo
 share/locale/ca/LC_MESSAGES/xfconf.mo
 share/locale/cs/LC_MESSAGES/xfconf.mo
 share/locale/da/LC_MESSAGES/xfconf.mo
 share/locale/de/LC_MESSAGES/xfconf.mo
+share/locale/el/LC_MESSAGES/xfconf.mo
+share/locale/en_AU/LC_MESSAGES/xfconf.mo
+share/locale/en_GB/LC_MESSAGES/xfconf.mo
 share/locale/es/LC_MESSAGES/xfconf.mo
 share/locale/eu/LC_MESSAGES/xfconf.mo
 share/locale/fi/LC_MESSAGES/xfconf.mo
 share/locale/fr/LC_MESSAGES/xfconf.mo
 share/locale/gl/LC_MESSAGES/xfconf.mo
+share/locale/he/LC_MESSAGES/xfconf.mo
+share/locale/hr/LC_MESSAGES/xfconf.mo
 share/locale/hu/LC_MESSAGES/xfconf.mo
 share/locale/id/LC_MESSAGES/xfconf.mo
+share/locale/is/LC_MESSAGES/xfconf.mo
 share/locale/it/LC_MESSAGES/xfconf.mo
 share/locale/ja/LC_MESSAGES/xfconf.mo
+share/locale/kk/LC_MESSAGES/xfconf.mo
+share/locale/ko/LC_MESSAGES/xfconf.mo
+share/locale/lt/LC_MESSAGES/xfconf.mo
+share/locale/lv/LC_MESSAGES/xfconf.mo
+share/locale/ms/LC_MESSAGES/xfconf.mo
 share/locale/nb/LC_MESSAGES/xfconf.mo
 share/locale/nl/LC_MESSAGES/xfconf.mo
+share/locale/nn/LC_MESSAGES/xfconf.mo
+share/locale/oc/LC_MESSAGES/xfconf.mo
+share/locale/pa/LC_MESSAGES/xfconf.mo
 share/locale/pl/LC_MESSAGES/xfconf.mo
 share/locale/pt/LC_MESSAGES/xfconf.mo
 share/locale/pt_BR/LC_MESSAGES/xfconf.mo
 share/locale/ro/LC_MESSAGES/xfconf.mo
 share/locale/ru/LC_MESSAGES/xfconf.mo
+share/locale/si/LC_MESSAGES/xfconf.mo
+share/locale/sk/LC_MESSAGES/xfconf.mo
+share/locale/sr/LC_MESSAGES/xfconf.mo
 share/locale/sv/LC_MESSAGES/xfconf.mo
+share/locale/te/LC_MESSAGES/xfconf.mo
+share/locale/th/LC_MESSAGES/xfconf.mo
 share/locale/tr/LC_MESSAGES/xfconf.mo
+share/locale/ug/LC_MESSAGES/xfconf.mo
 share/locale/uk/LC_MESSAGES/xfconf.mo
+share/locale/ur/LC_MESSAGES/xfconf.mo
+share/locale/ur_PK/LC_MESSAGES/xfconf.mo
 share/locale/zh_CN/LC_MESSAGES/xfconf.mo
+share/locale/zh_HK/LC_MESSAGES/xfconf.mo
+share/locale/zh_TW/LC_MESSAGES/xfconf.mo
diff --git a/devel/xfce4-conf/buildlink3.mk b/devel/xfce4-conf/buildlink3.mk
new file mode 100644
index 00000000000..92ccb82a2be
--- /dev/null
+++ b/devel/xfce4-conf/buildlink3.mk
@@ -0,0 +1,17 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/21 08:56:37 jperkin Exp $
+
+BUILDLINK_TREE+=	xfce4-conf
+
+.if !defined(XFCE4_CONF_BUILDLINK3_MK)
+XFCE4_CONF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.xfce4-conf+=	xfce4-conf>=4.12.0
+BUILDLINK_PKGSRCDIR.xfce4-conf?=	../../devel/xfce4-conf
+
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.endif	# XFCE4_CONF_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-xfce4-conf
diff --git a/devel/xfce4-conf/distinfo b/devel/xfce4-conf/distinfo
new file mode 100644
index 00000000000..c0afa58e608
--- /dev/null
+++ b/devel/xfce4-conf/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/04/21 08:56:37 jperkin Exp $
+
+SHA1 (xfconf-4.12.0.tar.bz2) = 453b1589f242f293c193b0432accd8888964c3ab
+RMD160 (xfconf-4.12.0.tar.bz2) = c328f7f1595a3912ac4008d2e70a5a0224b02d23
+Size (xfconf-4.12.0.tar.bz2) = 542544 bytes
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index 2273a2ad9cf..03827e6605b 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.27 2013/10/10 14:42:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/21 08:56:37 jperkin Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	4.6.0
 DISTNAME=	xfce4-dev-tools-${XFCE4_VERSION}
-PKGREVISION=	17
 CATEGORIES=	devel
+
+HOMEPAGE=	http://users.xfce.org/~benny/projects/xfce4-dev-tools/
 COMMENT=	Xfce development tools
-LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/xfce4-dev-tools/PLIST b/devel/xfce4-dev-tools/PLIST
index f8b345c95b5..cd4e401e4ec 100644
--- a/devel/xfce4-dev-tools/PLIST
+++ b/devel/xfce4-dev-tools/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/09/16 01:15:33 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/04/21 08:56:37 jperkin Exp $
 bin/xdt-autogen
 bin/xdt-commit
+bin/xdt-csource
 share/xfce4/dev-tools/m4macros/xdt-depends.m4
 share/xfce4/dev-tools/m4macros/xdt-features.m4
 share/xfce4/dev-tools/m4macros/xdt-i18n.m4
diff --git a/devel/xfce4-dev-tools/buildlink3.mk b/devel/xfce4-dev-tools/buildlink3.mk
deleted file mode 100644
index 6be5da8b275..00000000000
--- a/devel/xfce4-dev-tools/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:15:33 reed Exp $
-
-BUILDLINK_TREE+=	xfce4-dev-tools
-
-.if !defined(XFCE4_DEV_TOOLS_BUILDLINK3_MK)
-XFCE4_DEV_TOOLS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfce4-dev-tools+=	xfce4-dev-tools>=4.6.0
-BUILDLINK_PKGSRCDIR.xfce4-dev-tools?=	../../devel/xfce4-dev-tools
-BUILDLINK_DEPMETHOD.xfce4-dev-tools?=	build
-.endif # XFCE4_DEV_TOOLS_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfce4-dev-tools
diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo
index a065be854dc..eea2af06140 100644
--- a/devel/xfce4-dev-tools/distinfo
+++ b/devel/xfce4-dev-tools/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/09/16 01:15:33 reed Exp $
+$NetBSD: distinfo,v 1.4 2015/04/21 08:56:37 jperkin Exp $
 
-SHA1 (xfce4-dev-tools-4.6.0.tar.bz2) = a5a5cbc9e5f84f4939e53e3327c51f4b749c38a2
-RMD160 (xfce4-dev-tools-4.6.0.tar.bz2) = ff2a5e9c7bd637efdc76b126f8854b934d4862ba
-Size (xfce4-dev-tools-4.6.0.tar.bz2) = 61934 bytes
+SHA1 (xfce4-dev-tools-4.12.0.tar.bz2) = b769c9bf7982cfb0b8b8491db1dde706aec46c5a
+RMD160 (xfce4-dev-tools-4.12.0.tar.bz2) = dd1fb3b11830cad3f98d0eaf35d703528fcf95a6
+Size (xfce4-dev-tools-4.12.0.tar.bz2) = 309586 bytes
diff --git a/devel/xfconf/buildlink3.mk b/devel/xfconf/buildlink3.mk
deleted file mode 100644
index f84cea186d7..00000000000
--- a/devel/xfconf/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/09/15 10:04:22 obache Exp $
-
-BUILDLINK_TREE+=	xfconf
-
-.if !defined(XFCONF_BUILDLINK3_MK)
-XFCONF_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xfconf+=	xfconf>=4.6.0
-BUILDLINK_ABI_DEPENDS.xfconf+=	xfconf>=4.6.1nb11
-BUILDLINK_PKGSRCDIR.xfconf?=	../../devel/xfconf
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.endif	# XFCONF_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xfconf
diff --git a/devel/xfconf/distinfo b/devel/xfconf/distinfo
deleted file mode 100644
index 412204f1e52..00000000000
--- a/devel/xfconf/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/16 01:06:30 reed Exp $
-
-SHA1 (xfconf-4.6.1.tar.bz2) = 6df092942c5c5af5d65a58589fb85e29755a37ee
-RMD160 (xfconf-4.6.1.tar.bz2) = 970d3bf8bdd18c211b82fd0eb6ad2784cb8c52ef
-Size (xfconf-4.6.1.tar.bz2) = 440499 bytes