Update to 3.5.2

'xhost' problem fixed in 3.5.2.

8 files changed, 84 insertions, 128 deletions

diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 1c0bc83eb96b..4bd9c0dfd9a2 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION= 	3.5.0
+PORTVERSION= 	3.5.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-FORBIDDEN=	"Installs stupid xinitrc file containing xhost +$HOSTNAME"
-
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_ESOUND=	yes
@@ -26,8 +24,8 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--sysconfdir=${PREFIX}/etc \
 		--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 \
-	xfmountdev.1
+MAN1=	xfbd.1 xfce.1 xfclock.1 xfgnome.1 xfhelp.1 xflock.1 xfmountdev.1 \
+	xfmouse.1 xfpager.1 xfprint.1 xfrun.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 8fe9dcbff8cc..9a72856fdf21 100644
--- a/x11-wm/xfce/distinfo
+++ b/x11-wm/xfce/distinfo
@@ -1 +1 @@
-MD5 (xfce-3.5.0.tar.gz) = eeb0027720f79517a43e4b055842a49d
+MD5 (xfce-3.5.2.tar.gz) = 8e96bb1ab34f42102e210fb2c9f78ead
diff --git a/x11-wm/xfce/files/patch-af b/x11-wm/xfce/files/patch-af
index 73d579b680fb..c36d231109dd 100644
--- a/x11-wm/xfce/files/patch-af
+++ b/x11-wm/xfce/files/patch-af
@@ -1,24 +1,15 @@
---- configure.orig	Mon Aug 14 22:26:34 2000
-+++ configure	Tue Aug 22 17:35:12 2000
+--- configure.orig	Sun Oct  1 01:16:19 2000
++++ configure	Thu Nov  2 05:45:10 2000
 @@ -2622,6 +2622,8 @@
    if test "$cross_compiling" = yes; then
    ac_cv_func_mmap_fixed_mapped=no
  else
-+  ac_save_LIBS="$LIBS"
-+  LIBS="-lintl  $LIBS"
++    ac_save_LIBS="$LIBS"
++    LIBS="-lintl  $LIBS"
    cat > conftest.$ac_ext <<EOF
  #line 2627 "configure"
  #include "confdefs.h"
-@@ -5551,7 +5553,7 @@
- 
- else
-   
--  GTK_ENGINE_DIR=`gtk-config --prefix`/lib/gtk/themes/engines
-+  GTK_ENGINE_DIR=`${GTK_CONFIG} --prefix`/lib/gtk/themes/engines
- 
- fi
- 
-@@ -6611,8 +6613,8 @@
+@@ -6667,8 +6669,8 @@
  
  
  
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index a9db5b26a441..8f828cdc0da9 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -14,6 +14,7 @@ bin/xfmouse
 bin/xfpager
 bin/xfplay
 bin/xfprint
+bin/xfrun
 bin/xfsound
 bin/xfterm
 bin/xftrash
@@ -99,6 +100,7 @@ share/xfce/backdrops/Satin3.xpm
 share/xfce/backdrops/Sea.xpm
 share/xfce/backdrops/Sky.xpm
 share/xfce/backdrops/Sky2.xpm
+share/xfce/backdrops/Sky3.jpg
 share/xfce/backdrops/Slate.xpm
 share/xfce/backdrops/Soft.xpm
 share/xfce/backdrops/Softblue.xpm
@@ -131,6 +133,7 @@ share/xfce/backdrops/Wood2.xpm
 share/xfce/backdrops/Worm.xpm
 share/xfce/backdrops/Xfce.jpg
 share/xfce/backdrops/Xfce.xpm
+share/xfce/backdrops/Xfcemice.jpg
 share/xfce/help/help.gl.html
 share/xfce/help/help.html
 share/xfce/help/slogan.jpg
@@ -298,13 +301,16 @@ share/xfce/palettes/Ground
 share/xfce/palettes/Helice
 share/xfce/palettes/HiContrast
 share/xfce/palettes/HiTech
+share/xfce/palettes/HiTech2
 share/xfce/palettes/Iceland
 share/xfce/palettes/Mauve
 share/xfce/palettes/Metal
 share/xfce/palettes/Military
+share/xfce/palettes/Modern
 share/xfce/palettes/Nature
 share/xfce/palettes/Netsy
 share/xfce/palettes/OldWood
+share/xfce/palettes/Pale
 share/xfce/palettes/Paper
 share/xfce/palettes/Plum
 share/xfce/palettes/Prairie
@@ -312,6 +318,7 @@ share/xfce/palettes/Salmon
 share/xfce/palettes/Salmon2
 share/xfce/palettes/Sand
 share/xfce/palettes/Silver
