Update to 0.9.12, see more detail:

	http://fluxbox.org/version-0.9.php

4 files changed, 139 insertions, 124 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index a47249b420ee..fddf902d2100 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.9.11
+PORTVERSION=	0.9.12
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
@@ -22,6 +22,7 @@ RUN_DEPENDS=	bsetroot:${PORTSDIR}/x11-wm/boxtools
 
 CONFLICTS=	fluxbox-0.1.*
 
+USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
@@ -52,6 +53,13 @@ PLIST_SUB+=		DOCPDF:=""
 PLIST_SUB+=		DOCPDF:="@comment "
 .endif
 
+.if defined(WITH_IMLIB2)
+LIB_DEPENDS+=		Imlib2.2:${PORTSDIR}/graphics/imlib2
+CONFIGURE_ARGS+=	--enable-imlib2
+.else
+CONFIGURE_ARGS+=	--disable-imlib2
+.endif
+
 .if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-kde
 .else
@@ -111,6 +119,9 @@ pre-everything::
 .if !defined(WITH_GNOME)
 	@${ECHO_CMD} "WITH_GNOME=yes		Enable GNOME support"
 .endif
+.if !defined(WITH_IMLIB2)
+	@${ECHO_CMD} "WITH_IMLIB2=yes		Enable Imlib2 (pixmap themes) support"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO_CMD} "WITH_KDE=yes		Enable KDE slit support"
 .endif
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index bdbe7d141714..c738c7a70bbc 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (fluxbox-0.9.11.tar.gz) = 453e9170a6ab0a4df91ffaccd1604465
-SIZE (fluxbox-0.9.11.tar.gz) = 851770
+MD5 (fluxbox-0.9.12.tar.gz) = e4e6821d9e7a4b3f64c0d8069dbff8b8
+SIZE (fluxbox-0.9.12.tar.gz) = 871825
 MD5 (fb-doc-mfhtml.tgz) = e081dcea99483b538be9465cf3ab14c3
 SIZE (fb-doc-mfhtml.tgz) = 70736
 MD5 (fluxbook.pdf) = bcf3cb99a7d5b9ef16181d29d99a189b
diff --git a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
index 05f5c633280c..b22759c2398f 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
+++ b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
@@ -1,5 +1,5 @@
---- util/fluxbox-generate_menu.in.orig	Mon Dec  6 18:33:02 2004
-+++ util/fluxbox-generate_menu.in	Mon Dec  6 18:43:47 2004
+--- util/fluxbox-generate_menu.in.orig	Mon Jan 17 19:06:02 2005
++++ util/fluxbox-generate_menu.in	Mon Jan 17 19:19:37 2005
 @@ -45,7 +45,7 @@
  
  
