Updated xfce to 3.8.14

- use pkgsrc/lang/gcc on alpha as egcs won't work
- bug fixes
- new images and fonts
- new locale for uk

4 files changed, 141 insertions, 38 deletions

diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index e327266ac9e..0afcd529e88 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2002/01/14 10:04:53 martti Exp $
+# $NetBSD: Makefile,v 1.22 2002/02/15 09:05:01 martti Exp $
 
-DISTNAME=		xfce-3.8.7
+DISTNAME=		xfce-3.8.14
 CATEGORIES=		x11
 MASTER_SITES=		http://www.xfce.org/archive/
 
@@ -12,6 +12,11 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		imlib-1.9.*:../../graphics/imlib
 
+GCC_VERSION!=		gcc --version
+.if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha)
+.include "../../lang/gcc/Makefile.gcc"
+.endif
+
 USE_X11=		# defined
 USE_XPM=		# defined
 USE_X11BASE=		# defined
diff --git a/x11/xfce/PLIST b/x11/xfce/PLIST
index ef38e63a7e9..e3f9c120c9f 100644
--- a/x11/xfce/PLIST
+++ b/x11/xfce/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/14 10:04:53 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 09:05:01 martti Exp $
 bin/CDE2Xfcepal
 bin/glob
 bin/startxfce
@@ -34,12 +34,14 @@ etc/xfce/fvwmrc
 etc/xfce/xfbdrc
 etc/xfce/xfce3rc
 etc/xfce/xfce3rc.cs
+etc/xfce/xfce3rc.de
 etc/xfce/xfce3rc.fr
 etc/xfce/xfce3rc.hu
 etc/xfce/xfce3rc.ja
 etc/xfce/xfce3rc.ko
 etc/xfce/xfce3rc.nl
 etc/xfce/xfce3rc.sr
+etc/xfce/xfce3rc.uk
 etc/xfce/xfce3rc.zh_CN.GB2312
 etc/xfce/xfce3rc.zh_TW.Big5
 etc/xfce/xfclockrc
@@ -70,6 +72,7 @@ man/man1/xfsound.1
 man/man1/xfterm.1
 man/man1/xftrash.1
 man/man1/xftree.1
+man/man1/xfumed.1
 man/man1/xfwm.1
 share/locale/ca/LC_MESSAGES/xfce.mo
 share/locale/cs/LC_MESSAGES/xfce.mo
@@ -92,8 +95,10 @@ share/locale/ru/LC_MESSAGES/xfce.mo
 share/locale/sk/LC_MESSAGES/xfce.mo
 share/locale/sr/LC_MESSAGES/xfce.mo
 share/locale/sv/LC_MESSAGES/xfce.mo
+share/locale/uk/LC_MESSAGES/xfce.mo
 share/locale/zh/LC_MESSAGES/xfce.mo
 share/locale/zh_CN/LC_MESSAGES/xfce.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/xfce.mo
 share/xfce/COPYING
 share/xfce/XFce3.logo
 share/xfce/backdrops/A-Little-Exercise-3.jpg
@@ -143,10 +148,13 @@ share/xfce/backdrops/Greydrops.xpm
 share/xfce/backdrops/Greysea.xpm
 share/xfce/backdrops/Hardblue.xpm
 share/xfce/backdrops/Honey.xpm
+share/xfce/backdrops/Horizon.png
 share/xfce/backdrops/Leaves.xpm
+share/xfce/backdrops/Linea.xpm
 share/xfce/backdrops/Marbled.xpm
 share/xfce/backdrops/Master-Plan.jpg
 share/xfce/backdrops/Maze.xpm
+share/xfce/backdrops/MiceBlue.jpg
 share/xfce/backdrops/Nebula.xpm
 share/xfce/backdrops/Notes.xpm
 share/xfce/backdrops/Overdriven.jpg
@@ -157,7 +165,9 @@ share/xfce/backdrops/Pool.xpm
 share/xfce/backdrops/Psy.xpm
 share/xfce/backdrops/Psy2.xpm
 share/xfce/backdrops/Psy3.xpm
+share/xfce/backdrops/Purple.xpm
 share/xfce/backdrops/PurpleStripes.xpm
+share/xfce/backdrops/Reader.xpm
 share/xfce/backdrops/Rotin.xpm
 share/xfce/backdrops/Rough.xpm
 share/xfce/backdrops/Sandy-ridges.xpm
@@ -201,16 +211,63 @@ share/xfce/backdrops/Weave-red.xpm
 share/xfce/backdrops/Weird.xpm
 share/xfce/backdrops/Whirl.xpm
 share/xfce/backdrops/WhiteStripes.xpm
