Update xfce to 3.5.2. Changes from version 3.3.1 include bug fixes and many

interface and usability enhancements.

7 files changed, 185 insertions, 203 deletions

diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 56238538b4b..1994a1b976e 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,27 +1,38 @@
-# $NetBSD: Makefile,v 1.12 2000/08/23 23:14:35 tron Exp $
-
-DISTNAME=	xfce-3.3.1
-CATEGORIES=	x11
-MASTER_SITES=	http://www.xfce.org/archive/
-
-MAINTAINER=	jwise@netbsd.org
-HOMEPAGE=	http://www.xfce.org/
-
-DEPENDS+=       gettext>=0.10.35nb1:../../devel/gettext
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	imlib-1.9.*:../../graphics/imlib
-
-USE_X11=	YES
-USE_XPM=	YES
-USE_X11BASE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	XFCE_LOCALE_DIR=${PREFIX}/share/locale
-
-EVAL_PREFIX+=	IMLIBDIR=imlib XPMDIR=xpm
-CONFIGURE_ARGS+=--without-included-gettext \
-		--datadir=${PREFIX}/share \
-		--with-imlib=${IMLIBDIR} \
-		--with-xpm=${XPMDIR}
-USE_GMAKE=	YES
+# $NetBSD: Makefile,v 1.13 2000/10/15 02:38:59 jlam Exp $
+
+DISTNAME=		xfce-3.5.2
+CATEGORIES=		x11
+MASTER_SITES=		http://www.xfce.org/archive/
+
+MAINTAINER=		jwise@netbsd.org
+HOMEPAGE=		http://www.xfce.org/
+
+DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
+DEPENDS+=		gtk+-1.2.*:../../x11/gtk
+DEPENDS+=		imlib-1.9.*:../../graphics/imlib
+
+USE_X11=		# defined
+USE_XPM=		# defined
+USE_X11BASE=		# defined
+
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+USE_GMAKE=		# defined
+GNU_CONFIGURE=		# defined
+
+EVAL_PREFIX+=		IMLIBDIR=imlib
+CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
+CONFIGURE_ARGS+=	--enable-imlib=${IMLIBDIR}
+
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+# work around bug in configure script
+CONFIGURE_ENV+=		gt_cv_func_gettext_libintl="yes"
+
+CPPFLAGS+=		-I${LOCALBASE}/include	# libintl.h
+CPPFLAGS+=		-I${X11BASE}/include	# dependent includes for xpm.h
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce/files/md5 b/x11/xfce/files/md5
index 585a8e919aa..c7b6a804c1d 100644
--- a/x11/xfce/files/md5
+++ b/x11/xfce/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/03/03 17:50:28 jwise Exp $
+$NetBSD: md5,v 1.4 2000/10/15 02:39:01 jlam Exp $
 
-MD5 (xfce-3.3.1.tar.gz) = d1c96248f38c2faa7d57f88042a48df5
+MD5 (xfce-3.5.2.tar.gz) = 8e96bb1ab34f42102e210fb2c9f78ead
diff --git a/x11/xfce/files/patch-sum b/x11/xfce/files/patch-sum
index 72552db197a..98eefaf92ab 100644
--- a/x11/xfce/files/patch-sum
+++ b/x11/xfce/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/10/02 07:25:18 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/10/15 02:39:01 jlam Exp $
 
-MD5 (patch-aa) = afcb38e11068b15d29378d67be815496
-MD5 (patch-ab) = 4e4e905cf934681ee2a337eff29212ac
-MD5 (patch-ac) = 34fea04e32dd7fe54f9bdebf949fab97
+MD5 (patch-aa) = d78caa077656a5686c06913048d7d0cb
+MD5 (patch-ab) = 726d819c74d044376596a7f158c308ab
+MD5 (patch-ac) = 51ad2237b4cafa9d96b3a0a0c11ad3fd
diff --git a/x11/xfce/patches/patch-aa b/x11/xfce/patches/patch-aa
index 82be0c948c8..94d7509b13a 100644
--- a/x11/xfce/patches/patch-aa
+++ b/x11/xfce/patches/patch-aa
@@ -1,12 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2000/03/03 17:50:28 jwise Exp $
---- configure.orig	Fri Mar  3 11:52:48 2000
-+++ configure	Fri Mar  3 11:53:02 2000
-@@ -5508,7 +5508,7 @@
-   XFCE_DIR="$datadir/xfce"
+$NetBSD: patch-aa,v 1.3 2000/10/15 02:39:01 jlam Exp $
+
+--- configure.orig	Sat Sep 30 12:16:19 2000
++++ configure
+@@ -3875,6 +3875,10 @@
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
+ 
++# NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
+ 
+ for ac_hdr in ctype.h
+ do
+@@ -6159,7 +6163,7 @@
+   XFCE_CONFDIR="$sysconfdir/xfce"
  fi
  
 -XFCE_LOCALE_DIR="$XFCE_DIR/locale"
 +XFCE_LOCALE_DIR="$datadir/locale"
  
