Update to version 3.0.3

PR:		13054
Submitted by:	maintainer

12 files changed, 674 insertions, 128 deletions

diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index e5015bfd555a..70f42b2dae17 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -1,22 +1,28 @@
 # New ports collection makefile for:	xfce
-# Version required:	2.4.0
+# Version required:	3.0.3
 # Date created:		30 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.15 1999/03/31 15:52:31 steve Exp $
+# $Id: Makefile,v 1.16 1999/05/31 05:03:11 steve Exp $
 #
 
-DISTNAME=	xfce-2.4.0
+DISTNAME=	xfce-3.0.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
 MAINTAINER=	nacai@iname.com
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		xforms.0:${PORTSDIR}/x11-toolkits/xforms
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-USE_IMAKE=	yes
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
+		--datadir=${PREFIX}/share/
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN1=	xfce.1 xfmouse.1 xfpager.1 xfsound.1 xfwm.1
+MAN1=	xfbd.1 xfce.1 xfclock.1 xfmouse.1 xfpager.1 xfsound.1 \
+	xftree.1 xfwm.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce/distinfo b/x11-wm/xfce/distinfo
index 631faf41d337..fa76d6267df1 100644
--- a/x11-wm/xfce/distinfo
+++ b/x11-wm/xfce/distinfo
@@ -1 +1 @@
-MD5 (xfce-2.4.0.tar.gz) = 9f5125050d38b21e546408205b983e90
+MD5 (xfce-3.0.3.tar.gz) = ccec0991d1075cf8a43c254668dcde82
diff --git a/x11-wm/xfce/files/patch-aa b/x11-wm/xfce/files/patch-aa
deleted file mode 100644
index ec38c9f21e27..000000000000
--- a/x11-wm/xfce/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- XFCE.def.orig	Sun Mar 28 12:03:01 1999
-+++ XFCE.def	Sun Mar 28 12:04:53 1999
-@@ -1,10 +1,10 @@
- XCOMM Definition options : Please edit !
- XCOMM ==================================
- 
--#define LINUX
-+/* #define LINUX */
- /* #define SOLARIS */
--/* #define BSD */
--#define STATIC
-+#define BSD
-+/* #define STATIC */
- 
- XCOMM Compile options : Please check !
- XCOMM ================================
-@@ -41,7 +41,7 @@
- 
- #ifdef BSD
- XCOMM
--XCOMM for Free BSD 2.2.2
-+XCOMM for Free BSD 3.x or later
- XCOMM
- XFCE_SYSLIB =  -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/local/lib
- STD_LIBRARIES = -lXext -lX11 -lXpm -lm
-@@ -54,8 +54,8 @@
- LINK_OPTIONS = -O -s
- #endif
- 
--XCOMM BINDIR         = /usr/local/bin
--XFCE_DIR       = /var/XFCE
-+XCOMM BINDIR         = $(X11BASE)/bin
-+XFCE_DIR       = $(X11BASE)/share/XFCE
- XBINDIR        = $(BINDIR) 
- XFCE_PAL       = $(XFCE_DIR)/palettes
- XFCE_BACKDROPS = $(XFCE_DIR)/backdrops
diff --git a/x11-wm/xfce/pkg-comment b/x11-wm/xfce/pkg-comment
index 66eaa2c036db..2902db4925d4 100644
--- a/x11-wm/xfce/pkg-comment
+++ b/x11-wm/xfce/pkg-comment
@@ -1 +1 @@
-XForm Cool Environment
+CDE like desktop with GTK
diff --git a/x11-wm/xfce/pkg-descr b/x11-wm/xfce/pkg-descr
index 80d822b71665..2902db4925d4 100644
--- a/x11-wm/xfce/pkg-descr
+++ b/x11-wm/xfce/pkg-descr
@@ -1,4 +1 @@
-XFroms Cool Environment
-
-XFCE is a X toolbar that allow user to easily launch programs.
-When  you use with fvwm, it can switch desks.
+CDE like desktop with GTK
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index 52b7b19e9b28..899e0b47d883 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -1,24 +1,330 @@
 bin/xfbd
 bin/xfce
+bin/xfce_remove
+bin/xfce_setup
+bin/xfclock
+bin/xfhelp
 bin/xfmouse
 bin/xfpager
 bin/xfplay
 bin/xfsound
+bin/xftree
 bin/xfwm