+share/xfce/backdrops/WipeBlue.png
 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.jpg
 share/xfce/backdrops/Xfce.xpm
+share/xfce/backdrops/XfceStellar.xpm
 share/xfce/backdrops/Xfcelogo.xpm
 share/xfce/backdrops/Xfcemice.jpg
-share/xfce/fonts/cursor2.pcf
+share/xfce/cursors/cursor2.pcf
+share/xfce/cursors/fonts.dir
 share/xfce/fonts/fonts.dir
+share/xfce/fonts/uniread-variable-05-b-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-05-b-i.pcf.gz
+share/xfce/fonts/uniread-variable-05-b-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-05-b-r.pcf.gz
+share/xfce/fonts/uniread-variable-05-m-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-05-m-i.pcf.gz
+share/xfce/fonts/uniread-variable-05-m-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-05-m-r.pcf.gz
+share/xfce/fonts/uniread-variable-07-b-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-07-b-i.pcf.gz
+share/xfce/fonts/uniread-variable-07-b-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-07-b-r.pcf.gz
+share/xfce/fonts/uniread-variable-07-m-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-07-m-i.pcf.gz
+share/xfce/fonts/uniread-variable-07-m-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-07-m-r.pcf.gz
+share/xfce/fonts/uniread-variable-09-b-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-09-b-i.pcf.gz
+share/xfce/fonts/uniread-variable-09-b-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-09-b-r.pcf.gz
+share/xfce/fonts/uniread-variable-09-m-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-09-m-i.pcf.gz
+share/xfce/fonts/uniread-variable-09-m-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-09-m-r.pcf.gz
+share/xfce/fonts/uniread-variable-10-b-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-10-b-i.pcf.gz
+share/xfce/fonts/uniread-variable-10-b-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-10-b-r.pcf.gz
+share/xfce/fonts/uniread-variable-10-m-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-10-m-i.pcf.gz
+share/xfce/fonts/uniread-variable-10-m-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-10-m-r.pcf.gz
+share/xfce/fonts/uniread-variable-12-b-i-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-12-b-i.pcf.gz
+share/xfce/fonts/uniread-variable-12-b-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-12-b-r.pcf.gz
+share/xfce/fonts/uniread-variable-12-m-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-12-m-r.pcf.gz
+share/xfce/fonts/uniread-variable-14-b-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-14-b-r.pcf.gz
+share/xfce/fonts/uniread-variable-14-m-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-14-m-r.pcf.gz
+share/xfce/fonts/uniread-variable-18-m-r-ISO8859-1.pcf.gz
+share/xfce/fonts/uniread-variable-18-m-r.pcf.gz
 share/xfce/help/html/adv-wm-appearance.html
 share/xfce/help/html/adv-wm-bindings.html
 share/xfce/help/html/adv-wm-commands.html
@@ -226,6 +283,27 @@ share/xfce/help/html/copyright.html
 share/xfce/help/html/fileman.html
 share/xfce/help/html/gpl.html
 share/xfce/help/html/help.html
+share/xfce/help/html/images/buttons.jpg
+share/xfce/help/html/images/xfbd.jpg
+share/xfce/help/html/images/xfbdmgr.jpg
+share/xfce/help/html/images/xfce_panel.jpg
+share/xfce/help/html/images/xfce_popup.jpg
+share/xfce/help/html/images/xfce_setup1.jpg
+share/xfce/help/html/images/xfce_setup2.jpg
+share/xfce/help/html/images/xfce_setup3.jpg
+share/xfce/help/html/images/xfce_setup4.jpg
+share/xfce/help/html/images/xfce_slogan.jpg
+share/xfce/help/html/images/xfce_snap.jpg
+share/xfce/help/html/images/xfclock.jpg
+share/xfce/help/html/images/xfdiff.jpg
+share/xfce/help/html/images/xfglob.jpg
+share/xfce/help/html/images/xfmouse.jpg
+share/xfce/help/html/images/xfpager.jpg
+share/xfce/help/html/images/xfrun.jpg
+share/xfce/help/html/images/xfsamba.jpg
+share/xfce/help/html/images/xfsound.jpg
+share/xfce/help/html/images/xftree.jpg
+share/xfce/help/html/images/xfumed.jpg
 share/xfce/help/html/install.html
 share/xfce/help/html/intro.html
 share/xfce/help/html/license.html
@@ -265,27 +343,6 @@ share/xfce/help/html/utils-xfsound.html
 share/xfce/help/html/utils-xfumed.html
 share/xfce/help/html/wm-examples-2.html
 share/xfce/help/html/wm.html