+ echo "$ac_t""ok" 1>&6
  echo "$ac_t""XFCE_DIR set to $XFCE_DIR" 1>&6
- echo "$ac_t""XFCE_LOCALE_DIR set to $XFCE_LOCALE_DIR" 1>&6
diff --git a/x11/xfce/patches/patch-ab b/x11/xfce/patches/patch-ab
index 86ab728b626..dfe13b569dd 100644
--- a/x11/xfce/patches/patch-ab
+++ b/x11/xfce/patches/patch-ab
@@ -1,10 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2000/03/03 17:50:28 jwise Exp $
---- other/sample.xfsoundrc.in.orig	Fri Mar  3 12:38:11 2000
-+++ other/sample.xfsoundrc.in	Fri Mar  3 12:38:28 2000
-@@ -1,5 +1,5 @@
- Play
--esdplay
-+/usr/bin/audioplay
- XFCE_DIR/sounds/beep03.wav
- XFCE_DIR/sounds/pop02.wav
+$NetBSD: patch-ab,v 1.3 2000/10/15 02:39:02 jlam Exp $
+
+--- libs/configure.h.orig	Mon Sep  4 13:26:09 2000
++++ libs/configure.h
+@@ -22,7 +22,7 @@
+ #define CLOSE_STRING4 "quit"
  
+ /* #ifdef __alpha */
+-#if defined(__alpha) && !defined(linux)
++#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__))
+ #define NEEDS_ALPHA_HEADER
+ #undef BROKEN_SUN_HEADERS
+ #endif /* (__alpha) */
diff --git a/x11/xfce/patches/patch-ac b/x11/xfce/patches/patch-ac
index 66bfc1197a2..f243252c357 100644
--- a/x11/xfce/patches/patch-ac
+++ b/x11/xfce/patches/patch-ac
@@ -1,13 +1,11 @@
-$NetBSD: patch-ac,v 1.4 2000/10/02 07:25:19 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2000/10/15 02:39:02 jlam Exp $
 
---- libs/configure.h.orig	Tue Nov  9 21:20:00 1999
-+++ libs/configure.h
-@@ -69,7 +69,7 @@
- #define CLOSE_STRING4 "quit"
+--- other/xfsoundrc.in.orig	Mon Sep  4 13:26:09 2000
++++ other/xfsoundrc.in
+@@ -1,5 +1,5 @@
+ Play
+-xfplay
++/usr/bin/audioplay
+ XFCE_DIR/sounds/beep03.wav
+ XFCE_DIR/sounds/pop02.wav
  
- /* #ifdef __alpha */
--#if defined(__alpha) && !defined(linux)
-+#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__))
- #define NEEDS_ALPHA_HEADER
- #undef BROKEN_SUN_HEADERS
- #endif /* (__alpha) */
diff --git a/x11/xfce/pkg/PLIST b/x11/xfce/pkg/PLIST
index 6ada2551707..311b74293cd 100644
--- a/x11/xfce/pkg/PLIST
+++ b/x11/xfce/pkg/PLIST
@@ -1,36 +1,63 @@
-@comment $NetBSD: PLIST,v 1.3 2000/03/03 17:50:29 jwise Exp $
-bin/xfce
-bin/xfwm
-bin/xftree
-bin/xfpager
-bin/xfmouse
+@comment $NetBSD: PLIST,v 1.4 2000/10/15 02:39:02 jlam Exp $
+bin/CDE2Xfcepal
+bin/startxfce
 bin/xfbd