-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-pt
-lib/X11/app-defaults/XFce-sk
-share/XFCE/XFce2.logo
-share/XFCE/doc/COPYRIGHT
-share/XFCE/doc/FAQ
-share/XFCE/doc/INSTALL
-share/XFCE/doc/MANUAL
-share/XFCE/doc/README
-@dirrm share/XFCE/doc
+share/XFCE/COPYING
+share/XFCE/README.xfdefs.py
+share/XFCE/XFce3.logo
+share/XFCE/backdrops/Anneaux.xpm
+share/XFCE/backdrops/Arena.xpm
+share/XFCE/backdrops/BlueStucco.xpm
+share/XFCE/backdrops/Bluedrops.xpm
+share/XFCE/backdrops/Bluefalls.xpm
+share/XFCE/backdrops/Boucles.xpm
+share/XFCE/backdrops/Brownie.xpm
+share/XFCE/backdrops/Candies.xpm
+share/XFCE/backdrops/Cds.xpm
+share/XFCE/backdrops/Circle.xpm
+share/XFCE/backdrops/Cloth.xpm
+share/XFCE/backdrops/Clouds.xpm
+share/XFCE/backdrops/Cocoa.xpm
+share/XFCE/backdrops/Compute.xpm
+share/XFCE/backdrops/Concrete.xpm
+share/XFCE/backdrops/Darkblue2.xpm
+share/XFCE/backdrops/Desert2.xpm
+share/XFCE/backdrops/Dry.xpm
+share/XFCE/backdrops/Eyes.xpm
+share/XFCE/backdrops/Fire.xpm
+share/XFCE/backdrops/Flames.xpm
+share/XFCE/backdrops/Flow.xpm
+share/XFCE/backdrops/Funkyblue.xpm
+share/XFCE/backdrops/Gallets.xpm
+share/XFCE/backdrops/Glasses.xpm
+share/XFCE/backdrops/Gold.xpm
+share/XFCE/backdrops/Gradient.xpm
+share/XFCE/backdrops/GreenStucco.xpm
+share/XFCE/backdrops/Greenslate.xpm
+share/XFCE/backdrops/Grey.xpm
+share/XFCE/backdrops/Greydrops.xpm
+share/XFCE/backdrops/Greysea.xpm
+share/XFCE/backdrops/Hardblue.xpm
+share/XFCE/backdrops/Honey.xpm
+share/XFCE/backdrops/Leaves.xpm
+share/XFCE/backdrops/Marbled.xpm
+share/XFCE/backdrops/Maze.xpm
+share/XFCE/backdrops/Notes.xpm
+share/XFCE/backdrops/Pencils.xpm
+share/XFCE/backdrops/Plasma.xpm
+share/XFCE/backdrops/Pool.xpm
+share/XFCE/backdrops/Psy.xpm
+share/XFCE/backdrops/Psy2.xpm
+share/XFCE/backdrops/Psy3.xpm
+share/XFCE/backdrops/Rotin.xpm
+share/XFCE/backdrops/Rough.xpm
+share/XFCE/backdrops/Sandy-ridges.xpm
+share/XFCE/backdrops/Satin.xpm
+share/XFCE/backdrops/Satin2.xpm
+share/XFCE/backdrops/Satin3.xpm
+share/XFCE/backdrops/Sea.xpm
+share/XFCE/backdrops/Sky.xpm
+share/XFCE/backdrops/Slate.xpm
+share/XFCE/backdrops/Soft.xpm
+share/XFCE/backdrops/Softblue.xpm
+share/XFCE/backdrops/Sol.xpm
+share/XFCE/backdrops/Solid.xpm
+share/XFCE/backdrops/Space.xpm
+share/XFCE/backdrops/Space2.xpm
+share/XFCE/backdrops/Storm.xpm
+share/XFCE/backdrops/Teal.xpm
+share/XFCE/backdrops/Tiles.xpm
+share/XFCE/backdrops/Tiles2.xpm
+share/XFCE/backdrops/Tiles3.xpm
+share/XFCE/backdrops/Time.xpm
+share/XFCE/backdrops/Ufo.xpm
+share/XFCE/backdrops/Wall1.xpm
+share/XFCE/backdrops/Wall2.xpm
+share/XFCE/backdrops/Wall3.xpm
+share/XFCE/backdrops/Wax.xpm
+share/XFCE/backdrops/Weave-red.xpm
+share/XFCE/backdrops/Weird.xpm
+share/XFCE/backdrops/Wood-floor.xpm
+share/XFCE/backdrops/Wood.xpm
+share/XFCE/backdrops/Wood2.xpm
+share/XFCE/backdrops/Worm.xpm
+share/XFCE/backdrops/Xfce.xpm
+share/XFCE/help/help.html
+share/XFCE/help/slogan.gif
+share/XFCE/help/xfbd.gif
+share/XFCE/help/xfce_action.gif
+share/XFCE/help/xfce_colorsel.gif
+share/XFCE/help/xfce_fontsel.gif
+share/XFCE/help/xfce_modify.gif
+share/XFCE/help/xfce_panel.gif
+share/XFCE/help/xfce_popup.gif
+share/XFCE/help/xfce_popup_detached.gif
+share/XFCE/help/xfce_screen.gif
+share/XFCE/help/xfce_setup1.gif
+share/XFCE/help/xfce_setup2.gif
+share/XFCE/help/xfce_setup3.gif
+share/XFCE/help/xfce_snap.gif
+share/XFCE/help/xfmouse.gif
+share/XFCE/help/xfpager.gif
+share/XFCE/help/xfsound.gif
+share/XFCE/help/xftree.gif
+share/XFCE/help/xftree_menu.gif
+share/XFCE/help/xfwm_menu1.gif
+share/XFCE/help/xfwm_menu2.gif
+share/XFCE/help/xfwm_menu3.gif
+share/XFCE/help/xfwm_menu4.gif
+share/XFCE/help/xfwm_menu5.gif
+share/XFCE/icons/ABC.xpm
+share/XFCE/icons/AZ.xpm
+share/XFCE/icons/Animator.xpm
+share/XFCE/icons/AntiVirus.xpm
+share/XFCE/icons/BackUp.xpm
+share/XFCE/icons/Ballon.xpm
+share/XFCE/icons/Binoculars.xpm
+share/XFCE/icons/Bomb.xpm
+share/XFCE/icons/Bomb2.xpm
+share/XFCE/icons/Box_empty.xpm
+share/XFCE/icons/Box_full.xpm
+share/XFCE/icons/C++.xpm
+share/XFCE/icons/C.xpm
+share/XFCE/icons/CAD.xpm
+share/XFCE/icons/CAD2.xpm
+share/XFCE/icons/Calculator.xpm
+share/XFCE/icons/Camera.xpm
+share/XFCE/icons/Cards.xpm
+share/XFCE/icons/Chart.xpm
+share/XFCE/icons/Clock.xpm
+share/XFCE/icons/Colormap.xpm
+share/XFCE/icons/CompactDisc.xpm
+share/XFCE/icons/Connect.xpm
+share/XFCE/icons/Copy.xpm
+share/XFCE/icons/Database.xpm
+share/XFCE/icons/DiskCopy.xpm
+share/XFCE/icons/Disk_blue.xpm
+share/XFCE/icons/Disks.xpm
+share/XFCE/icons/Document.xpm
+share/XFCE/icons/Drawing.xpm
+share/XFCE/icons/Drawing2.xpm
+share/XFCE/icons/Drawing3.xpm
+share/XFCE/icons/Dynamite.xpm
+share/XFCE/icons/Earth.xpm
+share/XFCE/icons/Edit.xpm
+share/XFCE/icons/Editres.xpm
+share/XFCE/icons/Exit.xpm
+share/XFCE/icons/FAX.xpm
+share/XFCE/icons/Film.xpm
+share/XFCE/icons/Film2.xpm
+share/XFCE/icons/FontDesigner.xpm
+share/XFCE/icons/Fonts.xpm
+share/XFCE/icons/Format.xpm
+share/XFCE/icons/Ftp.xpm
+share/XFCE/icons/Game.xpm
+share/XFCE/icons/Graph_bar.xpm
+share/XFCE/icons/Graph_pie.xpm
+share/XFCE/icons/Hammer.xpm
+share/XFCE/icons/Key.xpm
+share/XFCE/icons/Keys.xpm
+share/XFCE/icons/Lightbulb.xpm
+share/XFCE/icons/Lightning.xpm
+share/XFCE/icons/Lock.xpm
+share/XFCE/icons/Magnify.xpm
+share/XFCE/icons/Mail.xpm
+share/XFCE/icons/Math4.xpm
+share/XFCE/icons/Meter.xpm
+share/XFCE/icons/Mosaic.xpm
+share/XFCE/icons/Mouse.xpm
+share/XFCE/icons/Moviemaker2.xpm
+share/XFCE/icons/Music.xpm
+share/XFCE/icons/Music2.xpm
+share/XFCE/icons/Netscape.xpm
+share/XFCE/icons/News.xpm
+share/XFCE/icons/No_drag.xpm
+share/XFCE/icons/Packer.xpm
+share/XFCE/icons/Palette.xpm
+share/XFCE/icons/Pencil.xpm
+share/XFCE/icons/Penguin.xpm
+share/XFCE/icons/Plug.xpm
+share/XFCE/icons/Postit.xpm
+share/XFCE/icons/PrefsDock.xpm
+share/XFCE/icons/Radar.xpm
+share/XFCE/icons/Raytracer.xpm
+share/XFCE/icons/Reader.xpm
+share/XFCE/icons/Sound.xpm
+share/XFCE/icons/SoundEditor.xpm
+share/XFCE/icons/TEX.xpm
+share/XFCE/icons/Tapes.xpm
+share/XFCE/icons/Telescope.xpm
+share/XFCE/icons/Temperature.xpm
+share/XFCE/icons/Terminal.xpm
+share/XFCE/icons/TextEditor.xpm
+share/XFCE/icons/Tic_tac_toe.xpm
+share/XFCE/icons/Tick.xpm
+share/XFCE/icons/Timer.xpm
+share/XFCE/icons/Torus.xpm
+share/XFCE/icons/View.xpm
+share/XFCE/icons/Viewer.xpm
+share/XFCE/icons/Warning.xpm
+share/XFCE/icons/WordProcessing.xpm
+share/XFCE/icons/WordProcessing2.xpm
+share/XFCE/icons/WordProcessing3.xpm
+share/XFCE/icons/X_server.xpm
+share/XFCE/icons/Xmix.xpm
+share/XFCE/icons/Xterm.xpm
+share/XFCE/icons/Xv.xpm
+share/XFCE/locale/ca/LC_MESSAGES/xfce.mo
+share/XFCE/locale/de/LC_MESSAGES/xfce.mo
+share/XFCE/locale/es/LC_MESSAGES/xfce.mo
+share/XFCE/locale/fr/LC_MESSAGES/xfce.mo
+share/XFCE/locale/it/LC_MESSAGES/xfce.mo
+share/XFCE/locale/pl/LC_MESSAGES/xfce.mo
+share/XFCE/palettes/Alpine
+share/XFCE/palettes/Anthracite
+share/XFCE/palettes/Bahamas
+share/XFCE/palettes/Citrouille
+share/XFCE/palettes/Dolly
+share/XFCE/palettes/Dust
+share/XFCE/palettes/Fall
+share/XFCE/palettes/Golden
+share/XFCE/palettes/Grayscale
+share/XFCE/palettes/HiContrast
+share/XFCE/palettes/Iceland
+share/XFCE/palettes/Mauve
+share/XFCE/palettes/Nature
+share/XFCE/palettes/Netsy
+share/XFCE/palettes/Plum
+share/XFCE/palettes/Prairie
+share/XFCE/palettes/Salmon
+share/XFCE/palettes/Sand
+share/XFCE/palettes/Spring
+share/XFCE/palettes/Sunny
+share/XFCE/palettes/TBlue
+share/XFCE/palettes/Teal
+share/XFCE/palettes/Tommy
+share/XFCE/palettes/Troica
+share/XFCE/palettes/Typhoon
+share/XFCE/palettes/Win
+share/XFCE/palettes/Xfce-1
+share/XFCE/sample.Xclients
+share/XFCE/sample.fvwm2rc
+share/XFCE/sample.fvwmrc
+share/XFCE/sample.mwm.xinitrc
+share/XFCE/sample.xfbdrc
+share/XFCE/sample.xfce3rc
+share/XFCE/sample.xfmouserc
+share/XFCE/sample.xfsoundrc
+share/XFCE/sample.xfwmrc
+share/XFCE/sample.xinitrc
+share/XFCE/sample.xsession
+share/XFCE/sounds/alert01.wav
+share/XFCE/sounds/beep01.wav
+share/XFCE/sounds/beep02.wav
+share/XFCE/sounds/beep03.wav
+share/XFCE/sounds/beep04.wav
+share/XFCE/sounds/beep05.wav
+share/XFCE/sounds/beep06.wav
+share/XFCE/sounds/beep07.wav
+share/XFCE/sounds/beep08.wav
+share/XFCE/sounds/beep09.wav
+share/XFCE/sounds/beep10.wav
+share/XFCE/sounds/beep11.wav
+share/XFCE/sounds/beep12.wav
+share/XFCE/sounds/bell01.wav
+share/XFCE/sounds/bell02.wav
+share/XFCE/sounds/bell03.wav
+share/XFCE/sounds/bell04.wav
+share/XFCE/sounds/bong01.wav
+share/XFCE/sounds/bong02.wav
+share/XFCE/sounds/bong03.wav
+share/XFCE/sounds/bong04.wav
+share/XFCE/sounds/bong05.wav
+share/XFCE/sounds/bong06.wav
+share/XFCE/sounds/bong07.wav
+share/XFCE/sounds/bong08.wav
+share/XFCE/sounds/bong09.wav
+share/XFCE/sounds/bong10.wav
+share/XFCE/sounds/bong11.wav
+share/XFCE/sounds/bong12.wav
+share/XFCE/sounds/crash01.wav
+share/XFCE/sounds/crash02.wav
+share/XFCE/sounds/crash04.wav
+share/XFCE/sounds/crash05.wav
+share/XFCE/sounds/crash06.wav
+share/XFCE/sounds/logon01.wav
+share/XFCE/sounds/logon02.wav
+share/XFCE/sounds/logout01.wav
+share/XFCE/sounds/ping01.wav
+share/XFCE/sounds/ping02.wav
+share/XFCE/sounds/ping03.wav
+share/XFCE/sounds/ping04.wav
+share/XFCE/sounds/pop01.wav
+share/XFCE/sounds/pop02.wav
+share/XFCE/sounds/sink01.wav
+share/XFCE/sounds/slide01.wav
+share/XFCE/sounds/slide02.wav
+share/XFCE/sounds/space01.wav
+share/XFCE/sounds/zap01.wav
+share/XFCE/sounds/zap02.wav
+share/XFCE/sounds/zap03.wav
+share/XFCE/sounds/zap04.wav
+share/XFCE/system.xfwmrc
+share/XFCE/xfdefs.py
+@dirrm share/XFCE/backdrops
+@dirrm share/XFCE/help
+@dirrm share/XFCE/icons
+@dirrm share/XFCE/locale/ca/LC_MESSAGES
+@dirrm share/XFCE/locale/ca
+@dirrm share/XFCE/locale/de/LC_MESSAGES
+@dirrm share/XFCE/locale/de
+@dirrm share/XFCE/locale/es/LC_MESSAGES
+@dirrm share/XFCE/locale/es
+@dirrm share/XFCE/locale/fr/LC_MESSAGES
+@dirrm share/XFCE/locale/fr
+@dirrm share/XFCE/locale/it/LC_MESSAGES
+@dirrm share/XFCE/locale/it
+@dirrm share/XFCE/locale/pl/LC_MESSAGES
+@dirrm share/XFCE/locale/pl
+@dirrm share/XFCE/locale
+@dirrm share/XFCE/palettes
+@dirrm share/XFCE/sounds
 @dirrm share/XFCE
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index e5015bfd555a..70f42b2dae17 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,22 +1,28 @@
 # New ports collection makefile for:	xfce
