aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2011-04-19 06:25:41 +0800
committerrene <rene@FreeBSD.org>2011-04-19 06:25:41 +0800
commit490b206354af8f9c667e2ec65ca95e9cb4743f34 (patch)
treeb5de2ac4b657e2171e14b45725d3b63f7284fb7c /x11
parente12d1d1e49c238730d927d0871067913564a6a83 (diff)
downloadfreebsd-ports-gnome-490b206354af8f9c667e2ec65ca95e9cb4743f34.tar.gz
freebsd-ports-gnome-490b206354af8f9c667e2ec65ca95e9cb4743f34.tar.zst
freebsd-ports-gnome-490b206354af8f9c667e2ec65ca95e9cb4743f34.zip
Remove most expired ports:
2011-04-17 cad/tclspice: has been broken for more than a year 2011-04-17 comms/hcfmdm: does not compile on 7.X or higher 2011-04-17 databases/mysqlcc: has been broken for almost a year 2011-04-17 devel/ruby-rjudy: does not compile on FreeBSD 7.x or newer 2011-04-17 devel/xfc: does not compile on FreeBSD 7.x or newer 2011-04-17 devel/lamson: has been broken for a half year 2011-04-17 devel/cocktail: does not build on FreeBSD 7.x or newer 2011-04-17 devel/djgpp-gcc: has been broken for half a year 2011-04-17 devel/gauche-sdl: has been broken for a year 2011-04-17 devel/gdb53-act: does not compile on FreeBSD 7.x and up 2011-04-17 editors/zed: does not compile on FreeBSD 7.x or newer 2011-04-17 games/aqbubble: does not compile on FreeBSD 7.x or newer 2011-04-17 graphics/libvisual-plugins: has been broken for 3 years 2011-04-17 japanese/roundcube: has been broken for almost a year 2011-04-17 japanese/tkstep80: does not compile on FreeBSD 7.x or newer 2011-04-17 lang/u++: has been broken for over a half year 2011-04-17 lang/pugs: has been broken for over a year 2011-04-17 lang/mozart: does not compile on FreeBSD 7.x or newer 2011-04-17 math/linalg: does not build on FreeBSD 7.x or newer 2011-04-17 math/R-cran-igraph: has been broken for over a half year 2011-04-17 misc/ftree: has been broken for over a half year 2011-04-17 multimedia/katchtv: has been broken for a half year 2011-04-17 multimedia/libomxil-bellagio: has been broken for almost a year 2011-04-17 multimedia/banshee-mirage: has been broken for over a half year 2011-04-17 net-p2p/trackerbt: has been broken for a half year 2011-04-17 net/cap: does not compile on FreeBSD 7.x or newer 2011-04-17 net/ggsd: does not compile on FreeBSD 7.x or newer 2011-04-17 net/b2bua: does not compile on FreeBSD 7.x or newer 2011-04-17 net/penguintv: has been broken for a half year 2011-04-17 news/openftd: has been broken for almost a year 2011-04-17 palm/romeo: does not compile on FreeBSD 7.x or newer 2011-04-17 science/pcp: does not compile on FreeBSD 7.x or newer 2011-04-17 science/elmer-fem: has been broken for over a year 2011-04-17 security/newpki-lib: does not compile on FreeBSD 7.x or newer 2011-04-17 security/newpki-server: does not compile on FreeBSD 7.x or newer 2011-04-17 security/xmlsec: does not compile on FreeBSD 7.x or newer 2011-04-17 security/f-protd: has been broken for over a year 2011-04-17 sysutils/xwlans: does not compile on FreeBSD 7.x or newer 2011-04-17 www/bk_edit: does not compile on FreeBSD 7.x and newer 2011-04-17 www/bricolage: has been broken for a half year 2011-04-17 x11-toolkits/gauche-gtk: has been broken for a year 2011-04-17 x11-toolkits/gambas2-gb-qt: has been broken for over a year 2011-04-17 x11-toolkits/php-gtk2: has been broken for over a half year 2011-04-17 x11-toolkits/p5-Tcl-Tk: has been broken for 2 year 2011-04-17 x11/metisse: has been broken for over a half year
Diffstat (limited to 'x11')
-rw-r--r--x11/Makefile1
-rw-r--r--x11/metisse/Makefile134
-rw-r--r--x11/metisse/distinfo2
-rw-r--r--x11/metisse/files/patch-fvwm-insitu-libs-Fpng.h20
-rw-r--r--x11/metisse/files/patch-libmetisse_Makefile.in19
-rw-r--r--x11/metisse/files/patch-mandriva-64bit-fixes429
-rw-r--r--x11/metisse/files/patch-mandriva-addcolors386
-rw-r--r--x11/metisse/files/patch-mandriva-restart75
-rw-r--r--x11/metisse/files/patch-xserver_GL_mesa_Makefile.in68
-rw-r--r--x11/metisse/pkg-descr5
-rw-r--r--x11/metisse/pkg-plist368
11 files changed, 0 insertions, 1507 deletions
diff --git a/x11/Makefile b/x11/Makefile
index fed8b08fe5f1..f862576418ad 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -198,7 +198,6 @@
SUBDIR += lxmenu-data
SUBDIR += lxpanel
SUBDIR += menu-cache
- SUBDIR += metisse
SUBDIR += mgapdesk
SUBDIR += mkcomposecache
SUBDIR += mlterm
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
deleted file mode 100644
index 4a4896c3fe69..000000000000
--- a/x11/metisse/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-# New ports collection makefile for: Metisse
-# Date created: 31 May 2007
-# Whom: Alexey Dokuchaev <danfe@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= metisse
-DISTVERSION= 0.4.0-rc4
-PORTREVISION= 7
-CATEGORIES= x11
-MASTER_SITES= http://insitu.lri.fr/metisse/download/latest/ \
- http://freebsd.nsu.ru/distfiles/metisse/
-
-MAINTAINER= danfe@FreeBSD.org
-COMMENT= An innovative X-based window system
-
-CONFLICTS= fvwm-1.* fvwm-2.5.*
-
-LIB_DEPENDS= Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo
-RUN_DEPENDS= ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
-
-BROKEN= does not compile
-DEPRECATED= has been broken for over a half year
-EXPIRATION_DATE=2011-04-17
-
-USE_BZIP2= yes
-PATCH_STRIP= -p1
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/lib/X11/fonts
-MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}"
-USE_GETTEXT= yes
-USE_LDCONFIG= yes
-USE_PYTHON= yes
-USE_XORG= xrender
-WANT_GNOME= yes
-
-OPTIONS= MMX "Enable MMX optimizations" on \
- GLX "Enable GLX extension" on \
- GLX_X86 "GLX with x86 optimizations" on \
- SPI "Enable widget tracking support" off \
- STROKE "Enable support for mouse gestures" off \
- RPLAY "Enable RPlay support in FvwmEvent" off \
- BIDI "Enable bi-directional text support" off \
- GTK "Enable legacy GTK+ 1.2.x support" off \
- IMLIB "Enable Imlib support in FvwmGtk" off \
- GNOME "Enable legacy GNOME 1.4 support" off
-
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_CPU:Mmmx} && !defined(WITHOUT_MMX)
-CONFIGURE_ARGS+= --enable-mmx
-.endif
-
-.if !defined(WITHOUT_GLX)
-CONFIGURE_ARGS+= --enable-glx
-.endif
-
-.if ${ARCH} == "i386" && !defined(WITHOUT_GLX_X86)
-CONFIGURE_ARGS+= --enable-glx-x86
-.endif
-
-.if defined(WITH_SPI)
-USE_GNOME= atspi
-.endif
-
-.if defined(WITH_STROKE)
-LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke
-.endif
-
-.if defined(WITH_RPLAY)
-LIB_DEPENDS+= rplay.1:${PORTSDIR}/audio/rplay
-.endif
-
-.if defined(WITH_BIDI)
-LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi
-.endif
-
-.if ${HAVE_GNOME:Mgtk12} || defined(WITH_GTK)
-USE_GNOME+= gtk12
-.endif
-
-.if ${HAVE_GNOME:Mimlib} || defined(WITH_IMLIB)
-USE_GNOME+= imlib
-.endif
-
-.if ${HAVE_GNOME:Mgnomelibs} || defined(WITH_GNOME)
-USE_GNOME+= gnomelibs
-.endif
-
-MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
- FvwmButtons.1 FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 \
- FvwmCpp.1 FvwmDebug.1 FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 \
- FvwmGtkDebug.1 FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 \
- FvwmM4.1 FvwmPager.1 FvwmPerl.1 FvwmProxy.1 FvwmRearrange.1 \
- FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 \
- FvwmTabs.1 FvwmTaskBar.1 FvwmTheme.1 FvwmWharf.1 \
- FvwmWinList.1 FvwmWindowMenu.1 fvwm-bug.1 fvwm-config.1 \
- fvwm-convert-2.4.1 fvwm-convert-2.6.1 fvwm-menu-desktop.1 \
- fvwm-menu-directory.1 fvwm-menu-headlines.1 \
- fvwm-menu-xlock.1 fvwm-perllib.1 fvwm-root.1 fvwm.1
-
-_GTK= ${USE_GNOME:Mgtk12} ${USE_GNOME:Mimlib}
-.if !empty(_GTK)
-MAN1+= FvwmGtk.1
-PLIST_SUB+= GTK=""
-.else
-PLIST_SUB+= GTK="@comment "
-.endif
-
-post-patch: .SILENT
-# Fix KDE tray
- ${REINPLACE_CMD} -e '4723d' ${WRKSRC}/fvwm-insitu/fvwm/events.c
-# Fix pager mode border color
- ${REINPLACE_CMD} -e 's/0\.1,0\.5,0\.4/0.7,0.71,0.7/' \
- ${WRKSRC}/FvwmCompositor/main/compositor.cxx
-# Fix desktop entries path
- ${REINPLACE_CMD} -E 's,^(configdir =).*,\1 ${DESKTOPDIR},' \
- ${WRKSRC}/fvwm-insitu/opale/session/Makefile.in
-# Simple GCC 4.2 gimmick
- ${REINPLACE_CMD} -e '/^typedef/s,GLvoid,void,g' \
- ${WRKSRC}/xserver/include/GL/glu.h
-
-.if ${OSVERSION} < 700042
-PLIST_SUB+= FBSD6="" \
- FBSD7="@comment "
-.else
-PLIST_SUB+= FBSD6="@comment " \
- FBSD7=""
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11/metisse/distinfo b/x11/metisse/distinfo
deleted file mode 100644
index 5db66fbe1df5..000000000000
--- a/x11/metisse/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (metisse-0.4.0-rc4.tar.bz2) = c393aae5d9693a66966d1306061571c58f90008673e3d631c4b01723e535f27f
-SIZE (metisse-0.4.0-rc4.tar.bz2) = 6017779
diff --git a/x11/metisse/files/patch-fvwm-insitu-libs-Fpng.h b/x11/metisse/files/patch-fvwm-insitu-libs-Fpng.h
deleted file mode 100644
index 04d6c9a1c879..000000000000
--- a/x11/metisse/files/patch-fvwm-insitu-libs-Fpng.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- dummy/fvwm-insitu/libs/Fpng.h.orig 2005-06-17 14:44:35.000000000 +0200
-+++ dummy/fvwm-insitu/libs/Fpng.h 2010-03-29 19:25:39.000000000 +0200
-@@ -429,7 +429,7 @@
- #define FPNG_FILLER_AFTER PNG_FILLER_AFTER
- #define FPNG_INFO_tRNS PNG_INFO_tRNS
-
--#define Fpng_check_sig(a,b) png_check_sig(a,b)
-+#define Fpng_check_sig(a,b) (!png_sig_cmp(a,0,b))
- #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d)
- #define Fpng_create_info_struct(a) png_create_info_struct(a)
- #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c)
-@@ -444,7 +444,7 @@
- #define Fpng_set_packing(a) png_set_packing(a)
- #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
- #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
--#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
-+#define Fpng_set_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
- #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
- #define Fpng_read_end(a,b) png_read_end(a,b)
- #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)
diff --git a/x11/metisse/files/patch-libmetisse_Makefile.in b/x11/metisse/files/patch-libmetisse_Makefile.in
deleted file mode 100644
index d1c0d6f75713..000000000000
--- a/x11/metisse/files/patch-libmetisse_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- metisse-0.4.0-rc4/libmetisse/Makefile.in.orig Sun Jun 3 22:50:15 2007
-+++ metisse-0.4.0-rc4/libmetisse/Makefile.in Sun Jun 3 22:51:48 2007
-@@ -307,6 +307,7 @@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
-+libdatadir = @exec_prefix@/libdata
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
-@@ -362,7 +363,7 @@
- libmetisse_la_LDFLAGS = -version-info @LT_LIBMETISSE_VERSION@
- libmetisseincludedir = @LIBMETISSE_INCLUDEDIR@
- libmetisseinclude_HEADERS = auth.h proto.h
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdatadir)/pkgconfig
- pkgconfig_DATA = libmetisse.pc
- all: all-am
-
diff --git a/x11/metisse/files/patch-mandriva-64bit-fixes b/x11/metisse/files/patch-mandriva-64bit-fixes
deleted file mode 100644
index 42ed52d5e1d8..000000000000
--- a/x11/metisse/files/patch-mandriva-64bit-fixes
+++ /dev/null
@@ -1,429 +0,0 @@
-2007-01-17 Gwenole Beauchesne <gbeauchesne@mandriva.com>
-
- * 64-bit fixes.
-
---- metisse-20070112/FvwmCompositor/desktop/MetisseDesktop.cxx.64bit-fixes 2007-01-10 23:56:27.000000000 +0100
-+++ metisse-20070112/FvwmCompositor/desktop/MetisseDesktop.cxx 2007-01-17 20:09:18.000000000 +0100
-@@ -1059,7 +1059,7 @@ MetisseDesktop::MetisseDesktop(
- return ;
- }
-
-- _xroot = DefaultRootWindow(_xdisplay);
-+ _xroot = XDefaultRootWindow(_xdisplay);
-
- _metisseSource = new MetisseSource(this, encoding, uri, use_shm);
- if (!_metisseSource)
-@@ -1181,7 +1181,7 @@ MetisseDesktop::HandleXCursor(
- << __FILE__ << ", " << __LINE__ << ")" << std::endl;
- }
- dpy = (Display*)castedWin->getDisplay();
-- dr = DefaultRootWindow(dpy);
-+ dr = XDefaultRootWindow(dpy);
-
- if (width * height)
- {
-@@ -1337,7 +1337,7 @@ void MetisseDesktop::_closeWindow(Metiss
- // ------------------------------------------------------------
-
- // FIXME FIXME
--void MetisseDesktop::_setSubFacadeProperty(unsigned long win, FacadeMapping facade)
-+void MetisseDesktop::_setSubFacadeProperty(Window win, FacadeMapping facade)
- {
- char cmd[256];
- FacadeMapping::iterator iter;
---- metisse-20070112/FvwmCompositor/main/AScreen.cxx.64bit-fixes 2007-01-12 23:00:08.000000000 +0100
-+++ metisse-20070112/FvwmCompositor/main/AScreen.cxx 2007-01-17 18:02:00.000000000 +0100
-@@ -704,7 +704,7 @@ int AScreen::_myPickClosest(
- #if DEBUG_PUSH_NAME
- for (j = 0; j < numNames-1; j++)
- {
-- sgNode *sg = (sgNode *)*hit;
-+ sgNode *sg = sgNode::lookupId(*hit);
- std::cerr << " names " << j << ": " << sg
- << std::endl;
- hit++;
-@@ -713,7 +713,7 @@ int AScreen::_myPickClosest(
- hit += numNames-1;
- #endif
-
-- WindowRenderer *sel = (WindowRenderer *)*hit++;
-+ WindowRenderer *sel = dynamic_cast<WindowRenderer *>(sgNode::lookupId(*hit++));
- #if DEBUG_PUSH_NAME
- std::cerr << " sel pointer: "<< sel << " " << sizeof(GLuint)
- << " " << sizeof(WindowRenderer *) << std::endl;
-@@ -890,8 +890,8 @@ void AScreen::_dragResetSelection(bool s
-
- if (selectionBufferSize)
- {
-- selection = (WindowRenderer *)
-- selectionBuffer[selectionBufferSize-1];
-+ selection = dynamic_cast<WindowRenderer *>(sgNode::lookupId(
-+ selectionBuffer[selectionBufferSize-1]));
- }
- else
- {
-@@ -943,8 +943,8 @@ void AScreen::resetSelection(bool sendEv
-
- if (_over_selectionBufferSize)
- {
-- _over_selection = (WindowRenderer *)
-- _over_selectionBuffer[_over_selectionBufferSize-1];
-+ _over_selection = dynamic_cast<WindowRenderer *>(sgNode::lookupId(
-+ _over_selectionBuffer[_over_selectionBufferSize-1]));
- }
- else
- {
-@@ -953,8 +953,8 @@ void AScreen::resetSelection(bool sendEv
-
- if (_selectionBufferSize)
- {
-- _selection = (WindowRenderer *)
-- _selectionBuffer[_selectionBufferSize-1];
-+ _selection = dynamic_cast<WindowRenderer *>(sgNode::lookupId(
-+ _selectionBuffer[_selectionBufferSize-1]));
- }
- else
- {
-@@ -1078,7 +1078,7 @@ bool AScreen::unprojectOverWindow(
- {
- GLuint numNames = *hit ;
- GLuint *names = hit+3 ;
-- MetisseWindow *w = (MetisseWindow *)names[numNames-2];
-+ MetisseWindow *w = dynamic_cast<MetisseWindow *>(sgNode::lookupId(names[numNames-2]));
- if (w == win)
- {
- z = *(hit+1) / 4294967295.0 ;
-@@ -1099,9 +1099,9 @@ bool AScreen::unprojectOverWindow(
- GLuint selBuffer[3] ;
- GLuint selSize=3;
-
-- selBuffer[2] = (GLuint )(win->getRenderer());
-- selBuffer[1] = (GLuint )(win);
-- selBuffer[0] = (GLuint )(root);
-+ selBuffer[2] = (win->getRenderer())->getId();
-+ selBuffer[1] = (win)->getId();
-+ selBuffer[0] = (root)->getId();
-
- unproject(x, y, z, _viewpoint, selBuffer, selSize, ox, oy, oz) ;
- #if 0
-@@ -1125,9 +1125,9 @@ bool AScreen::projectOverWindow(
-
- GLuint selBuffer[3] ;
- GLuint selSize=3;
-- selBuffer[2] = (GLuint )(win->getRenderer());
-- selBuffer[1] = (GLuint )(win);
-- selBuffer[0] = (GLuint )(root);
-+ selBuffer[2] = (win->getRenderer())->getId();
-+ selBuffer[1] = (win)->getId();
-+ selBuffer[0] = (root)->getId();
-
- _viewpoint->project(
- ox, oy, 0.0, selBuffer, selSize, px, py, pz);
---- metisse-20070112/FvwmCompositor/main/AUtils.cxx.64bit-fixes 2006-12-19 11:18:21.000000000 +0100
-+++ metisse-20070112/FvwmCompositor/main/AUtils.cxx 2007-01-17 18:02:00.000000000 +0100
-@@ -576,7 +576,7 @@ unproject(int x, int y, sgViewpoint *vie
- glGetDoublev(GL_PROJECTION_MATRIX, projmatrix) ;
-
- for (int i=0; i<selectionBufferSize; ++i) {
-- sgNode *o = (sgNode *)selectionBuffer[i] ;
-+ sgNode *o = sgNode::lookupId(selectionBuffer[i]) ;
-
- #if 0
- std::cerr << o->getName() << " < " << std::flush ;
-@@ -632,7 +632,7 @@ unproject(
- glGetDoublev(GL_PROJECTION_MATRIX, projmatrix) ;
-
- for (int i=0; i<selectionBufferSize; ++i) {
-- sgNode *o = (sgNode *)selectionBuffer[i] ;
-+ sgNode *o = sgNode::lookupId(selectionBuffer[i]) ;
- o->applyTransformations() ;
- }
-
---- metisse-20070112/FvwmCompositor/main/LayerManager.cxx.64bit-fixes 2007-01-12 23:00:08.000000000 +0100
-+++ metisse-20070112/FvwmCompositor/main/LayerManager.cxx 2007-01-17 18:02:00.000000000 +0100
-@@ -1108,7 +1108,7 @@ void LayerManager::x11project(int x, int
-
- GLuint selBuffer[1] ;
- GLuint selSize=1;
-- selBuffer[0] = (GLuint )(this);
-+ selBuffer[0] = (this)->getId();
-
- unproject(
- (int)x, (int)y, 0, _viewpoint, selBuffer,
-@@ -1182,9 +1182,9 @@ bool LayerManager::getWinBoundingBox(
- GLuint selBuffer[3] ;
- GLuint selSize=3;
-
-- selBuffer[2] = (GLuint )(win->getRenderer());
-- selBuffer[1] = (GLuint )(win);
-- selBuffer[0] = (GLuint )(this);
-+ selBuffer[2] = (win->getRenderer())->getId();
-+ selBuffer[1] = (win)->getId();
-+ selBuffer[0] = (this)->getId();
-
- GLdouble left, top, right, bottom, px, py, pz = 0;
- bool ret;
-@@ -1455,9 +1455,9 @@ void LayerManager::scaleWindow(
- GLuint selBuffer[3] ;
- GLuint selSize=3;
-
-- selBuffer[2] = (GLuint )(win->getRenderer());
-- selBuffer[1] = (GLuint )(win);
-- selBuffer[0] = (GLuint )(this);
-+ selBuffer[2] = (win->getRenderer())->getId();
-+ selBuffer[1] = (win)->getId();
-+ selBuffer[0] = (this)->getId();
-
- float tsX = _scaleX;
- float tsY = _scaleY;
-@@ -1587,9 +1587,9 @@ void LayerManager::rotateWindow(
- GLuint selBuffer[3] ;
- GLuint selSize=3;
-
-- selBuffer[2] = (GLuint )(win->getRenderer());
-- selBuffer[1] = (GLuint )(win);
-- selBuffer[0] = (GLuint )(this);
-+ selBuffer[2] = (win->getRenderer())->getId();
-+ selBuffer[1] = (win)->getId();
-+ selBuffer[0] = (this)->getId();
-
- float tsX = _scaleX;
- float tsY = _scaleY;
-@@ -1758,17 +1758,17 @@ void LayerManager::attachWindow(MetisseW
- GLuint selBuffer[3] ;
- GLuint selSize=3;
-
-- selBuffer[2] = (GLuint )(main->getRenderer());
-- selBuffer[1] = (GLuint )(main);
-- selBuffer[0] = (GLuint )(this);
-+ selBuffer[2] = (main->getRenderer())->getId();
-+ selBuffer[1] = (main)->getId();
-+ selBuffer[0] = (this)->getId();
-
- ret =_viewpoint->project(
- -mw/2 + (sx-mx) -tx, mh/2 + (my-sy) +ty, 0.0,
- selBuffer, selSize, &mleft, &mtop, &pz);
-
-- selBuffer[2] = (GLuint )(sub->getRenderer());
-- selBuffer[1] = (GLuint )(sub);
-- selBuffer[0] = (GLuint )(this);
-+ selBuffer[2] = (sub->getRenderer())->getId();
-+ selBuffer[1] = (sub)->getId();
-+ selBuffer[0] = (this)->getId();
-
- ret =_viewpoint->project(
- -sw/2, sh/2, 0.0, selBuffer, selSize, &sleft, &stop, &pz);
-@@ -2025,7 +2025,7 @@ bool LayerManager::getPointerEvent(
-
- GLuint selBuffer[1] ;
- GLuint selSize=1;
-- selBuffer[0] = (GLuint )(this);
-+ selBuffer[0] = this->getId() ;
-
- unproject(
- (int)x, (int)y, 0, _viewpoint, selBuffer,
---- metisse-20070112/bin/facade-holder.c.64bit-fixes 2006-10-19 14:47:19.000000000 +0200
-+++ metisse-20070112/bin/facade-holder.c 2007-01-17 19:00:08.000000000 +0100
-@@ -295,6 +295,7 @@ void resizeMe(int w, int h)
- XFree(size_hints);
- }
-
-+void
- setup_layout(int startup)
- {
- int max_width = 0;
-@@ -436,7 +437,7 @@ void clearWindows(void)
- void set_facade_property(Atom atom_type)
- {
- unsigned long *duplicate_hints;
-- unsigned long duplicate_count;
-+ int duplicate_count;
- int i;
- flist *l;
-
-@@ -450,7 +451,7 @@ void set_facade_property(Atom atom_type)
- l = l->next;
- }
-
-- duplicate_hints = (CARD32 *)safemalloc(7*i*sizeof(CARD32));
-+ duplicate_hints = (unsigned long *)safemalloc(7*i*sizeof(*duplicate_hints));
-
- l = Facade;
- while(l != NULL)
---- metisse-20070112/bin/metisse-dummy-win.c.64bit-fixes 2006-04-08 23:26:41.000000000 +0200
-+++ metisse-20070112/bin/metisse-dummy-win.c 2007-01-17 18:59:47.000000000 +0100
-@@ -391,11 +391,11 @@ static
- void set_metisse_properties(Atom atom_type)
- {
- unsigned long *duplicate_hints;
-- unsigned long duplicate_count;
-+ int duplicate_count;
- int i;
-
- duplicate_count = 0;
-- duplicate_hints = (CARD32 *)malloc(7*_num_facade*sizeof(CARD32));
-+ duplicate_hints = (unsigned long *)malloc(7*_num_facade*sizeof(*duplicate_hints));
- for (i = 0; i < _num_facade; i++)
- {
- duplicate_hints[duplicate_count++] = (CARD32)_facade[i].fid;
---- metisse-20070112/libutils/atoms.c.64bit-fixes 2006-10-05 23:49:35.000000000 +0200
-+++ metisse-20070112/libutils/atoms.c 2007-01-17 18:02:00.000000000 +0100
-@@ -24,6 +24,8 @@
- #include <X11/Xatom.h>
- #include <X11/Xproto.h>
-
-+#include "safemalloc.h"
-+
- static int atom_size(int format)
- {
- if (format == 32)
---- metisse-20070112/xserver/include/X11/Xfuncs.h.64bit-fixes 2004-02-01 01:53:15.000000000 +0100
-+++ metisse-20070112/xserver/include/X11/Xfuncs.h 2007-01-17 18:02:00.000000000 +0100
-@@ -48,10 +48,16 @@ void bcopy();
- #else
- #include <string.h>
- #define _XFUNCS_H_INCLUDED_STRING_H
-+#ifndef bcopy
- #define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-+#endif
-+#ifndef bzero
- #define bzero(b,len) memset(b, 0, (size_t)(len))
-+#endif
-+#ifndef bcmp
- #define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
- #endif
-+#endif
- #endif /* X_USEBFUNCS */
-
- /* the new Xfuncs.h */
---- metisse-20070112/xserver/metisse/rootlessCommon.h.64bit-fixes 2006-11-16 14:38:27.000000000 +0100
-+++ metisse-20070112/xserver/metisse/rootlessCommon.h 2007-01-18 16:25:01.000000000 +0100
-@@ -227,7 +227,7 @@ extern RegionRec rootlessHugeRoot;
- ((int)(_x) * _pPix->drawable.bitsPerPixel/8 + \
- (int)(_y) * _pPix->devKind); \
- if (0 && _pPix->drawable.bitsPerPixel != FB_UNIT) { \
-- unsigned _diff = ((unsigned) _pPix->devPrivate.ptr) & \
-+ unsigned _diff = ((char *)_pPix->devPrivate.ptr - (char *)0) & \
- (FB_UNIT / CHAR_BIT - 1); \
- _pPix->devPrivate.ptr = (char *) (_pPix->devPrivate.ptr) - \
- _diff; \
---- metisse-20070112/xserver/metisse/rfbserver.c.64bit-fixes 2006-12-13 14:50:20.000000000 +0100
-+++ metisse-20070112/xserver/metisse/rfbserver.c 2007-01-17 18:02:00.000000000 +0100
-@@ -111,7 +111,7 @@ rfbClientPtr rfbNewClient(sock)
- rfbProtocolVersionMsg pv;
- rfbClientPtr cl;
- struct sockaddr_in addr;
-- int addrlen = sizeof(struct sockaddr_in);
-+ socklen_t addrlen = sizeof(struct sockaddr_in);
-
- if (rfbClientHead == NULL) {
- /* no other clients - make sure we don't think any keys are pressed */
---- metisse-20070112/fvwm-insitu/fvwm/add_window.c.64bit-fixes 2006-12-07 14:47:06.000000000 +0100
-+++ metisse-20070112/fvwm-insitu/fvwm/add_window.c 2007-01-17 18:02:00.000000000 +0100
-@@ -85,6 +85,7 @@
- #include "colormaps.h"
- #include "decorations.h"
- #include "functions.h"
-+#include "builtins.h"
-
- /* ---------------------------- local definitions -------------------------- */
-
---- metisse-20070112/fvwm-insitu/fvwm/move_resize.c.64bit-fixes 2006-12-20 00:31:44.000000000 +0100
-+++ metisse-20070112/fvwm-insitu/fvwm/move_resize.c 2007-01-17 18:02:00.000000000 +0100
-@@ -93,10 +93,10 @@ static rectangle sizew_g =
- -1
- };
-
--static int move_interactive_finish_button_mask =
-- ((1<<(NUMBER_OF_EXTENDED_MOUSE_BUTTONS))-1) & ~0x2;
--static int move_drag_finish_button_mask =
-- ((1<<(NUMBER_OF_EXTENDED_MOUSE_BUTTONS))-1) & ~0x3;
-+static unsigned int move_interactive_finish_button_mask =
-+ ((1U<<(NUMBER_OF_EXTENDED_MOUSE_BUTTONS))-1) & ~0x2;
-+static unsigned int move_drag_finish_button_mask =
-+ ((1U<<(NUMBER_OF_EXTENDED_MOUSE_BUTTONS))-1) & ~0x3;
-
- /* ----- end of move globals ----- */
-
-@@ -1475,14 +1475,14 @@ int placement_binding(int button, KeySym
- {
- move_interactive_finish_button_mask =
- move_drag_finish_button_mask =
-- (1<<NUMBER_OF_EXTENDED_MOUSE_BUTTONS)-1;
-+ (1U<<NUMBER_OF_EXTENDED_MOUSE_BUTTONS)-1;
- }
- else if (button > 0 && button <=
- NUMBER_OF_EXTENDED_MOUSE_BUTTONS)
- {
- move_drag_finish_button_mask |= (1<<(button-1));
- move_interactive_finish_button_mask |=
-- (1<<(button-1));
-+ (1U<<(button-1));
- }
- }
- }
-@@ -1493,7 +1493,7 @@ int placement_binding(int button, KeySym
- if (button == 0)
- {
- move_drag_finish_button_mask =
-- (1<<NUMBER_OF_EXTENDED_MOUSE_BUTTONS)-1;
-+ (1U<<NUMBER_OF_EXTENDED_MOUSE_BUTTONS)-1;
- }
- else if (button > 0 && button <=
- NUMBER_OF_EXTENDED_MOUSE_BUTTONS)
-@@ -1509,7 +1509,7 @@ int placement_binding(int button, KeySym
- if (button == 0)
- {
- move_interactive_finish_button_mask =
-- (1<<NUMBER_OF_EXTENDED_MOUSE_BUTTONS)-1;
-+ (1U<<NUMBER_OF_EXTENDED_MOUSE_BUTTONS)-1;
- }
- else if (button > 0 && button <=
- NUMBER_OF_EXTENDED_MOUSE_BUTTONS)
---- metisse-20070112/fvwm-insitu/fvwm/builtins.c.64bit-fixes 2007-01-08 14:35:43.000000000 +0100
-+++ metisse-20070112/fvwm-insitu/fvwm/builtins.c 2007-01-17 18:02:00.000000000 +0100
-@@ -65,6 +65,7 @@
- #include "style.h"
- #include "move_resize.h"
- #include "menus.h"
-+#include "focus.h"
- #ifdef HAVE_STROKE
- #include "stroke.h"
- #endif /* HAVE_STROKE */
---- metisse-20070112/fvwm-insitu/fvwm/ewmh.c.64bit-fixes 2006-12-16 01:26:51.000000000 +0100
-+++ metisse-20070112/fvwm-insitu/fvwm/ewmh.c 2007-01-17 18:02:00.000000000 +0100
-@@ -1563,6 +1563,8 @@ int ewmh_HandleSplash(EWMH_CMD_ARGS)
- FPS_FOCUS_CLICK_ICON(S_FOCUS_POLICY(SCC(*style)), 1);
- FPS_FOCUS_BY_FUNCTION(S_FOCUS_POLICY(SCM(*style)), 1);
- FPS_FOCUS_BY_FUNCTION(S_FOCUS_POLICY(SCC(*style)), 1);
-+
-+ return 0; // is 0 the expected value??
- }
-
- int ewmh_HandleToolBar(EWMH_CMD_ARGS)
---- metisse-20070112/fvwm-insitu/fvwm/gnome.c.64bit-fixes 2006-11-23 02:02:16.000000000 +0100
-+++ metisse-20070112/fvwm-insitu/fvwm/gnome.c 2007-01-17 18:02:00.000000000 +0100
-@@ -943,10 +943,12 @@ CMD_GnomeShowDesks(F_CMD_ARGS)
- int n;
- Atom atom_set;
- long val[1];
-+ int intVal;
-
- atom_set = XInternAtom(dpy, XA_WIN_WORKSPACE_COUNT, False);
- DBUG("GNOME_ShowDesks","Routine Entered");
-- n = GetIntegerArguments(action, NULL, (int *)val, 1);
-+ n = GetIntegerArguments(action, NULL, &intVal, 1);
-+ val[0] = intVal;
- if(n != 1)
- {
- fvwm_msg(ERR, "GnomeShowDesks", "requires one argument");
---- metisse-20070112/fvwm-insitu/modules/FvwmIconMan/fvwm.c.64bit-fixes 2006-11-23 02:02:17.000000000 +0100
-+++ metisse-20070112/fvwm-insitu/modules/FvwmIconMan/fvwm.c 2007-01-17 18:02:00.000000000 +0100
-@@ -182,6 +182,7 @@ WinData *id_to_win(Ulong id)
-
- static void set_win_configuration(WinData *win, FvwmPacketBody *body)
- {
-+ extern void set_attention(WinData *win);
- win->desknum = body->add_config_data.desk;
- win->x = body->add_config_data.frame_x;
- win->y = body->add_config_data.frame_y;
diff --git a/x11/metisse/files/patch-mandriva-addcolors b/x11/metisse/files/patch-mandriva-addcolors
deleted file mode 100644
index a10606f7d4e8..000000000000
--- a/x11/metisse/files/patch-mandriva-addcolors
+++ /dev/null
@@ -1,386 +0,0 @@
---- metisse-0.4.0-rc4/FvwmCompositor/config/colours/Ia_Ora_free.theme.newcolor 2007-03-06 19:41:37.000000000 +0100
-+++ metisse-0.4.0-rc4/FvwmCompositor/config/colours/Ia_Ora_free.theme 2007-03-06 19:41:37.000000000 +0100
-@@ -0,0 +1,176 @@
-+# Ia Ora free colours
-+# from Mandriva ia_ora-gnome-1.0.9 free variante
-+
-+#### defaults
-+
-+# gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+Colorset 0 bg #eff3f7, sh, hi, bgTint, \
-+ fg black, fgsh #eff3f7, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+FuncFontsSet-DefaultFont 0 Normal Regular
-+
-+#### windows inactive / active
-+
-+# metacity titlebar_bg_gray+title_text_no_icon
-+Colorset 1 bg average, sh, hi, bgTint, \
-+ fg #eff3f7, fgsh #8692A6, fgAlpha, fgTint, \
-+ Vgradient 100 3 #dfe7ef 51 #c7d3df 0 #b6c3cf 49 #cfd7df, dither, Tint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi #CFD7DF, sh #CFD7DF,
-+# metacity titlebar_bg_blue+title_text_focused_no_icon
-+Colorset 2 bg average, sh, hi, bgTint, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #c7dfff 51 #69b6ff 0 #69b6ff 49 #8ec7ff, dither, Tint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi #4965AE, sh #4965AE,
-+# use #CFD7DF and #4965AE as bg (average more powerful?)
-+
-+# shadow [bold|normal|] [Italic|Regular|] [bold|medium|*] [o|r|i|*]
-+FuncFontsSet-WinFont 1 Bold Regular bold r
-+FuncFontsSet-ActiveWinFont 1 Bold Regular bold r
-+
-+# Border InActive/Active (no fg any way)
-+# From fred: They are 3 pixels wide : from exterior to interior, colors are :
-+# #CFD7DF (1 pixel), #DFE7EF (1 pixel) and #EFF3F7 (1 pixel).
-+# ... cannot do that
-+#
-+Colorset 3 bg #DFE7EF, hi #CFD7DF, sh #CFD7DF, bgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+Colorset 4 bg #DFE7EF, hi #CFD7DF, sh #CFD7DF, bgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+#### menu active / normal /greyed
-+
-+# bg
-+# gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+Colorset 5 bg #eff3f7, sh, hi, bgTint, \
-+ fg black, fgsh grey80, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+# selected (depends on ActiveForeOff, HilightBackOff ...)
-+# gtkrc black fg[SELECTED] + blue2 (bg[SELECTED]) ... no the hi gradient
-+Colorset 6 bg average, sh, hi, bgTint, \
-+ fg black, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #c7dfff 45 #79beff 0 #69b6ff 55 #4965ae, dither, Tint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# greyed, Only the fg is useful
-+# gtkrc gray4 fg[INSENSITIVE]
-+Colorset 7 bg #eff3f7, fg #B6C3CF, fgsh #eff3f7, fgAlpha 100, fgTint, Plain
-+
-+# No shadow in fonts ... used in menustyle
-+
-+DestroyFunc FuncColoursMenuStyleOverRide
-+AddToFunc FuncColoursMenuStyleOverRide
-++ I MenuStyle "$0" ActiveFore, HilightBack, Hilight3DThickness 0, TrianglesSolid
-++ I FuncFontsSet-MenuFont "$0" 0 Normal Regular medium r
-+
-+DestroyFunc FuncColoursWinMenuStyleOverRide
-+AddToFunc FuncColoursWinMenuStyleOverRide
-++ I FuncFontsSet-WinMenuFont "$0" 0 Normal Regular medium r
-+
-+DestroyFunc FuncColoursUtf8MenuStyleOverRide
-+AddToFunc FuncColoursUtf8MenuStyleOverRide
-++ I FuncFontsSet-Utf8MenuFont "$0" 0 Normal Regular medium r
-+
-+#### colors for modules
-+
-+### panel defaults
-+
-+# default
-+# gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+Colorset 10 bg #eff3f7, sh, hi, bgTint, \
-+ fg black, fgsh, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+# active
-+Colorset 11 bg average, sh, hi, bgTint, \
-+ fg white, fgsh grey10, fgAlpha, fgTint, \
-+ Vgradient 100 3 #c7dfff 45 #79beff 0 #69b6ff 55 #8ec7ff, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# pressed
-+# first colors of the hi gradient ...
-+Colorset 12 bg #c7dfff, sh, hi, bgTint, \
-+ fg white, fgsh grey10, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+### pager
-+
-+# Hmm, I've check gnome code and it is using some dark version of
-+# bg[active], so use #39496b. And for not selected, dark version of
-+# bg[normal], so use #94aabd. (From fred)
-+# These in the place of gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+# and gtkrc white fg[SELECTED] + blue2 (bg[SELECTED])
-+# 8cc7ff 398ede
-+# 39496b 94aabd
-+
-+# bg
-+Colorset 14 bg #94aabd, sh, hi, bgTint, \
-+ fg black, fgsh, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+# hi
-+Colorset 15 bg #398ede, sh, hi, bgTint, \
-+ fg white, fgsh, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+### tips
-+
-+# gtkrc "yellow"
-+Colorset 16 bg #FFFF94, sh, hi, bgTint, \
-+ fg black, fgsh, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+### "taskbar"
-+
-+# normal item as title bar
-+Colorset 17 bg average, sh, hi, bgTint, \
-+ fg #eff3f7, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #dfe7ef 45 #c7d3df 0 #b6c3cf 55 #cfd7df, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi item as title bar hi
-+Colorset 18 bg average, sh, hi, bgTint, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #c7dfff 45 #79beff 0 #69b6ff 55 #8ec7ff, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# iconified item as title + some alpha
-+Colorset 19 bg average, sh, hi, bgTint, \
-+ fg #eff3f7, fgsh black, fgAlpha 60, IconAlpha 60, \
-+ Vgradient 100 3 #c7dfff 45 #79beff 0 #69b6ff 55 #8ec7ff, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
-+
-+# as above selected
-+# normal item
-+Colorset 20 bg average, sh, hi, bgTint white 15, \
-+ fg #eff3f7, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #dfe7ef 45 #c7d3df 0 #b6c3cf 55 #cfd7df, dither, Tint black 15, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi item
-+Colorset 21 bg average, sh, hi, bgTint white 15, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #c7dfff 45 #79beff 0 #69b6ff 55 #8ec7ff, dither, Tint white 15, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# iconified
-+Colorset 22 bg average, sh, hi, bgTint white 15, \
-+ fg #eff3f7, fgsh black, fgAlpha 60, fgTint, \
-+ Vgradient 100 3 #dfe7ef 45 #c7d3df 0 #b6c3cf 55 #cfd7df, dither, Tint black 15, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
-+
-+# attention colorset ... from ia ora orange
-+# normal
-+Colorset 23 bg average, sh, hi, bgTint, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #ffcb10 45 #ffa208 0 #f79600 55 #f7b610, dither, Tint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# selected
-+Colorset 24 bg average, sh, hi, bgTint white 15, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #ffcb10 45 #ffa208 0 #f79600 55 #f7b610, dither, Tint white 15, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# icon
-+Colorset 25 bg average, sh, hi, bgTint white 15, \
-+ fg black, fgsh white, fgAlpha 60, fgTint, \
-+ Vgradient 100 3 #ffcb10 45 #ffa208 0 #f79600 55 #f7b610, dither, Tint, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
-+# icon and selected
-+Colorset 26 bg average, sh, hi, bgTint, \
-+ fg black, fgsh white, fgAlpha 60, fgTint, \
-+ Vgradient 100 3 #ffcb10 45 #ffa208 0 #f79600 55 #f7b610, dither, Tint white 15, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
---- metisse-0.4.0-rc4/FvwmCompositor/config/colours/Makefile.in.newcolor 2007-03-06 19:42:03.000000000 +0100
-+++ metisse-0.4.0-rc4/FvwmCompositor/config/colours/Makefile.in 2007-03-06 19:52:55.000000000 +0100
-@@ -300,7 +300,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- configdir = $(METISSE_FVWM_CONFIG_DIR)/colours
--CONFIG_FILES = Ia_Ora_blue.theme Ia_Ora_orange.theme Metisse_Contrast.theme \
-+CONFIG_FILES = Ia_Ora_blue.theme Ia_Ora_orange.theme Ia_Ora_free.theme Ia_Ora_gray.theme Metisse_Contrast.theme \
- Metisse.theme Opale.theme
-
- config_DATA = $(CONFIG_FILES)
---- metisse-0.4.0-rc4/FvwmCompositor/config/colours/Ia_Ora_gray.theme.newcolor 2007-03-06 19:45:12.000000000 +0100
-+++ metisse-0.4.0-rc4/FvwmCompositor/config/colours/Ia_Ora_gray.theme 2007-03-06 19:51:27.000000000 +0100
-@@ -0,0 +1,171 @@
-+# Ia Ora orange colours
-+# from Mandriva ia_ora-gnome-1.0.9 orange variante
-+
-+#### defaults
-+
-+# gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+Colorset 0 bg #eff3f7, sh, hi, bgTint, \
-+ fg black, fgsh #eff3f7, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+FuncFontsSet-DefaultFont 0 Normal Regular
-+
-+#### windows inactive / active
-+
-+# metacity titlebar_bg_gray+title_text_no_icon
-+Colorset 1 bg average, sh, hi, bgTint, \
-+ fg #eff3f7, fgsh #8692A6, fgAlpha, fgTint, \
-+ Vgradient 100 3 #dfe7ef 51 #c7d3df 0 #b6c3cf 49 #cfd7df, dither, Tint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi #CFD7DF, sh #CFD7DF,
-+# metacity titlebar_bg_blue+title_text_focused_no_icon
-+Colorset 2 bg average, sh, hi, bgTint, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #cfd7df 51 #a6b2c7 0 #8692a6 49 #c7d3df, dither, Tint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi #F7B610, sh #F7B610,
-+# use #CFD7DF and #F7B610 as bg (average more powerful?)
-+
-+# shadow [bold|normal|] [Italic|Regular|] [bold|medium|*] [o|r|i|*]
-+FuncFontsSet-WinFont 1 Bold Regular bold r
-+FuncFontsSet-ActiveWinFont 1 Bold Regular bold r
-+
-+# Border InActive/Active
-+# From fred: They are 3 pixels wide : from exterior to interior, colors are :
-+# #CFD7DF (1 pixel), #DFE7EF (1 pixel) and #EFF3F7 (1 pixel).
-+# ... cannot do that
-+#
-+Colorset 3 bg #DFE7EF, hi #CFD7DF, sh #CFD7DF, bgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+Colorset 4 bg #DFE7EF, hi #CFD7DF, sh #CFD7DF, bgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+#### menu active / normal /greyed
-+
-+# bg
-+# gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+Colorset 5 bg #eff3f7, sh, hi, bgTint, \
-+ fg black, fgsh grey80, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+# selected (depends on ActiveForeOff, HilightBackOff ...)
-+# gtkrc white fg[SELECTED] + blue2 (bg[SELECTED]) ... no the hi gradient
-+Colorset 6 bg average, sh, hi, bgTint, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #cfd7df 45 #a6b2c7 0 #8692a6 55 #c7d3df, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# greyed, Only the fg is useful
-+# gtkrc gray4 fg[INSENSITIVE]
-+Colorset 7 bg #eff3f7, fg #B6C3CF, fgsh #eff3f7, fgAlpha 100, fgTint, Plain, NoShape
-+
-+
-+# No shadow in fonts ... used in menustyle
-+
-+DestroyFunc FuncColoursMenuStyleOverRide
-+AddToFunc FuncColoursMenuStyleOverRide
-++ I MenuStyle "$0" ActiveFore, HilightBack, Hilight3DThickness 0, TrianglesSolid
-++ I FuncFontsSet-MenuFont "$0" 0 Normal Regular medium r
-+
-+DestroyFunc FuncColoursWinMenuStyleOverRide
-+AddToFunc FuncColoursWinMenuStyleOverRide
-++ I FuncFontsSet-WinMenuFont "$0" 0 Normal Regular medium r
-+
-+DestroyFunc FuncColoursUtf8MenuStyleOverRide
-+AddToFunc FuncColoursUtf8MenuStyleOverRide
-++ I FuncFontsSet-Utf8MenuFont "$0" 0 Normal Regular medium r
-+
-+#### colors afor modules
-+
-+### panel defaults
-+
-+#default
-+# gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+Colorset 10 bg #eff3f7, sh, hi, bgTint, \
-+ fg black, fgsh, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+# active
-+Colorset 11 bg average, sh, hi, bgTint, \
-+ fg white, fgsh grey10, fgAlpha, fgTint, \
-+ Vgradient 100 3 #ffcb10 45 #a6b2c7 0 #8692a6 55 #c7d3df, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# pressed
-+Colorset 12 bg #c7d7df, sh, hi, bgTint, \
-+ fg white, fgsh grey10, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+### pager bg
-+
-+# Hmm, I've check gnome code and it is using some dark version of
-+# bg[active], so use #39496b. And for not selected, dark version of
-+# bg[normal], so use #94aabd. (From fred)
-+# These in the place of gtkrc black fg[NORMAL] + gray0 (bg[NORMAL])
-+# and gtkrc white fg[SELECTED] + blue2 (bg[SELECTED])
-+
-+# bg
-+Colorset 14 bg #94aabd, sh, hi, bgTint, \
-+ fg black, fgsh, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+# hi
-+Colorset 15 bg #c6d3de, sh, hi, bgTint, \
-+ fg white, fgsh, fgAlpha, fgTint, \
-+ Plain, NoShape, IconAlpha, IconTint
-+
-+### tips
-+
-+# gtkrc "yellow"
-+Colorset 16 bg #FFFF94, fg black, Plain
-+
-+### "taskbar"
-+
-+# normal item as title bar
-+Colorset 17 bg average, sh, hi, bgTint, \
-+ fg #eff3f7, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #dfe7ef 45 #c7d3df 0 #b6c3cf 55 #cfd7df, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi item as title bar hi
-+Colorset 18 bg average, sh, hi, bgTint, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #cfd7df 45 #a6b2c7 0 #8692a6 55 #c6d3df, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# iconified item as title + some alpha
-+Colorset 19 bg average, sh, hi, bgTint, \
-+ fg #eff3f7, fgsh black, fgAlpha 60, IconAlpha 60, \
-+ Vgradient 100 3 #dfe7ef 45 #c7d3df 0 #b6c3cf 55 #cfd7df, dither, NoTint, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
-+
-+# as above selected
-+# normal item
-+Colorset 20 bg average, sh, hi, bgTint white 15, \
-+ fg #eff3f7, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #dfe7ef 45 #c7d3df 0 #b6c3cf 55 #cfd7df, dither, Tint black 15, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# hi item as title bar hi
-+Colorset 21 bg average, sh, hi, bgTint white 15, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #cfd7df 45 #a6b2c7 0 #8692a6 55 #c7d3df, dither, Tint white 15, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# iconified item as title + some alpha
-+Colorset 22 bg average, sh, hi, bgTint white 15, \
-+ fg #eff3f7, fgsh black, fgAlpha 60, fgTint, \
-+ Vgradient 100 3 #dfe7ef 45 #c7d3df 0 #b6c3cf 55 #cfd7df, dither, Tint black 15, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
-+
-+# attention colorset ... from ia ora blue
-+# normal
-+Colorset 23 bg average, sh, hi, bgTint, \
-+ fg white, fgsh black, fgAlpha 100, fgTint, \
-+ Vgradient 100 3 #8ea2cf 45 #415da6 0 #21459c 55 #4965ae, dither, Tint, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+# selected
-+Colorset 24 bg average, sh, hi, bgTint white 15, \
-+ fg white, fgsh black, fgAlpha, fgTint, \
-+ Vgradient 100 3 #8ea2cf 45 #415da6 0 #21459c 55 #4965ae, dither, Tint white 15, \
-+ Alpha, NoShape, IconAlpha, IconTint
-+Colorset 25 bg average, sh, hi, bgTint white 15, \
-+ fg black, fgsh white, fgAlpha 60, fgTint, \
-+ Vgradient 100 3 #8ea2cf 45 #415da6 0 #21459c 55 #4965ae, dither, Tint, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
-+# icon and selected
-+Colorset 26 bg average, sh, hi, bgTint, \
-+ fg black, fgsh white, fgAlpha 60, fgTint, \
-+ Vgradient 100 3 #8ea2cf 45 #415da6 0 #21459c 55 #4965ae, Tint white 15, \
-+ Alpha, NoShape, IconAlpha 60, IconTint
---- metisse-0.4.0-rc4/FvwmCompositor/config/themes/Ia_Ora_free.theme.newcolor 2007-03-06 19:41:05.000000000 +0100
-+++ metisse-0.4.0-rc4/FvwmCompositor/config/themes/Ia_Ora_free.theme 2007-03-06 19:41:17.000000000 +0100
-@@ -0,0 +1,2 @@
-+Read window/Ia_Ora.theme
-+Read colours/Ia_Ora_free.theme
---- metisse-0.4.0-rc4/FvwmCompositor/config/themes/Makefile.in.newcolor 2007-03-06 19:42:29.000000000 +0100
-+++ metisse-0.4.0-rc4/FvwmCompositor/config/themes/Makefile.in 2007-03-06 19:52:14.000000000 +0100
-@@ -302,7 +302,8 @@
- configdir = $(METISSE_FVWM_CONFIG_DIR)/themes
- CONFIG_FILES = Ia_Ora_blue.theme Opale_Vectors.theme \
- Metisse_Constrast.theme Metisse.theme \
-- Redmond_Ia_Ora.theme Ia_Ora_orange.theme Opale_Devel.theme \
-+ Redmond_Ia_Ora.theme Ia_Ora_orange.theme Ia_Ora_free.theme \
-+ Ia_Ora_gray.theme Opale_Devel.theme \
- Redmond_Opale.theme
-
- config_DATA = $(CONFIG_FILES)
---- metisse-0.4.0-rc4/FvwmCompositor/config/themes/Ia_Ora_gray.theme.newcolor 2007-03-06 19:52:24.000000000 +0100
-+++ metisse-0.4.0-rc4/FvwmCompositor/config/themes/Ia_Ora_gray.theme 2007-03-06 19:51:55.000000000 +0100
-@@ -0,0 +1,2 @@
-+Read window/Ia_Ora.theme
-+Read colours/Ia_Ora_gray.theme
diff --git a/x11/metisse/files/patch-mandriva-restart b/x11/metisse/files/patch-mandriva-restart
deleted file mode 100644
index 60344d2a0a67..000000000000
--- a/x11/metisse/files/patch-mandriva-restart
+++ /dev/null
@@ -1,75 +0,0 @@
---- metisse/FvwmCompositor/config/menus 8 Jan 2007 13:49:05 -0000 1.6
-+++ metisse/FvwmCompositor/config/menus 5 Mar 2007 10:14:49 -0000 1.7
-@@ -10,9 +10,14 @@
- + "&Terminal" FuncFvwmSimpleTerminal
- + "&FVWM Console" FuncFvwmConsole
- + "" Nop
--+ "&Restart" Restart
--+ "&Quit" Quit
--
-+#+ "&Restart" Restart
-+#+ "&Quit" Quit
-+Test (!EnvIsSet SESSION_MANAGER) + "&Restart" Restart
-+Test (!EnvIsSet SESSION_MANAGER) + "&Quit" Quit
-+Test (EnvIsSet SESSION_MANAGER !EnvIsSet KDE_FULL_SESSION !EnvIsSet GNOME_DESKTOP_SESSION_ID) \
-+ + "&Restart Session" Restart
-+Test (EnvIsSet SESSION_MANAGER) + "&Quit Session" QuitSession
-+Test (EnvIsSet SESSION_MANAGER) + "&Quit \& Save Session" SaveQuitSession
-
- #------------------------------------
- # some window ops menu
-Index: FvwmCompositor/config/metisserc.in
-===================================================================
-RCS file: /users/asspro/ihm/metisse-cvs/metisse/FvwmCompositor/config/metisserc.in,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -r1.11 -r1.12
---- metisse/FvwmCompositor/config/metisserc.in 30 Jan 2007 08:48:16 -0000 1.11
-+++ metisse/FvwmCompositor/config/metisserc.in 5 Mar 2007 10:14:49 -0000 1.12
-@@ -34,6 +34,7 @@
- # define the background: AFuncSetBackground
- read background
-
-+# always executed (start, restart, session)
- DestroyFunc StartFunction
- AddToFunc StartFunction
- #+ I FvwmTrace -n fmtrace
-@@ -43,6 +44,38 @@
- + I ModuleSynchronous FvwmEvent FvwmEvent-EventsHandler
- # start our panel
- + I FuncStartFuncStartPanel
-++ I Echo fvwmi StartFunction executed
-+
-+# only executed at start without a session manager (not restart)
-+DestroyFunc InitFunction
-+AddToFunc InitFunction
-++ I Echo fvwmi InitFunction executed
-+
-+# as above under a session manager
-+DestroyFunc SessionInitFunction
-+AddToFunc SessionInitFunction
-++ I Echo fvwmi SessionInitFunction executed
-+
-+# only executed at restart without a session manager (not start)
-+DestroyFunc RestartFunction
-+AddToFunc RestartFunction
-++ I Echo fvwmi RestartFunction executed
-+
-+# as above under a session manager
-+DestroyFunc SessionRestartFunction
-+AddToFunc SessionRestartFunction
-++ I Echo fvwmi SessionRestartFunction executed
-+
-+DestroyFunc ExitFunction
-+AddToFunc ExitFunction
-++ I Test (Quit) Echo fvwmi ExitFunction quiting
-++ I Test (ToRestart) Echo fvwmi ExitFunction to restart
-+
-+DestroyFunc SessionExitFunction
-+AddToFunc SessionExitFunction
-++ I Test (Quit) Exec killall Xmetisse
-++ I Test (Quit) Echo fvwmi SessionExitFunction quiting
-++ I Test (ToRestart) Echo fvwmi SessionExitFunction to restart
-
- # ---------------------------------------------------------------------------
- # Desk config (e.g., number of desks)
diff --git a/x11/metisse/files/patch-xserver_GL_mesa_Makefile.in b/x11/metisse/files/patch-xserver_GL_mesa_Makefile.in
deleted file mode 100644
index 324ab15ffdd3..000000000000
--- a/x11/metisse/files/patch-xserver_GL_mesa_Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
---- metisse-0.4.0-rc4/xserver/GL/mesa/Makefile.in.orig Wed Jul 14 11:57:56 2004
-+++ metisse-0.4.0-rc4/xserver/GL/mesa/Makefile.in Fri Jun 1 20:59:53 2007
-@@ -89,7 +89,7 @@
- main/texobj.c main/texobj.h main/texstate.c main/texstate.h \
- main/texstore.c main/texstore.h main/texutil.c main/texutil.h \
- main/texutil_tmp.h main/varray.c main/varray.h main/version.h \
-- main/vsnprintf.c main/vtxfmt.c main/vtxfmt.h main/vtxfmt_tmp.h \
-+ main/vtxfmt.c main/vtxfmt.h main/vtxfmt_tmp.h \
- glapi/glapi.c glapi/glapi.h glapi/glapioffsets.h \
- glapi/glapitable.h glapi/glapitemp.h glapi/glprocs.h \
- glapi/glthread.c glapi/glthread.h array_cache/acache.h \
-@@ -188,7 +188,7 @@
- libglcore_a-texformat.$(OBJEXT) libglcore_a-teximage.$(OBJEXT) \
- libglcore_a-texobj.$(OBJEXT) libglcore_a-texstate.$(OBJEXT) \
- libglcore_a-texstore.$(OBJEXT) libglcore_a-texutil.$(OBJEXT) \
-- libglcore_a-varray.$(OBJEXT) libglcore_a-vsnprintf.$(OBJEXT) \
-+ libglcore_a-varray.$(OBJEXT) \
- libglcore_a-vtxfmt.$(OBJEXT) libglcore_a-glapi.$(OBJEXT) \
- libglcore_a-glthread.$(OBJEXT)
- am__objects_3 = libglcore_a-ac_context.$(OBJEXT) \
-@@ -665,7 +665,6 @@
- main/varray.c \
- main/varray.h \
- main/version.h \
-- main/vsnprintf.c \
- main/vtxfmt.c \
- main/vtxfmt.h \
- main/vtxfmt_tmp.h \
-@@ -949,8 +948,8 @@
-
- #CFLAGS = -g -O3
- # -D_POSIX_SOURCE -DPTHREADS
--libglcore_a_CFLAGS = -UHAVE_CONFIG_H -DXFree86Server -D_POSIX_SOURCE \
-- -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE $(ASM_DEFINE)
-+libglcore_a_CFLAGS = -UHAVE_CONFIG_H -DXFree86Server \
-+ -D_SVID_SOURCE -D_BSD_SOURCE $(ASM_DEFINE)
-
-
- # -DPTHREADS
-@@ -1132,7 +1131,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libglcore_a-texstore.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libglcore_a-texutil.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libglcore_a-varray.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libglcore_a-vsnprintf.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libglcore_a-vtxfmt.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libglcore_a-x86.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libglcore_a-xf86glx.Po@am__quote@
-@@ -2114,20 +2112,6 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main/varray.c' object='libglcore_a-varray.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglcore_a_CFLAGS) $(CFLAGS) -c -o libglcore_a-varray.obj `if test -f 'main/varray.c'; then $(CYGPATH_W) 'main/varray.c'; else $(CYGPATH_W) '$(srcdir)/main/varray.c'; fi`
--
--libglcore_a-vsnprintf.o: main/vsnprintf.c
--@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglcore_a_CFLAGS) $(CFLAGS) -MT libglcore_a-vsnprintf.o -MD -MP -MF "$(DEPDIR)/libglcore_a-vsnprintf.Tpo" -c -o libglcore_a-vsnprintf.o `test -f 'main/vsnprintf.c' || echo '$(srcdir)/'`main/vsnprintf.c; \
--@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libglcore_a-vsnprintf.Tpo" "$(DEPDIR)/libglcore_a-vsnprintf.Po"; else rm -f "$(DEPDIR)/libglcore_a-vsnprintf.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main/vsnprintf.c' object='libglcore_a-vsnprintf.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglcore_a_CFLAGS) $(CFLAGS) -c -o libglcore_a-vsnprintf.o `test -f 'main/vsnprintf.c' || echo '$(srcdir)/'`main/vsnprintf.c
--
--libglcore_a-vsnprintf.obj: main/vsnprintf.c
--@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglcore_a_CFLAGS) $(CFLAGS) -MT libglcore_a-vsnprintf.obj -MD -MP -MF "$(DEPDIR)/libglcore_a-vsnprintf.Tpo" -c -o libglcore_a-vsnprintf.obj `if test -f 'main/vsnprintf.c'; then $(CYGPATH_W) 'main/vsnprintf.c'; else $(CYGPATH_W) '$(srcdir)/main/vsnprintf.c'; fi`; \
--@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libglcore_a-vsnprintf.Tpo" "$(DEPDIR)/libglcore_a-vsnprintf.Po"; else rm -f "$(DEPDIR)/libglcore_a-vsnprintf.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main/vsnprintf.c' object='libglcore_a-vsnprintf.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglcore_a_CFLAGS) $(CFLAGS) -c -o libglcore_a-vsnprintf.obj `if test -f 'main/vsnprintf.c'; then $(CYGPATH_W) 'main/vsnprintf.c'; else $(CYGPATH_W) '$(srcdir)/main/vsnprintf.c'; fi`
-
- libglcore_a-vtxfmt.o: main/vtxfmt.c
- @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libglcore_a_CFLAGS) $(CFLAGS) -MT libglcore_a-vtxfmt.o -MD -MP -MF "$(DEPDIR)/libglcore_a-vtxfmt.Tpo" -c -o libglcore_a-vtxfmt.o `test -f 'main/vtxfmt.c' || echo '$(srcdir)/'`main/vtxfmt.c; \
diff --git a/x11/metisse/pkg-descr b/x11/metisse/pkg-descr
deleted file mode 100644
index f0eb2f532c7d..000000000000
--- a/x11/metisse/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Metisse is an experimental X desktop with neat OpenGL features. It consists
-of a virtual X server called Xmetisse, a special version of FVWM, and a FVWM
-module FvwmCompositor.
-
-WWW: http://insitu.lri.fr/metisse/
diff --git a/x11/metisse/pkg-plist b/x11/metisse/pkg-plist
deleted file mode 100644
index 05dfe7c7f30e..000000000000
--- a/x11/metisse/pkg-plist
+++ /dev/null
@@ -1,368 +0,0 @@
-bin/FvwmCommand
-bin/Xmetisse
-bin/Xwnc
-bin/facade-holder
-bin/fvwm-bug
-bin/fvwm-convert-2.4
-bin/fvwm-convert-2.6
-bin/fvwm-menu-desktop
-bin/fvwm-menu-directory
-bin/fvwm-menu-headlines
-bin/fvwm-menu-xlock
-bin/fvwm-perllib
-bin/fvwm-root
-bin/fvwmi
-bin/fvwmi-config
-bin/metisse-combo2radio
-bin/metisse-combo2radio-edit
-bin/metisse-demo-address-app
-bin/metisse-dummy-win
-bin/metisse-start-fvwm
-bin/metisse-xlib
-bin/opale-start-fvwmi
-include/libmetisse/auth.h
-include/libmetisse/proto.h
-@dirrm include/libmetisse
-%%PYTHON_SITELIBDIR%%/facade_setup.py
-%%PYTHON_SITELIBDIR%%/facade_setup.pyc
-%%PYTHON_SITELIBDIR%%/facade_setup.pyo
-lib/libmetisse.a
-lib/libmetisse.la
-%%FBSD6%%lib/libmetisse.so
-%%FBSD6%%lib/libmetisse.so.1
-%%FBSD7%%lib/libmetisse.so.1.0
-libdata/pkgconfig/libmetisse.pc
-libexec/fvwm-insitu/2.5.20/FvwmAnimate
-libexec/fvwm-insitu/2.5.20/FvwmAudio
-libexec/fvwm-insitu/2.5.20/FvwmAuto
-libexec/fvwm-insitu/2.5.20/FvwmBacker
-libexec/fvwm-insitu/2.5.20/FvwmBanner
-libexec/fvwm-insitu/2.5.20/FvwmButtons
-libexec/fvwm-insitu/2.5.20/FvwmCascade
-libexec/fvwm-insitu/2.5.20/FvwmCommand.pm
-libexec/fvwm-insitu/2.5.20/FvwmCommand.sh
-libexec/fvwm-insitu/2.5.20/FvwmCommandS
-libexec/fvwm-insitu/2.5.20/FvwmCompositor
-libexec/fvwm-insitu/2.5.20/FvwmConsole
-libexec/fvwm-insitu/2.5.20/FvwmConsoleC
-libexec/fvwm-insitu/2.5.20/FvwmConsoleC.pl
-libexec/fvwm-insitu/2.5.20/FvwmCpp
-libexec/fvwm-insitu/2.5.20/FvwmDebug
-libexec/fvwm-insitu/2.5.20/FvwmDragWell
-libexec/fvwm-insitu/2.5.20/FvwmEvent
-libexec/fvwm-insitu/2.5.20/FvwmForm
-%%GTK%%libexec/fvwm-insitu/2.5.20/FvwmGtk
-libexec/fvwm-insitu/2.5.20/FvwmGtkDebug
-libexec/fvwm-insitu/2.5.20/FvwmIconBox
-libexec/fvwm-insitu/2.5.20/FvwmIconMan
-libexec/fvwm-insitu/2.5.20/FvwmIdent
-libexec/fvwm-insitu/2.5.20/FvwmM4
-libexec/fvwm-insitu/2.5.20/FvwmPager
-libexec/fvwm-insitu/2.5.20/FvwmPerl
-libexec/fvwm-insitu/2.5.20/FvwmProxy
-libexec/fvwm-insitu/2.5.20/FvwmRearrange
-libexec/fvwm-insitu/2.5.20/FvwmSave
-libexec/fvwm-insitu/2.5.20/FvwmSaveDesk
-libexec/fvwm-insitu/2.5.20/FvwmScript
-libexec/fvwm-insitu/2.5.20/FvwmScroll
-libexec/fvwm-insitu/2.5.20/FvwmTabs
-libexec/fvwm-insitu/2.5.20/FvwmTalk
-libexec/fvwm-insitu/2.5.20/FvwmTaskBar
-libexec/fvwm-insitu/2.5.20/FvwmTheme
-libexec/fvwm-insitu/2.5.20/FvwmTile
-libexec/fvwm-insitu/2.5.20/FvwmWharf
-libexec/fvwm-insitu/2.5.20/FvwmWinList
-libexec/fvwm-insitu/2.5.20/FvwmWindowMenu
-@dirrm libexec/fvwm-insitu/2.5.20
-@dirrm libexec/fvwm-insitu
-share/applications/fvwmi.desktop
-share/applications/mini-fvwmi.desktop
-share/applications/opale.desktop
-@dirrmtry share/applications
-%%DOCSDIR%%/docs/building.html
-%%DOCSDIR%%/docs/metisse-architecture.png
-%%DOCSDIR%%/docs/running.html
-%%DOCSDIR%%/docs/using.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/metisse.css
-%%DOCSDIR%%/no3d.png
-%%DOCSDIR%%/up.jpg
-@dirrm %%DOCSDIR%%/docs
-@dirrm %%DOCSDIR%%
-share/fvwm-insitu/ConfigFvwmBacker
-share/fvwm-insitu/ConfigFvwmButtons
-share/fvwm-insitu/ConfigFvwmDefaults
-share/fvwm-insitu/ConfigFvwmIconBox
-share/fvwm-insitu/ConfigFvwmIconMan
-share/fvwm-insitu/ConfigFvwmIdent
-share/fvwm-insitu/ConfigFvwmPager
-share/fvwm-insitu/ConfigFvwmProxyDefaults
-share/fvwm-insitu/ConfigFvwmScroll
-share/fvwm-insitu/ConfigFvwmSetup
-share/fvwm-insitu/ConfigFvwmTabs
-share/fvwm-insitu/ConfigFvwmTaskBar
-share/fvwm-insitu/ConfigFvwmWinList
-share/fvwm-insitu/FvwmForm-Capture
-share/fvwm-insitu/FvwmForm-Form
-share/fvwm-insitu/FvwmForm-QuitVerify
-share/fvwm-insitu/FvwmForm-Rlogin
-share/fvwm-insitu/FvwmForm-RootCursor
-share/fvwm-insitu/FvwmForm-Setup
-share/fvwm-insitu/FvwmForm-Talk
-share/fvwm-insitu/FvwmForm-TalkHelp
-share/fvwm-insitu/FvwmScript-BaseConfig
-share/fvwm-insitu/FvwmScript-BellSetup
-share/fvwm-insitu/FvwmScript-Buttons
-share/fvwm-insitu/FvwmScript-Colorset
-share/fvwm-insitu/FvwmScript-ComExample
-share/fvwm-insitu/FvwmScript-Date
-share/fvwm-insitu/FvwmScript-FileBrowser
-share/fvwm-insitu/FvwmScript-Find
-share/fvwm-insitu/FvwmScript-KeyboardSetup
-share/fvwm-insitu/FvwmScript-PointerSetup
-share/fvwm-insitu/FvwmScript-Quit
-share/fvwm-insitu/FvwmScript-ScreenDump
-share/fvwm-insitu/FvwmScript-ScreenSetup
-share/fvwm-insitu/FvwmScript-Setup95
-share/fvwm-insitu/FvwmScript-WidgetDemo
-share/fvwm-insitu/FvwmTabs-DefaultSetup
-share/fvwm-insitu/fvwm-script-ComExample.pl
-share/fvwm-insitu/fvwm-script-setup95.pl
-share/fvwm-insitu/mini-user-config
-share/fvwm-insitu/opale-common/config
-share/fvwm-insitu/opale-common/styles-mini-icons
-share/fvwm-insitu/opale-user-config
-share/fvwm-insitu/opale/backgrounds/sky-default.jpg
-share/fvwm-insitu/opale/icons/16x16/actions/restart.png
-share/fvwm-insitu/opale/icons/16x16/actions/system-lock-screen.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-close.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-delete.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-destroy.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-iconify.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-identify.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-lower.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-maximize.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-move.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-raise.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-resize.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-shade.png
-share/fvwm-insitu/opale/icons/16x16/actions/window-stick.png
-share/fvwm-insitu/opale/icons/16x16/apps/accessories-calculator.png
-share/fvwm-insitu/opale/icons/16x16/apps/accessories-text-editor.png
-share/fvwm-insitu/opale/icons/16x16/apps/amusement.png
-share/fvwm-insitu/opale/icons/16x16/apps/blender.png
-share/fvwm-insitu/opale/icons/16x16/apps/cd-player.png
-share/fvwm-insitu/opale/icons/16x16/apps/chat.png
-share/fvwm-insitu/opale/icons/16x16/apps/clock.png
-share/fvwm-insitu/opale/icons/16x16/apps/colors.png
-share/fvwm-insitu/opale/icons/16x16/apps/configuration.png
-share/fvwm-insitu/opale/icons/16x16/apps/development.png
-share/fvwm-insitu/opale/icons/16x16/apps/dia.png
-share/fvwm-insitu/opale/icons/16x16/apps/disk-cd.png
-share/fvwm-insitu/opale/icons/16x16/apps/disk-floppy.png
-share/fvwm-insitu/opale/icons/16x16/apps/disk.png
-share/fvwm-insitu/opale/icons/16x16/apps/drakconf.png
-share/fvwm-insitu/opale/icons/16x16/apps/file-manager.png
-share/fvwm-insitu/opale/icons/16x16/apps/file.png
-share/fvwm-insitu/opale/icons/16x16/apps/game-action.png
-share/fvwm-insitu/opale/icons/16x16/apps/game-board.png
-share/fvwm-insitu/opale/icons/16x16/apps/game-cards.png
-share/fvwm-insitu/opale/icons/16x16/apps/game-logic.png
-share/fvwm-insitu/opale/icons/16x16/apps/game.png
-share/fvwm-insitu/opale/icons/16x16/apps/ghostview.png
-share/fvwm-insitu/opale/icons/16x16/apps/gnu.png
-share/fvwm-insitu/opale/icons/16x16/apps/gqview.png
-share/fvwm-insitu/opale/icons/16x16/apps/gvim.png
-share/fvwm-insitu/opale/icons/16x16/apps/help.png
-share/fvwm-insitu/opale/icons/16x16/apps/image-viewer.png
-share/fvwm-insitu/opale/icons/16x16/apps/images-processor.png
-share/fvwm-insitu/opale/icons/16x16/apps/information.png
-share/fvwm-insitu/opale/icons/16x16/apps/licq.png
-share/fvwm-insitu/opale/icons/16x16/apps/lyx.png
-share/fvwm-insitu/opale/icons/16x16/apps/mail.png
-share/fvwm-insitu/opale/icons/16x16/apps/monitoring.png
-share/fvwm-insitu/opale/icons/16x16/apps/multimedia-volume-control.png
-share/fvwm-insitu/opale/icons/16x16/apps/multimedia.png
-share/fvwm-insitu/opale/icons/16x16/apps/music.png
-share/fvwm-insitu/opale/icons/16x16/apps/nedit.png
-share/fvwm-insitu/opale/icons/16x16/apps/netscape.png
-share/fvwm-insitu/opale/icons/16x16/apps/network.png
-share/fvwm-insitu/opale/icons/16x16/apps/news.png
-share/fvwm-insitu/opale/icons/16x16/apps/ooo_calc.png
-share/fvwm-insitu/opale/icons/16x16/apps/ooo_impress.png
-share/fvwm-insitu/opale/icons/16x16/apps/ooo_writer.png
-share/fvwm-insitu/opale/icons/16x16/apps/opale.png
-share/fvwm-insitu/opale/icons/16x16/apps/opera.png
-share/fvwm-insitu/opale/icons/16x16/apps/preferences-desktop-font.png
-share/fvwm-insitu/opale/icons/16x16/apps/preferences-desktop-keyboard.png
-share/fvwm-insitu/opale/icons/16x16/apps/psi.png
-share/fvwm-insitu/opale/icons/16x16/apps/science.png
-share/fvwm-insitu/opale/icons/16x16/apps/sound.png
-share/fvwm-insitu/opale/icons/16x16/apps/stylesheet.png
-share/fvwm-insitu/opale/icons/16x16/apps/system.png
-share/fvwm-insitu/opale/icons/16x16/apps/terminal-remote.png
-share/fvwm-insitu/opale/icons/16x16/apps/terminal-special.png
-share/fvwm-insitu/opale/icons/16x16/apps/themes.png
-share/fvwm-insitu/opale/icons/16x16/apps/todo.png
-share/fvwm-insitu/opale/icons/16x16/apps/unknown.png
-share/fvwm-insitu/opale/icons/16x16/apps/utilities-terminal.png
-share/fvwm-insitu/opale/icons/16x16/apps/utility.png
-share/fvwm-insitu/opale/icons/16x16/apps/video.png
-share/fvwm-insitu/opale/icons/16x16/apps/viewer.png
-share/fvwm-insitu/opale/icons/16x16/apps/windows.png
-share/fvwm-insitu/opale/icons/16x16/apps/word-processor.png
-share/fvwm-insitu/opale/icons/16x16/apps/wp.png
-share/fvwm-insitu/opale/icons/16x16/apps/www.png
-share/fvwm-insitu/opale/icons/16x16/apps/xeyes.png
-share/fvwm-insitu/opale/icons/16x16/apps/xfig.png
-share/fvwm-insitu/opale/icons/16x16/apps/xload.png
-share/fvwm-insitu/opale/icons/16x16/apps/xmms.png
-share/fvwm-insitu/opale/icons/16x16/apps/xosview.png
-share/fvwm-insitu/opale/icons/16x16/apps/xpdf.png
-share/fvwm-insitu/opale/icons/16x16/apps/xv.png
-share/fvwm-insitu/opale/icons/16x16/categories/applications-internet.png
-share/fvwm-insitu/opale/icons/16x16/categories/applications-office.png
-share/fvwm-insitu/opale/icons/16x16/categories/applications.png
-share/fvwm-insitu/opale/icons/16x16/devices/input-mouse.png
-share/fvwm-insitu/opale/icons/16x16/devices/printer.png
-share/fvwm-insitu/opale/icons/16x16/devices/scanner.png
-share/fvwm-insitu/opale/icons/16x16/devices/video-display.png
-share/fvwm-insitu/opale/icons/16x16/places/folder-open.png
-share/fvwm-insitu/opale/icons/16x16/places/folder.png
-share/fvwm-insitu/opale/icons/16x16/places/user-home.png
-share/fvwm-insitu/perllib/FVWM/Commands.pm
-share/fvwm-insitu/perllib/FVWM/Constants.pm
-share/fvwm-insitu/perllib/FVWM/Event.pm
-share/fvwm-insitu/perllib/FVWM/EventNames.pm
-share/fvwm-insitu/perllib/FVWM/Module.pm
-share/fvwm-insitu/perllib/FVWM/Module/Gtk.pm
-share/fvwm-insitu/perllib/FVWM/Module/Gtk2.pm
-share/fvwm-insitu/perllib/FVWM/Module/Terminal.pm
-share/fvwm-insitu/perllib/FVWM/Module/Tk.pm
-share/fvwm-insitu/perllib/FVWM/Module/Toolkit.pm
-share/fvwm-insitu/perllib/FVWM/Tracker.pm
-share/fvwm-insitu/perllib/FVWM/Tracker/Colorsets.pm
-share/fvwm-insitu/perllib/FVWM/Tracker/GlobalConfig.pm
-share/fvwm-insitu/perllib/FVWM/Tracker/ModuleConfig.pm
-share/fvwm-insitu/perllib/FVWM/Tracker/PageInfo.pm
-share/fvwm-insitu/perllib/FVWM/Tracker/Scheduler.pm
-share/fvwm-insitu/perllib/FVWM/Tracker/WindowList.pm
-share/fvwm-insitu/perllib/General/FileSystem.pm
-share/fvwm-insitu/perllib/General/Parse.pm
-share/fvwm-insitu/system.fvwm2rc-sample-95
-@dirrm share/fvwm-insitu/perllib/General
-@dirrm share/fvwm-insitu/perllib/FVWM/Tracker
-@dirrm share/fvwm-insitu/perllib/FVWM/Module
-@dirrm share/fvwm-insitu/perllib/FVWM
-@dirrm share/fvwm-insitu/perllib
-@dirrm share/fvwm-insitu/opale/icons/16x16/places
-@dirrm share/fvwm-insitu/opale/icons/16x16/devices
-@dirrm share/fvwm-insitu/opale/icons/16x16/categories
-@dirrm share/fvwm-insitu/opale/icons/16x16/apps
-@dirrm share/fvwm-insitu/opale/icons/16x16/actions
-@dirrm share/fvwm-insitu/opale/icons/16x16
-@dirrm share/fvwm-insitu/opale/icons
-@dirrm share/fvwm-insitu/opale/backgrounds
-@dirrm share/fvwm-insitu/opale-common
-@dirrm share/fvwm-insitu/opale
-@dirrm share/fvwm-insitu
-share/locale/ar/LC_MESSAGES/FvwmScript.mo
-share/locale/ar/LC_MESSAGES/FvwmTaskBar.mo
-share/locale/ar/LC_MESSAGES/fvwm.mo
-share/locale/de/LC_MESSAGES/FvwmScript.mo
-share/locale/de/LC_MESSAGES/FvwmTaskBar.mo
-share/locale/de/LC_MESSAGES/fvwm.mo
-share/locale/fr/LC_MESSAGES/FvwmScript.mo
-share/locale/fr/LC_MESSAGES/FvwmTaskBar.mo
-share/locale/fr/LC_MESSAGES/fvwm.mo
-share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
-share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo
-share/locale/sv_SE/LC_MESSAGES/fvwm.mo
-@dirrmtry share/locale/sv_SE/LC_MESSAGES
-@dirrmtry share/locale/sv_SE
-share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
-share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo
-share/locale/zh_CN/LC_MESSAGES/fvwm.mo
-%%DATADIR%%/fvwm/FvwmScript-SaveFacade
-%%DATADIR%%/fvwm/applications
-%%DATADIR%%/fvwm/background
-%%DATADIR%%/fvwm/bindings
-%%DATADIR%%/fvwm/bindings-functions
-%%DATADIR%%/fvwm/colours/Ia_Ora_blue.theme
-%%DATADIR%%/fvwm/colours/Ia_Ora_free.theme
-%%DATADIR%%/fvwm/colours/Ia_Ora_gray.theme
-%%DATADIR%%/fvwm/colours/Ia_Ora_orange.theme
-%%DATADIR%%/fvwm/colours/Metisse.theme
-%%DATADIR%%/fvwm/colours/Metisse_Contrast.theme
-%%DATADIR%%/fvwm/colours/Opale.theme
-%%DATADIR%%/fvwm/config
-%%DATADIR%%/fvwm/config-files-list
-%%DATADIR%%/fvwm/desks
-%%DATADIR%%/fvwm/fonts
-%%DATADIR%%/fvwm/images/backgrounds/sky-metisse.jpg
-%%DATADIR%%/fvwm/images/backgrounds/tabletop.png
-%%DATADIR%%/fvwm/images/buttons/Ia_Ora/close.png
-%%DATADIR%%/fvwm/images/buttons/Ia_Ora/maximize.png
-%%DATADIR%%/fvwm/images/buttons/Ia_Ora/minimize.png
-%%DATADIR%%/fvwm/images/buttons/Ia_Ora/not_sticky.png
-%%DATADIR%%/fvwm/images/buttons/Ia_Ora/sticky.png
-%%DATADIR%%/fvwm/images/buttons/Ia_Ora/unmaximize.png
-%%DATADIR%%/fvwm/images/buttons/redmond/close-activedown.png
-%%DATADIR%%/fvwm/images/buttons/redmond/close-activeup.png
-%%DATADIR%%/fvwm/images/buttons/redmond/close-inactive.png
-%%DATADIR%%/fvwm/images/buttons/redmond/iconify-activedown.png
-%%DATADIR%%/fvwm/images/buttons/redmond/iconify-activeup.png
-%%DATADIR%%/fvwm/images/buttons/redmond/iconify-inactive.png
-%%DATADIR%%/fvwm/images/buttons/redmond/maximize-activedown.png
-%%DATADIR%%/fvwm/images/buttons/redmond/maximize-activeup.png
-%%DATADIR%%/fvwm/images/buttons/redmond/maximize-inactive.png
-%%DATADIR%%/fvwm/images/buttons/redmond/unmaximize-activedown.png
-%%DATADIR%%/fvwm/images/buttons/redmond/unmaximize-activeup.png
-%%DATADIR%%/fvwm/images/buttons/redmond/unmaximize-inactive.png
-%%DATADIR%%/fvwm/images/cursors/fold_b.xpm
-%%DATADIR%%/fvwm/images/cursors/fold_bl.xpm
-%%DATADIR%%/fvwm/images/cursors/fold_br.xpm
-%%DATADIR%%/fvwm/images/cursors/fold_l.xpm
-%%DATADIR%%/fvwm/images/cursors/fold_r.xpm
-%%DATADIR%%/fvwm/images/cursors/fold_t.xpm
-%%DATADIR%%/fvwm/images/cursors/fold_tl.xpm
-%%DATADIR%%/fvwm/images/cursors/fold_tr.xpm
-%%DATADIR%%/fvwm/images/cursors/sb_bltr_double_arrow.xpm
-%%DATADIR%%/fvwm/menus
-%%DATADIR%%/fvwm/menustyle
-%%DATADIR%%/fvwm/metisserc
-%%DATADIR%%/fvwm/panels
-%%DATADIR%%/fvwm/scripting.pl
-%%DATADIR%%/fvwm/shading
-%%DATADIR%%/fvwm/stroke
-%%DATADIR%%/fvwm/styles
-%%DATADIR%%/fvwm/themes/Ia_Ora_blue.theme
-%%DATADIR%%/fvwm/themes/Ia_Ora_free.theme
-%%DATADIR%%/fvwm/themes/Ia_Ora_gray.theme
-%%DATADIR%%/fvwm/themes/Ia_Ora_orange.theme
-%%DATADIR%%/fvwm/themes/Metisse.theme
-%%DATADIR%%/fvwm/themes/Metisse_Constrast.theme
-%%DATADIR%%/fvwm/themes/Opale_Devel.theme
-%%DATADIR%%/fvwm/themes/Opale_Vectors.theme
-%%DATADIR%%/fvwm/themes/Redmond_Ia_Ora.theme
-%%DATADIR%%/fvwm/themes/Redmond_Opale.theme
-%%DATADIR%%/fvwm/window/Devel.theme
-%%DATADIR%%/fvwm/window/Ia_Ora.theme
-%%DATADIR%%/fvwm/window/Metisse.theme
-%%DATADIR%%/fvwm/window/Redmond.theme
-%%DATADIR%%/fvwm/window/Vectors.theme
-%%DATADIR%%/shaders/blur-f.glsl
-%%DATADIR%%/shaders/shaders-files-list
-%%DATADIR%%/shaders/simple-anim-f.glsl
-@dirrm %%DATADIR%%/shaders
-@dirrm %%DATADIR%%/fvwm/window
-@dirrm %%DATADIR%%/fvwm/themes
-@dirrm %%DATADIR%%/fvwm/images/cursors
-@dirrm %%DATADIR%%/fvwm/images/buttons/redmond
-@dirrm %%DATADIR%%/fvwm/images/buttons/Ia_Ora
-@dirrm %%DATADIR%%/fvwm/images/buttons
-@dirrm %%DATADIR%%/fvwm/images/backgrounds
-@dirrm %%DATADIR%%/fvwm/images
-@dirrm %%DATADIR%%/fvwm/colours
-@dirrm %%DATADIR%%/fvwm
-@dirrm %%DATADIR%%