+bin/xfce
+bin/xfce_remove
+bin/xfce_setup
+bin/xfce_upgrade
 bin/xfclock
-bin/xfsound
-bin/xfplay
 bin/xfgnome
 bin/xfhelp
+bin/xflock
+bin/xfmountdev
+bin/xfmouse
+bin/xfpager
+bin/xfplay
 bin/xfprint
-bin/xftrash
+bin/xfrun
+bin/xfsound
 bin/xfterm
-bin/xflock
-bin/xfce_setup
-bin/xfce_remove
-bin/startxfce
-man/man1/xfce.1
-man/man1/xfwm.1
-man/man1/xftree.1
-man/man1/xfpager.1
-man/man1/xfmouse.1
+bin/xftrash
+bin/xftree
+bin/xfwm
+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/xfmouserc
+etc/xfce/xfsoundrc
+etc/xfce/xfwmrc
+etc/xfce/xinitrc
+etc/xfce/xinitrc.mwm
+etc/xfce/xsession
+etc/xfce/xtree.reg
+lib/gtk/themes/engines/libxfce.a
+lib/gtk/themes/engines/libxfce.la
+lib/gtk/themes/engines/libxfce.so.0.0
 man/man1/xfbd.1
+man/man1/xfce.1
 man/man1/xfclock.1
-man/man1/xfsound.1
 man/man1/xfgnome.1
 man/man1/xfhelp.1
+man/man1/xflock.1
+man/man1/xfmountdev.1
+man/man1/xfmouse.1
+man/man1/xfpager.1
 man/man1/xfprint.1
-man/man1/xftrash.1
+man/man1/xfrun.1
+man/man1/xfsound.1
 man/man1/xfterm.1
-man/man1/xflock.1
+man/man1/xftrash.1
+man/man1/xftree.1
+man/man1/xfwm.1
 share/locale/ca/LC_MESSAGES/xfce.mo
 share/locale/da/LC_MESSAGES/xfce.mo
 share/locale/de/LC_MESSAGES/xfce.mo
@@ -38,40 +65,25 @@ share/locale/es/LC_MESSAGES/xfce.mo
 share/locale/et/LC_MESSAGES/xfce.mo
 share/locale/fi/LC_MESSAGES/xfce.mo
 share/locale/fr/LC_MESSAGES/xfce.mo
+share/locale/gl/LC_MESSAGES/xfce.mo
 share/locale/hu/LC_MESSAGES/xfce.mo
 share/locale/it/LC_MESSAGES/xfce.mo
 share/locale/ja/LC_MESSAGES/xfce.mo
+share/locale/nl/LC_MESSAGES/xfce.mo
 share/locale/pl/LC_MESSAGES/xfce.mo
+share/locale/ro/LC_MESSAGES/xfce.mo
 share/locale/ru/LC_MESSAGES/xfce.mo
 share/locale/sk/LC_MESSAGES/xfce.mo
 share/locale/sv/LC_MESSAGES/xfce.mo
-share/locale/gl/LC_MESSAGES/xfce.mo
 share/locale/zh/LC_MESSAGES/xfce.mo
 share/xfce/COPYING
 share/xfce/XFce3.logo
-share/xfce/sample.Xclients
-share/xfce/sample.fvwm2rc
-share/xfce/sample.fvwmrc
-share/xfce/sample.xfwmrc
-share/xfce/system.xfwmrc
-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.xinitrc
-share/xfce/sample.xsession
-share/xfce/xfdefs.py
-share/xfce/sample.xtree.reg
-share/xfce/README.xfdefs.py
-share/xfce/backdrops/A-Little-Exercise.jpg
 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
@@ -125,6 +137,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
@@ -138,8 +151,8 @@ share/xfce/backdrops/The-Good-Times.jpg
 share/xfce/backdrops/Tiles.xpm
 share/xfce/backdrops/Tiles2.xpm
 share/xfce/backdrops/Tiles3.xpm
-share/xfce/backdrops/Time.xpm
 share/xfce/backdrops/Time-For-Expansion.jpg
