6 files changed, 64 insertions, 10 deletions

diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 81859dce12e6..94d3fb9e4a9c 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xfce
-# Version required:	3.2.0
+# Version required:	3.2.2
 # Date created:		30 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xfce-3.2.0
+DISTNAME=	xfce-3.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
@@ -15,6 +15,7 @@ MAINTAINER=	nakai@FreeBSD.org
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		Imlib.5:${PORTSDIR}/graphics/imlib \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+RUN_DEPENDS=	${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -26,7 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
 
-MAN1=	xfbd.1 xfce.1 xfclock.1 xfgnome.1 xfhelp.1 xfmouse.1 xfpager.1 \
-	xfprint.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1
+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
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce/distinfo b/x11-wm/xfce/distinfo
index 0909ce5116c4..7be21d460024 100644
--- a/x11-wm/xfce/distinfo
+++ b/x11-wm/xfce/distinfo
@@ -1 +1 @@
-MD5 (xfce-3.2.0.tar.gz) = 18e54507020e8ae1580231f2f1c1ce8b
+MD5 (xfce-3.2.2.tar.gz) = e8ca2c6b4bb605ff16f67ee681419849
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index e7018e9f75ee..d2f9c9c1c8c3 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -6,6 +6,7 @@ bin/xfce_setup
 bin/xfclock
 bin/xfgnome
 bin/xfhelp
+bin/xflock
 bin/xfmouse
 bin/xfpager
 bin/xfplay
@@ -304,6 +305,7 @@ 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/da/LC_MESSAGES/xfce.mo
 share/xfce/locale/de/LC_MESSAGES/xfce.mo
 share/xfce/locale/es/LC_MESSAGES/xfce.mo
 share/xfce/locale/fi/LC_MESSAGES/xfce.mo
@@ -313,21 +315,30 @@ share/xfce/locale/it/LC_MESSAGES/xfce.mo
 share/xfce/locale/ja/LC_MESSAGES/xfce.mo
 share/xfce/locale/pl/LC_MESSAGES/xfce.mo
 share/xfce/locale/ru/LC_MESSAGES/xfce.mo
+share/xfce/locale/sv/LC_MESSAGES/xfce.mo
+share/xfce/locale/zh/LC_MESSAGES/xfce.mo
 share/xfce/palettes/Alpine
 share/xfce/palettes/Anthracite
 share/xfce/palettes/Bahamas
+share/xfce/palettes/Cheese
 share/xfce/palettes/Citrouille
 share/xfce/palettes/Clinky
+share/xfce/palettes/Craters
 share/xfce/palettes/Dolly
 share/xfce/palettes/Dust
 share/xfce/palettes/Fall
 share/xfce/palettes/Golden
 share/xfce/palettes/Grayscale
+share/xfce/palettes/Ground
 share/xfce/palettes/HiContrast
 share/xfce/palettes/Iceland
 share/xfce/palettes/Mauve
+share/xfce/palettes/Metal
+share/xfce/palettes/Military
 share/xfce/palettes/Nature
 share/xfce/palettes/Netsy
+share/xfce/palettes/OldWood
+share/xfce/palettes/Paper
 share/xfce/palettes/Plum
 share/xfce/palettes/Prairie
 share/xfce/palettes/Salmon
@@ -336,6 +347,7 @@ share/xfce/palettes/Sand
 share/xfce/palettes/Spring
 share/xfce/palettes/Stellar
 share/xfce/palettes/Sunny
+share/xfce/palettes/Symbiose
 share/xfce/palettes/TBlue
 share/xfce/palettes/Teal
 share/xfce/palettes/Tommy
@@ -412,12 +424,21 @@ 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
+share/xfce/textures/metal.xpm
+share/xfce/textures/military.xpm
+share/xfce/textures/oldwood.xpm
+share/xfce/textures/paper.xpm
 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/da/LC_MESSAGES
+@dirrm share/xfce/locale/da
 @dirrm share/xfce/locale/de/LC_MESSAGES
 @dirrm share/xfce/locale/de
 @dirrm share/xfce/locale/es/LC_MESSAGES
@@ -436,7 +457,12 @@ share/xfce/xfdefs.py
 @dirrm share/xfce/locale/pl
 @dirrm share/xfce/locale/ru/LC_MESSAGES
 @dirrm share/xfce/locale/ru
+@dirrm share/xfce/locale/sv/LC_MESSAGES
+@dirrm share/xfce/locale/sv
+@dirrm share/xfce/locale/zh/LC_MESSAGES
+@dirrm share/xfce/locale/zh
 @dirrm share/xfce/locale
 @dirrm share/xfce/palettes
 @dirrm share/xfce/sounds
+@dirrm share/xfce/textures
 @dirrm share/xfce
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 81859dce12e6..94d3fb9e4a9c 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xfce
-# Version required:	3.2.0
+# Version required:	3.2.2
 # Date created:		30 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xfce-3.2.0
+DISTNAME=	xfce-3.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
@@ -15,6 +15,7 @@ MAINTAINER=	nakai@FreeBSD.org
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		Imlib.5:${PORTSDIR}/graphics/imlib \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+RUN_DEPENDS=	${LOCALBASE}/bin/sox:${PORTSDIR}/audio/sox
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -26,7 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
 
-MAN1=	xfbd.1 xfce.1 xfclock.1 xfgnome.1 xfhelp.1 xfmouse.1 xfpager.1 \
-	xfprint.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1
+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
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4/distinfo b/x11-wm/xfce4/distinfo
index 0909ce5116c4..7be21d460024 100644
--- a/x11-wm/xfce4/distinfo
+++ b/x11-wm/xfce4/distinfo
@@ -1 +1 @@
-MD5 (xfce-3.2.0.tar.gz) = 18e54507020e8ae1580231f2f1c1ce8b
+MD5 (xfce-3.2.2.tar.gz) = e8ca2c6b4bb605ff16f67ee681419849
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index e7018e9f75ee..d2f9c9c1c8c3 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -6,6 +6,7 @@ bin/xfce_setup
 bin/xfclock
 bin/xfgnome
 bin/xfhelp
+bin/xflock
 bin/xfmouse
 bin/xfpager
 bin/xfplay
@@ -304,6 +305,7 @@ 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/da/LC_MESSAGES/xfce.mo
 share/xfce/locale/de/LC_MESSAGES/xfce.mo
 share/xfce/locale/es/LC_MESSAGES/xfce.mo
 share/xfce/locale/fi/LC_MESSAGES/xfce.mo
@@ -313,21 +315,30 @@ share/xfce/locale/it/LC_MESSAGES/xfce.mo
 share/xfce/locale/ja/LC_MESSAGES/xfce.mo
 share/xfce/locale/pl/LC_MESSAGES/xfce.mo
 share/xfce/locale/ru/LC_MESSAGES/xfce.mo
+share/xfce/locale/sv/LC_MESSAGES/xfce.mo
+share/xfce/locale/zh/LC_MESSAGES/xfce.mo
 share/xfce/palettes/Alpine
 share/xfce/palettes/Anthracite
 share/xfce/palettes/Bahamas
+share/xfce/palettes/Cheese
 share/xfce/palettes/Citrouille
 share/xfce/palettes/Clinky
+share/xfce/palettes/Craters
 share/xfce/palettes/Dolly
 share/xfce/palettes/Dust
 share/xfce/palettes/Fall
 share/xfce/palettes/Golden
 share/xfce/palettes/Grayscale
+share/xfce/palettes/Ground
 share/xfce/palettes/HiContrast
 share/xfce/palettes/Iceland
 share/xfce/palettes/Mauve
+share/xfce/palettes/Metal
+share/xfce/palettes/Military
 share/xfce/palettes/Nature
 share/xfce/palettes/Netsy
+share/xfce/palettes/OldWood
+share/xfce/palettes/Paper
 share/xfce/palettes/Plum
 share/xfce/palettes/Prairie
 share/xfce/palettes/Salmon
@@ -336,6 +347,7 @@ share/xfce/palettes/Sand
 share/xfce/palettes/Spring
 share/xfce/palettes/Stellar
 share/xfce/palettes/Sunny
+share/xfce/palettes/Symbiose
 share/xfce/palettes/TBlue
 share/xfce/palettes/Teal
 share/xfce/palettes/Tommy
@@ -412,12 +424,21 @@ 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
+share/xfce/textures/metal.xpm
+share/xfce/textures/military.xpm
+share/xfce/textures/oldwood.xpm
+share/xfce/textures/paper.xpm
 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/da/LC_MESSAGES
+@dirrm share/xfce/locale/da
 @dirrm share/xfce/locale/de/LC_MESSAGES
 @dirrm share/xfce/locale/de
 @dirrm share/xfce/locale/es/LC_MESSAGES
@@ -436,7 +457,12 @@ share/xfce/xfdefs.py
 @dirrm share/xfce/locale/pl
 @dirrm share/xfce/locale/ru/LC_MESSAGES
 @dirrm share/xfce/locale/ru
+@dirrm share/xfce/locale/sv/LC_MESSAGES
+@dirrm share/xfce/locale/sv
+@dirrm share/xfce/locale/zh/LC_MESSAGES
+@dirrm share/xfce/locale/zh
 @dirrm share/xfce/locale
 @dirrm share/xfce/palettes
 @dirrm share/xfce/sounds
+@dirrm share/xfce/textures
 @dirrm share/xfce