+share/xfce/palettes/Silver2
 share/xfce/palettes/Spring
 share/xfce/palettes/Standard
 share/xfce/palettes/Stellar
@@ -378,6 +385,7 @@ share/xfce/sounds/zap01.wav
 share/xfce/sounds/zap02.wav
 share/xfce/sounds/zap03.wav
 share/xfce/sounds/zap04.wav
+share/xfce/textures/Modern.xpm
 share/xfce/textures/bronze.xpm
 share/xfce/textures/cheese.xpm
 share/xfce/textures/craters.xpm
@@ -389,48 +397,29 @@ share/xfce/textures/oldwood.xpm
 share/xfce/textures/paper.xpm
 share/xfce/textures/silver.xpm
 share/xfce/textures/stripe.xpm
-@dirrm share/xfce/textures
-@dirrm share/xfce/sounds
-@dirrm share/xfce/palettes
-@dirrm share/xfce/locale/zh/LC_MESSAGES
-@dirrm share/xfce/locale/zh
-@dirrm share/xfce/locale/sv/LC_MESSAGES
-@dirrm share/xfce/locale/sv
-@dirrm share/xfce/locale/sk/LC_MESSAGES
-@dirrm share/xfce/locale/sk
-@dirrm share/xfce/locale/ru/LC_MESSAGES
-@dirrm share/xfce/locale/ru
-@dirrm share/xfce/locale/ro/LC_MESSAGES
-@dirrm share/xfce/locale/ro
-@dirrm share/xfce/locale/pl/LC_MESSAGES
-@dirrm share/xfce/locale/pl
-@dirrm share/xfce/locale/nl/LC_MESSAGES
-@dirrm share/xfce/locale/nl
-@dirrm share/xfce/locale/ja/LC_MESSAGES
-@dirrm share/xfce/locale/ja
-@dirrm share/xfce/locale/it/LC_MESSAGES
-@dirrm share/xfce/locale/it
-@dirrm share/xfce/locale/hu/LC_MESSAGES
-@dirrm share/xfce/locale/hu
-@dirrm share/xfce/locale/gl/LC_MESSAGES
-@dirrm share/xfce/locale/gl
-@dirrm share/xfce/locale/fr/LC_MESSAGES
-@dirrm share/xfce/locale/fr
-@dirrm share/xfce/locale/fi/LC_MESSAGES
-@dirrm share/xfce/locale/fi
-@dirrm share/xfce/locale/et/LC_MESSAGES
-@dirrm share/xfce/locale/et
-@dirrm share/xfce/locale/es/LC_MESSAGES
-@dirrm share/xfce/locale/es
-@dirrm share/xfce/locale/de/LC_MESSAGES
-@dirrm share/xfce/locale/de
-@dirrm share/xfce/locale/da/LC_MESSAGES
-@dirrm share/xfce/locale/da
-@dirrm share/xfce/locale/ca/LC_MESSAGES
-@dirrm share/xfce/locale/ca
-@dirrm share/xfce/locale
-@dirrm share/xfce/icons
-@dirrm share/xfce/help
+@dirrm etc/xfce
 @dirrm share/xfce/backdrops
+@dirrm share/xfce/help
+@dirrm share/xfce/icons
+@dirrm share/xfce/locale/ca/LC_MESSAGES
+@dirrm share/xfce/locale/da/LC_MESSAGES
+@dirrm share/xfce/locale/de/LC_MESSAGES
+@dirrm share/xfce/locale/es/LC_MESSAGES
+@dirrm share/xfce/locale/et/LC_MESSAGES
+@dirrm share/xfce/locale/fi/LC_MESSAGES
+@dirrm share/xfce/locale/fr/LC_MESSAGES
+@dirrm share/xfce/locale/gl/LC_MESSAGES
+@dirrm share/xfce/locale/hu/LC_MESSAGES
+@dirrm share/xfce/locale/it/LC_MESSAGES
+@dirrm share/xfce/locale/ja/LC_MESSAGES
+@dirrm share/xfce/locale/nl/LC_MESSAGES
+@dirrm share/xfce/locale/pl/LC_MESSAGES
+@dirrm share/xfce/locale/ro/LC_MESSAGES
+@dirrm share/xfce/locale/ru/LC_MESSAGES
+@dirrm share/xfce/locale/sk/LC_MESSAGES
+@dirrm share/xfce/locale/sv/LC_MESSAGES
+@dirrm share/xfce/locale/zh/LC_MESSAGES
+@dirrm share/xfce/palettes
+@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 1c0bc83eb96b..4bd9c0dfd9a2 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION= 	3.5.0
+PORTVERSION= 	3.5.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.xfce.org/archive/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-FORBIDDEN=	"Installs stupid xinitrc file containing xhost +$HOSTNAME"
-
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_ESOUND=	yes
@@ -26,8 +24,8 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--sysconfdir=${PREFIX}/etc \
 		--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 \