-# Version required:	2.4.0
+# Version required:	3.0.3
 # Date created:		30 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.15 1999/03/31 15:52:31 steve Exp $
+# $Id: Makefile,v 1.16 1999/05/31 05:03:11 steve Exp $
 #
 
-DISTNAME=	xfce-2.4.0
+DISTNAME=	xfce-3.0.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
 MAINTAINER=	nacai@iname.com
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		xforms.0:${PORTSDIR}/x11-toolkits/xforms
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-USE_IMAKE=	yes
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
+		--datadir=${PREFIX}/share/
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN1=	xfce.1 xfmouse.1 xfpager.1 xfsound.1 xfwm.1
+MAN1=	xfbd.1 xfce.1 xfclock.1 xfmouse.1 xfpager.1 xfsound.1 \
+	xftree.1 xfwm.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4/distinfo b/x11-wm/xfce4/distinfo
index 631faf41d337..fa76d6267df1 100644
--- a/x11-wm/xfce4/distinfo
+++ b/x11-wm/xfce4/distinfo
@@ -1 +1 @@
-MD5 (xfce-2.4.0.tar.gz) = 9f5125050d38b21e546408205b983e90
+MD5 (xfce-3.0.3.tar.gz) = ccec0991d1075cf8a43c254668dcde82
diff --git a/x11-wm/xfce4/files/patch-aa b/x11-wm/xfce4/files/patch-aa
deleted file mode 100644
index ec38c9f21e27..000000000000
--- a/x11-wm/xfce4/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- XFCE.def.orig	Sun Mar 28 12:03:01 1999
-+++ XFCE.def	Sun Mar 28 12:04:53 1999
-@@ -1,10 +1,10 @@
- XCOMM Definition options : Please edit !
- XCOMM ==================================
- 
--#define LINUX
-+/* #define LINUX */
- /* #define SOLARIS */
--/* #define BSD */
--#define STATIC
-+#define BSD
-+/* #define STATIC */
- 
- XCOMM Compile options : Please check !
- XCOMM ================================
-@@ -41,7 +41,7 @@
- 
- #ifdef BSD
- XCOMM
--XCOMM for Free BSD 2.2.2
-+XCOMM for Free BSD 3.x or later
- XCOMM
- XFCE_SYSLIB =  -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/local/lib
- STD_LIBRARIES = -lXext -lX11 -lXpm -lm
-@@ -54,8 +54,8 @@
- LINK_OPTIONS = -O -s
- #endif
- 
--XCOMM BINDIR         = /usr/local/bin
--XFCE_DIR       = /var/XFCE
-+XCOMM BINDIR         = $(X11BASE)/bin
-+XFCE_DIR       = $(X11BASE)/share/XFCE
- XBINDIR        = $(BINDIR) 
- XFCE_PAL       = $(XFCE_DIR)/palettes
- XFCE_BACKDROPS = $(XFCE_DIR)/backdrops
diff --git a/x11-wm/xfce4/pkg-comment b/x11-wm/xfce4/pkg-comment
index 66eaa2c036db..2902db4925d4 100644
--- a/x11-wm/xfce4/pkg-comment
+++ b/x11-wm/xfce4/pkg-comment
@@ -1 +1 @@
-XForm Cool Environment
+CDE like desktop with GTK
diff --git a/x11-wm/xfce4/pkg-descr b/x11-wm/xfce4/pkg-descr
index 80d822b71665..2902db4925d4 100644
--- a/x11-wm/xfce4/pkg-descr
+++ b/x11-wm/xfce4/pkg-descr
@@ -1,4 +1 @@
-XFroms Cool Environment
-
-XFCE is a X toolbar that allow user to easily launch programs.
-When  you use with fvwm, it can switch desks.
+CDE like desktop with GTK
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index 52b7b19e9b28..899e0b47d883 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -1,24 +1,330 @@
 bin/xfbd
 bin/xfce