-share/xfce/help/images/buttons.jpg
-share/xfce/help/images/xfbd.jpg
-share/xfce/help/images/xfbdmgr.jpg
-share/xfce/help/images/xfce_panel.jpg
-share/xfce/help/images/xfce_popup.jpg
-share/xfce/help/images/xfce_setup1.jpg
-share/xfce/help/images/xfce_setup2.jpg
-share/xfce/help/images/xfce_setup3.jpg
-share/xfce/help/images/xfce_setup4.jpg
-share/xfce/help/images/xfce_slogan.jpg
-share/xfce/help/images/xfce_snap.jpg
-share/xfce/help/images/xfclock.jpg
-share/xfce/help/images/xfdiff.jpg
-share/xfce/help/images/xfglob.jpg
-share/xfce/help/images/xfmouse.jpg
-share/xfce/help/images/xfpager.jpg
-share/xfce/help/images/xfrun.jpg
-share/xfce/help/images/xfsamba.jpg
-share/xfce/help/images/xfsound.jpg
-share/xfce/help/images/xftree.jpg
-share/xfce/help/images/xfumed.jpg
 share/xfce/icons/3dpaint.xpm
 share/xfce/icons/ABC.xpm
 share/xfce/icons/AZ.xpm
@@ -401,28 +458,39 @@ share/xfce/palettes/Basic
 share/xfce/palettes/BeHappy
 share/xfce/palettes/BeHappy2
 share/xfce/palettes/BeHappy3
+share/xfce/palettes/BeHappy4
+share/xfce/palettes/Blue
 share/xfce/palettes/BlueX
 share/xfce/palettes/BlueX2
 share/xfce/palettes/BlueX3
 share/xfce/palettes/BlueX4
 share/xfce/palettes/Bronze
 share/xfce/palettes/Bronze2
+share/xfce/palettes/CandyBox
 share/xfce/palettes/Cheese
+share/xfce/palettes/Chrome
 share/xfce/palettes/Citrouille
 share/xfce/palettes/Classic
 share/xfce/palettes/Classic2
 share/xfce/palettes/Clinky
 share/xfce/palettes/Craters
+share/xfce/palettes/DarkMetal
 share/xfce/palettes/Default
+share/xfce/palettes/Defcon
+share/xfce/palettes/Desert
 share/xfce/palettes/Dolly
 share/xfce/palettes/Dust
+share/xfce/palettes/Eaz-l
 share/xfce/palettes/Fall
 share/xfce/palettes/GTK+Default
+share/xfce/palettes/GTK+Default2
 share/xfce/palettes/Glass
 share/xfce/palettes/Golden
 share/xfce/palettes/GoldenBoy
+share/xfce/palettes/GoldenBoy2
 share/xfce/palettes/Grayscale
 share/xfce/palettes/GreenIron
+share/xfce/palettes/GreySlate
 share/xfce/palettes/Ground
 share/xfce/palettes/Helice
 share/xfce/palettes/HiContrast
@@ -432,6 +500,12 @@ share/xfce/palettes/Iceland
 share/xfce/palettes/Jazza
 share/xfce/palettes/Jazza2
 share/xfce/palettes/Kdetheme
+share/xfce/palettes/LightBulb
+share/xfce/palettes/LightBulb2
+share/xfce/palettes/LightBulb3
+share/xfce/palettes/Linea
+share/xfce/palettes/Linea2
+share/xfce/palettes/Linea3
 share/xfce/palettes/Liquid
 share/xfce/palettes/Liquid2
 share/xfce/palettes/Mauve
@@ -447,11 +521,15 @@ share/xfce/palettes/Netsy
 share/xfce/palettes/OldWood
 share/xfce/palettes/Pale
 share/xfce/palettes/Paper
+share/xfce/palettes/Pinky
 share/xfce/palettes/Plum
 share/xfce/palettes/Power
 share/xfce/palettes/Power2
 share/xfce/palettes/Prairie
 share/xfce/palettes/Prune
+share/xfce/palettes/PruneDark
+share/xfce/palettes/Quartz
+share/xfce/palettes/Reader
 share/xfce/palettes/Salmon
 share/xfce/palettes/Salmon2
 share/xfce/palettes/Sand
@@ -459,20 +537,32 @@ share/xfce/palettes/Silver
 share/xfce/palettes/Silver2
 share/xfce/palettes/Smooth
 share/xfce/palettes/SmoothBW
+share/xfce/palettes/SmoothGreen
+share/xfce/palettes/SoftBlue
 share/xfce/palettes/Spring
 share/xfce/palettes/Standard
+share/xfce/palettes/Standard2
 share/xfce/palettes/Stellar
+share/xfce/palettes/Stellar2
 share/xfce/palettes/Stripe