-	xfmountdev.1
+MAN1=	xfbd.1 xfce.1 xfclock.1 xfgnome.1 xfhelp.1 xflock.1 xfmountdev.1 \
+	xfmouse.1 xfpager.1 xfprint.1 xfrun.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 8fe9dcbff8cc..9a72856fdf21 100644
--- a/x11-wm/xfce4/distinfo
+++ b/x11-wm/xfce4/distinfo
@@ -1 +1 @@
-MD5 (xfce-3.5.0.tar.gz) = eeb0027720f79517a43e4b055842a49d
+MD5 (xfce-3.5.2.tar.gz) = 8e96bb1ab34f42102e210fb2c9f78ead
diff --git a/x11-wm/xfce4/files/patch-af b/x11-wm/xfce4/files/patch-af
index 73d579b680fb..c36d231109dd 100644
--- a/x11-wm/xfce4/files/patch-af
+++ b/x11-wm/xfce4/files/patch-af
@@ -1,24 +1,15 @@
---- configure.orig	Mon Aug 14 22:26:34 2000
-+++ configure	Tue Aug 22 17:35:12 2000
+--- configure.orig	Sun Oct  1 01:16:19 2000
++++ configure	Thu Nov  2 05:45:10 2000
 @@ -2622,6 +2622,8 @@
    if test "$cross_compiling" = yes; then
    ac_cv_func_mmap_fixed_mapped=no
  else
-+  ac_save_LIBS="$LIBS"
-+  LIBS="-lintl  $LIBS"
++    ac_save_LIBS="$LIBS"
++    LIBS="-lintl  $LIBS"
    cat > conftest.$ac_ext <<EOF
  #line 2627 "configure"
  #include "confdefs.h"
-@@ -5551,7 +5553,7 @@
- 
- else
-   
--  GTK_ENGINE_DIR=`gtk-config --prefix`/lib/gtk/themes/engines
-+  GTK_ENGINE_DIR=`${GTK_CONFIG} --prefix`/lib/gtk/themes/engines
- 
- fi
- 
-@@ -6611,8 +6613,8 @@
+@@ -6667,8 +6669,8 @@
  
  
  
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index a9db5b26a441..8f828cdc0da9 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -14,6 +14,7 @@ bin/xfmouse
 bin/xfpager
 bin/xfplay
 bin/xfprint
+bin/xfrun
 bin/xfsound
 bin/xfterm
 bin/xftrash
@@ -99,6 +100,7 @@ share/xfce/backdrops/Satin3.xpm
 share/xfce/backdrops/Sea.xpm
 share/xfce/backdrops/Sky.xpm
 share/xfce/backdrops/Sky2.xpm
+share/xfce/backdrops/Sky3.jpg
 share/xfce/backdrops/Slate.xpm
 share/xfce/backdrops/Soft.xpm
 share/xfce/backdrops/Softblue.xpm
@@ -131,6 +133,7 @@ share/xfce/backdrops/Wood2.xpm
 share/xfce/backdrops/Worm.xpm
 share/xfce/backdrops/Xfce.jpg
 share/xfce/backdrops/Xfce.xpm
+share/xfce/backdrops/Xfcemice.jpg
 share/xfce/help/help.gl.html
 share/xfce/help/help.html
 share/xfce/help/slogan.jpg
@@ -298,13 +301,16 @@ share/xfce/palettes/Ground
 share/xfce/palettes/Helice
 share/xfce/palettes/HiContrast
 share/xfce/palettes/HiTech
+share/xfce/palettes/HiTech2
 share/xfce/palettes/Iceland
 share/xfce/palettes/Mauve
 share/xfce/palettes/Metal
 share/xfce/palettes/Military
+share/xfce/palettes/Modern
 share/xfce/palettes/Nature
 share/xfce/palettes/Netsy
 share/xfce/palettes/OldWood
+share/xfce/palettes/Pale
 share/xfce/palettes/Paper
 share/xfce/palettes/Plum
 share/xfce/palettes/Prairie
@@ -312,6 +318,7 @@ share/xfce/palettes/Salmon
 share/xfce/palettes/Salmon2
 share/xfce/palettes/Sand
 share/xfce/palettes/Silver
