8 files changed, 116 insertions, 44 deletions

diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index db5c54385e06..79e50d6032f5 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION= 	3.3.3
+PORTVERSION= 	3.4.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
@@ -29,6 +29,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--with-xpm=${X11BASE}
 
 MAN1=	xfbd.1 xfce.1 xfclock.1 xfgnome.1 xfhelp.1 xflock.1 xfmouse.1 \
-	xfpager.1 xfprint.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1
+	xfpager.1 xfprint.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1 \
+	xfmountdev.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce/distinfo b/x11-wm/xfce/distinfo
index d813dd3b439c..336d6bd06d12 100644
--- a/x11-wm/xfce/distinfo
+++ b/x11-wm/xfce/distinfo
@@ -1 +1 @@
-MD5 (xfce-3.3.3.tar.gz) = 7a71e02938e655233e67858563bcf148
+MD5 (xfce-3.4.0.tar.gz) = f548446d6d542f8acad756837debfa0e
diff --git a/x11-wm/xfce/files/patch-af b/x11-wm/xfce/files/patch-af
new file mode 100644
index 000000000000..63ce55a43770
--- /dev/null
+++ b/x11-wm/xfce/files/patch-af
@@ -0,0 +1,22 @@
+--- configure.orig	Mon Jun  5 11:35:55 2000
++++ configure	Mon Jun  5 13:54:52 2000
+@@ -2698,6 +2698,8 @@
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
++  ac_save_LIBS="$LIBS"
++  LIBS="-lintl  $LIBS"
+   cat > conftest.$ac_ext <<EOF
+ #line 2703 "configure"
+ #include "confdefs.h"
+@@ -6116,8 +6118,8 @@
+ 
+ 
+ 
+-
+-
++XFCE_DIR=`eval echo $XFCE_DIR`
++XFCE_CONFDIR=`eval echo $XFCE_CONFDIR`
+ sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfce_setup.in > scripts/xfce_setup
+ sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfhelp.in > scripts/xfhelp
+ sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/startxfce.in > scripts/startxfce
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index 6fbfe34f8850..af39e37ba4c4 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -1,3 +1,4 @@
+bin/CDE2Xfcepal
 bin/startxfce
 bin/xfbd
 bin/xfce
@@ -7,6 +8,7 @@ bin/xfclock
 bin/xfgnome
 bin/xfhelp
 bin/xflock
+bin/xfmountdev
 bin/xfmouse
 bin/xfpager
 bin/xfplay
@@ -16,13 +18,34 @@ bin/xfterm
 bin/xftrash
 bin/xftree
 bin/xfwm
+etc/xfce/README.xfdefs.py
+etc/xfce/Xclients
+etc/xfce/fvwm2rc
+etc/xfce/fvwmrc
+etc/xfce/xfbdrc
+etc/xfce/xfce3rc
+etc/xfce/xfce3rc.hu
+etc/xfce/xfce3rc.ja
+etc/xfce/xfce3rc.ko
+etc/xfce/xfce3rc.zh_CN.GB2312
+etc/xfce/xfce3rc.zh_TW.Big5
+etc/xfce/xfclockrc
+etc/xfce/xfdefs.py
+etc/xfce/xfmouserc
+etc/xfce/xfsoundrc
+etc/xfce/xfwmrc
+etc/xfce/xinitrc
+etc/xfce/xinitrc.mwm
+etc/xfce/xsession
+etc/xfce/xtree.reg
 share/xfce/COPYING
-share/xfce/README.xfdefs.py
 share/xfce/XFce3.logo
 share/xfce/backdrops/A-Little-Exercise-3.jpg
 share/xfce/backdrops/A-Little-Exercise.jpg
 share/xfce/backdrops/Anneaux.xpm
 share/xfce/backdrops/Arena.xpm
+share/xfce/backdrops/BlueSatin.xpm
+share/xfce/backdrops/BlueSea.xpm
 share/xfce/backdrops/BlueStucco.xpm
 share/xfce/backdrops/Bluedrops.xpm
 share/xfce/backdrops/Bluefalls.xpm
@@ -318,7 +341,9 @@ share/xfce/locale/gl/LC_MESSAGES/xfce.mo
 share/xfce/locale/hu/LC_MESSAGES/xfce.mo
 share/xfce/locale/it/LC_MESSAGES/xfce.mo
 share/xfce/locale/ja/LC_MESSAGES/xfce.mo
+share/xfce/locale/nl/LC_MESSAGES/xfce.mo
 share/xfce/locale/pl/LC_MESSAGES/xfce.mo
+share/xfce/locale/ro/LC_MESSAGES/xfce.mo
 share/xfce/locale/ru/LC_MESSAGES/xfce.mo
 share/xfce/locale/sk/LC_MESSAGES/xfce.mo
 share/xfce/locale/sv/LC_MESSAGES/xfce.mo
@@ -355,6 +380,7 @@ share/xfce/palettes/Salmon2
 share/xfce/palettes/Sand
 share/xfce/palettes/Silver
 share/xfce/palettes/Spring
