Upgrade xfce from 1.2.4->2.0.4, make associated changes.

PR:		ports/7806
Submitted by:	Nakai@technologist.com (maintainer)

8 files changed, 892 insertions, 356 deletions

diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index e69af2b1abf5..a10cd0726d67 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -1,27 +1,23 @@
 # New ports collection makefile for:	xfce
-# Version required:	1.2.4
+# Version required:	2.1.1
 # Date created:		30 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1998/09/26 23:18:08 steve Exp $
+# $Id: Makefile,v 1.7 1998/10/05 05:18:01 steve Exp $
 #
 
-DISTNAME=	xfce-1.2.4
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/toolbars
+DISTNAME=	xfce-2.1.1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://www.xfce.org/archive/
 
-MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
+MAINTAINER=	Nakai@technologist.com
 
 BROKEN_ELF=	xforms is a.out only
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
-WRKSRC=		${WRKDIR}/XFCE-1.2.4
 USE_GMAKE=	yes
 USE_IMAKE=	yes
-XMKMF=		xmkmf
-MAN1=		XFCE.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce/distinfo b/x11-wm/xfce/distinfo
index 1e3981e37371..2c2e1cad485a 100644
--- a/x11-wm/xfce/distinfo
+++ b/x11-wm/xfce/distinfo
@@ -1 +1 @@
-MD5 (xfce-1.2.4.tar.gz) = 42b11ee2250451d5edc5270c30ada324
+MD5 (xfce-2.1.1.tar.gz) = c30093dea99745d096be0a15b3684714
diff --git a/x11-wm/xfce/files/patch-aa b/x11-wm/xfce/files/patch-aa
index 1c7ba54b9597..68c39c13cf61 100644
--- a/x11-wm/xfce/files/patch-aa
+++ b/x11-wm/xfce/files/patch-aa
@@ -1,156 +1,9 @@
-*** Imakefile.orig	Wed Aug 20 08:24:00 1997
---- Imakefile	Wed Oct  1 09:09:23 1997
-***************
-*** 1,7 ****
-! XPIXMAPDIR    = /usr/X11/include/X11/pixmaps
-! XBINDIR       = /usr/X11/bin
-! XFCE_DIR      = /var/XFCE
-! XFCE_PAL      = /var/XFCE/palettes
-  FVWM_MODULES  = /usr/lib/X11/fvwm
-  FVWM2_MODULES = /usr/lib/X11/fvwm2
-  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
---- 1,7 ----
-! XPIXMAPDIR    = /usr/X11R6/lib/X11/XFCE/pixmaps
-! XBINDIR       = /usr/X11R6/bin
-! XFCE_DIR      = /usr/X11R6/lib/X11/XFCE
-! XFCE_PAL      = /usr/X11R6/lib/X11/XFCE/palettes
-  FVWM_MODULES  = /usr/lib/X11/fvwm
-  FVWM2_MODULES = /usr/lib/X11/fvwm2
-  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
-***************
-*** 17,24 ****
-   my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\
-   sendinfo.o startup.o tiptools.o
-  
-! XCOMM for LINUX: 
-! EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm 
-  
-  XCOMM for static link with XForms
-  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
---- 17,24 ----
-   my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\
-   sendinfo.o startup.o tiptools.o
-  
-! XCOMM for FreeBSD: 
-! EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm 
-  
-  XCOMM for static link with XForms
-  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
-***************
-*** 60,85 ****
-  install_palettes::
-  	mkdir -p $(XFCE_PAL)
-  	chmod a+rw $(XFCE_PAL)
-! 	cp -vpb palettes\/* $(XFCE_PAL)
-  
-  install_bin::   	XFCE install.man
-  	@if [ -d $(XBINDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi
-! 	@cp -vfb XFCE $(XBINDIR);
-! 	ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce;
-  	@chmod 0755 $(XBINDIR)/XFCE;
-  	@if [ -d $(FVWM_MODULES) ]; then \
-! 	ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
-  	@if [ -d $(FVWM2_MODULES) ]; then \
-! 	ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
-  	mkdir -p $(XFCE_DIR)
-  	mkdir -p $(XFCE_DIR)/doc
-! 	@cp -vpb sample.* $(XFCE_DIR)/;
-! 	@cp -vpb INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
-! 	ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;
-! 	ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;
-! 	ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;
-! 	ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;
-  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
-  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
---- 60,85 ----
-  install_palettes::
-  	mkdir -p $(XFCE_PAL)
-  	chmod a+rw $(XFCE_PAL)
-! 	cp -R palettes\/* $(XFCE_PAL)
-  
-  install_bin::   	XFCE install.man
-  	@if [ -d $(XBINDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi
-! 	@cp -R XFCE $(XBINDIR);
-! 	ln -sf $(XBINDIR)/XFCE $(XBINDIR)/xfce;
-  	@chmod 0755 $(XBINDIR)/XFCE;
-  	@if [ -d $(FVWM_MODULES) ]; then \
-! 	ln -sf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
-  	@if [ -d $(FVWM2_MODULES) ]; then \
-! 	ln -sf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
-  	mkdir -p $(XFCE_DIR)
-  	mkdir -p $(XFCE_DIR)/doc
-! 	@cp -R sample.* $(XFCE_DIR)/;
-! 	@cp -R INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
-! 	ln -sf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;
-! 	ln -sf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;
-! 	ln -sf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;
-! 	ln -sf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;
-  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
-  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
-***************
-*** 97,126 ****
-  
-  install_logo::		install_bin install_palettes
-  	@mkdir -p $(XFCE_DIR)
-! 	@cp -vpb XFCE_full.logo $(XFCE_DIR);
-! 	@cp -vpb XFCE_dithered.logo $(XFCE_DIR);
-  
-  install_full::		install_logo
-! 	ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install_dithered::	install_logo
-! 	ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install::		install_full
-  
-  francais::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  english::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  italiano::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  deutsch::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
---- 97,126 ----
-  
-  install_logo::		install_bin install_palettes
-  	@mkdir -p $(XFCE_DIR)
-! 	@cp -R XFCE_full.logo $(XFCE_DIR);
-! 	@cp -R XFCE_dithered.logo $(XFCE_DIR);
-  
-  install_full::		install_logo
-! 	ln -sf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install_dithered::	install_logo
-! 	ln -sf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install::		install_full
-  
-  francais::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  english::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  italiano::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  deutsch::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
+--- XFCE.def.orig	Wed Oct 21 09:11:00 1998
++++ XFCE.def	Tue Nov 17 13:24:34 1998
+@@ -1,5 +1,5 @@
+ XBINDIR        = $(BINDIR) 
+-XFCE_DIR       = /var/XFCE
++XFCE_DIR       = $(PREFIX)/lib/X11/XFCE
+ XFCE_PAL       = $(XFCE_DIR)/palettes
+ XFCE_BACKDROPS = $(XFCE_DIR)/backdrops
+ XFCE_HELP      = $(XFCE_DIR)/help
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index 2d9bfc60ed4c..c686098da396 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -1,37 +1,456 @@
-bin/XFCE
+bin/xfbd
 bin/xfce
-lib/X11/XFCE/.fvwm2rc
-lib/X11/XFCE/.fvwmrc
-lib/X11/XFCE/.xfcerc
-lib/X11/XFCE/.xinitrc
-lib/X11/XFCE/XFCE.logo
-lib/X11/XFCE/XFCE_dithered.logo
-lib/X11/XFCE/XFCE_full.logo
+bin/xfplay
+bin/xfsound
+bin/xfwm
+lib/X11/XFCE/Quickstart
+lib/X11/XFCE/XFce2.logo
+lib/X11/XFCE/backdrops/Anneaux.xpm
+lib/X11/XFCE/backdrops/Arena.xpm
+lib/X11/XFCE/backdrops/Bluedrops.xpm
+lib/X11/XFCE/backdrops/Bluefalls.xpm
+lib/X11/XFCE/backdrops/Boucles.xpm
+lib/X11/XFCE/backdrops/Brownie.xpm
+lib/X11/XFCE/backdrops/Candies.xpm
+lib/X11/XFCE/backdrops/Cds.xpm
+lib/X11/XFCE/backdrops/Circle.xpm
+lib/X11/XFCE/backdrops/Cloth.xpm
+lib/X11/XFCE/backdrops/Clouds.xpm
+lib/X11/XFCE/backdrops/Cocoa.xpm
+lib/X11/XFCE/backdrops/Compute.xpm
+lib/X11/XFCE/backdrops/Concrete.xpm
+lib/X11/XFCE/backdrops/Darkblue.xpm
+lib/X11/XFCE/backdrops/Darkblue2.xpm
+lib/X11/XFCE/backdrops/Desert.xpm
+lib/X11/XFCE/backdrops/Desert2.xpm
+lib/X11/XFCE/backdrops/Dry.xpm
+lib/X11/XFCE/backdrops/Eyes.xpm
+lib/X11/XFCE/backdrops/Fire.xpm
+lib/X11/XFCE/backdrops/Flames.xpm
+lib/X11/XFCE/backdrops/Flow.xpm
+lib/X11/XFCE/backdrops/Funkyblue.xpm
+lib/X11/XFCE/backdrops/Gallets.xpm
+lib/X11/XFCE/backdrops/Glasses.xpm
+lib/X11/XFCE/backdrops/Gold.xpm
+lib/X11/XFCE/backdrops/Gradient.xpm
+lib/X11/XFCE/backdrops/Granit.xpm
+lib/X11/XFCE/backdrops/Gray.xpm
+lib/X11/XFCE/backdrops/Green.xpm
+lib/X11/XFCE/backdrops/Greenslate.xpm
+lib/X11/XFCE/backdrops/Grey.xpm
+lib/X11/XFCE/backdrops/Grey_marb.xpm
+lib/X11/XFCE/backdrops/Greydrops.xpm
+lib/X11/XFCE/backdrops/Greysea.xpm
+lib/X11/XFCE/backdrops/Guimauve.xpm
+lib/X11/XFCE/backdrops/Hardblue.xpm
+lib/X11/XFCE/backdrops/Honey.xpm
+lib/X11/XFCE/backdrops/Leaves.xpm
+lib/X11/XFCE/backdrops/Marble2.xpm
+lib/X11/XFCE/backdrops/Marbled.xpm
+lib/X11/XFCE/backdrops/Marbled2.xpm
+lib/X11/XFCE/backdrops/Marblee.xpm
+lib/X11/XFCE/backdrops/Maze.xpm
+lib/X11/XFCE/backdrops/Multicolor1.xpm
+lib/X11/XFCE/backdrops/Multicolor2.xpm
+lib/X11/XFCE/backdrops/Notes.xpm
+lib/X11/XFCE/backdrops/Paper.xpm
+lib/X11/XFCE/backdrops/Pencils.xpm
+lib/X11/XFCE/backdrops/Pieces.xpm
+lib/X11/XFCE/backdrops/Plasma.xpm
+lib/X11/XFCE/backdrops/Pool.xpm
+lib/X11/XFCE/backdrops/Praline.xpm
+lib/X11/XFCE/backdrops/Psy.xpm
+lib/X11/XFCE/backdrops/Psy2.xpm
+lib/X11/XFCE/backdrops/Psy3.xpm
+lib/X11/XFCE/backdrops/Raindrops.xpm
+lib/X11/XFCE/backdrops/Rock.xpm
+lib/X11/XFCE/backdrops/Rotin.xpm
+lib/X11/XFCE/backdrops/Rough.xpm
+lib/X11/XFCE/backdrops/Sandy-ridges.xpm
+lib/X11/XFCE/backdrops/Satin.xpm
+lib/X11/XFCE/backdrops/Satin2.xpm
+lib/X11/XFCE/backdrops/Satin3.xpm
+lib/X11/XFCE/backdrops/Sea.xpm
+lib/X11/XFCE/backdrops/Sky.xpm
+lib/X11/XFCE/backdrops/Slate.xpm
+lib/X11/XFCE/backdrops/Smooth.xpm
+lib/X11/XFCE/backdrops/Soft.xpm
+lib/X11/XFCE/backdrops/Softblue.xpm
+lib/X11/XFCE/backdrops/Sol.xpm
+lib/X11/XFCE/backdrops/Solid.xpm
+lib/X11/XFCE/backdrops/Space.xpm
+lib/X11/XFCE/backdrops/Space2.xpm
+lib/X11/XFCE/backdrops/Speed.xpm
+lib/X11/XFCE/backdrops/Storm.xpm
+lib/X11/XFCE/backdrops/Stucco.xpm
+lib/X11/XFCE/backdrops/Teal.xpm
+lib/X11/XFCE/backdrops/Tiles.xpm
+lib/X11/XFCE/backdrops/Tiles2.xpm
+lib/X11/XFCE/backdrops/Tiles3.xpm
+lib/X11/XFCE/backdrops/Time.xpm
+lib/X11/XFCE/backdrops/Ufo.xpm
+lib/X11/XFCE/backdrops/Wall1.xpm
+lib/X11/XFCE/backdrops/Wall2.xpm
+lib/X11/XFCE/backdrops/Wall3.xpm
+lib/X11/XFCE/backdrops/Wax.xpm
+lib/X11/XFCE/backdrops/Weave-red.xpm
+lib/X11/XFCE/backdrops/Weird.xpm
+lib/X11/XFCE/backdrops/Wood-floor.xpm
+lib/X11/XFCE/backdrops/Wood.xpm
+lib/X11/XFCE/backdrops/Wood2.xpm
+lib/X11/XFCE/backdrops/Worm.xpm
+lib/X11/XFCE/backdrops/XFce_logo.xpm
+lib/X11/XFCE/backdrops/Yellow.xpm
 lib/X11/XFCE/doc/COPYRIGHT
 lib/X11/XFCE/doc/INSTALL
 lib/X11/XFCE/doc/MANUAL
 lib/X11/XFCE/doc/README
+lib/X11/XFCE/help/en/addmodcm.html
+lib/X11/XFCE/help/en/author.html
+lib/X11/XFCE/help/en/binary.html
+lib/X11/XFCE/help/en/defscreen.html
+lib/X11/XFCE/help/en/desktop.html
+lib/X11/XFCE/help/en/index.html
+lib/X11/XFCE/help/en/info.html
+lib/X11/XFCE/help/en/intro.html
+lib/X11/XFCE/help/en/library.html
+lib/X11/XFCE/help/en/links.html
+lib/X11/XFCE/help/en/menus.html
+lib/X11/XFCE/help/en/panel.html
+lib/X11/XFCE/help/en/panelcom.html
+lib/X11/XFCE/help/en/parameters.html
+lib/X11/XFCE/help/en/setup.html
+lib/X11/XFCE/help/en/table.html
+lib/X11/XFCE/help/en/welcome.html
+lib/X11/XFCE/help/en/xfbd.html
+lib/X11/XFCE/help/en/xfsound.html
+lib/X11/XFCE/help/en/xfwm.html
+lib/X11/XFCE/help/fr/addmodcm.html
+lib/X11/XFCE/help/fr/author.html
+lib/X11/XFCE/help/fr/binary.html
+lib/X11/XFCE/help/fr/defscreen.html
+lib/X11/XFCE/help/fr/desktop.html
+lib/X11/XFCE/help/fr/index.html
+lib/X11/XFCE/help/fr/info.html
+lib/X11/XFCE/help/fr/intro.html
+lib/X11/XFCE/help/fr/library.html
+lib/X11/XFCE/help/fr/links.html
+lib/X11/XFCE/help/fr/menus.html
+lib/X11/XFCE/help/fr/panel.html
+lib/X11/XFCE/help/fr/panelcom.html
+lib/X11/XFCE/help/fr/parameters.html
+lib/X11/XFCE/help/fr/setup.html
+lib/X11/XFCE/help/fr/table.html
+lib/X11/XFCE/help/fr/welcome.html
+lib/X11/XFCE/help/fr/xfbd.html
+lib/X11/XFCE/help/fr/xfsound.html
+lib/X11/XFCE/help/fr/xfwm.html
+lib/X11/XFCE/help/images/Announcement.gif
+lib/X11/XFCE/help/images/Backleft.gif
+lib/X11/XFCE/help/images/XFBD.gif
+lib/X11/XFCE/help/images/XFCE_additem.gif
+lib/X11/XFCE/help/images/XFCE_butinfo.gif
+lib/X11/XFCE/help/images/XFCE_butlock.gif
+lib/X11/XFCE/help/images/XFCE_butquit.gif
+lib/X11/XFCE/help/images/XFCE_butsetup.gif
+lib/X11/XFCE/help/images/XFCE_center.gif
+lib/X11/XFCE/help/images/XFCE_close.gif
+lib/X11/XFCE/help/images/XFCE_define.gif
+lib/X11/XFCE/help/images/XFCE_filesel.gif
+lib/X11/XFCE/help/images/XFCE_iconify.gif
+lib/X11/XFCE/help/images/XFCE_iconmenu.gif
+lib/X11/XFCE/help/images/XFCE_iconmenu2.gif
+lib/X11/XFCE/help/images/XFCE_left.gif
+lib/X11/XFCE/help/images/XFCE_loadpal.gif
+lib/X11/XFCE/help/images/XFCE_logo.gif
+lib/X11/XFCE/help/images/XFCE_menu.gif
+lib/X11/XFCE/help/images/XFCE_menu_detached.gif
+lib/X11/XFCE/help/images/XFCE_menu_selected.gif
+lib/X11/XFCE/help/images/XFCE_move.gif
+lib/X11/XFCE/help/images/XFCE_panel.gif
+lib/X11/XFCE/help/images/XFCE_popdown.gif
+lib/X11/XFCE/help/images/XFCE_popup.gif
+lib/X11/XFCE/help/images/XFCE_right.gif
+lib/X11/XFCE/help/images/XFCE_screen.gif
+lib/X11/XFCE/help/images/XFCE_selexec.gif
+lib/X11/XFCE/help/images/XFCE_setup.gif
+lib/X11/XFCE/help/images/XFCE_topleft.gif
+lib/X11/XFCE/help/images/XFSND_dialog.gif
+lib/X11/XFCE/help/images/XFSND_eventlist.gif
+lib/X11/XFCE/help/images/XFSND_fileselect.gif
+lib/X11/XFCE/help/images/XFWM_activetitlebar.gif
+lib/X11/XFCE/help/images/XFWM_colors.gif
+lib/X11/XFCE/help/images/XFWM_iconify.gif
+lib/X11/XFCE/help/images/XFWM_inactivetitlebar.gif
+lib/X11/XFCE/help/images/XFWM_maximize.gif
+lib/X11/XFCE/help/images/XFWM_maximized.gif
+lib/X11/XFCE/help/images/XFWM_menuclose.gif
+lib/X11/XFCE/help/images/XFWM_pal1.gif
+lib/X11/XFCE/help/images/XFWM_pal2.gif
+lib/X11/XFCE/help/images/XFWM_pal3.gif
+lib/X11/XFCE/help/images/XFWM_pal4.gif
+lib/X11/XFCE/help/images/XFWM_sticky.gif
+lib/X11/XFCE/help/images/XFWM_window.gif
+lib/X11/XFCE/help/images/a_propos_auteur.gif
+lib/X11/XFCE/help/images/about_the_author.gif
+lib/X11/XFCE/help/images/autres_liens.gif
+lib/X11/XFCE/help/images/backdrop_manager.gif
+lib/X11/XFCE/help/images/backgr.gif
+lib/X11/XFCE/help/images/barre_principale.gif
+lib/X11/XFCE/help/images/binary_distribution.gif
+lib/X11/XFCE/help/images/bouncing.gif
+lib/X11/XFCE/help/images/cholesterol-small.gif
+lib/X11/XFCE/help/images/cholesterol_free.gif
+lib/X11/XFCE/help/images/clic_dbl.gif
+lib/X11/XFCE/help/images/clic_left.gif
+lib/X11/XFCE/help/images/clic_mid.gif
+lib/X11/XFCE/help/images/clic_right.gif
+lib/X11/XFCE/help/images/commandes_barre_principale.gif
+lib/X11/XFCE/help/images/compiler_xfce.gif
+lib/X11/XFCE/help/images/compiling_sources.gif
+lib/X11/XFCE/help/images/contenu_menus.gif
+lib/X11/XFCE/help/images/define_front_panel_commands.gif
+lib/X11/XFCE/help/images/desktop_with_xfce.gif
+lib/X11/XFCE/help/images/distribution_precompilee.gif
+lib/X11/XFCE/help/images/download.gif
+lib/X11/XFCE/help/images/english.gif
+lib/X11/XFCE/help/images/france.gif
+lib/X11/XFCE/help/images/gestionnaire_fenetres.gif
+lib/X11/XFCE/help/images/gestionnaire_papier.gif
+lib/X11/XFCE/help/images/gestionnaire_sons.gif
+lib/X11/XFCE/help/images/introduction.gif
+lib/X11/XFCE/help/images/labels_ecran.gif
+lib/X11/XFCE/help/images/librairie_xforms.gif
+lib/X11/XFCE/help/images/linux-kheops.gif
+lib/X11/XFCE/help/images/liste_distribution.gif
+lib/X11/XFCE/help/images/logo.gif
+lib/X11/XFCE/help/images/logo07.gif
+lib/X11/XFCE/help/images/mailing_list.gif
+lib/X11/XFCE/help/images/menu_entries.gif
+lib/X11/XFCE/help/images/menus_deroulants.gif
+lib/X11/XFCE/help/images/moongroup_micro.gif
+lib/X11/XFCE/help/images/moongroup_neon.gif
+lib/X11/XFCE/help/images/moongroup_small.gif
+lib/X11/XFCE/help/images/mouse.gif
+lib/X11/XFCE/help/images/new.gif
+lib/X11/XFCE/help/images/nocount.gif
+lib/X11/XFCE/help/images/olivier.gif
+lib/X11/XFCE/help/images/other_links.gif
+lib/X11/XFCE/help/images/parametres_configuration.gif
+lib/X11/XFCE/help/images/penguincompany.jpg
+lib/X11/XFCE/help/images/popup_menus.gif
+lib/X11/XFCE/help/images/press.gif
+lib/X11/XFCE/help/images/screen_1.gif
+lib/X11/XFCE/help/images/screen_2.gif
+lib/X11/XFCE/help/images/screen_3.gif
+lib/X11/XFCE/help/images/screen_4.gif
+lib/X11/XFCE/help/images/screen_labels.gif
+lib/X11/XFCE/help/images/screens.gif
+lib/X11/XFCE/help/images/setup_parameters.gif
+lib/X11/XFCE/help/images/sound_manager.gif
+lib/X11/XFCE/help/images/telechargement.gif
+lib/X11/XFCE/help/images/ver2released.gif
+lib/X11/XFCE/help/images/vertical_XFCE.gif
+lib/X11/XFCE/help/images/votre_bureau.gif
+lib/X11/XFCE/help/images/xfce2_help_system.gif
+lib/X11/XFCE/help/images/xfce_front_panel.gif
+lib/X11/XFCE/help/images/xforms_library.gif
+lib/X11/XFCE/help/images/xfwm_window_manager.gif
+lib/X11/XFCE/help/index.html
+lib/X11/XFCE/icons/ABC.xpm
+lib/X11/XFCE/icons/AZ.xpm
+lib/X11/XFCE/icons/Animator.xpm
+lib/X11/XFCE/icons/AntiVirus.xpm
+lib/X11/XFCE/icons/BackUp.xpm
+lib/X11/XFCE/icons/Ballon.xpm
+lib/X11/XFCE/icons/Binoculars.xpm
+lib/X11/XFCE/icons/Bomb.xpm
+lib/X11/XFCE/icons/Bomb2.xpm
+lib/X11/XFCE/icons/Box_empty.xpm
+lib/X11/XFCE/icons/Box_full.xpm
+lib/X11/XFCE/icons/C++.xpm
+lib/X11/XFCE/icons/C.xpm
+lib/X11/XFCE/icons/CAD.xpm
+lib/X11/XFCE/icons/CAD2.xpm
+lib/X11/XFCE/icons/Calculator.xpm
+lib/X11/XFCE/icons/Camera.xpm
+lib/X11/XFCE/icons/Cards.xpm
+lib/X11/XFCE/icons/Chart.xpm
+lib/X11/XFCE/icons/Clock.xpm
+lib/X11/XFCE/icons/Colormap.xpm
+lib/X11/XFCE/icons/CompactDisc.xpm
+lib/X11/XFCE/icons/Connect.xpm
+lib/X11/XFCE/icons/Copy.xpm
+lib/X11/XFCE/icons/Database.xpm
+lib/X11/XFCE/icons/DiskCopy.xpm
+lib/X11/XFCE/icons/Disk_blue.xpm
+lib/X11/XFCE/icons/Disks.xpm
+lib/X11/XFCE/icons/Document.xpm
+lib/X11/XFCE/icons/Drawing.xpm
+lib/X11/XFCE/icons/Drawing2.xpm
+lib/X11/XFCE/icons/Drawing3.xpm
+lib/X11/XFCE/icons/Dynamite.xpm
+lib/X11/XFCE/icons/Earth.xpm
+lib/X11/XFCE/icons/Edit.xpm
+lib/X11/XFCE/icons/Editres.xpm
+lib/X11/XFCE/icons/Exit.xpm
+lib/X11/XFCE/icons/FAX.xpm
+lib/X11/XFCE/icons/Film.xpm
+lib/X11/XFCE/icons/Film2.xpm
+lib/X11/XFCE/icons/FontDesigner.xpm
+lib/X11/XFCE/icons/Fonts.xpm
+lib/X11/XFCE/icons/Format.xpm
+lib/X11/XFCE/icons/Ftp.xpm
+lib/X11/XFCE/icons/Game.xpm
+lib/X11/XFCE/icons/Graph_bar.xpm
+lib/X11/XFCE/icons/Graph_pie.xpm
+lib/X11/XFCE/icons/Hammer.xpm
+lib/X11/XFCE/icons/Key.xpm
+lib/X11/XFCE/icons/Keys.xpm
+lib/X11/XFCE/icons/Lightbulb.xpm
+lib/X11/XFCE/icons/Lightning.xpm
+lib/X11/XFCE/icons/Lock.xpm
+lib/X11/XFCE/icons/Magnify.xpm
+lib/X11/XFCE/icons/Mail.xpm
+lib/X11/XFCE/icons/Math4.xpm
+lib/X11/XFCE/icons/Meter.xpm
+lib/X11/XFCE/icons/Mosaic.xpm
+lib/X11/XFCE/icons/Mouse.xpm
+lib/X11/XFCE/icons/Moviemaker2.xpm
+lib/X11/XFCE/icons/Music.xpm
+lib/X11/XFCE/icons/Music2.xpm
+lib/X11/XFCE/icons/Netscape.xpm
+lib/X11/XFCE/icons/News.xpm
+lib/X11/XFCE/icons/No_drag.xpm
+lib/X11/XFCE/icons/Packer.xpm
+lib/X11/XFCE/icons/Palette.xpm
+lib/X11/XFCE/icons/Pencil.xpm
+lib/X11/XFCE/icons/Penguin.xpm
+lib/X11/XFCE/icons/Plug.xpm
+lib/X11/XFCE/icons/Postit.xpm
+lib/X11/XFCE/icons/PrefsDock.xpm
+lib/X11/XFCE/icons/Radar.xpm
+lib/X11/XFCE/icons/Raytracer.xpm
+lib/X11/XFCE/icons/Reader.xpm
+lib/X11/XFCE/icons/Sound.xpm
+lib/X11/XFCE/icons/SoundEditor.xpm
+lib/X11/XFCE/icons/TEX.xpm
+lib/X11/XFCE/icons/Tapes.xpm
+lib/X11/XFCE/icons/Telescope.xpm
+lib/X11/XFCE/icons/Temperature.xpm
+lib/X11/XFCE/icons/Terminal.xpm
+lib/X11/XFCE/icons/TextEditor.xpm
+lib/X11/XFCE/icons/Tic_tac_toe.xpm
+lib/X11/XFCE/icons/Tick.xpm
+lib/X11/XFCE/icons/Timer.xpm
+lib/X11/XFCE/icons/Torus.xpm
+lib/X11/XFCE/icons/View.xpm
+lib/X11/XFCE/icons/Viewer.xpm
+lib/X11/XFCE/icons/Warning.xpm
+lib/X11/XFCE/icons/WordProcessing.xpm
+lib/X11/XFCE/icons/WordProcessing2.xpm
+lib/X11/XFCE/icons/WordProcessing3.xpm
+lib/X11/XFCE/icons/X_server.xpm
+lib/X11/XFCE/icons/Xmix.xpm
+lib/X11/XFCE/icons/Xterm.xpm
+lib/X11/XFCE/icons/Xv.xpm
 lib/X11/XFCE/palettes/Alpine
 lib/X11/XFCE/palettes/Anthracite
 lib/X11/XFCE/palettes/Bahamas
 lib/X11/XFCE/palettes/Citrouille
 lib/X11/XFCE/palettes/Dolly
 lib/X11/XFCE/palettes/Dust
+lib/X11/XFCE/palettes/Fall
 lib/X11/XFCE/palettes/Golden
 lib/X11/XFCE/palettes/Grayscale
 lib/X11/XFCE/palettes/HiContrast
+lib/X11/XFCE/palettes/Iceland
 lib/X11/XFCE/palettes/Mauve
 lib/X11/XFCE/palettes/Nature
+lib/X11/XFCE/palettes/Netsy
+lib/X11/XFCE/palettes/Plum
 lib/X11/XFCE/palettes/Prairie
-lib/X11/XFCE/palettes/Prune
+lib/X11/XFCE/palettes/Salmon
 lib/X11/XFCE/palettes/Sand
 lib/X11/XFCE/palettes/Spring
 lib/X11/XFCE/palettes/Sunny
+lib/X11/XFCE/palettes/Teal
+lib/X11/XFCE/palettes/Troica
+lib/X11/XFCE/palettes/Typhoon
 lib/X11/XFCE/palettes/Win
+lib/X11/XFCE/palettes/Xfce-1
+lib/X11/XFCE/sample.Xclients
 lib/X11/XFCE/sample.fvwm2rc
 lib/X11/XFCE/sample.fvwmrc
+lib/X11/XFCE/sample.mwm.xinitrc
+lib/X11/XFCE/sample.xfbdrc
 lib/X11/XFCE/sample.xfcerc
+lib/X11/XFCE/sample.xfsoundrc
+lib/X11/XFCE/sample.xfwmrc
 lib/X11/XFCE/sample.xinitrc
-@dirrm lib/X11/XFCE/doc
-@dirrm lib/X11/XFCE/palettes
+lib/X11/XFCE/sounds/alert01.wav
+lib/X11/XFCE/sounds/beep01.wav
+lib/X11/XFCE/sounds/beep02.wav
+lib/X11/XFCE/sounds/beep03.wav
+lib/X11/XFCE/sounds/beep04.wav
+lib/X11/XFCE/sounds/beep05.wav
+lib/X11/XFCE/sounds/beep06.wav
+lib/X11/XFCE/sounds/beep07.wav
+lib/X11/XFCE/sounds/beep08.wav
+lib/X11/XFCE/sounds/beep09.wav
+lib/X11/XFCE/sounds/beep10.wav
+lib/X11/XFCE/sounds/beep11.wav
+lib/X11/XFCE/sounds/beep12.wav
+lib/X11/XFCE/sounds/bell01.wav
+lib/X11/XFCE/sounds/bell02.wav
+lib/X11/XFCE/sounds/bell03.wav
+lib/X11/XFCE/sounds/bell04.wav
+lib/X11/XFCE/sounds/bong01.wav
+lib/X11/XFCE/sounds/bong02.wav
+lib/X11/XFCE/sounds/bong03.wav
+lib/X11/XFCE/sounds/bong04.wav
+lib/X11/XFCE/sounds/bong05.wav
+lib/X11/XFCE/sounds/bong06.wav
+lib/X11/XFCE/sounds/bong07.wav
+lib/X11/XFCE/sounds/bong08.wav
+lib/X11/XFCE/sounds/bong09.wav
+lib/X11/XFCE/sounds/bong10.wav
+lib/X11/XFCE/sounds/bong11.wav
+lib/X11/XFCE/sounds/bong12.wav
+lib/X11/XFCE/sounds/crash01.wav
+lib/X11/XFCE/sounds/crash02.wav
+lib/X11/XFCE/sounds/crash04.wav
+lib/X11/XFCE/sounds/crash05.wav
+lib/X11/XFCE/sounds/crash06.wav
+lib/X11/XFCE/sounds/logon01.wav
+lib/X11/XFCE/sounds/logon02.wav
+lib/X11/XFCE/sounds/logout01.wav
+lib/X11/XFCE/sounds/ping01.wav
+lib/X11/XFCE/sounds/ping02.wav
+lib/X11/XFCE/sounds/ping03.wav
+lib/X11/XFCE/sounds/ping04.wav
+lib/X11/XFCE/sounds/pop01.wav
+lib/X11/XFCE/sounds/pop02.wav
+lib/X11/XFCE/sounds/sink01.wav
+lib/X11/XFCE/sounds/slide01.wav
+lib/X11/XFCE/sounds/slide02.wav
+lib/X11/XFCE/sounds/space01.wav
+lib/X11/XFCE/sounds/zap01.wav
+lib/X11/XFCE/sounds/zap02.wav
+lib/X11/XFCE/sounds/zap03.wav
+lib/X11/XFCE/sounds/zap04.wav
+lib/X11/app-defaults/XFce
+lib/X11/app-defaults/XFce-de
+lib/X11/app-defaults/XFce-en
+lib/X11/app-defaults/XFce-es
+lib/X11/app-defaults/XFce-fr
+lib/X11/app-defaults/XFce-hu
+lib/X11/app-defaults/XFce-it
+lib/X11/app-defaults/XFce-sk
+man/man1/xfce.1.gz
+man/man1/xfsound.1.gz
+man/man1/xfwm.1.gz
+@dirrm lib/X11/XFCE/backdrops
+@dirrm lib/X11/XFCE/help
+@dirrm lib/X11/XFCE/sounds
 @dirrm lib/X11/XFCE
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index e69af2b1abf5..a10cd0726d67 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,27 +1,23 @@
 # New ports collection makefile for:	xfce
-# Version required:	1.2.4
+# Version required:	2.1.1
 # Date created:		30 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1998/09/26 23:18:08 steve Exp $
+# $Id: Makefile,v 1.7 1998/10/05 05:18:01 steve Exp $
 #
 
-DISTNAME=	xfce-1.2.4
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/toolbars
+DISTNAME=	xfce-2.1.1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://www.xfce.org/archive/
 
-MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
+MAINTAINER=	Nakai@technologist.com
 
 BROKEN_ELF=	xforms is a.out only
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
-WRKSRC=		${WRKDIR}/XFCE-1.2.4
 USE_GMAKE=	yes
 USE_IMAKE=	yes
-XMKMF=		xmkmf
-MAN1=		XFCE.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4/distinfo b/x11-wm/xfce4/distinfo
index 1e3981e37371..2c2e1cad485a 100644
--- a/x11-wm/xfce4/distinfo
+++ b/x11-wm/xfce4/distinfo
@@ -1 +1 @@
-MD5 (xfce-1.2.4.tar.gz) = 42b11ee2250451d5edc5270c30ada324
+MD5 (xfce-2.1.1.tar.gz) = c30093dea99745d096be0a15b3684714
diff --git a/x11-wm/xfce4/files/patch-aa b/x11-wm/xfce4/files/patch-aa
index 1c7ba54b9597..68c39c13cf61 100644
--- a/x11-wm/xfce4/files/patch-aa
+++ b/x11-wm/xfce4/files/patch-aa
@@ -1,156 +1,9 @@
-*** Imakefile.orig	Wed Aug 20 08:24:00 1997
---- Imakefile	Wed Oct  1 09:09:23 1997
-***************
-*** 1,7 ****
-! XPIXMAPDIR    = /usr/X11/include/X11/pixmaps
-! XBINDIR       = /usr/X11/bin
-! XFCE_DIR      = /var/XFCE
-! XFCE_PAL      = /var/XFCE/palettes
-  FVWM_MODULES  = /usr/lib/X11/fvwm
-  FVWM2_MODULES = /usr/lib/X11/fvwm2
-  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
---- 1,7 ----
-! XPIXMAPDIR    = /usr/X11R6/lib/X11/XFCE/pixmaps
-! XBINDIR       = /usr/X11R6/bin
-! XFCE_DIR      = /usr/X11R6/lib/X11/XFCE
-! XFCE_PAL      = /usr/X11R6/lib/X11/XFCE/palettes
-  FVWM_MODULES  = /usr/lib/X11/fvwm
-  FVWM2_MODULES = /usr/lib/X11/fvwm2
-  FVWM_SRC      = $(wildcard /usr/src/fvwm-1*) 
-***************
-*** 17,24 ****
-   my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\
-   sendinfo.o startup.o tiptools.o
-  
-! XCOMM for LINUX: 
-! EXTRA_LIBRARIES = -L/usr/local/lib -lforms -lXpm -lm 
-  
-  XCOMM for static link with XForms
-  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
---- 17,24 ----
-   my_goodies.o my_string.o pulldown.o resources.o screen.o screen_cb.o selects.o\
-   sendinfo.o startup.o tiptools.o
-  
-! XCOMM for FreeBSD: 
-! EXTRA_LIBRARIES = -L/usr/X11R6/lib -lxforms -lXpm -lm 
-  
-  XCOMM for static link with XForms
-  XCOMM EXTRA_LIBRARIES = /usr/X11/lib/libforms.a -L/usr/local/lib -lXpm -lm
-***************
-*** 60,85 ****
-  install_palettes::
-  	mkdir -p $(XFCE_PAL)
-  	chmod a+rw $(XFCE_PAL)
-! 	cp -vpb palettes\/* $(XFCE_PAL)
-  
-  install_bin::   	XFCE install.man
-  	@if [ -d $(XBINDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi
-! 	@cp -vfb XFCE $(XBINDIR);
-! 	ln -svf $(XBINDIR)/XFCE $(XBINDIR)/xfce;
-  	@chmod 0755 $(XBINDIR)/XFCE;
-  	@if [ -d $(FVWM_MODULES) ]; then \
-! 	ln -svf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
-  	@if [ -d $(FVWM2_MODULES) ]; then \
-! 	ln -svf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
-  	mkdir -p $(XFCE_DIR)
-  	mkdir -p $(XFCE_DIR)/doc
-! 	@cp -vpb sample.* $(XFCE_DIR)/;
-! 	@cp -vpb INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
-! 	ln -svf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;
-! 	ln -svf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;
-! 	ln -svf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;
-! 	ln -svf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;
-  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
-  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
---- 60,85 ----
-  install_palettes::
-  	mkdir -p $(XFCE_PAL)
-  	chmod a+rw $(XFCE_PAL)
-! 	cp -R palettes\/* $(XFCE_PAL)
-  
-  install_bin::   	XFCE install.man
-  	@if [ -d $(XBINDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(XBINDIR)); fi
-! 	@cp -R XFCE $(XBINDIR);
-! 	ln -sf $(XBINDIR)/XFCE $(XBINDIR)/xfce;
-  	@chmod 0755 $(XBINDIR)/XFCE;
-  	@if [ -d $(FVWM_MODULES) ]; then \
-! 	ln -sf $(XBINDIR)/XFCE $(FVWM_MODULES); fi
-  	@if [ -d $(FVWM2_MODULES) ]; then \
-! 	ln -sf $(XBINDIR)/XFCE $(FVWM2_MODULES); fi
-  	mkdir -p $(XFCE_DIR)
-  	mkdir -p $(XFCE_DIR)/doc
-! 	@cp -R sample.* $(XFCE_DIR)/;
-! 	@cp -R INSTALL MANUAL README COPYRIGHT $(XFCE_DIR)/doc/
-! 	ln -sf $(XFCE_DIR)/sample.fvwmrc $(XFCE_DIR)/.fvwmrc;
-! 	ln -sf $(XFCE_DIR)/sample.fvwm2rc $(XFCE_DIR)/.fvwm2rc;
-! 	ln -sf $(XFCE_DIR)/sample.xfcerc $(XFCE_DIR)/.xfcerc;
-! 	ln -sf $(XFCE_DIR)/sample.xinitrc $(XFCE_DIR)/.xinitrc;
-  	@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \
-  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi
-  	$(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) ./XFce-en.ad \
-***************
-*** 97,126 ****
-  
-  install_logo::		install_bin install_palettes
-  	@mkdir -p $(XFCE_DIR)
-! 	@cp -vpb XFCE_full.logo $(XFCE_DIR);
-! 	@cp -vpb XFCE_dithered.logo $(XFCE_DIR);
-  
-  install_full::		install_logo
-! 	ln -svf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install_dithered::	install_logo
-! 	ln -svf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install::		install_full
-  
-  francais::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  english::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  italiano::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  deutsch::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
---- 97,126 ----
-  
-  install_logo::		install_bin install_palettes
-  	@mkdir -p $(XFCE_DIR)
-! 	@cp -R XFCE_full.logo $(XFCE_DIR);
-! 	@cp -R XFCE_dithered.logo $(XFCE_DIR);
-  
-  install_full::		install_logo
-! 	ln -sf $(XFCE_DIR)/XFCE_full.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install_dithered::	install_logo
-! 	ln -sf $(XFCE_DIR)/XFCE_dithered.logo $(XFCE_DIR)/XFCE.logo;
-  
-  install::		install_full
-  
-  francais::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-fr \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  english::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-en \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  italiano::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-it \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
-  deutsch::
-! 	ln -sf $(DESTDIR)$(XAPPLOADDIR)/XFce-de \
-  	       $(DESTDIR)$(XAPPLOADDIR)/XFce
-  
+--- XFCE.def.orig	Wed Oct 21 09:11:00 1998
++++ XFCE.def	Tue Nov 17 13:24:34 1998
+@@ -1,5 +1,5 @@
+ XBINDIR        = $(BINDIR) 
+-XFCE_DIR       = /var/XFCE
++XFCE_DIR       = $(PREFIX)/lib/X11/XFCE
+ XFCE_PAL       = $(XFCE_DIR)/palettes
+ XFCE_BACKDROPS = $(XFCE_DIR)/backdrops
+ XFCE_HELP      = $(XFCE_DIR)/help
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index 2d9bfc60ed4c..c686098da396 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -1,37 +1,456 @@
-bin/XFCE
+bin/xfbd
 bin/xfce
-lib/X11/XFCE/.fvwm2rc
-lib/X11/XFCE/.fvwmrc
-lib/X11/XFCE/.xfcerc
-lib/X11/XFCE/.xinitrc
-lib/X11/XFCE/XFCE.logo
-lib/X11/XFCE/XFCE_dithered.logo
-lib/X11/XFCE/XFCE_full.logo
+bin/xfplay
+bin/xfsound
+bin/xfwm
+lib/X11/XFCE/Quickstart
+lib/X11/XFCE/XFce2.logo
+lib/X11/XFCE/backdrops/Anneaux.xpm
+lib/X11/XFCE/backdrops/Arena.xpm
+lib/X11/XFCE/backdrops/Bluedrops.xpm
+lib/X11/XFCE/backdrops/Bluefalls.xpm
+lib/X11/XFCE/backdrops/Boucles.xpm
+lib/X11/XFCE/backdrops/Brownie.xpm
+lib/X11/XFCE/backdrops/Candies.xpm
+lib/X11/XFCE/backdrops/Cds.xpm
+lib/X11/XFCE/backdrops/Circle.xpm
+lib/X11/XFCE/backdrops/Cloth.xpm
+lib/X11/XFCE/backdrops/Clouds.xpm
+lib/X11/XFCE/backdrops/Cocoa.xpm
+lib/X11/XFCE/backdrops/Compute.xpm
+lib/X11/XFCE/backdrops/Concrete.xpm
+lib/X11/XFCE/backdrops/Darkblue.xpm
+lib/X11/XFCE/backdrops/Darkblue2.xpm
+lib/X11/XFCE/backdrops/Desert.xpm
+lib/X11/XFCE/backdrops/Desert2.xpm
+lib/X11/XFCE/backdrops/Dry.xpm
+lib/X11/XFCE/backdrops/Eyes.xpm
+lib/X11/XFCE/backdrops/Fire.xpm
+lib/X11/XFCE/backdrops/Flames.xpm
+lib/X11/XFCE/backdrops/Flow.xpm
+lib/X11/XFCE/backdrops/Funkyblue.xpm
+lib/X11/XFCE/backdrops/Gallets.xpm
+lib/X11/XFCE/backdrops/Glasses.xpm
+lib/X11/XFCE/backdrops/Gold.xpm
+lib/X11/XFCE/backdrops/Gradient.xpm
+lib/X11/XFCE/backdrops/Granit.xpm
+lib/X11/XFCE/backdrops/Gray.xpm
+lib/X11/XFCE/backdrops/Green.xpm
+lib/X11/XFCE/backdrops/Greenslate.xpm
+lib/X11/XFCE/backdrops/Grey.xpm
+lib/X11/XFCE/backdrops/Grey_marb.xpm
+lib/X11/XFCE/backdrops/Greydrops.xpm
+lib/X11/XFCE/backdrops/Greysea.xpm
+lib/X11/XFCE/backdrops/Guimauve.xpm
+lib/X11/XFCE/backdrops/Hardblue.xpm
+lib/X11/XFCE/backdrops/Honey.xpm
+lib/X11/XFCE/backdrops/Leaves.xpm
+lib/X11/XFCE/backdrops/Marble2.xpm
+lib/X11/XFCE/backdrops/Marbled.xpm
+lib/X11/XFCE/backdrops/Marbled2.xpm
+lib/X11/XFCE/backdrops/Marblee.xpm
+lib/X11/XFCE/backdrops/Maze.xpm
+lib/X11/XFCE/backdrops/Multicolor1.xpm
+lib/X11/XFCE/backdrops/Multicolor2.xpm
+lib/X11/XFCE/backdrops/Notes.xpm
+lib/X11/XFCE/backdrops/Paper.xpm
+lib/X11/XFCE/backdrops/Pencils.xpm
+lib/X11/XFCE/backdrops/Pieces.xpm
+lib/X11/XFCE/backdrops/Plasma.xpm
+lib/X11/XFCE/backdrops/Pool.xpm
+lib/X11/XFCE/backdrops/Praline.xpm
+lib/X11/XFCE/backdrops/Psy.xpm
+lib/X11/XFCE/backdrops/Psy2.xpm
+lib/X11/XFCE/backdrops/Psy3.xpm
+lib/X11/XFCE/backdrops/Raindrops.xpm
+lib/X11/XFCE/backdrops/Rock.xpm
+lib/X11/XFCE/backdrops/Rotin.xpm
+lib/X11/XFCE/backdrops/Rough.xpm
+lib/X11/XFCE/backdrops/Sandy-ridges.xpm
+lib/X11/XFCE/backdrops/Satin.xpm
+lib/X11/XFCE/backdrops/Satin2.xpm
+lib/X11/XFCE/backdrops/Satin3.xpm
+lib/X11/XFCE/backdrops/Sea.xpm
+lib/X11/XFCE/backdrops/Sky.xpm
+lib/X11/XFCE/backdrops/Slate.xpm
+lib/X11/XFCE/backdrops/Smooth.xpm
+lib/X11/XFCE/backdrops/Soft.xpm
+lib/X11/XFCE/backdrops/Softblue.xpm
+lib/X11/XFCE/backdrops/Sol.xpm
+lib/X11/XFCE/backdrops/Solid.xpm
+lib/X11/XFCE/backdrops/Space.xpm
+lib/X11/XFCE/backdrops/Space2.xpm
+lib/X11/XFCE/backdrops/Speed.xpm
+lib/X11/XFCE/backdrops/Storm.xpm
+lib/X11/XFCE/backdrops/Stucco.xpm
+lib/X11/XFCE/backdrops/Teal.xpm
+lib/X11/XFCE/backdrops/Tiles.xpm
+lib/X11/XFCE/backdrops/Tiles2.xpm
+lib/X11/XFCE/backdrops/Tiles3.xpm
+lib/X11/XFCE/backdrops/Time.xpm
+lib/X11/XFCE/backdrops/Ufo.xpm
+lib/X11/XFCE/backdrops/Wall1.xpm
+lib/X11/XFCE/backdrops/Wall2.xpm
+lib/X11/XFCE/backdrops/Wall3.xpm
+lib/X11/XFCE/backdrops/Wax.xpm
+lib/X11/XFCE/backdrops/Weave-red.xpm
+lib/X11/XFCE/backdrops/Weird.xpm
+lib/X11/XFCE/backdrops/Wood-floor.xpm
+lib/X11/XFCE/backdrops/Wood.xpm
+lib/X11/XFCE/backdrops/Wood2.xpm
+lib/X11/XFCE/backdrops/Worm.xpm
+lib/X11/XFCE/backdrops/XFce_logo.xpm
+lib/X11/XFCE/backdrops/Yellow.xpm
 lib/X11/XFCE/doc/COPYRIGHT
 lib/X11/XFCE/doc/INSTALL
 lib/X11/XFCE/doc/MANUAL
 lib/X11/XFCE/doc/README
+lib/X11/XFCE/help/en/addmodcm.html
+lib/X11/XFCE/help/en/author.html
+lib/X11/XFCE/help/en/binary.html
+lib/X11/XFCE/help/en/defscreen.html
+lib/X11/XFCE/help/en/desktop.html
+lib/X11/XFCE/help/en/index.html
+lib/X11/XFCE/help/en/info.html
+lib/X11/XFCE/help/en/intro.html
+lib/X11/XFCE/help/en/library.html
+lib/X11/XFCE/help/en/links.html
+lib/X11/XFCE/help/en/menus.html
+lib/X11/XFCE/help/en/panel.html
+lib/X11/XFCE/help/en/panelcom.html
+lib/X11/XFCE/help/en/parameters.html
+lib/X11/XFCE/help/en/setup.html
+lib/X11/XFCE/help/en/table.html
+lib/X11/XFCE/help/en/welcome.html
+lib/X11/XFCE/help/en/xfbd.html
+lib/X11/XFCE/help/en/xfsound.html
+lib/X11/XFCE/help/en/xfwm.html
+lib/X11/XFCE/help/fr/addmodcm.html
+lib/X11/XFCE/help/fr/author.html
+lib/X11/XFCE/help/fr/binary.html
+lib/X11/XFCE/help/fr/defscreen.html
+lib/X11/XFCE/help/fr/desktop.html
+lib/X11/XFCE/help/fr/index.html
+lib/X11/XFCE/help/fr/info.html
+lib/X11/XFCE/help/fr/intro.html
+lib/X11/XFCE/help/fr/library.html
+lib/X11/XFCE/help/fr/links.html
+lib/X11/XFCE/help/fr/menus.html
+lib/X11/XFCE/help/fr/panel.html
+lib/X11/XFCE/help/fr/panelcom.html
+lib/X11/XFCE/help/fr/parameters.html
+lib/X11/XFCE/help/fr/setup.html
+lib/X11/XFCE/help/fr/table.html
+lib/X11/XFCE/help/fr/welcome.html
+lib/X11/XFCE/help/fr/xfbd.html
+lib/X11/XFCE/help/fr/xfsound.html
+lib/X11/XFCE/help/fr/xfwm.html
+lib/X11/XFCE/help/images/Announcement.gif
+lib/X11/XFCE/help/images/Backleft.gif
+lib/X11/XFCE/help/images/XFBD.gif
+lib/X11/XFCE/help/images/XFCE_additem.gif
+lib/X11/XFCE/help/images/XFCE_butinfo.gif
+lib/X11/XFCE/help/images/XFCE_butlock.gif
+lib/X11/XFCE/help/images/XFCE_butquit.gif
+lib/X11/XFCE/help/images/XFCE_butsetup.gif
+lib/X11/XFCE/help/images/XFCE_center.gif
+lib/X11/XFCE/help/images/XFCE_close.gif
+lib/X11/XFCE/help/images/XFCE_define.gif
+lib/X11/XFCE/help/images/XFCE_filesel.gif
+lib/X11/XFCE/help/images/XFCE_iconify.gif
+lib/X11/XFCE/help/images/XFCE_iconmenu.gif
+lib/X11/XFCE/help/images/XFCE_iconmenu2.gif
+lib/X11/XFCE/help/images/XFCE_left.gif
+lib/X11/XFCE/help/images/XFCE_loadpal.gif
+lib/X11/XFCE/help/images/XFCE_logo.gif
+lib/X11/XFCE/help/images/XFCE_menu.gif
+lib/X11/XFCE/help/images/XFCE_menu_detached.gif
+lib/X11/XFCE/help/images/XFCE_menu_selected.gif
+lib/X11/XFCE/help/images/XFCE_move.gif
+lib/X11/XFCE/help/images/XFCE_panel.gif
+lib/X11/XFCE/help/images/XFCE_popdown.gif
+lib/X11/XFCE/help/images/XFCE_popup.gif
+lib/X11/XFCE/help/images/XFCE_right.gif
+lib/X11/XFCE/help/images/XFCE_screen.gif
+lib/X11/XFCE/help/images/XFCE_selexec.gif
+lib/X11/XFCE/help/images/XFCE_setup.gif
+lib/X11/XFCE/help/images/XFCE_topleft.gif
+lib/X11/XFCE/help/images/XFSND_dialog.gif
+lib/X11/XFCE/help/images/XFSND_eventlist.gif
+lib/X11/XFCE/help/images/XFSND_fileselect.gif
+lib/X11/XFCE/help/images/XFWM_activetitlebar.gif
+lib/X11/XFCE/help/images/XFWM_colors.gif
+lib/X11/XFCE/help/images/XFWM_iconify.gif
+lib/X11/XFCE/help/images/XFWM_inactivetitlebar.gif
+lib/X11/XFCE/help/images/XFWM_maximize.gif
+lib/X11/XFCE/help/images/XFWM_maximized.gif
+lib/X11/XFCE/help/images/XFWM_menuclose.gif
+lib/X11/XFCE/help/images/XFWM_pal1.gif
+lib/X11/XFCE/help/images/XFWM_pal2.gif
+lib/X11/XFCE/help/images/XFWM_pal3.gif
+lib/X11/XFCE/help/images/XFWM_pal4.gif
+lib/X11/XFCE/help/images/XFWM_sticky.gif
+lib/X11/XFCE/help/images/XFWM_window.gif
+lib/X11/XFCE/help/images/a_propos_auteur.gif
+lib/X11/XFCE/help/images/about_the_author.gif
+lib/X11/XFCE/help/images/autres_liens.gif
+lib/X11/XFCE/help/images/backdrop_manager.gif
+lib/X11/XFCE/help/images/backgr.gif
+lib/X11/XFCE/help/images/barre_principale.gif
+lib/X11/XFCE/help/images/binary_distribution.gif
+lib/X11/XFCE/help/images/bouncing.gif
+lib/X11/XFCE/help/images/cholesterol-small.gif
+lib/X11/XFCE/help/images/cholesterol_free.gif
+lib/X11/XFCE/help/images/clic_dbl.gif
+lib/X11/XFCE/help/images/clic_left.gif
+lib/X11/XFCE/help/images/clic_mid.gif
+lib/X11/XFCE/help/images/clic_right.gif
+lib/X11/XFCE/help/images/commandes_barre_principale.gif
+lib/X11/XFCE/help/images/compiler_xfce.gif
+lib/X11/XFCE/help/images/compiling_sources.gif
+lib/X11/XFCE/help/images/contenu_menus.gif
+lib/X11/XFCE/help/images/define_front_panel_commands.gif
+lib/X11/XFCE/help/images/desktop_with_xfce.gif
+lib/X11/XFCE/help/images/distribution_precompilee.gif
+lib/X11/XFCE/help/images/download.gif
+lib/X11/XFCE/help/images/english.gif
+lib/X11/XFCE/help/images/france.gif
+lib/X11/XFCE/help/images/gestionnaire_fenetres.gif
+lib/X11/XFCE/help/images/gestionnaire_papier.gif
+lib/X11/XFCE/help/images/gestionnaire_sons.gif
+lib/X11/XFCE/help/images/introduction.gif
+lib/X11/XFCE/help/images/labels_ecran.gif
+lib/X11/XFCE/help/images/librairie_xforms.gif
+lib/X11/XFCE/help/images/linux-kheops.gif
+lib/X11/XFCE/help/images/liste_distribution.gif
+lib/X11/XFCE/help/images/logo.gif
+lib/X11/XFCE/help/images/logo07.gif
+lib/X11/XFCE/help/images/mailing_list.gif
+lib/X11/XFCE/help/images/menu_entries.gif
+lib/X11/XFCE/help/images/menus_deroulants.gif
+lib/X11/XFCE/help/images/moongroup_micro.gif
+lib/X11/XFCE/help/images/moongroup_neon.gif
+lib/X11/XFCE/help/images/moongroup_small.gif
+lib/X11/XFCE/help/images/mouse.gif
+lib/X11/XFCE/help/images/new.gif
+lib/X11/XFCE/help/images/nocount.gif
+lib/X11/XFCE/help/images/olivier.gif
+lib/X11/XFCE/help/images/other_links.gif
+lib/X11/XFCE/help/images/parametres_configuration.gif
+lib/X11/XFCE/help/images/penguincompany.jpg
+lib/X11/XFCE/help/images/popup_menus.gif
+lib/X11/XFCE/help/images/press.gif
+lib/X11/XFCE/help/images/screen_1.gif
+lib/X11/XFCE/help/images/screen_2.gif
+lib/X11/XFCE/help/images/screen_3.gif
+lib/X11/XFCE/help/images/screen_4.gif
+lib/X11/XFCE/help/images/screen_labels.gif
+lib/X11/XFCE/help/images/screens.gif
+lib/X11/XFCE/help/images/setup_parameters.gif
+lib/X11/XFCE/help/images/sound_manager.gif
+lib/X11/XFCE/help/images/telechargement.gif
+lib/X11/XFCE/help/images/ver2released.gif
+lib/X11/XFCE/help/images/vertical_XFCE.gif
+lib/X11/XFCE/help/images/votre_bureau.gif
+lib/X11/XFCE/help/images/xfce2_help_system.gif
+lib/X11/XFCE/help/images/xfce_front_panel.gif
+lib/X11/XFCE/help/images/xforms_library.gif
+lib/X11/XFCE/help/images/xfwm_window_manager.gif
+lib/X11/XFCE/help/index.html
+lib/X11/XFCE/icons/ABC.xpm
+lib/X11/XFCE/icons/AZ.xpm
+lib/X11/XFCE/icons/Animator.xpm
+lib/X11/XFCE/icons/AntiVirus.xpm
+lib/X11/XFCE/icons/BackUp.xpm
+lib/X11/XFCE/icons/Ballon.xpm
+lib/X11/XFCE/icons/Binoculars.xpm
+lib/X11/XFCE/icons/Bomb.xpm
+lib/X11/XFCE/icons/Bomb2.xpm
+lib/X11/XFCE/icons/Box_empty.xpm
+lib/X11/XFCE/icons/Box_full.xpm
+lib/X11/XFCE/icons/C++.xpm
+lib/X11/XFCE/icons/C.xpm
+lib/X11/XFCE/icons/CAD.xpm
+lib/X11/XFCE/icons/CAD2.xpm
+lib/X11/XFCE/icons/Calculator.xpm
+lib/X11/XFCE/icons/Camera.xpm
+lib/X11/XFCE/icons/Cards.xpm
+lib/X11/XFCE/icons/Chart.xpm
+lib/X11/XFCE/icons/Clock.xpm
+lib/X11/XFCE/icons/Colormap.xpm
+lib/X11/XFCE/icons/CompactDisc.xpm
+lib/X11/XFCE/icons/Connect.xpm
+lib/X11/XFCE/icons/Copy.xpm
+lib/X11/XFCE/icons/Database.xpm
+lib/X11/XFCE/icons/DiskCopy.xpm
+lib/X11/XFCE/icons/Disk_blue.xpm
+lib/X11/XFCE/icons/Disks.xpm
+lib/X11/XFCE/icons/Document.xpm
+lib/X11/XFCE/icons/Drawing.xpm
+lib/X11/XFCE/icons/Drawing2.xpm
+lib/X11/XFCE/icons/Drawing3.xpm
+lib/X11/XFCE/icons/Dynamite.xpm
+lib/X11/XFCE/icons/Earth.xpm
+lib/X11/XFCE/icons/Edit.xpm
+lib/X11/XFCE/icons/Editres.xpm
+lib/X11/XFCE/icons/Exit.xpm
+lib/X11/XFCE/icons/FAX.xpm
+lib/X11/XFCE/icons/Film.xpm
+lib/X11/XFCE/icons/Film2.xpm
+lib/X11/XFCE/icons/FontDesigner.xpm
+lib/X11/XFCE/icons/Fonts.xpm
+lib/X11/XFCE/icons/Format.xpm
+lib/X11/XFCE/icons/Ftp.xpm
+lib/X11/XFCE/icons/Game.xpm
+lib/X11/XFCE/icons/Graph_bar.xpm
+lib/X11/XFCE/icons/Graph_pie.xpm
+lib/X11/XFCE/icons/Hammer.xpm
+lib/X11/XFCE/icons/Key.xpm
+lib/X11/XFCE/icons/Keys.xpm
+lib/X11/XFCE/icons/Lightbulb.xpm
+lib/X11/XFCE/icons/Lightning.xpm
+lib/X11/XFCE/icons/Lock.xpm
+lib/X11/XFCE/icons/Magnify.xpm
+lib/X11/XFCE/icons/Mail.xpm
+lib/X11/XFCE/icons/Math4.xpm
+lib/X11/XFCE/icons/Meter.xpm
+lib/X11/XFCE/icons/Mosaic.xpm
+lib/X11/XFCE/icons/Mouse.xpm
+lib/X11/XFCE/icons/Moviemaker2.xpm
+lib/X11/XFCE/icons/Music.xpm
+lib/X11/XFCE/icons/Music2.xpm
+lib/X11/XFCE/icons/Netscape.xpm
+lib/X11/XFCE/icons/News.xpm
+lib/X11/XFCE/icons/No_drag.xpm
+lib/X11/XFCE/icons/Packer.xpm
+lib/X11/XFCE/icons/Palette.xpm
+lib/X11/XFCE/icons/Pencil.xpm
+lib/X11/XFCE/icons/Penguin.xpm
+lib/X11/XFCE/icons/Plug.xpm
+lib/X11/XFCE/icons/Postit.xpm
+lib/X11/XFCE/icons/PrefsDock.xpm
+lib/X11/XFCE/icons/Radar.xpm
+lib/X11/XFCE/icons/Raytracer.xpm
+lib/X11/XFCE/icons/Reader.xpm
+lib/X11/XFCE/icons/Sound.xpm
+lib/X11/XFCE/icons/SoundEditor.xpm
+lib/X11/XFCE/icons/TEX.xpm
+lib/X11/XFCE/icons/Tapes.xpm
+lib/X11/XFCE/icons/Telescope.xpm
+lib/X11/XFCE/icons/Temperature.xpm
+lib/X11/XFCE/icons/Terminal.xpm
+lib/X11/XFCE/icons/TextEditor.xpm
+lib/X11/XFCE/icons/Tic_tac_toe.xpm
+lib/X11/XFCE/icons/Tick.xpm
+lib/X11/XFCE/icons/Timer.xpm
+lib/X11/XFCE/icons/Torus.xpm
+lib/X11/XFCE/icons/View.xpm
+lib/X11/XFCE/icons/Viewer.xpm
+lib/X11/XFCE/icons/Warning.xpm
+lib/X11/XFCE/icons/WordProcessing.xpm
+lib/X11/XFCE/icons/WordProcessing2.xpm
+lib/X11/XFCE/icons/WordProcessing3.xpm
+lib/X11/XFCE/icons/X_server.xpm
+lib/X11/XFCE/icons/Xmix.xpm
+lib/X11/XFCE/icons/Xterm.xpm
+lib/X11/XFCE/icons/Xv.xpm
 lib/X11/XFCE/palettes/Alpine
 lib/X11/XFCE/palettes/Anthracite
 lib/X11/XFCE/palettes/Bahamas
 lib/X11/XFCE/palettes/Citrouille
 lib/X11/XFCE/palettes/Dolly
 lib/X11/XFCE/palettes/Dust
+lib/X11/XFCE/palettes/Fall
 lib/X11/XFCE/palettes/Golden
 lib/X11/XFCE/palettes/Grayscale
 lib/X11/XFCE/palettes/HiContrast
+lib/X11/XFCE/palettes/Iceland
 lib/X11/XFCE/palettes/Mauve
 lib/X11/XFCE/palettes/Nature
+lib/X11/XFCE/palettes/Netsy
+lib/X11/XFCE/palettes/Plum
 lib/X11/XFCE/palettes/Prairie
-lib/X11/XFCE/palettes/Prune
+lib/X11/XFCE/palettes/Salmon
 lib/X11/XFCE/palettes/Sand
 lib/X11/XFCE/palettes/Spring
 lib/X11/XFCE/palettes/Sunny
+lib/X11/XFCE/palettes/Teal
+lib/X11/XFCE/palettes/Troica
+lib/X11/XFCE/palettes/Typhoon
 lib/X11/XFCE/palettes/Win
+lib/X11/XFCE/palettes/Xfce-1
+lib/X11/XFCE/sample.Xclients
 lib/X11/XFCE/sample.fvwm2rc
 lib/X11/XFCE/sample.fvwmrc
+lib/X11/XFCE/sample.mwm.xinitrc
+lib/X11/XFCE/sample.xfbdrc
 lib/X11/XFCE/sample.xfcerc
+lib/X11/XFCE/sample.xfsoundrc
+lib/X11/XFCE/sample.xfwmrc
 lib/X11/XFCE/sample.xinitrc
-@dirrm lib/X11/XFCE/doc
-@dirrm lib/X11/XFCE/palettes
+lib/X11/XFCE/sounds/alert01.wav
+lib/X11/XFCE/sounds/beep01.wav
+lib/X11/XFCE/sounds/beep02.wav
+lib/X11/XFCE/sounds/beep03.wav
+lib/X11/XFCE/sounds/beep04.wav
+lib/X11/XFCE/sounds/beep05.wav
+lib/X11/XFCE/sounds/beep06.wav
+lib/X11/XFCE/sounds/beep07.wav
+lib/X11/XFCE/sounds/beep08.wav
+lib/X11/XFCE/sounds/beep09.wav
+lib/X11/XFCE/sounds/beep10.wav
+lib/X11/XFCE/sounds/beep11.wav
+lib/X11/XFCE/sounds/beep12.wav
+lib/X11/XFCE/sounds/bell01.wav
+lib/X11/XFCE/sounds/bell02.wav
+lib/X11/XFCE/sounds/bell03.wav
+lib/X11/XFCE/sounds/bell04.wav
+lib/X11/XFCE/sounds/bong01.wav
+lib/X11/XFCE/sounds/bong02.wav
+lib/X11/XFCE/sounds/bong03.wav
+lib/X11/XFCE/sounds/bong04.wav
+lib/X11/XFCE/sounds/bong05.wav
+lib/X11/XFCE/sounds/bong06.wav
+lib/X11/XFCE/sounds/bong07.wav
+lib/X11/XFCE/sounds/bong08.wav
+lib/X11/XFCE/sounds/bong09.wav
+lib/X11/XFCE/sounds/bong10.wav
+lib/X11/XFCE/sounds/bong11.wav
+lib/X11/XFCE/sounds/bong12.wav
+lib/X11/XFCE/sounds/crash01.wav
+lib/X11/XFCE/sounds/crash02.wav
+lib/X11/XFCE/sounds/crash04.wav
+lib/X11/XFCE/sounds/crash05.wav
+lib/X11/XFCE/sounds/crash06.wav
+lib/X11/XFCE/sounds/logon01.wav
+lib/X11/XFCE/sounds/logon02.wav
+lib/X11/XFCE/sounds/logout01.wav
+lib/X11/XFCE/sounds/ping01.wav
+lib/X11/XFCE/sounds/ping02.wav
+lib/X11/XFCE/sounds/ping03.wav
+lib/X11/XFCE/sounds/ping04.wav
+lib/X11/XFCE/sounds/pop01.wav
+lib/X11/XFCE/sounds/pop02.wav
+lib/X11/XFCE/sounds/sink01.wav
+lib/X11/XFCE/sounds/slide01.wav
+lib/X11/XFCE/sounds/slide02.wav
+lib/X11/XFCE/sounds/space01.wav
+lib/X11/XFCE/sounds/zap01.wav
+lib/X11/XFCE/sounds/zap02.wav
+lib/X11/XFCE/sounds/zap03.wav
+lib/X11/XFCE/sounds/zap04.wav
+lib/X11/app-defaults/XFce
+lib/X11/app-defaults/XFce-de
+lib/X11/app-defaults/XFce-en
+lib/X11/app-defaults/XFce-es
+lib/X11/app-defaults/XFce-fr
+lib/X11/app-defaults/XFce-hu
+lib/X11/app-defaults/XFce-it
+lib/X11/app-defaults/XFce-sk
+man/man1/xfce.1.gz
+man/man1/xfsound.1.gz
+man/man1/xfwm.1.gz
+@dirrm lib/X11/XFCE/backdrops
+@dirrm lib/X11/XFCE/help
+@dirrm lib/X11/XFCE/sounds
 @dirrm lib/X11/XFCE