- Add LICENSE [1]

- Remove the indefinite article from COMMENT [1,2]
- Trim docs, use proper PORTDOCS= [1]
- Add SYSTRAY Option [1]
- Makefile cleanup [1]
- Trim pkg-plist, remove PORTDOCS [1]
- Introduce a new option PDFDOCS (rather then PDF) [2]
- Sort options *_DESC [2]

PR:		ports/179170 [1], ports/179344 [2]
Submitted by:	nemysis <nemysis@gmx.ch> [1], bsam [2]

2 files changed, 277 insertions, 274 deletions

diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index d3350ecb2e7d..5bb2fb7d1dc6 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -9,7 +9,9 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	beat@FreeBSD.org
-COMMENT=	A small and fast window manager based on BlackBox
+COMMENT=	Small and fast window manager based on BlackBox
+
+LICENSE=	MIT
 
 RUN_DEPENDS=	xmessage:${PORTSDIR}/x11/xmessage
 
@@ -18,21 +20,23 @@ USE_GMAKE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
-DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
+PORTDOCS=		AUTHORS ChangeLog NEWS README TODO
 MAN1=		fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 \
 		startfluxbox.1 fluxbox-remote.1
 MAN5=		fluxbox-apps.5 fluxbox-keys.5 fluxbox-menu.5 \
 		fluxbox-style.5
 DOCSVERSION=	20060629
 
-OPTIONS_DEFINE=	DOCS DOCHTML PDF DEBUG GNOME IMLIB2 XINERAMA \
-		XRENDER NLS SLIT REMEMBER TOOLBAR
-OPTIONS_DEFAULT=	XRENDER SLIT REMEMBER TOOLBAR
+OPTIONS_DEFINE=	DOCS DOCHTML PDFDOCS DEBUG GNOME IMLIB2 XINERAMA \
+		XRENDER NLS SLIT SYSTRAY REMEMBER TOOLBAR
+OPTIONS_DEFAULT=	XRENDER SLIT SYSTRAY REMEMBER TOOLBAR
 DOCHTML_DESC=	Install html documentation
-XRENDER_DESC=	Enable xrender support
-SLIT_DESC=	Enable slit feature
+PDFDOCS_DESC=	Build and install PDF documentation
 REMEMBER_DESC=	Enable remember feature
+SLIT_DESC=	Enable slit feature
+SYSTRAY_DESC=	Enable systray feature
 TOOLBAR_DESC=	Enable toolbar feature
+XRENDER_DESC=	Enable xrender support
 
 .include <bsd.port.options.mk>
 
@@ -46,19 +50,19 @@ MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \
 			http://people.freebsd.org/~mezz/distfiles/:html
 DISTFILES+=		fb-doc-mfhtml-${DOCSVERSION}.tgz:html
 EXTRACT_ONLY+=		fb-doc-mfhtml-${DOCSVERSION}.tgz
-PLIST_SUB+=		DOCHTML:=""
+PLIST_SUB+=		DOCHTML=""
 .else
-PLIST_SUB+=		DOCHTML:="@comment "
+PLIST_SUB+=		DOCHTML="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MPDF}
+.if ${PORT_OPTIONS:MPDFDOCS}
 # http://fluxbox.org/docbook/en/pdf/
 MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \
 			http://people.freebsd.org/~mezz/distfiles/:pdf
 DISTFILES+=		fluxbook-${DOCSVERSION}.pdf:pdf
-PLIST_SUB+=		DOCPDF:=""
+PLIST_SUB+=		DOCPDF=""
 .else
-PLIST_SUB+=		DOCPDF:="@comment "
+PLIST_SUB+=		DOCPDF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIMLIB2}
@@ -78,12 +82,12 @@ USES+=			iconv
 CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib -liconv"
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS:=""
+PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS:="@comment "
+PLIST_SUB+=		NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MREMEMBER}
@@ -98,6 +102,12 @@ CONFIGURE_ARGS+=	--enable-slit
 CONFIGURE_ARGS+=	--disable-slit
 .endif
 
+.if ${PORT_OPTIONS:MSYSTRAY}
+CONFIGURE_ARGS+=	--enable-systray
+.else
+CONFIGURE_ARGS+=	--disable-systray
+.endif
+
 .if ${PORT_OPTIONS:MTOOLBAR}
 CONFIGURE_ARGS+=	--enable-toolbar
 .else
@@ -121,10 +131,9 @@ CONFIGURE_ARGS+=	--disable-gnome
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/util/fluxbox-generate_menu.in
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/util/fbsetbg
-.if empty(PORT_OPTIONS:MNLS)
+		${WRKSRC}/util/fluxbox-generate_menu.in ${WRKSRC}/util/fbsetbg
+
+.if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \
 		${WRKSRC}/configure
 .endif
@@ -132,19 +141,20 @@ post-patch:
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
-.if ${PORT_OPTIONS:MPDF}
+
+.if ${PORT_OPTIONS:MPDFDOCS}
 	@${MKDIR} ${DOCSDIR}/pdf
-	@${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \
+	${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \
 		${DOCSDIR}/pdf/
 .endif
+
 .if ${PORT_OPTIONS:MDOCHTML}
 	@${MKDIR} ${DOCSDIR}/html
-	@${INSTALL_DATA} ${WRKDIR}/html/*.css ${DOCSDIR}/html/
-	@${INSTALL_DATA} ${WRKDIR}/html/*.html ${DOCSDIR}/html/
+. for h in *.css *.html
+	(cd ${WRKDIR}/html && ${INSTALL_DATA} ${h} ${DOCSDIR}/html)
+. endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist
index 3a483390b192..15ca2e1fe81a 100644
--- a/x11-wm/fluxbox/pkg-plist
+++ b/x11-wm/fluxbox/pkg-plist
@@ -6,183 +6,177 @@ bin/fluxbox-generate_menu
 bin/fluxbox-remote
 bin/fluxbox-update_configs
 bin/startfluxbox
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%DOCHTML:%%%%DOCSDIR%%/html/app-artwiz.html
-%%DOCHTML:%%%%DOCSDIR%%/html/app-debugging.html
-%%DOCHTML:%%%%DOCSDIR%%/html/app-setup.html
-%%DOCHTML:%%%%DOCSDIR%%/html/app-themeref.html
-%%DOCHTML:%%%%DOCSDIR%%/html/book1.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c151.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c152.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c153.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c155.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c157.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c158.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c160.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c161.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c28.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c288.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c289.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c290.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c292.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c294.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c295.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c297.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c298.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c731.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c732.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c733.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c735.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c737.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c738.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c740.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c741.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c96.html
-%%DOCHTML:%%%%DOCSDIR%%/html/c98.html
-%%DOCHTML:%%%%DOCSDIR%%/html/chap-bg.html
-%%DOCHTML:%%%%DOCSDIR%%/html/chap-slit.html
-%%DOCHTML:%%%%DOCSDIR%%/html/chap-tabs.html
-%%DOCHTML:%%%%DOCSDIR%%/html/chap-themes.html
-%%DOCHTML:%%%%DOCSDIR%%/html/chap-toolbar.html
-%%DOCHTML:%%%%DOCSDIR%%/html/docbook.css
-%%DOCHTML:%%%%DOCSDIR%%/html/faq.html
-%%DOCHTML:%%%%DOCSDIR%%/html/index.html
-%%DOCHTML:%%%%DOCSDIR%%/html/sect-fbgm.html
-%%DOCHTML:%%%%DOCSDIR%%/html/sect-fluxspace.html
-%%DOCHTML:%%%%DOCSDIR%%/html/sect-pager.html
-%%DOCHTML:%%%%DOCSDIR%%/html/sect-wmctrl.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x148.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x159.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x160.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x161.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x163.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x165.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x166.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x168.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x169.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x232.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x233.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x234.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x236.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x238.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x239.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x241.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x242.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x320.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x321.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x322.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x324.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x326.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x327.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x329.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x330.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x351.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x352.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x353.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x355.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x357.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x358.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x360.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x361.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x47.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x748.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x749.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x750.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x752.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x754.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x755.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x757.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x758.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x827.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x828.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x829.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x831.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x833.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x834.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x836.html
-%%DOCHTML:%%%%DOCSDIR%%/html/x837.html
-%%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook-20060629.pdf
+%%DOCHTML%%%%DOCSDIR%%/html/app-artwiz.html
+%%DOCHTML%%%%DOCSDIR%%/html/app-debugging.html
+%%DOCHTML%%%%DOCSDIR%%/html/app-setup.html
+%%DOCHTML%%%%DOCSDIR%%/html/app-themeref.html
+%%DOCHTML%%%%DOCSDIR%%/html/book1.html
+%%DOCHTML%%%%DOCSDIR%%/html/c151.html
+%%DOCHTML%%%%DOCSDIR%%/html/c152.html
+%%DOCHTML%%%%DOCSDIR%%/html/c153.html
+%%DOCHTML%%%%DOCSDIR%%/html/c155.html
+%%DOCHTML%%%%DOCSDIR%%/html/c157.html
+%%DOCHTML%%%%DOCSDIR%%/html/c158.html
+%%DOCHTML%%%%DOCSDIR%%/html/c160.html
+%%DOCHTML%%%%DOCSDIR%%/html/c161.html
+%%DOCHTML%%%%DOCSDIR%%/html/c28.html
+%%DOCHTML%%%%DOCSDIR%%/html/c288.html
+%%DOCHTML%%%%DOCSDIR%%/html/c289.html
+%%DOCHTML%%%%DOCSDIR%%/html/c290.html
+%%DOCHTML%%%%DOCSDIR%%/html/c292.html
+%%DOCHTML%%%%DOCSDIR%%/html/c294.html
+%%DOCHTML%%%%DOCSDIR%%/html/c295.html
+%%DOCHTML%%%%DOCSDIR%%/html/c297.html
+%%DOCHTML%%%%DOCSDIR%%/html/c298.html
+%%DOCHTML%%%%DOCSDIR%%/html/c731.html
+%%DOCHTML%%%%DOCSDIR%%/html/c732.html
+%%DOCHTML%%%%DOCSDIR%%/html/c733.html
+%%DOCHTML%%%%DOCSDIR%%/html/c735.html
+%%DOCHTML%%%%DOCSDIR%%/html/c737.html
+%%DOCHTML%%%%DOCSDIR%%/html/c738.html
+%%DOCHTML%%%%DOCSDIR%%/html/c740.html
+%%DOCHTML%%%%DOCSDIR%%/html/c741.html
+%%DOCHTML%%%%DOCSDIR%%/html/c96.html
+%%DOCHTML%%%%DOCSDIR%%/html/c98.html
+%%DOCHTML%%%%DOCSDIR%%/html/chap-bg.html
+%%DOCHTML%%%%DOCSDIR%%/html/chap-slit.html
+%%DOCHTML%%%%DOCSDIR%%/html/chap-tabs.html
+%%DOCHTML%%%%DOCSDIR%%/html/chap-themes.html
+%%DOCHTML%%%%DOCSDIR%%/html/chap-toolbar.html
+%%DOCHTML%%%%DOCSDIR%%/html/docbook.css
+%%DOCHTML%%%%DOCSDIR%%/html/faq.html
+%%DOCHTML%%%%DOCSDIR%%/html/index.html
+%%DOCHTML%%%%DOCSDIR%%/html/sect-fbgm.html
+%%DOCHTML%%%%DOCSDIR%%/html/sect-fluxspace.html
+%%DOCHTML%%%%DOCSDIR%%/html/sect-pager.html
+%%DOCHTML%%%%DOCSDIR%%/html/sect-wmctrl.html
+%%DOCHTML%%%%DOCSDIR%%/html/x148.html
+%%DOCHTML%%%%DOCSDIR%%/html/x159.html
+%%DOCHTML%%%%DOCSDIR%%/html/x160.html
+%%DOCHTML%%%%DOCSDIR%%/html/x161.html
+%%DOCHTML%%%%DOCSDIR%%/html/x163.html
+%%DOCHTML%%%%DOCSDIR%%/html/x165.html
+%%DOCHTML%%%%DOCSDIR%%/html/x166.html
+%%DOCHTML%%%%DOCSDIR%%/html/x168.html
+%%DOCHTML%%%%DOCSDIR%%/html/x169.html
+%%DOCHTML%%%%DOCSDIR%%/html/x232.html
+%%DOCHTML%%%%DOCSDIR%%/html/x233.html
+%%DOCHTML%%%%DOCSDIR%%/html/x234.html
+%%DOCHTML%%%%DOCSDIR%%/html/x236.html
+%%DOCHTML%%%%DOCSDIR%%/html/x238.html
+%%DOCHTML%%%%DOCSDIR%%/html/x239.html
+%%DOCHTML%%%%DOCSDIR%%/html/x241.html
+%%DOCHTML%%%%DOCSDIR%%/html/x242.html
+%%DOCHTML%%%%DOCSDIR%%/html/x320.html
+%%DOCHTML%%%%DOCSDIR%%/html/x321.html
+%%DOCHTML%%%%DOCSDIR%%/html/x322.html
+%%DOCHTML%%%%DOCSDIR%%/html/x324.html
+%%DOCHTML%%%%DOCSDIR%%/html/x326.html
+%%DOCHTML%%%%DOCSDIR%%/html/x327.html
+%%DOCHTML%%%%DOCSDIR%%/html/x329.html
+%%DOCHTML%%%%DOCSDIR%%/html/x330.html
+%%DOCHTML%%%%DOCSDIR%%/html/x351.html
+%%DOCHTML%%%%DOCSDIR%%/html/x352.html
+%%DOCHTML%%%%DOCSDIR%%/html/x353.html
+%%DOCHTML%%%%DOCSDIR%%/html/x355.html
+%%DOCHTML%%%%DOCSDIR%%/html/x357.html
+%%DOCHTML%%%%DOCSDIR%%/html/x358.html
+%%DOCHTML%%%%DOCSDIR%%/html/x360.html
+%%DOCHTML%%%%DOCSDIR%%/html/x361.html
+%%DOCHTML%%%%DOCSDIR%%/html/x47.html
+%%DOCHTML%%%%DOCSDIR%%/html/x748.html
+%%DOCHTML%%%%DOCSDIR%%/html/x749.html
+%%DOCHTML%%%%DOCSDIR%%/html/x750.html
+%%DOCHTML%%%%DOCSDIR%%/html/x752.html
+%%DOCHTML%%%%DOCSDIR%%/html/x754.html
+%%DOCHTML%%%%DOCSDIR%%/html/x755.html
+%%DOCHTML%%%%DOCSDIR%%/html/x757.html
+%%DOCHTML%%%%DOCSDIR%%/html/x758.html
+%%DOCHTML%%%%DOCSDIR%%/html/x827.html
+%%DOCHTML%%%%DOCSDIR%%/html/x828.html
+%%DOCHTML%%%%DOCSDIR%%/html/x829.html
+%%DOCHTML%%%%DOCSDIR%%/html/x831.html
+%%DOCHTML%%%%DOCSDIR%%/html/x833.html
+%%DOCHTML%%%%DOCSDIR%%/html/x834.html
+%%DOCHTML%%%%DOCSDIR%%/html/x836.html
+%%DOCHTML%%%%DOCSDIR%%/html/x837.html
+%%DOCPDF%%%%DOCSDIR%%/pdf/fluxbook-20060629.pdf
 %%DATADIR%%/apps
 %%DATADIR%%/init
 %%DATADIR%%/keys
 %%DATADIR%%/menu
-%%NLS:%%%%DATADIR%%/nls/C/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/be_BY.CP1251/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/be_BY.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/bg_BG.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/bg_BG.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/cs_CZ.ISO-8859-2/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/cs_CZ.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/da_DK.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/da_DK.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/de_AT.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/de_AT.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/de_CH.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/de_CH.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/de_DE.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/de_DE.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/el_GR.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/en_GB.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/en_GB.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/en_US.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/en_US.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/es_AR.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/es_AR.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/es_ES.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/es_ES.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/et_EE.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/et_EE.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/fi_FI.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/fi_FI.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/fr_CH.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/fr_CH.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/fr_FR.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/fr_FR.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/he_IL.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/it_IT.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/it_IT.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/ja_JP.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/ja_JP.eucJP/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/ko_KR.EUC-KR/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/ko_KR.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/lv_LV.ISO-8859-13/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/lv_LV.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/mk_MK.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/nb_NO.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/nl_NL.ISO-8859-15/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/nl_NL.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/no_NO.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/no_NO.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/pl_PL.ISO-8859-2/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/pl_PL.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/pt_BR.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/pt_BR.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/pt_PT.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/pt_PT.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/ru_RU.KOI8-R/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/ru_RU.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/sk_SK.ISO-8859-2/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/sk_SK.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/sl_SI.ISO-8859-2/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/sl_SI.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/sv_SE.ISO-8859-1/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/sv_SE.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/tr_TR.ISO-8859-9/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/tr_TR.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/uk_UA.KOI8-U/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/uk_UA.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/vi_VN.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/zh_CN.BIG5/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/zh_CN.GB18030/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/zh_CN.GB2312/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/zh_CN.GBK/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/zh_CN.UTF-8/fluxbox.cat
-%%NLS:%%%%DATADIR%%/nls/zh_TW.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/C/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/be_BY.CP1251/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/be_BY.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/bg_BG.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/bg_BG.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/cs_CZ.ISO-8859-2/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/cs_CZ.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/da_DK.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/da_DK.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/de_AT.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/de_AT.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/de_CH.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/de_CH.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/de_DE.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/de_DE.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/el_GR.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/en_GB.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/en_GB.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/en_US.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/en_US.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/es_AR.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/es_AR.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/es_ES.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/es_ES.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/et_EE.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/et_EE.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/fi_FI.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/fi_FI.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/fr_CH.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/fr_CH.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/fr_FR.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/fr_FR.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/he_IL.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/it_IT.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/it_IT.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/ja_JP.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/ja_JP.eucJP/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/ko_KR.EUC-KR/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/ko_KR.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/lv_LV.ISO-8859-13/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/lv_LV.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/mk_MK.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/nb_NO.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/nl_NL.ISO-8859-15/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/nl_NL.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/no_NO.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/no_NO.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/pl_PL.ISO-8859-2/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/pl_PL.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/pt_BR.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/pt_BR.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/pt_PT.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/pt_PT.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/ru_RU.KOI8-R/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/ru_RU.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/sk_SK.ISO-8859-2/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/sk_SK.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/sl_SI.ISO-8859-2/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/sl_SI.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/sv_SE.ISO-8859-1/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/sv_SE.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/tr_TR.ISO-8859-9/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/tr_TR.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/uk_UA.KOI8-U/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/uk_UA.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/vi_VN.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/zh_CN.BIG5/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/zh_CN.GB18030/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/zh_CN.GB2312/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/zh_CN.GBK/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/zh_CN.UTF-8/fluxbox.cat
+%%NLS%%%%DATADIR%%/nls/zh_TW.UTF-8/fluxbox.cat
 %%DATADIR%%/overlay
 %%DATADIR%%/styles/Artwiz
 %%DATADIR%%/styles/BlueFlux/pixmaps/button_close_active.xpm
@@ -330,80 +324,79 @@ bin/startfluxbox
 @dirrm %%DATADIR%%/styles/BlueFlux/pixmaps
 @dirrm %%DATADIR%%/styles/BlueFlux
 @dirrm %%DATADIR%%/styles
-%%NLS:%%@dirrm %%DATADIR%%/nls/zh_TW.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GBK
-%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GB2312
-%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.GB18030
-%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.BIG5
-%%NLS:%%@dirrm %%DATADIR%%/nls/vi_VN.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/uk_UA.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/uk_UA.KOI8-U
-%%NLS:%%@dirrm %%DATADIR%%/nls/tr_TR.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/tr_TR.ISO-8859-9
-%%NLS:%%@dirrm %%DATADIR%%/nls/sv_SE.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/sv_SE.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/sl_SI.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/sl_SI.ISO-8859-2
-%%NLS:%%@dirrm %%DATADIR%%/nls/sk_SK.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/sk_SK.ISO-8859-2
-%%NLS:%%@dirrm %%DATADIR%%/nls/ru_RU.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/ru_RU.KOI8-R
-%%NLS:%%@dirrm %%DATADIR%%/nls/pt_PT.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/pt_PT.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/pt_BR.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/pt_BR.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/pl_PL.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/pl_PL.ISO-8859-2
-%%NLS:%%@dirrm %%DATADIR%%/nls/no_NO.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/no_NO.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/nl_NL.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/nl_NL.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/nb_NO.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/mk_MK.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/lv_LV.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/lv_LV.ISO-8859-13
-%%NLS:%%@dirrm %%DATADIR%%/nls/ko_KR.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/ko_KR.EUC-KR
-%%NLS:%%@dirrm %%DATADIR%%/nls/ja_JP.eucJP
-%%NLS:%%@dirrm %%DATADIR%%/nls/ja_JP.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/it_IT.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/it_IT.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/he_IL.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/fr_FR.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/fr_FR.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/fr_CH.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/fr_CH.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/fi_FI.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/fi_FI.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/et_EE.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/et_EE.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/es_ES.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/es_ES.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/es_AR.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/es_AR.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/en_US.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/en_US.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/en_GB.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/en_GB.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/el_GR.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/de_DE.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/de_DE.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/de_CH.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/de_CH.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/de_AT.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/de_AT.ISO-8859-15
-%%NLS:%%@dirrm %%DATADIR%%/nls/da_DK.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/da_DK.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/cs_CZ.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/cs_CZ.ISO-8859-2
-%%NLS:%%@dirrm %%DATADIR%%/nls/bg_BG.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/bg_BG.ISO-8859-1
-%%NLS:%%@dirrm %%DATADIR%%/nls/be_BY.UTF-8
-%%NLS:%%@dirrm %%DATADIR%%/nls/be_BY.CP1251
-%%NLS:%%@dirrm %%DATADIR%%/nls/C
-%%NLS:%%@dirrm %%DATADIR%%/nls
+%%NLS%%@dirrm %%DATADIR%%/nls/zh_TW.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/zh_CN.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/zh_CN.GBK
+%%NLS%%@dirrm %%DATADIR%%/nls/zh_CN.GB2312
+%%NLS%%@dirrm %%DATADIR%%/nls/zh_CN.GB18030
+%%NLS%%@dirrm %%DATADIR%%/nls/zh_CN.BIG5
+%%NLS%%@dirrm %%DATADIR%%/nls/vi_VN.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/uk_UA.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/uk_UA.KOI8-U
+%%NLS%%@dirrm %%DATADIR%%/nls/tr_TR.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/tr_TR.ISO-8859-9
+%%NLS%%@dirrm %%DATADIR%%/nls/sv_SE.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/sv_SE.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/sl_SI.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/sl_SI.ISO-8859-2
+%%NLS%%@dirrm %%DATADIR%%/nls/sk_SK.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/sk_SK.ISO-8859-2
+%%NLS%%@dirrm %%DATADIR%%/nls/ru_RU.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/ru_RU.KOI8-R
+%%NLS%%@dirrm %%DATADIR%%/nls/pt_PT.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/pt_PT.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/pt_BR.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/pt_BR.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/pl_PL.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/pl_PL.ISO-8859-2
+%%NLS%%@dirrm %%DATADIR%%/nls/no_NO.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/no_NO.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/nl_NL.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/nl_NL.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/nb_NO.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/mk_MK.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/lv_LV.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/lv_LV.ISO-8859-13
+%%NLS%%@dirrm %%DATADIR%%/nls/ko_KR.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/ko_KR.EUC-KR
+%%NLS%%@dirrm %%DATADIR%%/nls/ja_JP.eucJP
+%%NLS%%@dirrm %%DATADIR%%/nls/ja_JP.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/it_IT.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/it_IT.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/he_IL.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/fr_FR.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/fr_FR.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/fr_CH.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/fr_CH.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/fi_FI.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/fi_FI.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/et_EE.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/et_EE.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/es_ES.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/es_ES.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/es_AR.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/es_AR.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/en_US.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/en_US.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/en_GB.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/en_GB.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/el_GR.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/de_DE.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/de_DE.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/de_CH.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/de_CH.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/de_AT.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/de_AT.ISO-8859-15
+%%NLS%%@dirrm %%DATADIR%%/nls/da_DK.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/da_DK.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/cs_CZ.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/cs_CZ.ISO-8859-2
+%%NLS%%@dirrm %%DATADIR%%/nls/bg_BG.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/bg_BG.ISO-8859-1
+%%NLS%%@dirrm %%DATADIR%%/nls/be_BY.UTF-8
+%%NLS%%@dirrm %%DATADIR%%/nls/be_BY.CP1251
+%%NLS%%@dirrm %%DATADIR%%/nls/C
+%%NLS%%@dirrm %%DATADIR%%/nls
 @dirrm %%DATADIR%%
-%%DOCPDF:%%@dirrm %%DOCSDIR%%/pdf
-%%DOCHTML:%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DOCPDF%%@dirrm %%DOCSDIR%%/pdf
+%%DOCHTML%%@dirrm %%DOCSDIR%%/html