Add "nls" option, defaults to on all systems except MirBSD. MirBSD does not

have gencat, which is needed for nls support.

ok wiz, no reply from maintainer.

3 files changed, 90 insertions, 78 deletions

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 229ceab704e..b10b2da7fbb 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2012/02/06 12:41:48 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2012/04/17 17:13:01 bsiegert Exp $
 #
 
 DISTNAME=	fluxbox-1.1.1
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +21,6 @@ USE_LIBTOOL=	YES
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--enable-shape
-CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-xinerama
 
 .include "options.mk"
@@ -33,7 +32,6 @@ CXXFLAGS+=		-template=no%extdef
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index 2b594a51793..26973444dc4 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/07/07 15:47:59 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/04/17 17:13:01 bsiegert Exp $
 bin/fbrun
 bin/fbsetbg
 bin/fbsetroot
@@ -21,77 +21,77 @@ share/fluxbox/keys
 share/fluxbox/menu
 share/fluxbox/overlay
 share/fluxbox/windowmenu
-share/fluxbox/nls/C/fluxbox.cat
-share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
-share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
-share/fluxbox/nls/bg_BG.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/bg_BG.UTF-8/fluxbox.cat
-share/fluxbox/nls/cs_CZ.ISO-8859-2/fluxbox.cat
-share/fluxbox/nls/cs_CZ.UTF-8/fluxbox.cat
-share/fluxbox/nls/da_DK.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/da_DK.UTF-8/fluxbox.cat
-share/fluxbox/nls/de_AT.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/de_AT.UTF-8/fluxbox.cat
-share/fluxbox/nls/de_CH.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/de_CH.UTF-8/fluxbox.cat
-share/fluxbox/nls/de_DE.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/de_DE.UTF-8/fluxbox.cat
-share/fluxbox/nls/el_GR.UTF-8/fluxbox.cat
-share/fluxbox/nls/en_GB.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/en_GB.UTF-8/fluxbox.cat
-share/fluxbox/nls/en_US.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/en_US.UTF-8/fluxbox.cat
-share/fluxbox/nls/es_AR.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/es_AR.UTF-8/fluxbox.cat
-share/fluxbox/nls/es_ES.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/es_ES.UTF-8/fluxbox.cat
-share/fluxbox/nls/et_EE.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/et_EE.UTF-8/fluxbox.cat
-share/fluxbox/nls/fi_FI.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/fi_FI.UTF-8/fluxbox.cat
-share/fluxbox/nls/fr_CH.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/fr_CH.UTF-8/fluxbox.cat
-share/fluxbox/nls/fr_FR.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/fr_FR.UTF-8/fluxbox.cat
-share/fluxbox/nls/it_IT.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/it_IT.UTF-8/fluxbox.cat
-share/fluxbox/nls/ja_JP.UTF-8/fluxbox.cat
-share/fluxbox/nls/ja_JP.eucJP/fluxbox.cat
-share/fluxbox/nls/ko_KR.EUC-KR/fluxbox.cat
-share/fluxbox/nls/ko_KR.UTF-8/fluxbox.cat
-share/fluxbox/nls/lv_LV.ISO-8859-13/fluxbox.cat
-share/fluxbox/nls/lv_LV.UTF-8/fluxbox.cat
-share/fluxbox/nls/mk_MK.UTF-8/fluxbox.cat
-share/fluxbox/nls/nb_NO.UTF-8/fluxbox.cat
-share/fluxbox/nls/nl_NL.ISO-8859-15/fluxbox.cat
-share/fluxbox/nls/nl_NL.UTF-8/fluxbox.cat
-share/fluxbox/nls/no_NO.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/no_NO.UTF-8/fluxbox.cat
-share/fluxbox/nls/pl_PL.ISO-8859-2/fluxbox.cat
-share/fluxbox/nls/pl_PL.UTF-8/fluxbox.cat
-share/fluxbox/nls/pt_BR.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/pt_BR.UTF-8/fluxbox.cat
-share/fluxbox/nls/pt_PT.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/pt_PT.UTF-8/fluxbox.cat
-share/fluxbox/nls/ru_RU.KOI8-R/fluxbox.cat
-share/fluxbox/nls/ru_RU.UTF-8/fluxbox.cat
-share/fluxbox/nls/sk_SK.ISO-8859-2/fluxbox.cat
-share/fluxbox/nls/sk_SK.UTF-8/fluxbox.cat
-share/fluxbox/nls/sl_SI.ISO-8859-2/fluxbox.cat
-share/fluxbox/nls/sl_SI.UTF-8/fluxbox.cat
-share/fluxbox/nls/sv_SE.ISO-8859-1/fluxbox.cat
-share/fluxbox/nls/sv_SE.UTF-8/fluxbox.cat
-share/fluxbox/nls/tr_TR.ISO-8859-9/fluxbox.cat
-share/fluxbox/nls/tr_TR.UTF-8/fluxbox.cat
-share/fluxbox/nls/uk_UA.KOI8-U/fluxbox.cat
-share/fluxbox/nls/uk_UA.UTF-8/fluxbox.cat
-share/fluxbox/nls/vi_VN.UTF-8/fluxbox.cat
-share/fluxbox/nls/zh_CN.BIG5/fluxbox.cat
-share/fluxbox/nls/zh_CN.GB18030/fluxbox.cat
-share/fluxbox/nls/zh_CN.GB2312/fluxbox.cat
-share/fluxbox/nls/zh_CN.GBK/fluxbox.cat
-share/fluxbox/nls/zh_CN.UTF-8/fluxbox.cat
-share/fluxbox/nls/zh_TW.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/C/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/bg_BG.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/bg_BG.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/cs_CZ.ISO-8859-2/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/cs_CZ.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/da_DK.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/da_DK.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/de_AT.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/de_AT.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/de_CH.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/de_CH.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/de_DE.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/de_DE.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/el_GR.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/en_GB.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/en_GB.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/en_US.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/en_US.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/es_AR.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/es_AR.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/es_ES.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/es_ES.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/et_EE.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/et_EE.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/fi_FI.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/fi_FI.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/fr_CH.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/fr_CH.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/fr_FR.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/fr_FR.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/it_IT.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/it_IT.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/ja_JP.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/ja_JP.eucJP/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/ko_KR.EUC-KR/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/ko_KR.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/lv_LV.ISO-8859-13/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/lv_LV.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/mk_MK.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/nb_NO.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/nl_NL.ISO-8859-15/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/nl_NL.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/no_NO.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/no_NO.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/pl_PL.ISO-8859-2/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/pl_PL.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/pt_BR.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/pt_BR.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/pt_PT.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/pt_PT.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/ru_RU.KOI8-R/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/ru_RU.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/sk_SK.ISO-8859-2/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/sk_SK.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/sl_SI.ISO-8859-2/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/sl_SI.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/sv_SE.ISO-8859-1/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/sv_SE.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/tr_TR.ISO-8859-9/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/tr_TR.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/uk_UA.KOI8-U/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/uk_UA.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/vi_VN.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/zh_CN.BIG5/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/zh_CN.GB18030/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/zh_CN.GB2312/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/zh_CN.GBK/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/zh_CN.UTF-8/fluxbox.cat
+${PLIST.nls}share/fluxbox/nls/zh_TW.UTF-8/fluxbox.cat
 share/fluxbox/styles/Artwiz
 share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
 share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