+share/xfce/backdrops/Time.xpm
 share/xfce/backdrops/Toulouse-1.jpg
 share/xfce/backdrops/Toulouse-2.jpg
 share/xfce/backdrops/Toulouse-3.jpg
@@ -155,99 +168,91 @@ 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/Xfcemice.jpg
+share/xfce/help/help.gl.html
+share/xfce/help/help.html
+share/xfce/help/slogan.jpg
+share/xfce/help/title_legend.jpg
+share/xfce/help/xfbd.jpg
+share/xfce/help/xfce_action.jpg
+share/xfce/help/xfce_colorsel.jpg
+share/xfce/help/xfce_fontsel.jpg
+share/xfce/help/xfce_modify.jpg
+share/xfce/help/xfce_panel.jpg
+share/xfce/help/xfce_popup.jpg
+share/xfce/help/xfce_popup_detached.jpg
+share/xfce/help/xfce_screen.jpg
+share/xfce/help/xfce_setup1.jpg
+share/xfce/help/xfce_setup2.jpg
+share/xfce/help/xfce_setup3.jpg
+share/xfce/help/xfce_setup4.jpg
+share/xfce/help/xfce_snap.jpg
+share/xfce/help/xfmouse.jpg
+share/xfce/help/xfpager.jpg
+share/xfce/help/xfsound.jpg
+share/xfce/help/xftree.jpg
+share/xfce/help/xftree_menu.jpg
+share/xfce/help/xfwm_menu1.jpg
+share/xfce/help/xfwm_menu2.jpg
+share/xfce/help/xfwm_menu3.jpg
+share/xfce/help/xfwm_menu4.jpg
+share/xfce/help/xfwm_menu5.jpg
 share/xfce/icons/3dpaint.xpm
 share/xfce/icons/ABC.xpm
 share/xfce/icons/AZ.xpm
 share/xfce/icons/AceKingCards.xpm
-share/xfce/icons/Animator.xpm
 share/xfce/icons/AntiVirus.xpm
 share/xfce/icons/ArtFolderEmpty.xpm
 share/xfce/icons/ArtFolderFull.xpm
 share/xfce/icons/BWDialogEdit.xpm
 share/xfce/icons/BWwidgets.xpm
-share/xfce/icons/BackUp.xpm
-share/xfce/icons/Ballon.xpm
 share/xfce/icons/BallotBox.xpm
-share/xfce/icons/Binoculars.xpm
-share/xfce/icons/Bomb.xpm
-share/xfce/icons/Bomb2.xpm
 share/xfce/icons/Book.xpm
-share/xfce/icons/Box_empty.xpm
-share/xfce/icons/Box_full.xpm
 share/xfce/icons/BulletHole.xpm
-share/xfce/icons/C++.xpm
-share/xfce/icons/C.xpm
-share/xfce/icons/CAD.xpm
-share/xfce/icons/CAD2.xpm
 share/xfce/icons/CDPlayer.xpm
 share/xfce/icons/CPUChip.xpm
 share/xfce/icons/Calculator.xpm
-share/xfce/icons/Camera.xpm
-share/xfce/icons/Cards.xpm
-share/xfce/icons/Chart.xpm
 share/xfce/icons/CheckMarkMonitor.xpm
 share/xfce/icons/ChiselChartSlide.xpm
 share/xfce/icons/Clock.xpm
 share/xfce/icons/ClosedPackageBox.xpm
 share/xfce/icons/ColoredCompactDisc.xpm
-share/xfce/icons/Colormap.xpm
-share/xfce/icons/CompactDisc.xpm
 share/xfce/icons/Connect.xpm
-share/xfce/icons/Copy.xpm
 share/xfce/icons/CrashCartoon.xpm
 share/xfce/icons/CylinderWrenchSpreadsheet.xpm
-share/xfce/icons/Database.xpm
-share/xfce/icons/Disks.xpm
 share/xfce/icons/DeskGlobe.xpm
 share/xfce/icons/Director.xpm
-share/xfce/icons/DiskCopy.xpm
+share/xfce/icons/Disk-Blue.xpm
 share/xfce/icons/DiskFloppy.xpm
 share/xfce/icons/DiskHammer.xpm
 share/xfce/icons/DiskHardDrive.xpm
 share/xfce/icons/DiskOptical.xpm
-share/xfce/icons/Disk_blue.xpm
 share/xfce/icons/DisketteBoxEmpty.xpm
 share/xfce/icons/DisketteBoxFull.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/Equation.xpm
 share/xfce/icons/EscherCube.xpm
 share/xfce/icons/EscherTriangle.xpm
-share/xfce/icons/Exit.xpm
-share/xfce/icons/FAX.xpm
 share/xfce/icons/FaxRecieved.xpm
 share/xfce/icons/FileAPP.xpm
 share/xfce/icons/FileManager.xpm
-share/xfce/icons/Film.xpm
-share/xfce/icons/Film2.xpm
 share/xfce/icons/FilmNegative.xpm
 share/xfce/icons/Folder.xpm
 share/xfce/icons/FolderDeposit.xpm
 share/xfce/icons/FolderOpen.xpm
 share/xfce/icons/Folders.xpm
-share/xfce/icons/FontDesigner.xpm
-share/xfce/icons/Fonts.xpm
-share/xfce/icons/Format.xpm
 share/xfce/icons/ForwardBackwardPagesBook.xpm
 share/xfce/icons/FreeBSD.xpm
-share/xfce/icons/Ftp.xpm
 share/xfce/icons/GIMP.xpm
-share/xfce/icons/Gimp2.xpm
 share/xfce/icons/Game.xpm
+share/xfce/icons/Gimp2.xpm
 share/xfce/icons/Gnome-apps.xpm
-share/xfce/icons/Hammer.xpm
 share/xfce/icons/Gnome-logo.xpm
 share/xfce/icons/Gnome-panel.xpm
 share/xfce/icons/GoldenSatelliteDish.xpm
-share/xfce/icons/Graph_bar.xpm
-share/xfce/icons/Graph_pie.xpm
 share/xfce/icons/HandOpen.xpm
 share/xfce/icons/HandPointing.xpm
 share/xfce/icons/HandPointingLeft.xpm
@@ -256,73 +261,42 @@ share/xfce/icons/HandPunch.xpm
 share/xfce/icons/HandReach.xpm
 share/xfce/icons/Info.xpm
 share/xfce/icons/Interface.xpm
-share/xfce/icons/Key.xpm
 share/xfce/icons/Keys.xpm
 share/xfce/icons/KeysOnChain.xpm
 share/xfce/icons/LeatherEmptyBag.xpm
 share/xfce/icons/LeatherFullBag.xpm
 share/xfce/icons/Lightbulb.xpm
-share/xfce/icons/Lightning.xpm
-share/xfce/icons/Lock.xpm
 share/xfce/icons/MaelstromInFrame.xpm
-share/xfce/icons/Magnify.xpm
 share/xfce/icons/MagnifyGlas.xpm
 share/xfce/icons/Mail.xpm
 share/xfce/icons/MailboxGoldGradientBackground.xpm
-share/xfce/icons/Math4.xpm
-share/xfce/icons/Meter.xpm
 share/xfce/icons/MicroPhonePro.xpm
 share/xfce/icons/Monalisa.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/Netscape3.xpm
 share/xfce/icons/NetscapeLogo.xpm
 share/xfce/icons/News.xpm
-share/xfce/icons/No_drag.xpm
 share/xfce/icons/OldBlueAddingMachine.xpm
-share/xfce/icons/Packer.xpm
-share/xfce/icons/Palette.xpm
 share/xfce/icons/Pen.xpm
-share/xfce/icons/Pencil.xpm
 share/xfce/icons/Pencils.xpm
 share/xfce/icons/Penguin.xpm
 share/xfce/icons/PhonePortable.xpm
 share/xfce/icons/PhoneTTOffhook.xpm
-share/xfce/icons/Plug.xpm
 share/xfce/icons/Postit.xpm
 share/xfce/icons/PrefsDock.xpm
 share/xfce/icons/Printer.xpm
-share/xfce/icons/Radar.xpm
 share/xfce/icons/RayTracedGear.xpm
-share/xfce/icons/Raytracer.xpm
-share/xfce/icons/Reader.xpm
 share/xfce/icons/RecycleLogo.xpm