+share/xfce/palettes/Stripe2
+share/xfce/palettes/Stripe3
 share/xfce/palettes/Sunny
 share/xfce/palettes/Symbiose
 share/xfce/palettes/TBlue
 share/xfce/palettes/Teal
+share/xfce/palettes/Thinice
 share/xfce/palettes/Tiny
 share/xfce/palettes/Tommy
 share/xfce/palettes/Tradition
+share/xfce/palettes/Tradition2
 share/xfce/palettes/Troica
 share/xfce/palettes/Typhoon
+share/xfce/palettes/Ultrafina
+share/xfce/palettes/Vanadium
 share/xfce/palettes/Win
+share/xfce/palettes/Win2
+share/xfce/palettes/Win3
 share/xfce/palettes/Xfce-1
 share/xfce/palettes/Xfce-2
 share/xfce/sounds/alert01.wav
@@ -527,9 +617,13 @@ share/xfce/sounds/zap02.wav
 share/xfce/sounds/zap03.wav
 share/xfce/sounds/zap04.wav
 share/xfce/textures/Aluminium.xpm
+share/xfce/textures/BWGrad.xpm
 share/xfce/textures/BlueX.xpm
 share/xfce/textures/BlueX2.xpm
 share/xfce/textures/Bronze2.xpm
+share/xfce/textures/Chrome.xpm
+share/xfce/textures/DarkMetal.xpm
+share/xfce/textures/DefaultGrad.xpm
 share/xfce/textures/Glass.xpm
 share/xfce/textures/GoldenBoy.xpm
 share/xfce/textures/Kdetheme.xpm
@@ -540,6 +634,7 @@ share/xfce/textures/Power.xpm
 share/xfce/textures/Power2.xpm
 share/xfce/textures/Smooth.xpm
 share/xfce/textures/SmoothBW.xpm
+share/xfce/textures/Ultrafina.xpm
 share/xfce/textures/Xfcemetal.xpm
 share/xfce/textures/bronze.xpm
 share/xfce/textures/cheese.xpm
@@ -557,10 +652,11 @@ share/xfce/textures/stripe.xpm
 @dirrm lib/gtk/themes
 @dirrm lib/gtk
 @dirrm share/xfce/backdrops
+@dirrm share/xfce/cursors
 @dirrm share/xfce/fonts
+@dirrm share/xfce/help/html/images
 @dirrm share/xfce/help/html/stylesheet-images
 @dirrm share/xfce/help/html
-@dirrm share/xfce/help/images
 @dirrm share/xfce/help
 @dirrm share/xfce/icons
 @dirrm share/xfce/palettes
diff --git a/x11/xfce/distinfo b/x11/xfce/distinfo
index 1b74318c093..8f3c22861d8 100644
--- a/x11/xfce/distinfo
+++ b/x11/xfce/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/01/14 10:04:53 martti Exp $
+$NetBSD: distinfo,v 1.5 2002/02/15 09:05:01 martti Exp $
 
-SHA1 (xfce-3.8.7.tar.gz) = 958ee162f42c767986814367a766dd87425b9840
-Size (xfce-3.8.7.tar.gz) = 3965611 bytes
-SHA1 (patch-ac) = a0d8dc9a5e2ff332fcf8d367495c140fe8b891e3
+SHA1 (xfce-3.8.14.tar.gz) = 29970b93ff5708f39b1ebb0bd34101220a5401de
+Size (xfce-3.8.14.tar.gz) = 4575761 bytes
+SHA1 (patch-ac) = 522fda7357121014b3570ebce1f64aaca3141a54
diff --git a/x11/xfce/patches/patch-ac b/x11/xfce/patches/patch-ac
index 38f5b58d0f5..eac91bdcf23 100644
--- a/x11/xfce/patches/patch-ac
+++ b/x11/xfce/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.8 2001/09/14 16:11:57 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2002/02/15 09:05:01 martti Exp $
 
---- other/xfsoundrc.in.orig	Fri Aug  3 21:56:38 2001
-+++ other/xfsoundrc.in
-@@ -1,5 +1,5 @@
- Play
--xfplay
-+/usr/bin/audioplay
- 
+--- xfsound/xfsound.h.orig	Fri Feb 15 08:46:53 2002
++++ xfsound/xfsound.h	Fri Feb 15 08:47:07 2002
+@@ -28,7 +28,7 @@
+ #define KNOWN_BUILTIN		3
  
+ #define INTERNAL_PLAYER "internal"
+-#define DEFAULT_PLAYER  "xfplay 2>/dev/null"
++#define DEFAULT_PLAYER  "/usr/bin/audioplay"
  
+ GtkWidget *xfsound;
+ GtkWidget *play_sound_checkbutton;