+share/xfce/palettes/Silver2
 share/xfce/palettes/Spring
 share/xfce/palettes/Standard
 share/xfce/palettes/Stellar
@@ -378,6 +385,7 @@ share/xfce/sounds/zap01.wav
 share/xfce/sounds/zap02.wav
 share/xfce/sounds/zap03.wav
 share/xfce/sounds/zap04.wav
+share/xfce/textures/Modern.xpm
 share/xfce/textures/bronze.xpm
 share/xfce/textures/cheese.xpm
 share/xfce/textures/craters.xpm
@@ -389,48 +397,29 @@ share/xfce/textures/oldwood.xpm
 share/xfce/textures/paper.xpm
 share/xfce/textures/silver.xpm
 share/xfce/textures/stripe.xpm
-@dirrm share/xfce/textures
-@dirrm share/xfce/sounds
-@dirrm share/xfce/palettes
-@dirrm share/xfce/locale/zh/LC_MESSAGES
-@dirrm share/xfce/locale/zh
-@dirrm share/xfce/locale/sv/LC_MESSAGES
-@dirrm share/xfce/locale/sv
-@dirrm share/xfce/locale/sk/LC_MESSAGES
-@dirrm share/xfce/locale/sk
-@dirrm share/xfce/locale/ru/LC_MESSAGES
-@dirrm share/xfce/locale/ru
-@dirrm share/xfce/locale/ro/LC_MESSAGES
-@dirrm share/xfce/locale/ro
-@dirrm share/xfce/locale/pl/LC_MESSAGES
-@dirrm share/xfce/locale/pl
-@dirrm share/xfce/locale/nl/LC_MESSAGES
-@dirrm share/xfce/locale/nl
-@dirrm share/xfce/locale/ja/LC_MESSAGES
-@dirrm share/xfce/locale/ja
-@dirrm share/xfce/locale/it/LC_MESSAGES
-@dirrm share/xfce/locale/it
-@dirrm share/xfce/locale/hu/LC_MESSAGES
-@dirrm share/xfce/locale/hu
-@dirrm share/xfce/locale/gl/LC_MESSAGES
-@dirrm share/xfce/locale/gl
-@dirrm share/xfce/locale/fr/LC_MESSAGES
-@dirrm share/xfce/locale/fr
-@dirrm share/xfce/locale/fi/LC_MESSAGES
-@dirrm share/xfce/locale/fi
-@dirrm share/xfce/locale/et/LC_MESSAGES
-@dirrm share/xfce/locale/et
-@dirrm share/xfce/locale/es/LC_MESSAGES
-@dirrm share/xfce/locale/es
-@dirrm share/xfce/locale/de/LC_MESSAGES
-@dirrm share/xfce/locale/de
-@dirrm share/xfce/locale/da/LC_MESSAGES
-@dirrm share/xfce/locale/da
-@dirrm share/xfce/locale/ca/LC_MESSAGES
-@dirrm share/xfce/locale/ca
-@dirrm share/xfce/locale
-@dirrm share/xfce/icons
-@dirrm share/xfce/help
+@dirrm etc/xfce
 @dirrm share/xfce/backdrops
+@dirrm share/xfce/help
+@dirrm share/xfce/icons
+@dirrm share/xfce/locale/ca/LC_MESSAGES
+@dirrm share/xfce/locale/da/LC_MESSAGES
+@dirrm share/xfce/locale/de/LC_MESSAGES
+@dirrm share/xfce/locale/es/LC_MESSAGES
+@dirrm share/xfce/locale/et/LC_MESSAGES
+@dirrm share/xfce/locale/fi/LC_MESSAGES
+@dirrm share/xfce/locale/fr/LC_MESSAGES
+@dirrm share/xfce/locale/gl/LC_MESSAGES
+@dirrm share/xfce/locale/hu/LC_MESSAGES
+@dirrm share/xfce/locale/it/LC_MESSAGES
+@dirrm share/xfce/locale/ja/LC_MESSAGES
+@dirrm share/xfce/locale/nl/LC_MESSAGES
+@dirrm share/xfce/locale/pl/LC_MESSAGES
+@dirrm share/xfce/locale/ro/LC_MESSAGES
+@dirrm share/xfce/locale/ru/LC_MESSAGES
+@dirrm share/xfce/locale/sk/LC_MESSAGES
+@dirrm share/xfce/locale/sv/LC_MESSAGES
+@dirrm share/xfce/locale/zh/LC_MESSAGES
+@dirrm share/xfce/palettes
+@dirrm share/xfce/sounds
+@dirrm share/xfce/textures
 @dirrm share/xfce
-@dirrm etc/xfce