+share/xfce/palettes/Standard
 share/xfce/palettes/Stellar
 share/xfce/palettes/Stripe
 share/xfce/palettes/Sunny
@@ -367,22 +393,6 @@ share/xfce/palettes/Typhoon
 share/xfce/palettes/Win
 share/xfce/palettes/Xfce-1
 share/xfce/palettes/Xfce-2
-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.xfce3rc.ja
-share/xfce/sample.xfce3rc.ko
-share/xfce/sample.xfce3rc.zh_CN.GB2312
-share/xfce/sample.xfce3rc.zh_TW.Big5
-share/xfce/sample.xfmouserc
-share/xfce/sample.xfsoundrc
-share/xfce/sample.xfwmrc
-share/xfce/sample.xinitrc
-share/xfce/sample.xsession
-share/xfce/sample.xtree.reg
 share/xfce/sounds/alert01.wav
 share/xfce/sounds/beep01.wav
 share/xfce/sounds/beep02.wav
@@ -434,7 +444,6 @@ 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/textures/cheese.xpm
 share/xfce/textures/craters.xpm
 share/xfce/textures/ground.xpm
@@ -445,7 +454,6 @@ share/xfce/textures/oldwood.xpm
 share/xfce/textures/paper.xpm
 share/xfce/textures/silver.xpm
 share/xfce/textures/stripe.xpm
-share/xfce/xfdefs.py
 @dirrm share/xfce/backdrops
 @dirrm share/xfce/help
 @dirrm share/xfce/icons
@@ -471,8 +479,12 @@ share/xfce/xfdefs.py
 @dirrm share/xfce/locale/it
 @dirrm share/xfce/locale/ja/LC_MESSAGES
 @dirrm share/xfce/locale/ja
+@dirrm share/xfce/locale/nl/LC_MESSAGES
+@dirrm share/xfce/locale/nl
 @dirrm share/xfce/locale/pl/LC_MESSAGES
 @dirrm share/xfce/locale/pl
+@dirrm share/xfce/locale/ro/LC_MESSAGES
+@dirrm share/xfce/locale/ro
 @dirrm share/xfce/locale/ru/LC_MESSAGES
 @dirrm share/xfce/locale/ru
 @dirrm share/xfce/locale/sk/LC_MESSAGES
@@ -486,3 +498,4 @@ share/xfce/xfdefs.py
 @dirrm share/xfce/sounds
 @dirrm share/xfce/textures
 @dirrm share/xfce
+@dirrm etc/xfce
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index db5c54385e06..79e50d6032f5 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION= 	3.3.3
+PORTVERSION= 	3.4.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
@@ -29,6 +29,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--with-xpm=${X11BASE}
 
 MAN1=	xfbd.1 xfce.1 xfclock.1 xfgnome.1 xfhelp.1 xflock.1 xfmouse.1 \
-	xfpager.1 xfprint.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1
+	xfpager.1 xfprint.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1 \
+	xfmountdev.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4/distinfo b/x11-wm/xfce4/distinfo
index d813dd3b439c..336d6bd06d12 100644
--- a/x11-wm/xfce4/distinfo
+++ b/x11-wm/xfce4/distinfo
@@ -1 +1 @@
-MD5 (xfce-3.3.3.tar.gz) = 7a71e02938e655233e67858563bcf148
+MD5 (xfce-3.4.0.tar.gz) = f548446d6d542f8acad756837debfa0e
diff --git a/x11-wm/xfce4/files/patch-af b/x11-wm/xfce4/files/patch-af
new file mode 100644
index 000000000000..63ce55a43770
--- /dev/null
+++ b/x11-wm/xfce4/files/patch-af
@@ -0,0 +1,22 @@
+--- configure.orig	Mon Jun  5 11:35:55 2000
++++ configure	Mon Jun  5 13:54:52 2000
+@@ -2698,6 +2698,8 @@
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
++  ac_save_LIBS="$LIBS"
++  LIBS="-lintl  $LIBS"
+   cat > conftest.$ac_ext <<EOF
+ #line 2703 "configure"
+ #include "confdefs.h"
+@@ -6116,8 +6118,8 @@
+ 
+ 
+ 
+-
+-
++XFCE_DIR=`eval echo $XFCE_DIR`
++XFCE_CONFDIR=`eval echo $XFCE_CONFDIR`
+ sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfce_setup.in > scripts/xfce_setup
+ sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfhelp.in > scripts/xfhelp
+ sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/startxfce.in > scripts/startxfce
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index 6fbfe34f8850..af39e37ba4c4 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -1,3 +1,4 @@
+bin/CDE2Xfcepal
 bin/startxfce
 bin/xfbd
 bin/xfce
@@ -7,6 +8,7 @@ bin/xfclock
 bin/xfgnome
 bin/xfhelp
 bin/xflock
+bin/xfmountdev
 bin/xfmouse
 bin/xfpager
 bin/xfplay