-share/xfce/icons/Sound.xpm
-share/xfce/icons/SoundEditor.xpm
 share/xfce/icons/Stoplight.xpm
-share/xfce/icons/TEX.xpm
 share/xfce/icons/Tablet.xpm
-share/xfce/icons/Tapes.xpm
-share/xfce/icons/XV.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/TrueDie.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/XV.xpm
 share/xfce/icons/X_server.xpm
 share/xfce/icons/Xmix.xpm
 share/xfce/icons/Xterm.xpm
@@ -331,6 +305,7 @@ share/xfce/palettes/Alpine
 share/xfce/palettes/Analog
 share/xfce/palettes/Anthracite
 share/xfce/palettes/Bahamas
+share/xfce/palettes/Bronze
 share/xfce/palettes/Cheese
 share/xfce/palettes/Citrouille
 share/xfce/palettes/Clinky
@@ -342,15 +317,19 @@ share/xfce/palettes/Fall
 share/xfce/palettes/Golden
 share/xfce/palettes/Grayscale
 share/xfce/palettes/Ground
-share/xfce/palettes/HiTech
+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
@@ -358,13 +337,16 @@ 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
 share/xfce/palettes/Stripe
 share/xfce/palettes/Sunny
 share/xfce/palettes/Symbiose
 share/xfce/palettes/TBlue
 share/xfce/palettes/Teal
+share/xfce/palettes/Tiny
 share/xfce/palettes/Tommy
 share/xfce/palettes/Troica
 share/xfce/palettes/Typhoon
@@ -422,48 +404,24 @@ share/xfce/sounds/zap01.wav
 share/xfce/sounds/zap02.wav
 share/xfce/sounds/zap03.wav
 share/xfce/sounds/zap04.wav
-share/xfce/help/help.html
-share/xfce/help/help.gl.html
-share/xfce/help/slogan.jpg
-share/xfce/help/title_legend.jpg
-share/xfce/help/xfbd.jpg
-share/xfce/help/xfce_action.jpg
-share/xfce/help/xfce_colorsel.jpg
-share/xfce/help/xfce_fontsel.jpg
-share/xfce/help/xfce_modify.jpg
-share/xfce/help/xfce_panel.jpg
-share/xfce/help/xfce_popup.jpg
-share/xfce/help/xfce_popup_detached.jpg
-share/xfce/help/xfce_screen.jpg
-share/xfce/help/xfce_setup1.jpg
-share/xfce/help/xfce_setup2.jpg
-share/xfce/help/xfce_setup3.jpg
-share/xfce/help/xfce_setup4.jpg
-share/xfce/help/xfce_snap.jpg
-share/xfce/help/xfmouse.jpg
-share/xfce/help/xfpager.jpg
-share/xfce/help/xfsound.jpg
-share/xfce/help/xftree.jpg
-share/xfce/help/xftree_menu.jpg
-share/xfce/help/xfwm_menu1.jpg
-share/xfce/help/xfwm_menu2.jpg
-share/xfce/help/xfwm_menu3.jpg
-share/xfce/help/xfwm_menu4.jpg
-share/xfce/help/xfwm_menu5.jpg
+share/xfce/textures/Modern.xpm
+share/xfce/textures/bronze.xpm
 share/xfce/textures/cheese.xpm
 share/xfce/textures/craters.xpm
-share/xfce/textures/hitech.xpm
 share/xfce/textures/ground.xpm
+share/xfce/textures/hitech.xpm
 share/xfce/textures/metal.xpm
 share/xfce/textures/military.xpm
 share/xfce/textures/oldwood.xpm
 share/xfce/textures/paper.xpm
 share/xfce/textures/silver.xpm
 share/xfce/textures/stripe.xpm
+@unexec rmdir -p %D/lib/gtk/themes/engines 2>/dev/null || true
 @dirrm share/xfce/textures
-@dirrm share/xfce/help
 @dirrm share/xfce/sounds
 @dirrm share/xfce/palettes
 @dirrm share/xfce/icons
+@dirrm share/xfce/help
 @dirrm share/xfce/backdrops
 @dirrm share/xfce
+@dirrm etc/xfce