The x11-wm/fluxbox-devel has been merged into x11-wm/fluxbox and remove

fluxbox-devel. The 0.1.14 version is gone for good. The highlight changes for
fluxbox:

	-Update to 1.0rc2.
	-Change the prefix from X11BASE (/usr/X11R6) to LOCALBASE (/usr/local).
	-The bsetroot has been renamed to fbsetroot.

As for the other ports, chase the fluxbox-devel -> fluxbox.

Request by:	too many to list (include developers)

13 files changed, 593 insertions, 228 deletions

diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 33bd7775cc9c..424adefa1199 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -6,49 +6,184 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.1.14
-PORTREVISION=	2
+PORTVERSION=	1.0rc2
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A small and fast window manager based on BlackBox
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
 
+USE_XLIB=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget
 WANT_GNOME=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-newwmspec
 
-MAN1=		fluxbox.1
+DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
+MAN1=		fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \
+		startfluxbox.1
+DOCSVERSION=	20060629
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+CFLAGS+=		-g
+STRIP=
+.endif
+
+.if defined(WITH_DOCHTML)
+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:=""
+.else
+PLIST_SUB+=		DOCHTML:="@comment "
+.endif
+
+.if defined(WITH_DOCPDF)
+MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \
+			http://people.freebsd.org/~mezz/distfiles/:pdf
+DISTFILES+=		fluxbook-${DOCSVERSION}.pdf:pdf
+PLIST_SUB+=		DOCPDF:=""
+.else
+PLIST_SUB+=		DOCPDF:="@comment "
+.endif
+
+.if defined(WITH_IMLIB2)
+LIB_DEPENDS+=		Imlib2.4:${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
+CONFIGURE_ARGS+=	--disable-kde
 .endif
 
 .if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_ICONV=		yes
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=		NLS:=""
+.else
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS:="@comment "
+.endif
+
+.if !defined(WITHOUT_REMEMBER)
+CONFIGURE_ARGS+=	--enable-remember
+.else
+CONFIGURE_ARGS+=	--disable-remember
+.endif
+
+.if !defined(WITHOUT_SLIT)
+CONFIGURE_ARGS+=	--enable-slit
+.else
+CONFIGURE_ARGS+=	--disable-slit
+.endif
+
+.if !defined(WITHOUT_TOOLBAR)
+CONFIGURE_ARGS+=	--enable-toolbar
+.else
+CONFIGURE_ARGS+=	--disable-toolbar
+.endif
+
+.if !defined(WITHOUT_XRENDER)
+CONFIGURE_ARGS+=	--enable-xrender
+.else
+CONFIGURE_ARGS+=	--disable-xrender
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomelibs}!="" || defined(PACKAGE_BUILDING)
+.if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-gnome
+.else
+CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
 pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Definable build options"
 	@${ECHO_CMD} "-----------------------"
+.if !defined(WITH_DEBUG)
+	@${ECHO_CMD} "WITH_DEBUG=yes		Build with debugging symbols"
+.endif
+.if !defined(WITH_DOCHTML)
+	@${ECHO_CMD} "WITH_DOCHTML=yes	Install the HTML documentation"
+.endif
+.if !defined(WITH_DOCPDF)
+	@${ECHO_CMD} "WITH_DOCPDF=yes		Install the PDF documentation"
+.endif
+.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	- Enable KDE slit support"
+	@${ECHO_CMD} "WITH_KDE=yes		Enable KDE slit support"
 .endif
 .if !defined(WITH_XINERAMA)
