4 files changed, 92 insertions, 64 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 754ce3a50758..c59ae3c75aaa 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-mixer
-PORTVERSION=	4.10.0
-PORTREVISION=	5
+PORTVERSION=	4.11.0
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -12,19 +11,21 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Volume control for the Xfce desktop
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel xfconf
 USE_GSTREAMER=	good
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	KEYBIND
+OPTIONS_DEFINE=	KEYBIND NLS
 
 KEYBIND_DESC=	Multimedia keyboard shortcuts
 
@@ -37,6 +38,15 @@ CONFIGURE_ARGS+=--enable-keybinder
 CONFIGURE_ARGS+=--disable-keybinder
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+USES+=  gettext
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=     NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=     NLS="@comment "
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name 'Makefile.in' -or -name 'xfce-mixer-track.c' \
 		-type f | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 5ce7f52defcb..8ecd5350db69 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-mixer-4.10.0.tar.bz2) = a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade
-SIZE (xfce4/xfce4-mixer-4.10.0.tar.bz2) = 461526
+SHA256 (xfce4/xfce4-mixer-4.11.0.tar.bz2) = fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2
+SIZE (xfce4/xfce4-mixer-4.11.0.tar.bz2) = 472235
diff --git a/audio/xfce4-mixer/files/patch-configure b/audio/xfce4-mixer/files/patch-configure
new file mode 100644
index 000000000000..c7415503c212
--- /dev/null
+++ b/audio/xfce4-mixer/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2014-04-09 19:40:22.000000000 +0000
++++ ./configure	2014-04-09 22:42:39.000000000 +0000
+@@ -13405,7 +13405,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++     #USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index 5cea796e0b99..44be32f9f595 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -2,52 +2,55 @@ bin/xfce4-mixer
 lib/xfce4/panel/plugins/libmixer.so
 man/man1/xfce4-mixer.1.gz
 share/applications/xfce4-mixer.desktop
-share/locale/am/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ast/LC_MESSAGES/xfce4-mixer.mo
-share/locale/bg/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/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/eu/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/he/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
-share/locale/id/LC_MESSAGES/xfce4-mixer.mo
-share/locale/is/LC_MESSAGES/xfce4-mixer.mo
-share/locale/it/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
-share/locale/kk/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/nb/LC_MESSAGES/xfce4-mixer.mo
-share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/nn/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/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/sr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
-share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ug/LC_MESSAGES/xfce4-mixer.mo
-share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ur/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ur_PK/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
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
 share/pixmaps/chain-broken.png
 share/pixmaps/chain.png
 share/icons/hicolor/16x16/status/audio-input-microphone-muted.png
@@ -55,17 +58,21 @@ share/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
 share/xfce4/panel/plugins/mixer.desktop
 @dirrmtry share/xfce4/panel/plugins
 @dirrmtry share/xfce4/panel
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
+%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_HK
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrmtry lib/xfce4/panel/plugins
 @dirrmtry lib/xfce4/panel