@@ -16,13 +18,34 @@ bin/xfterm
 bin/xftrash
 bin/xftree
 bin/xfwm
+etc/xfce/README.xfdefs.py
+etc/xfce/Xclients
+etc/xfce/fvwm2rc
+etc/xfce/fvwmrc
+etc/xfce/xfbdrc
+etc/xfce/xfce3rc
+etc/xfce/xfce3rc.hu
+etc/xfce/xfce3rc.ja
+etc/xfce/xfce3rc.ko
+etc/xfce/xfce3rc.zh_CN.GB2312
+etc/xfce/xfce3rc.zh_TW.Big5
+etc/xfce/xfclockrc
+etc/xfce/xfdefs.py
+etc/xfce/xfmouserc
+etc/xfce/xfsoundrc
+etc/xfce/xfwmrc
+etc/xfce/xinitrc
+etc/xfce/xinitrc.mwm
+etc/xfce/xsession
+etc/xfce/xtree.reg
 share/xfce/COPYING
-share/xfce/README.xfdefs.py
 share/xfce/XFce3.logo
 share/xfce/backdrops/A-Little-Exercise-3.jpg
 share/xfce/backdrops/A-Little-Exercise.jpg
 share/xfce/backdrops/Anneaux.xpm
 share/xfce/backdrops/Arena.xpm
+share/xfce/backdrops/BlueSatin.xpm
+share/xfce/backdrops/BlueSea.xpm
 share/xfce/backdrops/BlueStucco.xpm
 share/xfce/backdrops/Bluedrops.xpm
 share/xfce/backdrops/Bluefalls.xpm
@@ -318,7 +341,9 @@ share/xfce/locale/gl/LC_MESSAGES/xfce.mo
 share/xfce/locale/hu/LC_MESSAGES/xfce.mo
 share/xfce/locale/it/LC_MESSAGES/xfce.mo
 share/xfce/locale/ja/LC_MESSAGES/xfce.mo
+share/xfce/locale/nl/LC_MESSAGES/xfce.mo
 share/xfce/locale/pl/LC_MESSAGES/xfce.mo
+share/xfce/locale/ro/LC_MESSAGES/xfce.mo
 share/xfce/locale/ru/LC_MESSAGES/xfce.mo
 share/xfce/locale/sk/LC_MESSAGES/xfce.mo
 share/xfce/locale/sv/LC_MESSAGES/xfce.mo
@@ -355,6 +380,7 @@ share/xfce/palettes/Salmon2
 share/xfce/palettes/Sand
 share/xfce/palettes/Silver
 share/xfce/palettes/Spring
+share/xfce/palettes/Standard
 share/xfce/palettes/Stellar
 share/xfce/palettes/Stripe
 share/xfce/palettes/Sunny
@@ -367,22 +393,6 @@ share/xfce/palettes/Typhoon
 share/xfce/palettes/Win
 share/xfce/palettes/Xfce-1
 share/xfce/palettes/Xfce-2
-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.xfce3rc.ja
-share/xfce/sample.xfce3rc.ko
-share/xfce/sample.xfce3rc.zh_CN.GB2312
-share/xfce/sample.xfce3rc.zh_TW.Big5
-share/xfce/sample.xfmouserc
-share/xfce/sample.xfsoundrc
-share/xfce/sample.xfwmrc
-share/xfce/sample.xinitrc
-share/xfce/sample.xsession
-share/xfce/sample.xtree.reg
 share/xfce/sounds/alert01.wav
 share/xfce/sounds/beep01.wav
 share/xfce/sounds/beep02.wav
@@ -434,7 +444,6 @@ 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/textures/cheese.xpm
 share/xfce/textures/craters.xpm
 share/xfce/textures/ground.xpm
@@ -445,7 +454,6 @@ share/xfce/textures/oldwood.xpm
 share/xfce/textures/paper.xpm
 share/xfce/textures/silver.xpm
 share/xfce/textures/stripe.xpm
-share/xfce/xfdefs.py
 @dirrm share/xfce/backdrops
 @dirrm share/xfce/help
 @dirrm share/xfce/icons
@@ -471,8 +479,12 @@ share/xfce/xfdefs.py
 @dirrm share/xfce/locale/it
 @dirrm share/xfce/locale/ja/LC_MESSAGES
 @dirrm share/xfce/locale/ja
+@dirrm share/xfce/locale/nl/LC_MESSAGES
+@dirrm share/xfce/locale/nl
 @dirrm share/xfce/locale/pl/LC_MESSAGES
 @dirrm share/xfce/locale/pl
+@dirrm share/xfce/locale/ro/LC_MESSAGES
+@dirrm share/xfce/locale/ro
 @dirrm share/xfce/locale/ru/LC_MESSAGES
 @dirrm share/xfce/locale/ru
 @dirrm share/xfce/locale/sk/LC_MESSAGES
@@ -486,3 +498,4 @@ share/xfce/xfdefs.py
 @dirrm share/xfce/sounds
 @dirrm share/xfce/textures
 @dirrm share/xfce
+@dirrm etc/xfce