@@ -7,9 +7,9 @@
 -[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
 +[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:%%LOCALBASE%%/bin:%%X11BASE%%/bin
  
- # Functions
- display_usage() {
-@@ -78,8 +78,8 @@
+ # Check for Imlib2-support
+ if ( fluxbox -info 2> /dev/null | grep -- -IMLIB ); then
+@@ -85,8 +85,8 @@
  
    Only for packagers:
  
@@ -20,7 +20,7 @@
      -q  KDE-prefix; idem dito
  
  
-@@ -109,7 +109,7 @@
+@@ -116,7 +116,7 @@
  case `uname` in
      Linux|*BSD)
          find_it() {
@@ -29,7 +29,7 @@
          }
  
          find_it_options() {
-@@ -802,19 +802,19 @@
+@@ -825,19 +825,19 @@
  # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
  
  # --- PREFIX'es
@@ -56,7 +56,7 @@
  
  
  # --- Boolean variables.
-@@ -939,7 +939,7 @@
+@@ -962,7 +962,7 @@
  
  
  # gnome prefix
@@ -65,7 +65,7 @@
      if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
          break;
      fi
-@@ -947,7 +947,7 @@
+@@ -970,7 +970,7 @@
  # Will remain $PREFIX if all else fails
  
  # kde prefix
@@ -74,7 +74,7 @@
      if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
          break;
      fi
-@@ -992,7 +992,7 @@
+@@ -1015,7 +1015,7 @@
  else
      [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
      #The precise order is up for debate.
@@ -83,7 +83,7 @@
          if find_it $browser; then
              DEFAULT_BROWSER=$browser
              break
-@@ -1032,7 +1032,8 @@
+@@ -1055,7 +1055,8 @@
      links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
      firefox|firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
      konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
@@ -93,7 +93,7 @@
      MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
      MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
      *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
-@@ -1050,7 +1051,8 @@
+@@ -1073,7 +1074,8 @@
      append_submenu "${BROWSERMENU}"
          normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape
          find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
@@ -103,11 +103,11 @@
          find_it konqueror   append "[exec]   (konqueror) {kfmclient openProfile webbrowsing}"
          find_it links       append "[exec]   (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
          find_it w3m         append "[exec]   (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}"
-@@ -1210,7 +1212,6 @@
+@@ -1241,7 +1243,6 @@
  
      append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
          append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
--	append "[stylesdir] (/usr/share/commonbox/styles/)"
+-        append "[stylesdir] (/usr/share/commonbox/styles/)"
      append_menu_end
  
      append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index 9fcb4c6d2f67..3e16b9a39004 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -59,113 +59,117 @@ bin/startfluxbox
 %%DOCHTML:%%%%DOCSDIR%%/html/x817.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x820.html
 %%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook.pdf
-share/fluxbox/init
-share/fluxbox/keys
-share/fluxbox/menu
-%%NLS:%%share/fluxbox/nls/C/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/bg_BG/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/da_DK/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/de_DE/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/es_ES/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/et_EE/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/fr_FR/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/it_IT/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/ja_JP/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/lv_LV/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/nl_NL/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/pl_PL/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/pt_BR/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/pt_PT/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/ru_RU/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/sl_SI/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/sv_SE/fluxbox.cat
-%%NLS:%%share/fluxbox/nls/tr_TR/fluxbox.cat
-share/fluxbox/styles/Artwiz
-share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_close_unfocus.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_max_active.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_max_pressed.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_max_unfocus.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_min_active.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_min_pressed.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_min_unfocus.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_stick_active.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_stick_pressed.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_stuck.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_toolbar.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/menu_frame.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/title_bar.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/toolbar.xpm
-share/fluxbox/styles/BlueFlux/pixmaps/toolbar_label.xpm
-share/fluxbox/styles/BlueFlux/theme.cfg
-share/fluxbox/styles/BlueNight
-share/fluxbox/styles/Carbondioxide
-share/fluxbox/styles/Clean
-share/fluxbox/styles/Cthulhain
-share/fluxbox/styles/Emerge/pixmaps/bullet.xpm
-share/fluxbox/styles/Emerge/pixmaps/close-pressed.xpm
-share/fluxbox/styles/Emerge/pixmaps/close-unfocus.xpm
-share/fluxbox/styles/Emerge/pixmaps/close.xpm
-share/fluxbox/styles/Emerge/pixmaps/icon-pressed.xpm
-share/fluxbox/styles/Emerge/pixmaps/icon-unfocus.xpm
-share/fluxbox/styles/Emerge/pixmaps/icon.xpm
-share/fluxbox/styles/Emerge/pixmaps/max-pressed.xpm
-share/fluxbox/styles/Emerge/pixmaps/max-unfocus.xpm
-share/fluxbox/styles/Emerge/pixmaps/max.xpm
-share/fluxbox/styles/Emerge/pixmaps/selected.xpm
-share/fluxbox/styles/Emerge/pixmaps/stick-pressed.xpm
-share/fluxbox/styles/Emerge/pixmaps/stick-unfocus.xpm
-share/fluxbox/styles/Emerge/pixmaps/stick.xpm
-share/fluxbox/styles/Emerge/pixmaps/stuck-pressed.xpm
-share/fluxbox/styles/Emerge/pixmaps/stuck-unfocus.xpm
-share/fluxbox/styles/Emerge/pixmaps/stuck.xpm
-share/fluxbox/styles/Emerge/pixmaps/unselected.xpm
-share/fluxbox/styles/Emerge/theme.cfg
-share/fluxbox/styles/Flux
-share/fluxbox/styles/LemonSpace
-share/fluxbox/styles/Makro
-share/fluxbox/styles/MerleyKay
-share/fluxbox/styles/Meta
-share/fluxbox/styles/Minimal
-share/fluxbox/styles/Nyz
-share/fluxbox/styles/Operation
-share/fluxbox/styles/Outcomes
-share/fluxbox/styles/Rampage
-share/fluxbox/styles/Results
-share/fluxbox/styles/Shade
-share/fluxbox/styles/Spiff
-share/fluxbox/styles/Twice
-share/fluxbox/styles/qnx-photon
-@dirrm share/fluxbox/styles/Emerge/pixmaps
-@dirrm share/fluxbox/styles/Emerge
-@dirrm share/fluxbox/styles/BlueFlux/pixmaps
-@dirrm share/fluxbox/styles/BlueFlux
-@dirrm share/fluxbox/styles
-%%NLS:%%@dirrm share/fluxbox/nls/tr_TR
-%%NLS:%%@dirrm share/fluxbox/nls/sv_SE
-%%NLS:%%@dirrm share/fluxbox/nls/sl_SI
-%%NLS:%%@dirrm share/fluxbox/nls/ru_RU
-%%NLS:%%@dirrm share/fluxbox/nls/pt_PT
-%%NLS:%%@dirrm share/fluxbox/nls/pt_BR
-%%NLS:%%@dirrm share/fluxbox/nls/pl_PL
-%%NLS:%%@dirrm share/fluxbox/nls/nl_NL
-%%NLS:%%@dirrm share/fluxbox/nls/lv_LV
-%%NLS:%%@dirrm share/fluxbox/nls/ja_JP
-%%NLS:%%@dirrm share/fluxbox/nls/it_IT
-%%NLS:%%@dirrm share/fluxbox/nls/fr_FR
-%%NLS:%%@dirrm share/fluxbox/nls/et_EE
-%%NLS:%%@dirrm share/fluxbox/nls/es_ES
-%%NLS:%%@dirrm share/fluxbox/nls/de_DE
-%%NLS:%%@dirrm share/fluxbox/nls/da_DK
-%%NLS:%%@dirrm share/fluxbox/nls/bg_BG
-%%NLS:%%@dirrm share/fluxbox/nls/C
-%%NLS:%%@dirrm share/fluxbox/nls
-@dirrm share/fluxbox
+%%DATADIR%%/init
+%%DATADIR%%/keys
+%%DATADIR%%/menu
+%%NLS:%%%%DATADIR%%/nls/C/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/bg_BG/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/da_DK/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/de_DE/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/es_ES/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/et_EE/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/fr_FR/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/it_IT/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/ja_JP/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/ko_KR/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/lv_LV/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/nl_NL/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/pl_PL/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/pt_BR/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/pt_PT/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/ru_RU/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/sl_SI/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/sv_SE/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/tr_TR/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/vi_VN/fluxbox.cat
+%%DATADIR%%/styles/Artwiz
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_close_active.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_close_pressed.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_close_unfocus.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_max_active.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_max_pressed.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_max_unfocus.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_min_active.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_min_pressed.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_min_unfocus.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_stick_active.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_stick_pressed.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_stuck.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_toolbar.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/menu_frame.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/title_bar.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/toolbar.xpm
+%%DATADIR%%/styles/BlueFlux/pixmaps/toolbar_label.xpm
+%%DATADIR%%/styles/BlueFlux/theme.cfg
+%%DATADIR%%/styles/BlueNight
+%%DATADIR%%/styles/Carbondioxide
+%%DATADIR%%/styles/Clean
+%%DATADIR%%/styles/Cthulhain
+%%DATADIR%%/styles/Emerge/pixmaps/bullet.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/close-pressed.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/close-unfocus.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/close.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/icon-pressed.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/icon-unfocus.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/icon.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/max-pressed.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/max-unfocus.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/max.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/selected.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/stick-pressed.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/stick-unfocus.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/stick.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/stuck-pressed.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/stuck-unfocus.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/stuck.xpm
+%%DATADIR%%/styles/Emerge/pixmaps/unselected.xpm
+%%DATADIR%%/styles/Emerge/theme.cfg
+%%DATADIR%%/styles/Flux
+%%DATADIR%%/styles/LemonSpace
+%%DATADIR%%/styles/Makro
+%%DATADIR%%/styles/MerleyKay
+%%DATADIR%%/styles/Meta
+%%DATADIR%%/styles/Minimal
+%%DATADIR%%/styles/Nyz
+%%DATADIR%%/styles/Operation
+%%DATADIR%%/styles/Outcomes
+%%DATADIR%%/styles/Rampage
+%%DATADIR%%/styles/Results
+%%DATADIR%%/styles/Shade
+%%DATADIR%%/styles/Spiff
+%%DATADIR%%/styles/Twice
+%%DATADIR%%/styles/qnx-photon
+@dirrm %%DATADIR%%/styles/Emerge/pixmaps
+@dirrm %%DATADIR%%/styles/Emerge
+@dirrm %%DATADIR%%/styles/BlueFlux/pixmaps
+@dirrm %%DATADIR%%/styles/BlueFlux
+@dirrm %%DATADIR%%/styles
+%%NLS:%%@dirrm %%DATADIR%%/nls/vi_VN
+%%NLS:%%@dirrm %%DATADIR%%/nls/tr_TR
+%%NLS:%%@dirrm %%DATADIR%%/nls/sv_SE
+%%NLS:%%@dirrm %%DATADIR%%/nls/sl_SI
+%%NLS:%%@dirrm %%DATADIR%%/nls/ru_RU
+%%NLS:%%@dirrm %%DATADIR%%/nls/pt_PT
+%%NLS:%%@dirrm %%DATADIR%%/nls/pt_BR
+%%NLS:%%@dirrm %%DATADIR%%/nls/pl_PL
+%%NLS:%%@dirrm %%DATADIR%%/nls/nl_NL
+%%NLS:%%@dirrm %%DATADIR%%/nls/lv_LV
+%%NLS:%%@dirrm %%DATADIR%%/nls/ko_KR
+%%NLS:%%@dirrm %%DATADIR%%/nls/ja_JP
+%%NLS:%%@dirrm %%DATADIR%%/nls/it_IT
+%%NLS:%%@dirrm %%DATADIR%%/nls/fr_FR
+%%NLS:%%@dirrm %%DATADIR%%/nls/et_EE
+%%NLS:%%@dirrm %%DATADIR%%/nls/es_ES
+%%NLS:%%@dirrm %%DATADIR%%/nls/de_DE
+%%NLS:%%@dirrm %%DATADIR%%/nls/da_DK
+%%NLS:%%@dirrm %%DATADIR%%/nls/bg_BG
+%%NLS:%%@dirrm %%DATADIR%%/nls/C
+%%NLS:%%@dirrm %%DATADIR%%/nls
+@dirrm %%DATADIR%%
 %%DOCPDF:%%@dirrm %%DOCSDIR%%/pdf
 %%DOCHTML:%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%