3 files changed, 68 insertions, 54 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 20490f92ad70..5b531272b917 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-mixer
-PORTVERSION=	4.4.3
-PORTREVISION=	0
+PORTVERSION=	4.6.0
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -15,13 +14,16 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 volume mixer module for xfce4-panel
 
+BUILD_DEPENDS+=	gstreamer-plugins-good>=0.10.22:${PORTSDIR}/multimedia/gstreamer-plugins-good
+RUN_DEPENDS+=	gstreamer-plugins-good>=0.10.22:${PORTSDIR}/multimedia/gstreamer-plugins-good
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20 intltool intlhack libxml2 pkgconfig
-USE_XFCE=	configenv libgui libmcs libutil mcsmanager panel
+USE_XFCE=	configenv libgui libutil panel xfconf
 USE_XORG=	xproto x11 xrender xext xinerama xrandr xcursor xcomposite \
 		xdamage xfixes xi xau xdmcp
 
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 36b104ce7ed6..04675fa7cc3c 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-mixer-4.4.3.tar.bz2) = 0d7b402acaffdb5d8b292f2ce3ea1441
-SHA256 (xfce4/xfce4-mixer-4.4.3.tar.bz2) = 4104acd9bd09e675765ceac88a10d8e0b920f50856fa571409fa51fa6a084554
-SIZE (xfce4/xfce4-mixer-4.4.3.tar.bz2) = 483417
+MD5 (xfce4/xfce4-mixer-4.6.0.tar.bz2) = ee7956a73efe43da4b27ad9cd1f4d20b
+SHA256 (xfce4/xfce4-mixer-4.6.0.tar.bz2) = ce5c4103ee092c8d17bcd7ab6de215244ffe33e4634ae94e901c2f6c86bf5d0d
+SIZE (xfce4/xfce4-mixer-4.6.0.tar.bz2) = 410876
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index a705bba665b4..4c2e1de829ec 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -1,79 +1,91 @@
 bin/xfce4-mixer
-lib/xfce4/modules/libxfce4mixer.la
-lib/xfce4/modules/libxfce4mixer.so
-lib/xfce4/modules/libxfce4mixer.so.0
-lib/xfce4/mcs-plugins/sound_settings.la
-lib/xfce4/mcs-plugins/sound_settings.so
 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/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_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
-@dirrmtry lib/xfce4/modules
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
+share/pixmaps/xfce4-mixer/chain-broken.png
+share/pixmaps/xfce4-mixer/chain.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-low.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-low-medium.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-medium.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-high.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-volume-very-high.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-record.png
+share/xfce4-mixer/icons/hicolor/16x16/status/xfce4-mixer-no-record.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/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-low.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-low-medium.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-medium.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-high.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-volume-very-high.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-record.png
+share/xfce4-mixer/icons/hicolor/24x24/status/xfce4-mixer-no-record.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/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-low.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-low-medium.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-medium.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-high.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-volume-very-high.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-record.png
+share/xfce4-mixer/icons/hicolor/48x48/status/xfce4-mixer-no-record.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/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-low.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-low-medium.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-medium.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-high.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-volume-very-high.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-record.svg
+share/xfce4-mixer/icons/hicolor/scalable/status/xfce4-mixer-no-record.svg
+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/panel-plugins/xfce4-mixer-plugin.desktop
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
+@dirrm share/pixmaps/xfce4-mixer
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
+@dirrm share/xfce4-mixer/icons/hicolor/16x16/status
+@dirrm share/xfce4-mixer/icons/hicolor/16x16
+@dirrm share/xfce4-mixer/icons/hicolor/24x24/status
+@dirrm share/xfce4-mixer/icons/hicolor/24x24
+@dirrm share/xfce4-mixer/icons/hicolor/48x48/status
+@dirrm share/xfce4-mixer/icons/hicolor/48x48
+@dirrm share/xfce4-mixer/icons/hicolor/scalable/status
+@dirrm share/xfce4-mixer/icons/hicolor/scalable
+@dirrm share/xfce4-mixer/icons/hicolor
+@dirrm share/xfce4-mixer/icons
+@dirrm share/xfce4-mixer