diff --git a/wm/fluxbox/options.mk b/wm/fluxbox/options.mk
index edf505a24e6..55832f1c683 100644
--- a/wm/fluxbox/options.mk
+++ b/wm/fluxbox/options.mk
@@ -1,11 +1,17 @@
-# $NetBSD: options.mk,v 1.5 2007/01/15 17:41:28 tonio Exp $
+# $NetBSD: options.mk,v 1.6 2012/04/17 17:13:01 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fluxbox
-PKG_SUPPORTED_OPTIONS=	gnome kde imlib2 xft xrender
+PKG_SUPPORTED_OPTIONS=	gnome kde imlib2 xft xrender nls
 PKG_SUGGESTED_OPTIONS=	xrender
 
 .include "../../mk/bsd.options.mk"
 
+.if ${OPSYS} != "MirBSD"
+PKG_SUGGESTED_OPTIONS+=	nls
+.endif
+
+PLIST_VARS+=		nls
+
 .if !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=	--enable-gnome
 .else
@@ -38,3 +44,11 @@ CONFIGURE_ARGS+=	--enable-xrender
 .else
 CONFIGURE_ARGS+=	--disable-xrender
 .endif
+
+.if !empty(PKG_OPTIONS:Mnls)
+CONFIGURE_ARGS+=	--enable-nls
+.include "../../converters/libiconv/buildlink3.mk"
+PLIST.nls=		Yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif