- Update to 1.1.2

- Introduce WITHOUT_NLS knob

PR:		103074 (based on)
Submitted by:	maintainer

6 files changed, 86 insertions, 70 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 499547660f2f..0eec645b7363 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://audacious-media-player.org/release/ \
 		${MASTER_SITE_LOCAL}
@@ -24,7 +23,6 @@ LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
 		tag.5:${PORTSDIR}/audio/taglib
 
 USE_GNOME=	gtk20 libglade2
-USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -51,7 +49,8 @@ OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		SID	"Enable sid input" off \
 		MPC	"Enable mpc input" off \
 		ESOUND	"Enable Esound output"  off \
-		GNOME   "Build with gnomevfs/gconf support" off
+		GNOME   "Build with gnomevfs/gconf support" off \
+		NLS	"Native Language Support" on
 
 .include <bsd.port.pre.mk>
 
@@ -115,6 +114,15 @@ USE_GNOME+=	gnomevfs2
 CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-gconf
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 2ca032d5652f..9e5bc59bcbd1 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.1.1.tgz) = e9108f71725cf8336f7b965424c285f8
-SHA256 (audacious-1.1.1.tgz) = 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
-SIZE (audacious-1.1.1.tgz) = 3387162
+MD5 (audacious-1.1.2.tgz) = 14aba1f9c42a48afeeb6ce5dcaf180c6
+SHA256 (audacious-1.1.2.tgz) = 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81
+SIZE (audacious-1.1.2.tgz) = 3394364
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 94f44dc48b6a..e306a329003f 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -73,32 +73,32 @@ share/pixmaps/audacious.png
 %%DATADIR%%/images/audioscrobbler.png
 %%DATADIR%%/images/audioscrobbler_badge.png
 %%DATADIR%%/images/connectivity.png
-share/locale/br/LC_MESSAGES/audacious.mo
-share/locale/cs/LC_MESSAGES/audacious.mo
-share/locale/cy/LC_MESSAGES/audacious.mo
-share/locale/de/LC_MESSAGES/audacious.mo
-share/locale/el/LC_MESSAGES/audacious.mo
-share/locale/es/LC_MESSAGES/audacious.mo
-share/locale/fi/LC_MESSAGES/audacious.mo
-share/locale/fr/LC_MESSAGES/audacious.mo
-share/locale/hi/LC_MESSAGES/audacious.mo
-share/locale/hu/LC_MESSAGES/audacious.mo
-share/locale/it/LC_MESSAGES/audacious.mo
-share/locale/ja/LC_MESSAGES/audacious.mo
-share/locale/ka/LC_MESSAGES/audacious.mo
-share/locale/ko/LC_MESSAGES/audacious.mo
-share/locale/lt/LC_MESSAGES/audacious.mo
-share/locale/mk/LC_MESSAGES/audacious.mo
-share/locale/nl/LC_MESSAGES/audacious.mo
-share/locale/pl/LC_MESSAGES/audacious.mo
-share/locale/pt_BR/LC_MESSAGES/audacious.mo
-share/locale/ro/LC_MESSAGES/audacious.mo
-share/locale/ru/LC_MESSAGES/audacious.mo
-share/locale/sk/LC_MESSAGES/audacious.mo
-share/locale/sv/LC_MESSAGES/audacious.mo
-share/locale/uk/LC_MESSAGES/audacious.mo
-share/locale/zh_CN/LC_MESSAGES/audacious.mo
-share/locale/zh_TW/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/br/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/el/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/es/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/Skins/Default
@@ -112,5 +112,5 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm lib/audacious
 @dirrm include/audacious
 @dirrmtry share/applications
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+%%NLS%%@dirrmtry share/locale/br/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/br
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 499547660f2f..0eec645b7363 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://audacious-media-player.org/release/ \
 		${MASTER_SITE_LOCAL}
@@ -24,7 +23,6 @@ LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
 		tag.5:${PORTSDIR}/audio/taglib
 
 USE_GNOME=	gtk20 libglade2
-USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -51,7 +49,8 @@ OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		SID	"Enable sid input" off \
 		MPC	"Enable mpc input" off \
 		ESOUND	"Enable Esound output"  off \
-		GNOME   "Build with gnomevfs/gconf support" off
+		GNOME   "Build with gnomevfs/gconf support" off \
+		NLS	"Native Language Support" on
 
 .include <bsd.port.pre.mk>
 
@@ -115,6 +114,15 @@ USE_GNOME+=	gnomevfs2
 CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-gconf
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 2ca032d5652f..9e5bc59bcbd1 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.1.1.tgz) = e9108f71725cf8336f7b965424c285f8
-SHA256 (audacious-1.1.1.tgz) = 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
-SIZE (audacious-1.1.1.tgz) = 3387162
+MD5 (audacious-1.1.2.tgz) = 14aba1f9c42a48afeeb6ce5dcaf180c6
+SHA256 (audacious-1.1.2.tgz) = 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81
+SIZE (audacious-1.1.2.tgz) = 3394364
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 94f44dc48b6a..e306a329003f 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -73,32 +73,32 @@ share/pixmaps/audacious.png
 %%DATADIR%%/images/audioscrobbler.png
 %%DATADIR%%/images/audioscrobbler_badge.png
 %%DATADIR%%/images/connectivity.png
-share/locale/br/LC_MESSAGES/audacious.mo
-share/locale/cs/LC_MESSAGES/audacious.mo
-share/locale/cy/LC_MESSAGES/audacious.mo
-share/locale/de/LC_MESSAGES/audacious.mo
-share/locale/el/LC_MESSAGES/audacious.mo
-share/locale/es/LC_MESSAGES/audacious.mo
-share/locale/fi/LC_MESSAGES/audacious.mo
-share/locale/fr/LC_MESSAGES/audacious.mo
-share/locale/hi/LC_MESSAGES/audacious.mo
-share/locale/hu/LC_MESSAGES/audacious.mo
-share/locale/it/LC_MESSAGES/audacious.mo
-share/locale/ja/LC_MESSAGES/audacious.mo
-share/locale/ka/LC_MESSAGES/audacious.mo
-share/locale/ko/LC_MESSAGES/audacious.mo
-share/locale/lt/LC_MESSAGES/audacious.mo
-share/locale/mk/LC_MESSAGES/audacious.mo
-share/locale/nl/LC_MESSAGES/audacious.mo
-share/locale/pl/LC_MESSAGES/audacious.mo
-share/locale/pt_BR/LC_MESSAGES/audacious.mo
-share/locale/ro/LC_MESSAGES/audacious.mo
-share/locale/ru/LC_MESSAGES/audacious.mo
-share/locale/sk/LC_MESSAGES/audacious.mo
-share/locale/sv/LC_MESSAGES/audacious.mo
-share/locale/uk/LC_MESSAGES/audacious.mo
-share/locale/zh_CN/LC_MESSAGES/audacious.mo
-share/locale/zh_TW/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/br/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/el/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/es/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/Skins/Default
@@ -112,5 +112,5 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm lib/audacious
 @dirrm include/audacious
 @dirrmtry share/applications
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+%%NLS%%@dirrmtry share/locale/br/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/br