-	@${ECHO_CMD} "WITH_XINERAMA	- Enable Xinerama support"
+	@${ECHO_CMD} "WITH_XINERAMA=yes	Enable Xinerama support"
+.endif
+.if !defined(WITHOUT_NLS)
+	@${ECHO_CMD} "WITHOUT_NLS=yes		Disable NLS support"
+.endif
+.if !defined(WITHOUT_REMEMBER)
+	@${ECHO_CMD} "WITHOUT_REMEMBER=yes	Disable remembering attributes support"
+.endif
+.if !defined(WITHOUT_SLIT)
+	@${ECHO_CMD} "WITHOUT_SLIT=yes	Disable slit"
+.endif
+.if !defined(WITHOUT_TOOLBAR)
+	@${ECHO_CMD} "WITHOUT_TOOLBAR=yes	Disable toolbar"
+.endif
+.if !defined(WITHOUT_XRENDER)
+	@${ECHO_CMD} "WITHOUT_XRENDER=yes	Disable Xrender (transparent) support"
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g' \
+			${WRKSRC}/util/fluxbox-generate_menu.in
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+		s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/util/fbsetbg
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \
+		${WRKSRC}/configure
+.endif
+
+post-install:
+.ifndef (NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+.if defined(WITH_DOCPDF)
+	@${MKDIR} ${DOCSDIR}/pdf
+	@${INSTALL_DATA} ${DISTDIR}/fluxbook.pdf ${DOCSDIR}/pdf/
+.endif
+.if defined(WITH_DOCHTML)
+	@${MKDIR} ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKDIR}/html/*.css ${DOCSDIR}/html/
+	@${INSTALL_DATA} ${WRKDIR}/html/*.html ${DOCSDIR}/html/
 .endif
-	@${ECHO_CMD} ""
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index 8d70f229a09f..44e62cb53da4 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1,3 +1,9 @@
-MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
-SHA256 (fluxbox-0.1.14.tar.gz) = 4fefa4f5c848e3b36b4eeb8bc9a6dd1b8bd67a028db3d965cd647aac6e9f00fb
-SIZE (fluxbox-0.1.14.tar.gz) = 504047
+MD5 (fluxbox-1.0rc2.tar.gz) = 701d6e55553dc53f70e97e639a8cc583
+SHA256 (fluxbox-1.0rc2.tar.gz) = ee27c57ddc7e0bc66c32e5e4e92026aa6db513dddd345b2e9f895ff8789dabf2
+SIZE (fluxbox-1.0rc2.tar.gz) = 1016197
+MD5 (fb-doc-mfhtml-20060629.tgz) = 0c100fe1489c22f5b205d87b9a6fa006
+SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
+SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
+MD5 (fluxbook-20060629.pdf) = 83d96b1c8a9276238300cf732f137182
+SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde
+SIZE (fluxbook-20060629.pdf) = 430351
diff --git a/x11-wm/fluxbox/files/patch-doc::Makefile.in b/x11-wm/fluxbox/files/patch-doc::Makefile.in
deleted file mode 100644
index 5fae70ca2aee..000000000000
--- a/x11-wm/fluxbox/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/Makefile.in.orig	Tue Oct  8 23:14:11 2002
-+++ doc/Makefile.in	Tue Oct  8 23:14:41 2002
-@@ -97,8 +97,8 @@
- 
- CLEANFILES = fluxbox.1
- MAINTAINERCLEANFILES = Makefile.in
--man_MANS = fluxbox.1 bsetroot.1
--EXTRA_DIST = fluxbox.1.in bsetroot.1 Coding_style
-+man_MANS = fluxbox.1
-+EXTRA_DIST = fluxbox.1.in Coding_style
- subdir = doc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-wm/fluxbox/files/patch-fix_iconvmenu_crash b/x11-wm/fluxbox/files/patch-fix_iconvmenu_crash
new file mode 100644
index 000000000000..fc655e7839b6
--- /dev/null
+++ b/x11-wm/fluxbox/files/patch-fix_iconvmenu_crash
@@ -0,0 +1,13 @@
+diff -I'^// \$Id' -Naur --exclude-from diff-exclude trunk.orig/src/FbTk/FbString.cc trunk.tabs/src/FbTk/FbString.cc
+--- src/FbTk/FbString.cc	2006-06-26 20:55:59.000000000 +1000
++++ src/FbTk/FbString.cc	2006-07-05 09:37:16.000000000 +1000
+@@ -261,7 +261,8 @@
+     if (newiconv == ((iconv_t)(-1)))
+         return false;
+     else {
+-        iconv_close(m_iconv);
++        if (m_iconv != ((iconv_t)-1))
++            iconv_close(m_iconv);
+         m_iconv = newiconv;
+         return true;
+     }
diff --git a/x11-wm/fluxbox/files/patch-src-Resource.hh b/x11-wm/fluxbox/files/patch-src-Resource.hh
deleted file mode 100644
index 7e854873b332..000000000000
--- a/x11-wm/fluxbox/files/patch-src-Resource.hh
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/Resource.hh.orig	Thu Jul 29 21:04:30 2004
-+++ src/Resource.hh	Thu Jul 29 21:22:14 2004
-@@ -66,16 +66,9 @@
- {
- public:	
- 	Resource(ResourceManager &rm, T val, 
--	const std::string &name, const std::string &altname):
--	Resource_base(name, altname),
--	m_value(val), m_defaultval(val),
--	m_rm(rm)
--	{
--		m_rm.addResource(*this); // add this to resource handler
--	}
--	virtual ~Resource() {
--		m_rm.removeResource(*this); // remove this from resource handler
--	}
-+	const std::string &name, const std::string &altname);
-+
-+	virtual ~Resource();
- 
- 	inline void setDefaultValue() {  m_value = m_defaultval; }
- 	void setFromString(const char *strval);
-@@ -128,5 +121,18 @@
- 	static bool m_init;
- 	ResourceList m_resourcelist;
- };
-+
-+template <typename T>
-+Resource<T>::Resource(ResourceManager &rm, T val, const std::string &name, 
-+			const std::string &altname):
-+	Resource_base(name, altname), m_value(val), m_defaultval(val), 
-+	m_rm(rm) {
-+                m_rm.addResource(*this); // add this to resource handler
-+}
-+
-+template <typename T>
-+Resource<T>::~Resource() {
-+                m_rm.removeResource(*this); // remove this from resource handler
-+}
- 
- #endif //_RESOURCE_HH_
diff --git a/x11-wm/fluxbox/files/patch-src-Tab.cc b/x11-wm/fluxbox/files/patch-src-Tab.cc
deleted file mode 100644
index 81749dda5c2b..000000000000
--- a/x11-wm/fluxbox/files/patch-src-Tab.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Tab.cc.orig	Tue Feb 25 03:00:22 2003
-+++ src/Tab.cc	Tue Feb 25 03:01:31 2003
-@@ -1011,14 +1011,14 @@
- 	Fluxbox *fluxbox = Fluxbox::instance();
- 	if (m_prev) {	//if this have a chain to "the left" (previous tab) then set it's next to this next
- 		m_prev->m_next = m_next;
--		if(!m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
-+		if(!m_next && !m_prev->m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
- 			m_prev->m_win->setTab(false);
- 		else
- 			tmp = m_prev;
- 	} 
- 	if (m_next) {	//if this have a chain to "the right" (next tab) then set it's prev to this prev
- 		m_next->m_prev = m_prev;
--		if(!m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
-+		if(!m_prev && !m_next->m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
- 			m_next->m_win->setTab(false);
- 		else
- 			tmp = m_next;
diff --git a/x11-wm/fluxbox/files/patch-src-Toolbar.cc b/x11-wm/fluxbox/files/patch-src-Toolbar.cc
deleted file mode 100644
index 780c866619e5..000000000000
--- a/x11-wm/fluxbox/files/patch-src-Toolbar.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -u -r src/Toolbar.cc.orig src/Toolbar.cc
---- src/Toolbar.cc.orig	Sat Dec  7 22:41:57 2002
-+++ src/Toolbar.cc	Tue Oct 28 01:03:30 2003
-@@ -204,6 +204,7 @@
- }
- 		
- void Toolbar::reconfigure() {
-+	I18n *i18n = I18n::instance();
- 	int head_x = 0,
- 			head_y = 0,
- 			head_w,
-@@ -318,6 +319,7 @@
- 		frame.clock_w = 0;
- #else // !HAVE_STRFTIME
- 	
-+	using namespace FBNLS;
- 	frame.clock_w =	screen()->getToolbarStyle()->font.textWidth(
- 		i18n->getMessage(
- 			ToolbarSet, ToolbarNoStrftimeLength,
-@@ -521,6 +523,7 @@
- void Toolbar::checkClock(bool redraw, bool date) {
- 	time_t tmp = 0;
- 	struct tm *tt = 0;
-+	I18n *i18n = I18n::instance();
- 
- 	if ((tmp = time(NULL)) != -1) {
- 		if (! (tt = localtime(&tmp))) {
-@@ -545,9 +549,11 @@
- 			return;
- #else // !HAVE_STRFTIME
- 		char t[9];
-+		using namespace FBNLS;
-+
- 		if (date) {
- 			// format the date... with special consideration for y2k ;)
--			if (screen()->getDateFormat() == Blackbox::B_EuropeanDate) {
-+			if (screen()->getDateFormat() == Fluxbox::B_EuropeanDate) {
- 				sprintf(t,
- 					i18n->getMessage(
- 				 		ToolbarSet, ToolbarNoStrftimeDateFormatEu,
-@@ -1101,6 +1107,8 @@
- 		CommonSet, CommonAutoHide,
- 		"Auto hide"),
- 		2);
-+
-+	using namespace FBNLS;
- 	insert(i18n->getMessage(
- 		ToolbarSet, ToolbarEditWkspcName,
- 		"Edit current workspace name"),
diff --git a/x11-wm/fluxbox/files/patch-src-fluxbox.hh b/x11-wm/fluxbox/files/patch-src-fluxbox.hh
deleted file mode 100644
index ad39792bf22f..000000000000
--- a/x11-wm/fluxbox/files/patch-src-fluxbox.hh
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r src/fluxbox.hh.orig src/fluxbox.hh
---- src/fluxbox.hh.orig	Sat Dec  7 09:15:26 2002
-+++ src/fluxbox.hh	Mon Oct 27 23:34:49 2003
-@@ -184,7 +184,7 @@
- 
- #ifndef	 HAVE_STRFTIME
- 
--	enum { B_AMERICANDATE = 1, B_EUROPEANDATE };
-+	enum { B_AmericanDate = 1, B_EuropeanDate };
- #endif // HAVE_STRFTIME
- 	
- 	typedef std::vector<Fluxbox::Titlebar> TitlebarList;
diff --git a/x11-wm/fluxbox/files/patch-util-fbrun-FbRun.hh b/x11-wm/fluxbox/files/patch-util-fbrun-FbRun.hh
deleted file mode 100644
index 721c2bb88a30..000000000000
--- a/x11-wm/fluxbox/files/patch-util-fbrun-FbRun.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r util/fbrun/FbRun.hh.orig util/fbrun/FbRun.hh
---- util/fbrun/FbRun.hh.orig Sat Dec  7 09:15:27 2002
-+++ util/fbrun/FbRun.hh	Mon Oct 27 23:57:51 2003
-@@ -29,6 +29,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cassert>
- 
- /**
- 	Creates and managed a run window
diff --git a/x11-wm/fluxbox/files/patch-util::Makefile.in b/x11-wm/fluxbox/files/patch-util::Makefile.in
deleted file mode 100644
index a9191b2e5ca9..000000000000
--- a/x11-wm/fluxbox/files/patch-util::Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- util/Makefile.in.orig	Tue Dec 10 11:33:13 2002
-+++ util/Makefile.in	Tue Dec 10 11:33:30 2002
-@@ -94,8 +94,8 @@
- 
- SUBDIRS = fbrun
- INCLUDES = -I../src/FbTk/
--bin_SCRIPTS = bsetbg fluxbox-generate_menu
--bin_PROGRAMS = bsetroot
-+bin_SCRIPTS = fluxbox-generate_menu
-+bin_PROGRAMS =
- bsetroot_SOURCES = bsetroot.cc bsetroot.hh
- bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \
- 	../src/StringUtil.o ../src/FbTk/libFbTk.a
-@@ -107,7 +107,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--bin_PROGRAMS = bsetroot$(EXEEXT)
-+bin_PROGRAMS =
- PROGRAMS = $(bin_PROGRAMS)
- 
- am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
diff --git a/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in b/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in
new file mode 100644
index 000000000000..bc77d49baa86
--- /dev/null
+++ b/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in
@@ -0,0 +1,165 @@
+--- util/fluxbox-generate_menu.in.orig	Mon Aug 28 01:26:18 2006
++++ util/fluxbox-generate_menu.in	Mon Aug 28 01:37:24 2006
+@@ -48,7 +48,7 @@
+ 
+ 
+ WHOAMI=`whoami`
+-[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
++[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin
+ 
+ # Check for Imlib2-support
+ if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
+@@ -81,7 +81,7 @@
+     -d  other path(s) to recursively search for *.desktop files
+     -ds wider search for *.desktop files (takes more time)
+     -i  other path(s) to search for icons
+-        e.g., "/usr/kde/3.3/share/icons/crystalsvg/16x16/*"
++        e.g., "%%LOCALBASE%%/share/icons/crystalsvg/16x16/*"
+     -is wider search for icons (worth the extra time)
+     -in skip icon search
+ 
+@@ -98,7 +98,7 @@
+   Only for packagers:
+ 
+     -p  prefix; default is @PREFIX@
+-    -n  Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected
++    -n  Gnome-prefix; %%X11BASE%%, %%LOCALBASE%% and /opt autodetected
+     -q  KDE-prefix; idem dito
+ 
+ 
+@@ -282,7 +282,10 @@
+     # echo -n "for $temp_icon"
+     eval doSearchLoop $USER_ICONPATHS \
+       "$FB_ICONDIR" \
+-      "/usr/share/${execname%% *}" \
++      "%%LOCALBASE%%/share/${execname%% *}" \
++      "%%X11BASE%%/share/${execname%% *}" \
++      "%%LOCALBASE%%/share/gnome/${execname%% *}" \
++      "%%X11BASE%%/share/gnome/${execname%% *}" \
+       ${OTHER_ICONPATHS} \
+ 
+ 
+@@ -1204,16 +1207,16 @@
+ # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
+ # your prefix is: @PREFIX@
+ 
+-# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so
++# fluxbox-generate already looks in %%LOCALBASE%%, %%X11BASE%% and /opt so
+ # there should be no need to specify them.
+ #
+ # PREFIX=@PREFIX@
+-# GNOME_PREFIX=/opt/gnome
+-# KDE_PREFIX=/opt/kde
++# GNOME_PREFIX=%%X11BASE%%
++# KDE_PREFIX=%%LOCALBASE%%
+ 
+ 
+ # Sepparate the list of background-dirs with semicolumns ':'
+-# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
++# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%LOCALBASE%%/share/wallpapers:%%X11BASE%%/share/wallpapers"
+ 
+ 
+ # --- Boolean variables.
+@@ -1281,29 +1284,35 @@
+         -g) GNOMEMENU=yes; shift;;
+         -in) NO_ICON=yes; shift;;
+         -is) OTHER_ICONPATHS="
+-                /usr/share/icons,
+-                /usr/share/icons/mini,
+-                /usr/share/pixmaps,
+-                /usr/local/share/icons,
+-                /usr/local/share/icons/mini,
+-                /usr/local/share/pixmaps,
+-                /usr/share/xclass/icons,
+-                /usr/share/xclass/pixmaps,
+-                /usr/local/share/xclass/icons,
+-                /usr/local/share/xclass/pixmaps,
+-                /usr/X11R6/share/icons/default/16x16,
+-                /usr/X11R6/share/icons/kde/16x16,
+-                /usr/X11R6/share/icons/hicolor/16x16,
+-                /usr/local/X11R6/share/icons/default/16x16,
+-                /usr/local/X11R6/share/icons/kde/16x16,
+-                /usr/local/X11R6/share/icons/hicolor/16x16,
++                %%LOCALBASE%%/share/icons,
++                %%LOCALBASE%%/share/icons/mini,
++                %%LOCALBASE%%/share/gnome/icons,
++                %%LOCALBASE%%/share/gnome/pixmaps,
++                %%LOCALBASE%%/share/pixmaps,
++                %%LOCALBASE%%/share/xclass/icons,
++                %%LOCALBASE%%/share/xclass/pixmaps,
++                %%LOCALBASE%%/share/icons/default/16x16,
++                %%LOCALBASE%%/share/icons/kde/16x16,
++                %%LOCALBASE%%/share/icons/hicolor/16x16,
++                %%X11BASE%%/share/icons,
++                %%X11BASE%%/share/icons/mini,
++                %%X11BASE%%/share/gnome/icons,
++                %%X11BASE%%/share/gnome/pixmaps,
++                %%X11BASE%%/share/pixmaps,
++                %%X11BASE%%/share/xclass/icons,
++                %%X11BASE%%/share/xclass/pixmaps,
++                %%X11BASE%%/share/icons/default/16x16,
++                %%X11BASE%%/share/icons/kde/16x16,
++                %%X11BASE%%/share/icons/hicolor/16x16,
+             "
+             shift;;
+         -ds) OTHER_DESKTOP_PATHS="
+-                /usr/share/mimelnk 
+-                /usr/share/applications
+-                /usr/share/xsessions 
+-                /usr/share/services 
++                %%LOCALBASE%%/share/applications
++                %%LOCALBASE%%/share/gnome/applications
++                %%LOCALBASE%%/share/gnome/xsessions
++                %%X11BASE%%/share/applications
++                %%X11BASE%%/share/gnome/applications
++                %%X11BASE%%/share/gnome/xsessions
+             "
+             # /usr/share/apps \
+             shift;;
+@@ -1378,7 +1387,7 @@
+ 
+ 
+ # gnome prefix
+-for GNOME_PREFIX in "${GNOME_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
++for GNOME_PREFIX in "${GNOME_PREFIX}" %%X11BASE%% %%LOCALBASE%% /opt "${PREFIX}"; do
+     if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
+         break;
+     fi
+@@ -1386,7 +1395,7 @@
+ # Will remain $PREFIX if all else fails
+ 
+ # kde prefix
+-for KDE_PREFIX in "${KDE_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do
++for KDE_PREFIX in "${KDE_PREFIX}" %%LOCALBASE%% %%X11BASE%% /opt "${PREFIX}"; do
+     if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
+         break;
+     fi
+@@ -1474,7 +1483,7 @@
+ else
+     [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
+     #The precise order is up for debate.
+-    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla galeon konqueror dillo netscape w3m amaya links lynx; do
++    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla galeon konqueror dillo netscape w3m amaya links lynx; do
+         if find_it $browser; then
+             DEFAULT_BROWSER=$browser
+             break
+@@ -1514,7 +1523,8 @@
+     links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
+     firefox|firebird|mozilla|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
+     konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
+-    opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
++    linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
++    opera) append "[exec] (opera) {opera}" ;;
+     MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
+     MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
+     *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
+@@ -1533,7 +1543,8 @@
+     append_submenu "${BROWSERMENU}"
+         normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape vncviewer
+         find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
+-        find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
++        find_it linux-opera append "[exec]   (linux-opera) {linux-opera}"
++        find_it opera       append "[exec]   (opera) {opera}"
+         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}}"
diff --git a/x11-wm/fluxbox/pkg-descr b/x11-wm/fluxbox/pkg-descr
index 381fcdfe6656..d9d37833dbaf 100644
--- a/x11-wm/fluxbox/pkg-descr
+++ b/x11-wm/fluxbox/pkg-descr
@@ -1,10 +1,13 @@
 Fluxbox is a window manager based on BlackBox with some new features:
 
+ o Transparent menus
+ o Pixmap themes
+ o Window snapping
  o Integrated bbkeys
  o Iconbar
- o Configurable titlebar
+ o Configurable titlebar (slit)
  o Windows tabs
  o Wheel scroll changes workspace
  o KDE and partial Gnome support
  
-WWW: http://fluxbox.sourceforge.net/
+WWW: http://fluxbox.org/version-0.9.php
diff --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist
index 481821c9119f..87102623f77d 100644
--- a/x11-wm/fluxbox/pkg-plist
+++ b/x11-wm/fluxbox/pkg-plist
@@ -1,73 +1,283 @@
 bin/fbrun
+bin/fbsetbg
+bin/fbsetroot
 bin/fluxbox
 bin/fluxbox-generate_menu
+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.pdf
 %%DATADIR%%/init
 %%DATADIR%%/keys
 %%DATADIR%%/menu
-%%DATADIR%%/nls/C/fluxbox.cat
-%%DATADIR%%/nls/bg_BG/fluxbox.cat
-%%DATADIR%%/nls/da_DK/fluxbox.cat
-%%DATADIR%%/nls/es_ES/fluxbox.cat
-%%DATADIR%%/nls/et_EE/fluxbox.cat
-%%DATADIR%%/nls/fr_FR/fluxbox.cat
-%%DATADIR%%/nls/it_IT/fluxbox.cat
-%%DATADIR%%/nls/ja_JP/fluxbox.cat
-%%DATADIR%%/nls/lv_LV/fluxbox.cat
-%%DATADIR%%/nls/pt_BR/fluxbox.cat
-%%DATADIR%%/nls/pt_PT/fluxbox.cat
-%%DATADIR%%/nls/ru_RU/fluxbox.cat
-%%DATADIR%%/nls/sv_SE/fluxbox.cat
-%%DATADIR%%/nls/tr_TR/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_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/el_GR.utf8/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/fr_FR.ISO-8859-15/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/fr_FR.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/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/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-1/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.ISO-8859-1/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/zh_CN.UTF-8/fluxbox.cat
 %%DATADIR%%/styles/Artwiz
-%%DATADIR%%/styles/Blue
+%%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/CleanColor
 %%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/Rancor
 %%DATADIR%%/styles/Results
 %%DATADIR%%/styles/Shade
 %%DATADIR%%/styles/Spiff
 %%DATADIR%%/styles/Twice
 %%DATADIR%%/styles/qnx-photon
-@unexec rm %D/%%DATADIR%%/nls/lv 2>&1 >/dev/null || true
-@unexec rm %D/%%DATADIR%%/nls/fr 2>&1 >/dev/null || true
-@unexec rm %D/%%DATADIR%%/nls/es 2>&1 >/dev/null || true
-@unexec rm %D/%%DATADIR%%/nls/en_US 2>&1 >/dev/null || true
-@unexec rm %D/%%DATADIR%%/nls/en 2>&1 >/dev/null || true
-@unexec rm %D/%%DATADIR%%/nls/US_ASCII 2>&1 >/dev/null || true
-@unexec rm %D/%%DATADIR%%/nls/POSIX 2>&1 >/dev/null || true
-@exec ln -s lv_LV %D/%%DATADIR%%/nls/lv
-@exec ln -s fr_FR %D/%%DATADIR%%/nls/fr
-@exec ln -s es_ES %D/%%DATADIR%%/nls/es
-@exec ln -s C %D/%%DATADIR%%/nls/en_US
-@exec ln -s C %D/%%DATADIR%%/nls/en
-@exec ln -s C %D/%%DATADIR%%/nls/US_ASCII
-@exec ln -s C %D/%%DATADIR%%/nls/POSIX
+@dirrm %%DATADIR%%/styles/Emerge/pixmaps
+@dirrm %%DATADIR%%/styles/Emerge
+@dirrm %%DATADIR%%/styles/BlueFlux/pixmaps
+@dirrm %%DATADIR%%/styles/BlueFlux
 @dirrm %%DATADIR%%/styles
-@dirrm %%DATADIR%%/nls/tr_TR
-@dirrm %%DATADIR%%/nls/sv_SE
-@dirrm %%DATADIR%%/nls/ru_RU
-@dirrm %%DATADIR%%/nls/pt_PT
-@dirrm %%DATADIR%%/nls/pt_BR
-@dirrm %%DATADIR%%/nls/lv_LV
-@dirrm %%DATADIR%%/nls/ja_JP
-@dirrm %%DATADIR%%/nls/it_IT
-@dirrm %%DATADIR%%/nls/fr_FR
-@dirrm %%DATADIR%%/nls/et_EE
-@dirrm %%DATADIR%%/nls/es_ES
-@dirrm %%DATADIR%%/nls/da_DK
-@dirrm %%DATADIR%%/nls/bg_BG
-@dirrm %%DATADIR%%/nls/C
-@dirrm %%DATADIR%%/nls
+%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN.ISO-8859-1
+%%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-1
+%%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/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/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/fr_FR.UTF-8
+%%NLS:%%@dirrm %%DATADIR%%/nls/fr_FR.ISO-8859-15
+%%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/el_GR.utf8
+%%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/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%%