Upgrading Xfce to 4.6.1.

This is for PR #40984. This is based on work from
dieter roelants. Thank you Dieter.
Also I had done some work independently on this.
Hopefully, I am getting this all committed at one time.

The changelogs are at
http://www.xfce.org/documentation/changelogs/4.6.1
http://www.xfce.org/documentation/changelogs/4.6.0

Also don't need the xfce4-dev-tools for building. (It is only
needed when building from SVN source.)

4 files changed, 67 insertions, 50 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index e327c1e9932..f683afc02b1 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,18 +1,25 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:33 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	audio
 COMMENT=	Xfce mixer plugin
 
-MAKE_JOBS_SAFE=	no
+MAKE_DIRS+=	${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins
+MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/panel-plugins
 
+BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.14
+
+.include "../../devel/xfconf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-mixer/PLIST b/audio/xfce4-mixer/PLIST
index 9ce8baf1e3a..97d28860b6d 100644
--- a/audio/xfce4-mixer/PLIST
+++ b/audio/xfce4-mixer/PLIST
@@ -1,61 +1,77 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:10:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:33 reed Exp $
 bin/xfce4-mixer
-lib/xfce4/mcs-plugins/sound_settings.la
-lib/xfce4/modules/libxfce4mixer.la
 libexec/xfce4/panel-plugins/xfce4-mixer-plugin
-share/applications/xfce-mixer-settings.desktop
-share/icons/hicolor/48x48/apps/xfce4-mixer.png
+share/applications/xfce4-mixer.desktop
 share/locale/am/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
-share/locale/az/LC_MESSAGES/xfce4-mixer.mo
-share/locale/be/LC_MESSAGES/xfce4-mixer.mo
-share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
 share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
 share/locale/da/LC_MESSAGES/xfce4-mixer.mo
 share/locale/de/LC_MESSAGES/xfce4-mixer.mo
-share/locale/dz/LC_MESSAGES/xfce4-mixer.mo
-share/locale/el/LC_MESSAGES/xfce4-mixer.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
 share/locale/es/LC_MESSAGES/xfce4-mixer.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-mixer.mo
-share/locale/et/LC_MESSAGES/xfce4-mixer.mo
 share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/fa/LC_MESSAGES/xfce4-mixer.mo
 share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
 share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/gu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/he/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hy/LC_MESSAGES/xfce4-mixer.mo
 share/locale/id/LC_MESSAGES/xfce4-mixer.mo
 share/locale/it/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ka/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
-share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
-share/locale/lv/LC_MESSAGES/xfce4-mixer.mo
-share/locale/mk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/mr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
+share/locale/nb/LC_MESSAGES/xfce4-mixer.mo
 share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pa/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
+share/locale/pt/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
 share/locale/si/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
 share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ta/LC_MESSAGES/xfce4-mixer.mo
 share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
 share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
-share/xfce4/panel-plugins/xfce4-mixer.desktop
+share/pixmaps/xfce4-mixer/chain-broken.png
+share/pixmaps/xfce4-mixer/chain.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-muted.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-no-muted.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-no-record.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-record.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-high.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-low-medium.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-low.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-medium.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-muted.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-ultra-low.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-very-high.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-muted.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-no-muted.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-no-record.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-record.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-high.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-low-medium.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-low.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-medium.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-muted.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-ultra-low.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-very-high.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-muted.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-no-muted.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-no-record.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-record.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-high.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-low-medium.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-low.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-medium.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-muted.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-ultra-low.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-very-high.png
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-muted.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-no-muted.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-no-record.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-record.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-high.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-low-medium.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-low.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-medium.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-muted.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-ultra-low.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-very-high.svg
+share/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index 93a70a9df03..05985e5971a 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,19 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.24 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:33 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-mixer
 
 .if !defined(XFCE4_MIXER_BUILDLINK3_MK)
 XFCE4_MIXER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-mixer?=	xfce4-mixer>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif # XFCE4_MIXER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-mixer
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 8686fdc6b32..7b5830076b0 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2008/12/17 12:50:02 hira Exp $
+$NetBSD: distinfo,v 1.18 2009/09/16 01:15:33 reed Exp $
 
-SHA1 (xfce4-mixer-4.4.3.tar.bz2) = 33549a5adae984e36f77a50be0d4d67df3fc82bb
-RMD160 (xfce4-mixer-4.4.3.tar.bz2) = 004d3bc6f74e9bc6ed3c1f8b9555972e55dfb8e2
-Size (xfce4-mixer-4.4.3.tar.bz2) = 483417 bytes
+SHA1 (xfce4-mixer-4.6.1.tar.bz2) = e86163782fc4fc31671c7cb212d23d34106ad3af
+RMD160 (xfce4-mixer-4.6.1.tar.bz2) = 1fd6c450967a87c28082f960de3659633b876efe
+Size (xfce4-mixer-4.6.1.tar.bz2) = 412483 bytes