+bin/xfce_remove
+bin/xfce_setup
+bin/xfclock
+bin/xfhelp
 bin/xfmouse
 bin/xfpager
 bin/xfplay
 bin/xfsound
+bin/xftree
 bin/xfwm
-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-pt
-lib/X11/app-defaults/XFce-sk
-share/XFCE/XFce2.logo
-share/XFCE/doc/COPYRIGHT
-share/XFCE/doc/FAQ
-share/XFCE/doc/INSTALL
-share/XFCE/doc/MANUAL
-share/XFCE/doc/README
-@dirrm share/XFCE/doc
+share/XFCE/COPYING
+share/XFCE/README.xfdefs.py
+share/XFCE/XFce3.logo
+share/XFCE/backdrops/Anneaux.xpm
+share/XFCE/backdrops/Arena.xpm
+share/XFCE/backdrops/BlueStucco.xpm
+share/XFCE/backdrops/Bluedrops.xpm
+share/XFCE/backdrops/Bluefalls.xpm
+share/XFCE/backdrops/Boucles.xpm
+share/XFCE/backdrops/Brownie.xpm
+share/XFCE/backdrops/Candies.xpm
+share/XFCE/backdrops/Cds.xpm
+share/XFCE/backdrops/Circle.xpm
+share/XFCE/backdrops/Cloth.xpm
+share/XFCE/backdrops/Clouds.xpm
+share/XFCE/backdrops/Cocoa.xpm
+share/XFCE/backdrops/Compute.xpm
+share/XFCE/backdrops/Concrete.xpm
+share/XFCE/backdrops/Darkblue2.xpm
+share/XFCE/backdrops/Desert2.xpm
+share/XFCE/backdrops/Dry.xpm
+share/XFCE/backdrops/Eyes.xpm
+share/XFCE/backdrops/Fire.xpm
+share/XFCE/backdrops/Flames.xpm
+share/XFCE/backdrops/Flow.xpm
+share/XFCE/backdrops/Funkyblue.xpm
+share/XFCE/backdrops/Gallets.xpm
+share/XFCE/backdrops/Glasses.xpm
+share/XFCE/backdrops/Gold.xpm
+share/XFCE/backdrops/Gradient.xpm
+share/XFCE/backdrops/GreenStucco.xpm
+share/XFCE/backdrops/Greenslate.xpm
+share/XFCE/backdrops/Grey.xpm
+share/XFCE/backdrops/Greydrops.xpm
+share/XFCE/backdrops/Greysea.xpm
+share/XFCE/backdrops/Hardblue.xpm
+share/XFCE/backdrops/Honey.xpm
+share/XFCE/backdrops/Leaves.xpm
+share/XFCE/backdrops/Marbled.xpm
+share/XFCE/backdrops/Maze.xpm
+share/XFCE/backdrops/Notes.xpm
+share/XFCE/backdrops/Pencils.xpm
+share/XFCE/backdrops/Plasma.xpm
+share/XFCE/backdrops/Pool.xpm
+share/XFCE/backdrops/Psy.xpm
+share/XFCE/backdrops/Psy2.xpm
+share/XFCE/backdrops/Psy3.xpm
+share/XFCE/backdrops/Rotin.xpm
+share/XFCE/backdrops/Rough.xpm
+share/XFCE/backdrops/Sandy-ridges.xpm
+share/XFCE/backdrops/Satin.xpm
+share/XFCE/backdrops/Satin2.xpm
+share/XFCE/backdrops/Satin3.xpm
+share/XFCE/backdrops/Sea.xpm
+share/XFCE/backdrops/Sky.xpm
+share/XFCE/backdrops/Slate.xpm
+share/XFCE/backdrops/Soft.xpm
+share/XFCE/backdrops/Softblue.xpm
+share/XFCE/backdrops/Sol.xpm
+share/XFCE/backdrops/Solid.xpm
+share/XFCE/backdrops/Space.xpm
+share/XFCE/backdrops/Space2.xpm
+share/XFCE/backdrops/Storm.xpm
+share/XFCE/backdrops/Teal.xpm
+share/XFCE/backdrops/Tiles.xpm
+share/XFCE/backdrops/Tiles2.xpm
+share/XFCE/backdrops/Tiles3.xpm
+share/XFCE/backdrops/Time.xpm
+share/XFCE/backdrops/Ufo.xpm
+share/XFCE/backdrops/Wall1.xpm
+share/XFCE/backdrops/Wall2.xpm
+share/XFCE/backdrops/Wall3.xpm
+share/XFCE/backdrops/Wax.xpm
+share/XFCE/backdrops/Weave-red.xpm
+share/XFCE/backdrops/Weird.xpm
+share/XFCE/backdrops/Wood-floor.xpm
+share/XFCE/backdrops/Wood.xpm
+share/XFCE/backdrops/Wood2.xpm
+share/XFCE/backdrops/Worm.xpm
+share/XFCE/backdrops/Xfce.xpm
+share/XFCE/help/help.html
+share/XFCE/help/slogan.gif
+share/XFCE/help/xfbd.gif
+share/XFCE/help/xfce_action.gif
+share/XFCE/help/xfce_colorsel.gif
+share/XFCE/help/xfce_fontsel.gif
+share/XFCE/help/xfce_modify.gif
+share/XFCE/help/xfce_panel.gif
+share/XFCE/help/xfce_popup.gif
+share/XFCE/help/xfce_popup_detached.gif
+share/XFCE/help/xfce_screen.gif
+share/XFCE/help/xfce_setup1.gif
+share/XFCE/help/xfce_setup2.gif
+share/XFCE/help/xfce_setup3.gif
+share/XFCE/help/xfce_snap.gif
+share/XFCE/help/xfmouse.gif
+share/XFCE/help/xfpager.gif
+share/XFCE/help/xfsound.gif
+share/XFCE/help/xftree.gif
+share/XFCE/help/xftree_menu.gif
+share/XFCE/help/xfwm_menu1.gif
+share/XFCE/help/xfwm_menu2.gif
+share/XFCE/help/xfwm_menu3.gif
+share/XFCE/help/xfwm_menu4.gif
+share/XFCE/help/xfwm_menu5.gif
+share/XFCE/icons/ABC.xpm
+share/XFCE/icons/AZ.xpm
+share/XFCE/icons/Animator.xpm
+share/XFCE/icons/AntiVirus.xpm
+share/XFCE/icons/BackUp.xpm
+share/XFCE/icons/Ballon.xpm
+share/XFCE/icons/Binoculars.xpm
+share/XFCE/icons/Bomb.xpm
+share/XFCE/icons/Bomb2.xpm
+share/XFCE/icons/Box_empty.xpm
+share/XFCE/icons/Box_full.xpm
+share/XFCE/icons/C++.xpm
+share/XFCE/icons/C.xpm
+share/XFCE/icons/CAD.xpm
+share/XFCE/icons/CAD2.xpm
+share/XFCE/icons/Calculator.xpm
+share/XFCE/icons/Camera.xpm
+share/XFCE/icons/Cards.xpm
+share/XFCE/icons/Chart.xpm
+share/XFCE/icons/Clock.xpm
+share/XFCE/icons/Colormap.xpm
+share/XFCE/icons/CompactDisc.xpm
+share/XFCE/icons/Connect.xpm
+share/XFCE/icons/Copy.xpm
+share/XFCE/icons/Database.xpm
+share/XFCE/icons/DiskCopy.xpm
+share/XFCE/icons/Disk_blue.xpm
+share/XFCE/icons/Disks.xpm
+share/XFCE/icons/Document.xpm
+share/XFCE/icons/Drawing.xpm
+share/XFCE/icons/Drawing2.xpm
+share/XFCE/icons/Drawing3.xpm
+share/XFCE/icons/Dynamite.xpm
+share/XFCE/icons/Earth.xpm
+share/XFCE/icons/Edit.xpm
+share/XFCE/icons/Editres.xpm
+share/XFCE/icons/Exit.xpm
+share/XFCE/icons/FAX.xpm
+share/XFCE/icons/Film.xpm
+share/XFCE/icons/Film2.xpm
+share/XFCE/icons/FontDesigner.xpm
+share/XFCE/icons/Fonts.xpm
+share/XFCE/icons/Format.xpm
+share/XFCE/icons/Ftp.xpm
+share/XFCE/icons/Game.xpm
+share/XFCE/icons/Graph_bar.xpm
+share/XFCE/icons/Graph_pie.xpm
+share/XFCE/icons/Hammer.xpm
+share/XFCE/icons/Key.xpm
+share/XFCE/icons/Keys.xpm
+share/XFCE/icons/Lightbulb.xpm
+share/XFCE/icons/Lightning.xpm
+share/XFCE/icons/Lock.xpm
+share/XFCE/icons/Magnify.xpm
+share/XFCE/icons/Mail.xpm
+share/XFCE/icons/Math4.xpm
+share/XFCE/icons/Meter.xpm
+share/XFCE/icons/Mosaic.xpm
+share/XFCE/icons/Mouse.xpm
+share/XFCE/icons/Moviemaker2.xpm
+share/XFCE/icons/Music.xpm
+share/XFCE/icons/Music2.xpm
+share/XFCE/icons/Netscape.xpm
+share/XFCE/icons/News.xpm
+share/XFCE/icons/No_drag.xpm
+share/XFCE/icons/Packer.xpm
+share/XFCE/icons/Palette.xpm
+share/XFCE/icons/Pencil.xpm
+share/XFCE/icons/Penguin.xpm
+share/XFCE/icons/Plug.xpm
+share/XFCE/icons/Postit.xpm
+share/XFCE/icons/PrefsDock.xpm
+share/XFCE/icons/Radar.xpm
+share/XFCE/icons/Raytracer.xpm
+share/XFCE/icons/Reader.xpm
+share/XFCE/icons/Sound.xpm
+share/XFCE/icons/SoundEditor.xpm
+share/XFCE/icons/TEX.xpm
+share/XFCE/icons/Tapes.xpm
+share/XFCE/icons/Telescope.xpm
+share/XFCE/icons/Temperature.xpm
+share/XFCE/icons/Terminal.xpm
+share/XFCE/icons/TextEditor.xpm
+share/XFCE/icons/Tic_tac_toe.xpm
+share/XFCE/icons/Tick.xpm
+share/XFCE/icons/Timer.xpm
+share/XFCE/icons/Torus.xpm
+share/XFCE/icons/View.xpm
+share/XFCE/icons/Viewer.xpm
+share/XFCE/icons/Warning.xpm
+share/XFCE/icons/WordProcessing.xpm
+share/XFCE/icons/WordProcessing2.xpm
+share/XFCE/icons/WordProcessing3.xpm
+share/XFCE/icons/X_server.xpm
+share/XFCE/icons/Xmix.xpm
+share/XFCE/icons/Xterm.xpm
+share/XFCE/icons/Xv.xpm
+share/XFCE/locale/ca/LC_MESSAGES/xfce.mo
+share/XFCE/locale/de/LC_MESSAGES/xfce.mo
+share/XFCE/locale/es/LC_MESSAGES/xfce.mo
+share/XFCE/locale/fr/LC_MESSAGES/xfce.mo
+share/XFCE/locale/it/LC_MESSAGES/xfce.mo
+share/XFCE/locale/pl/LC_MESSAGES/xfce.mo
+share/XFCE/palettes/Alpine
+share/XFCE/palettes/Anthracite
+share/XFCE/palettes/Bahamas
+share/XFCE/palettes/Citrouille
+share/XFCE/palettes/Dolly
+share/XFCE/palettes/Dust
+share/XFCE/palettes/Fall
+share/XFCE/palettes/Golden
+share/XFCE/palettes/Grayscale
+share/XFCE/palettes/HiContrast
+share/XFCE/palettes/Iceland
+share/XFCE/palettes/Mauve
+share/XFCE/palettes/Nature
+share/XFCE/palettes/Netsy
+share/XFCE/palettes/Plum
+share/XFCE/palettes/Prairie
+share/XFCE/palettes/Salmon
+share/XFCE/palettes/Sand
+share/XFCE/palettes/Spring
+share/XFCE/palettes/Sunny
+share/XFCE/palettes/TBlue
+share/XFCE/palettes/Teal
+share/XFCE/palettes/Tommy
+share/XFCE/palettes/Troica
+share/XFCE/palettes/Typhoon
+share/XFCE/palettes/Win
+share/XFCE/palettes/Xfce-1
+share/XFCE/sample.Xclients
+share/XFCE/sample.fvwm2rc
+share/XFCE/sample.fvwmrc
+share/XFCE/sample.mwm.xinitrc
+share/XFCE/sample.xfbdrc
+share/XFCE/sample.xfce3rc
+share/XFCE/sample.xfmouserc
+share/XFCE/sample.xfsoundrc
+share/XFCE/sample.xfwmrc
+share/XFCE/sample.xinitrc
+share/XFCE/sample.xsession
+share/XFCE/sounds/alert01.wav
+share/XFCE/sounds/beep01.wav
+share/XFCE/sounds/beep02.wav
+share/XFCE/sounds/beep03.wav
+share/XFCE/sounds/beep04.wav
+share/XFCE/sounds/beep05.wav
+share/XFCE/sounds/beep06.wav
+share/XFCE/sounds/beep07.wav
+share/XFCE/sounds/beep08.wav
+share/XFCE/sounds/beep09.wav
+share/XFCE/sounds/beep10.wav
+share/XFCE/sounds/beep11.wav
+share/XFCE/sounds/beep12.wav
+share/XFCE/sounds/bell01.wav
+share/XFCE/sounds/bell02.wav
+share/XFCE/sounds/bell03.wav
+share/XFCE/sounds/bell04.wav
+share/XFCE/sounds/bong01.wav
+share/XFCE/sounds/bong02.wav
+share/XFCE/sounds/bong03.wav
+share/XFCE/sounds/bong04.wav
+share/XFCE/sounds/bong05.wav
+share/XFCE/sounds/bong06.wav
+share/XFCE/sounds/bong07.wav
+share/XFCE/sounds/bong08.wav
+share/XFCE/sounds/bong09.wav
+share/XFCE/sounds/bong10.wav
+share/XFCE/sounds/bong11.wav
+share/XFCE/sounds/bong12.wav
+share/XFCE/sounds/crash01.wav
+share/XFCE/sounds/crash02.wav
+share/XFCE/sounds/crash04.wav
+share/XFCE/sounds/crash05.wav
+share/XFCE/sounds/crash06.wav
+share/XFCE/sounds/logon01.wav
+share/XFCE/sounds/logon02.wav
+share/XFCE/sounds/logout01.wav
+share/XFCE/sounds/ping01.wav
+share/XFCE/sounds/ping02.wav
+share/XFCE/sounds/ping03.wav
+share/XFCE/sounds/ping04.wav
+share/XFCE/sounds/pop01.wav
+share/XFCE/sounds/pop02.wav
+share/XFCE/sounds/sink01.wav
+share/XFCE/sounds/slide01.wav
+share/XFCE/sounds/slide02.wav
+share/XFCE/sounds/space01.wav
+share/XFCE/sounds/zap01.wav
+share/XFCE/sounds/zap02.wav
+share/XFCE/sounds/zap03.wav
+share/XFCE/sounds/zap04.wav
+share/XFCE/system.xfwmrc
+share/XFCE/xfdefs.py
+@dirrm share/XFCE/backdrops
+@dirrm share/XFCE/help
+@dirrm share/XFCE/icons
+@dirrm share/XFCE/locale/ca/LC_MESSAGES
+@dirrm share/XFCE/locale/ca
+@dirrm share/XFCE/locale/de/LC_MESSAGES
+@dirrm share/XFCE/locale/de
+@dirrm share/XFCE/locale/es/LC_MESSAGES
+@dirrm share/XFCE/locale/es
+@dirrm share/XFCE/locale/fr/LC_MESSAGES
+@dirrm share/XFCE/locale/fr
+@dirrm share/XFCE/locale/it/LC_MESSAGES
+@dirrm share/XFCE/locale/it
+@dirrm share/XFCE/locale/pl/LC_MESSAGES
+@dirrm share/XFCE/locale/pl
+@dirrm share/XFCE/locale
+@dirrm share/XFCE/palettes
+@dirrm share/XFCE/sounds
 @dirrm share/XFCE