upgrade to xfce 3.8.14

2002-03-24 01:20:39 +00:00 · 2002-03-24 01:20:39 +00:00 · 0f93cbde92
commit 0f93cbde92
parent 43fcdf8e20
19 changed files with 590 additions and 204 deletions
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@ -1,35 +1,37 @@
-# New ports collection makefile for:	xfce
-# Version required:	3.2.5
-# Date created:		28 Jan 2000
-# Whom:			Kevin Lo <kevlo@openbsd.org>
-#
-# $OpenBSD: Makefile,v 1.15 2001/11/26 07:46:43 kevlo Exp $
-#
+# $OpenBSD: Makefile,v 1.16 2002/03/24 01:20:39 brad Exp $

-COMMENT=	"CDE like desktop with GTK"
+COMMENT=	"CDE like desktop with Gtk"

-DISTNAME=	xfce-3.6.3
+DISTNAME=	xfce-3.8.14
 CATEGORIES=	x11
-NEED_VERSION=	1.474
-MASTER_SITES=	http://www.xfce.org/archive/
+NEED_VERSION=	1.500
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= xfce

 HOMEPAGE=	http://www.xfce.org/

+LIB_DEPENDS=	gtk.1::x11/gtk+ \
+		gdk_pixbuf.2::graphics/gdk-pixbuf \
+		audiofile::devel/libaudiofile \
+		xml2::textproc/libxml
+RUN_DEPENDS=	::audio/sox
+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-LIB_DEPENDS=	Imlib.19,gdk_imlib::graphics/imlib \
-		gtk.1::x11/gtk+
-RUN_DEPENDS=	::audio/sox
-
 USE_X11=	Yes
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-CONFIGURE_ARGS=	--with-xpm=${X11BASE} \
-		--with-conf-dir=${PREFIX}/lib/xfce	
+CONFIGURE_STYLE= autoconf
+CONFIGURE_ARGS=	--disable-arts \
+		--enable-audiofile="${LOCALBASE}" \
+		--enable-gdk-pixbuf="${LOCALBASE}" \
+		--enable-gtk-engine="${PREFIX}/lib/gtk/themes/engines" \
+		--enable-libxml2="${LOCALBASE}" \
+		--with-conf-dir="${PREFIX}/lib/xfce" \
+		--with-data-dir="${PREFIX}/share/xfce" \
+		--with-libiconv-prefix="${LOCALBASE}" \
+		--with-locale-dir="${PREFIX}/share/locale" \
+		--with-xpm="${X11BASE}"

 .include <bsd.port.mk>
--- a/x11/xfce/distinfo
+++ b/x11/xfce/distinfo
@ -1,3 +1,3 @@
-MD5 (xfce-3.6.3.tar.gz) = e42e017604edf8daa24417a28a218333
-RMD160 (xfce-3.6.3.tar.gz) = 0d2c147a1acd4dc4de7c28ae112a282db4dda495
-SHA1 (xfce-3.6.3.tar.gz) = 98fec6c67f6ede75375bb14bed672256b4bdcf04
+MD5 (xfce-3.8.14.tar.gz) = e92f08aa1aa404d3246cfb21cc9a237e
+RMD160 (xfce-3.8.14.tar.gz) = 36a7831a0067f62dc5d8597aa56b77b4d7ae3b31
+SHA1 (xfce-3.8.14.tar.gz) = 29970b93ff5708f39b1ebb0bd34101220a5401de
--- a/x11/xfce/patches/patch-aclocal_m4
+++ b/x11/xfce/patches/patch-aclocal_m4
@ -0,0 +1,81 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2002/03/24 01:20:39 brad Exp $
+--- aclocal.m4.orig	Sun Jan 20 14:16:51 2002
+++ aclocal.m4	Sat Mar 23 20:11:55 2002
+@@ -971,7 +971,14 @@ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+  case "$host_os" in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+  ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+  ;;
+  esac
+ fi
+ 
+ # Allow CC to be a program name with arguments.
+@@ -1374,7 +1381,9 @@ cygwin* | mingw* | pw32* )
+     with_gnu_ld=no
+   fi
+   ;;
+-
+openbsd*)
+  with_gnu_ld=no
+  ;;
+ esac
+ 
+ ld_shlibs=yes
+@@ -1778,10 +1787,21 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+    case "$host_os" in
+      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+      *)
+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+       if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	 export_dynamic_flag_spec='${wl}-E'
+       fi
+      ;;
+    esac
+     ;;
+ 
+   os2*)
+@@ -2255,9 +2275,23 @@ newsos6)
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+  need_lib_prefix=no
+  need_version=no
+  file_magic_cmd=/usr/bin/file
+  file_magic_test_file=`echo /usr/lib/libc.so.*`
+  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    case "$host_os" in
+    openbsd2.[89] | openbsd2.[89].*)
+      shlibpath_overrides_runpath=no
+    ;;
+    *)
+      shlibpath_overrides_runpath=yes
+    ;;
+    esac
+  else
+    deplibs_check_method='file_magic OpenBSD.* shared library'
+    shlibpath_overrides_runpath=yes
+   fi
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--- a/x11/xfce/patches/patch-config_h_in
+++ b/x11/xfce/patches/patch-config_h_in
@ -0,0 +1,11 @@
+$OpenBSD: patch-config_h_in,v 1.1 2002/03/24 01:20:39 brad Exp $
+--- config.h.in.orig	Thu Jan 17 17:32:03 2002
+++ config.h.in	Sat Mar 23 20:11:55 2002
+@@ -13,6 +13,7 @@
+ #undef DEBUG
+ #undef HAVE_X11_EXTENSIONS_XINERAMA_H
+ #undef HAVE_X11_XFT_XFT_H
+#undef HAVE_SOUNDCARD_H
+ #undef HAVE_SYS_SOUNDCARD_H
+ #undef HAVE_LINUX_SOUNDCARD_H
+ #undef HAVE_MACHINE_SOUNDCARD_H
--- a/x11/xfce/patches/patch-configure_in
+++ b/x11/xfce/patches/patch-configure_in
@ -0,0 +1,25 @@
+$OpenBSD: patch-configure_in,v 1.1 2002/03/24 01:20:39 brad Exp $
+--- configure.in.orig	Sun Jan 20 09:35:07 2002
+++ configure.in	Sat Mar 23 20:11:55 2002
+@@ -63,7 +63,7 @@ AC_LINK_FILES($nls_cv_header_libgt, $nls
+ AC_CHECK_HEADERS(ctype.h)
+ AC_CHECK_HEADERS(unistd.h string.h getopt.h)
+ AC_CHECK_HEADERS(fcntl.h)
+-AC_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h machine/soundcard.h)
+AC_CHECK_HEADERS(soundcard.h sys/soundcard.h linux/soundcard.h machine/soundcard.h)
+ AC_HEADER_STAT
+ AC_HEADER_DIRENT
+ AC_C_CONST
+@@ -109,6 +109,12 @@ AC_ARG_WITH(xpm,
+ 
+ AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, , 
+              AC_MSG_ERROR(libXpm not found), $X_PRE_LIBS -lX11 $X_LIBS $X_EXTRA_LIBS)
+
+save_LIBS="$LIBS"
+LIBS=""
+AC_CHECK_LIB(ossaudio, _oss_ioctl, OSSAUDIO_LIBS="-lossaudio")
+AC_SUBST(OSSAUDIO_LIBS)
+LIBS="$save_LIBS"
+ 
+ AC_CHECK_HEADER(X11/xpm.h, ,
+                 AC_MSG_ERROR(X11/xpm.h not found))
--- a/x11/xfce/patches/patch-libs_configure_h
+++ b/x11/xfce/patches/patch-libs_configure_h
@ -1,11 +0,0 @@
--- libs/configure.h.orig	Wed Nov 29 09:27:12 2000
-+++ libs/configure.h	Wed Nov 29 09:28:42 2000
-@@ -22,7 +22,7 @@
- #define CLOSE_STRING4 "quit"
- 
- /* #ifdef __alpha */
-#if defined(__alpha) && !defined(linux)
-+#if defined(__alpha) && !(defined(linux) || defined(__OpenBSD__))
- #define NEEDS_ALPHA_HEADER
- #undef BROKEN_SUN_HEADERS
- #endif /* (__alpha) */
--- a/x11/xfce/patches/patch-ltconfig
+++ b/x11/xfce/patches/patch-ltconfig
@ -1,49 +0,0 @@
--- ltconfig.orig	Mon Aug 14 19:26:37 2000
-+++ ltconfig	Wed Nov 29 18:04:59 2000
-@@ -1105,6 +1105,9 @@
-     with_gnu_ld=no
-   fi
-   ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- 
- esac
- 
-@@ -1402,10 +1405,18 @@
-     ;;
- 
-   openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-+    case "$host_os" in
-+      openbsd2.[01234567])
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+       hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
-+      *)
-+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
-+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      ;;
-+    esac
-     ;;
- 
-   os2*)
-@@ -2021,13 +2032,10 @@
- 
- openbsd*)
-   version_type=sunos
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-    need_version=no
-  fi
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  library_names_spec='${libname}${release}.so ${libname}.so'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method='pass_all'
-   ;;
- 
- os2*)
--- a/x11/xfce/patches/patch-ltmain_sh
+++ b/x11/xfce/patches/patch-ltmain_sh
@ -0,0 +1,98 @@
+$OpenBSD: patch-ltmain_sh,v 1.1 2002/03/24 01:20:39 brad Exp $
+--- ltmain.sh.orig	Sun Dec  9 17:51:24 2001
+++ ltmain.sh	Sat Mar 23 20:11:55 2002
+@@ -1021,15 +1021,18 @@ compiler."
+ 	;;
+ 
+       -l*)
+-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+-	  case $host in
+-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+-	    # These systems don't actually have a C or math library (as such)
+	if test "$arg" = "-lc"; then
+	  case "$host" in
+	  *-*-openbsd*)
+	    # Do not include libc due to us having libc/libc_r.
+ 	    continue
+ 	    ;;
+-	  *-*-mingw* | *-*-os2*)
+-	    # These systems don't actually have a C library (as such)
+-	    test "X$arg" = "X-lc" && continue
+          esac
+	elif test "$arg" = "-lc_r"; then
+	  case "$host" in
+	  *-*-openbsd*)
+	    # Do not include libc_r directly, use -pthread flag.
+	    continue
+ 	    ;;
+ 	  esac
+ 	fi
+@@ -1037,6 +1040,17 @@ compiler."
+ 	continue
+ 	;;
+ 
+      -pthread)
+	case $host in
+	*-*-openbsd*)
+	  deplibs="$deplibs $arg"
+	  ;;
+	*)
+	  continue
+	  ;;
+	esac
+	;;
+
+       -module)
+ 	module=yes
+ 	continue
+@@ -2405,6 +2419,9 @@ compiler."
+ 	    # Rhapsody C library is in the System framework
+ 	    deplibs="$deplibs -framework System"
+ 	    ;;
+          *-*-openbsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+@@ -4412,40 +4429,6 @@ relink_command=\"$relink_command\""
+     # Exit here if they wanted silent mode.
+     test "$show" = ":" && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
--- a/x11/xfce/patches/patch-scripts_xfhelp_in
+++ b/x11/xfce/patches/patch-scripts_xfhelp_in
@ -1,10 +0,0 @@
--- scripts/xfhelp.in.orig	Wed Nov 29 14:54:00 2000
-+++ scripts/xfhelp.in	Wed Nov 29 14:54:17 2000
-@@ -19,7 +19,6 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
-XFCE_DIR=
- if [ "x$BROWSER" = "x" ]
- then
-   BROWSER=netscape
--- a/x11/xfce/patches/patch-scripts_xflock
+++ b/x11/xfce/patches/patch-scripts_xflock
@ -0,0 +1,10 @@
+$OpenBSD: patch-scripts_xflock,v 1.1 2002/03/24 01:20:39 brad Exp $
+--- scripts/xflock.orig	Thu Jul 12 17:45:22 2001
+++ scripts/xflock	Sat Mar 23 20:11:56 2002
+@@ -19,5 +19,5 @@
+ #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-xscreensaver-command -lock || xlock $*
+xlock $*
+ exit 0
--- a/x11/xfce/patches/patch-xflock
+++ b/x11/xfce/patches/patch-xflock
@ -1,9 +0,0 @@
--- scripts/xflock.orig	Wed Nov 29 12:31:58 2000
-+++ scripts/xflock	Wed Nov 29 12:32:09 2000
-@@ -19,5 +19,5 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
-xscreensaver-command -lock || xlock $*
-+xlock $*
- exit 0
--- a/x11/xfce/patches/patch-xfmenu_Makefile_in
+++ b/x11/xfce/patches/patch-xfmenu_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-xfmenu_Makefile_in,v 1.1 2002/03/24 01:20:39 brad Exp $
+--- xfmenu/Makefile.in.orig	Sun Jan 20 14:16:57 2002
+++ xfmenu/Makefile.in	Sat Mar 23 20:11:56 2002
+@@ -141,7 +141,7 @@ xfmenu_SOURCES = xfmenu.c
+ 
+ xfmenu_LDADD = ../libs/libxfwmcore.la @DMALLOC_LIB@  @GLIB_LIBS@ \
+  ${X_LIBS} ${X_PRE_LIBS} \
+- -lXext -lX11 -lXpm @XFT_LIBS@
+ -lXext -lX11 -lXpm @XFT_LIBS@ ${LIBICONV}
+ 
+ 
+ xfmenu_DEPENDENCIES = ../libs/libxfwmcore.la
--- a/x11/xfce/patches/patch-xfsound_Makefile_in
+++ b/x11/xfce/patches/patch-xfsound_Makefile_in
@ -1,11 +1,12 @@
--- xfsound/Makefile.in.orig	Wed Nov 29 11:35:17 2000
-+++ xfsound/Makefile.in	Wed Nov 29 11:37:07 2000
-@@ -122,7 +122,7 @@
- xfsound_SOURCES =  	xfsound_cb.c xfsound_cb.h 	xfsound.c xfsound.h 	xfdsp.c xfdsp.h
- 
- 
-xfsound_LDADD = ../libs/libxfcecore.la ../libs/libxfwmcore.la @DMALLOC_LIB@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ @GDK_PIXBUF_LIBS@ @INTLLIBS@ @LIBS@ ../libs/libxfwmcore.la ${X_LIBS} ${X_PRE_LIBS} -lXpm
-+xfsound_LDADD = ../libs/libxfcecore.la ../libs/libxfwmcore.la @DMALLOC_LIB@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ @GDK_PIXBUF_LIBS@ @INTLLIBS@ @LIBS@ ../libs/libxfwmcore.la ${X_LIBS} ${X_PRE_LIBS} -lXpm -lossaudio
+$OpenBSD: patch-xfsound_Makefile_in,v 1.2 2002/03/24 01:20:39 brad Exp $
+--- xfsound/Makefile.in.orig	Sun Jan 20 14:16:57 2002
+++ xfsound/Makefile.in	Sat Mar 23 20:11:56 2002
+@@ -152,7 +152,7 @@ xfsound_SOURCES = \
+ xfsound_LDADD = ../libs/libxfcecore.la ../libs/libxfwmcore.la \
+  @DMALLOC_LIB@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ @GDK_PIXBUF_LIBS@ \
+  @AUDIOFILE_LIBS@ @ARTS_LIBS@ @INTLLIBS@ @LIBS@ ../libs/libxfwmcore.la \
+- ${X_LIBS} ${X_PRE_LIBS} -lXpm @XFT_LIBS@
+ ${X_LIBS} ${X_PRE_LIBS} -lXpm @XFT_LIBS@ @OSSAUDIO_LIBS@
 
 
 xfsound_DEPENDENCIES = ../libs/libxfcecore.la ../libs/libxfwmcore.la
--- a/x11/xfce/patches/patch-xfsound_xfdsp_c
+++ b/x11/xfce/patches/patch-xfsound_xfdsp_c
@ -1,21 +1,59 @@
--- xfsound/xfdsp.c.orig	Wed Nov 29 09:43:22 2000
-+++ xfsound/xfdsp.c	Wed Nov 29 09:46:38 2000
-@@ -48,6 +48,9 @@
- #if defined(linux)
- #include <sys/soundcard.h>	/* guess :) */
- #endif
-+#if defined(__OpenBSD__)
+$OpenBSD: patch-xfsound_xfdsp_c,v 1.2 2002/03/24 01:20:39 brad Exp $
+--- xfsound/xfdsp.c.orig	Wed Nov 21 01:36:39 2001
+++ xfsound/xfdsp.c	Sat Mar 23 20:11:56 2002
+@@ -66,6 +66,9 @@
+ #if defined(HAVE_ARTS)
+ #include <artsc.h>
+ #else
+#if defined(HAVE_SOUNDCARD_H)
 +#include <soundcard.h>
+#else
+ #if defined(HAVE_SYS_SOUNDCARD_H)
+ #include <sys/soundcard.h>
+ #else
+@@ -78,6 +81,7 @@
+ #endif
+ #endif
+ #endif
 +#endif
 
 #include "xfdsp.h"
 
-@@ -62,7 +65,7 @@
+@@ -89,6 +93,20 @@
+ #  include "dmalloc.h"
+ #endif
 
+#ifdef __OpenBSD__
+static char *dsp[] = {
+	"/dev/sound",
+	"/dev/sound0",
+	"/dev/sound1",
+	"/dev/sound2",
+	"/dev/sound3",
+	"/dev/sound4",
+	"/dev/sound5",
+	"/dev/sound6",
+	"/dev/sound7",
+	NULL
+};
+#else
+ static char *dsp[] = {
+ 	"/dev/dsp",
+ 	"/dev/dsp0",
+@@ -101,6 +119,7 @@ static char *dsp[] = {
+ 	"/dev/dsp7",
+ 	NULL
+ };
+#endif
+ 
+ void
+ sound_init (void)
+@@ -119,7 +138,7 @@ sound_init (void)
+ #endif
+ }
+ 
+-#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_LINUX_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H) || defined(HAVE_ARTS)
+#if defined(HAVE_SOUNDCARD_H) || defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_LINUX_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H) || defined(HAVE_ARTS)
+ 
+ #if !defined(HAVE_ARTS)
 int masterfd;
- 
-#if defined(linux)
-+#if defined(linux) || defined(__OpenBSD__)
- int
- i_play (char *soundfile)
- {
--- a/x11/xfce/patches/patch-xfsound_xfdsp_h
+++ b/x11/xfce/patches/patch-xfsound_xfdsp_h
@ -0,0 +1,17 @@
+$OpenBSD: patch-xfsound_xfdsp_h,v 1.1 2002/03/24 01:20:39 brad Exp $
+--- xfsound/xfdsp.h.orig	Wed Sep 12 09:07:41 2001
+++ xfsound/xfdsp.h	Sat Mar 23 20:11:56 2002
+@@ -22,7 +22,13 @@
+ 
+ #define XF_IND		1
+ #define ST_GET		0
+
+#ifdef __OpenBSD__
+#define DSP_NAME	"/dev/sound"
+#else
+ #define DSP_NAME	"/dev/dsp"
+#endif
+
+ #define ARTSD_CMD       "exec artsd"
+ 
+ typedef int ST_CONFIG[3];
--- a/x11/xfce/patches/patch-xfsound_xfplay
+++ b/x11/xfce/patches/patch-xfsound_xfplay
@ -1,8 +0,0 @@
--- xfsound/xfplay.orig	Wed Nov 29 09:24:25 2000
-+++ xfsound/xfplay	Wed Nov 29 09:25:48 2000
-@@ -2,4 +2,4 @@
- #
- # This script is part of XFce
- # "ossdsp" option submitted by "Sami Tikka" <sami.tikka@kolumbus.fi>
-exec sox $1 -t ossdsp /dev/dsp
-+exec sox $1 -t ossdsp /dev/sound
--- a/x11/xfce/patches/patch-xfwm_session_c
+++ b/x11/xfce/patches/patch-xfwm_session_c
@ -1,37 +0,0 @@
--- xfwm/session.c.orig	Thu Jul  6 22:23:16 2000
-+++ xfwm/session.c	Wed Nov 29 11:53:22 2000
-@@ -577,8 +577,10 @@
- callback_save_yourself2 (SmcConn sm_conn, SmPointer client_data)
- {
-   char *path = NULL;
-  char *filename = NULL;
-  FILE *f = NULL;
-+  char *filename;
-+  FILE *f;
-+  int fd;
-+
-   Bool success = True;
-   struct passwd *pwd;
- 
-@@ -589,16 +591,18 @@
-       path = pwd->pw_dir;
-     }
- 
-  filename = tempnam (path, ".fs-");
-+  sprintf (filename, "path/.fs-XXXXXXXX");
-+  fd = mkstemp (filename);
- 
-   if (Scr.Options & SessionMgt)
-     {
-      f = fopen (filename, "w");
-+      f = fdopen (fd, "w");
-       success = save_session_state (sm_conn, filename, f);
-       fclose (f);
-     }
-  if (!success)
-+  if (!success || fd < 0)
-     xfwm_msg (WARN, "SaveSession", "Can't save session\n");
-+  close (fd);
-   /* also save session for builtin session mgt, so user will get
-    * back to his environmnent even if he doesn't use ICE
-    */
--- a/x11/xfce/pkg/PFRAG.shared
+++ b/x11/xfce/pkg/PFRAG.shared
@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2000/11/30 05:28:55 kevlo Exp $
-lib/gtk/themes/engines/libxfce.so
-DYNLIBDIR(%B)
--- a/x11/xfce/pkg/PLIST
+++ b/x11/xfce/pkg/PLIST
@ -1,36 +1,49 @@
-@comment $OpenBSD: PLIST,v 1.4 2000/11/30 05:28:55 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.5 2002/03/24 01:20:39 brad Exp $
 bin/CDE2Xfcepal
+bin/glob
 bin/startxfce
 bin/xfbd
+bin/xfbdmgr
 bin/xfce
 bin/xfce_remove
 bin/xfce_setup
 bin/xfce_upgrade
 bin/xfclock
+bin/xfdiff
+bin/xfglob
 bin/xfgnome
 bin/xfhelp
 bin/xflock
+bin/xfmenu
 bin/xfmountdev
 bin/xfmouse
 bin/xfpager
 bin/xfplay
 bin/xfprint
 bin/xfrun
+bin/xfsamba
 bin/xfsound
 bin/xfterm
 bin/xftrash
 bin/xftree
+bin/xfumed
 bin/xfwm
-%%SHARED%%
+lib/gtk/themes/engines/libxfce.a
+lib/gtk/themes/engines/libxfce.la
 lib/xfce/Xclients
 lib/xfce/fvwm2rc
 lib/xfce/fvwmrc
 lib/xfce/xfbdrc
 lib/xfce/xfce3rc
 lib/xfce/xfce3rc.cs
+lib/xfce/xfce3rc.de
+lib/xfce/xfce3rc.fr
 lib/xfce/xfce3rc.hu
 lib/xfce/xfce3rc.ja
 lib/xfce/xfce3rc.ko
+lib/xfce/xfce3rc.nl
+lib/xfce/xfce3rc.sr
+lib/xfce/xfce3rc.uk
 lib/xfce/xfce3rc.zh_CN.GB2312
 lib/xfce/xfce3rc.zh_TW.Big5
 lib/xfce/xfclockrc
@ -41,9 +54,11 @@ lib/xfce/xinitrc
 lib/xfce/xinitrc.mwm
 lib/xfce/xsession
 lib/xfce/xtree.reg
+man/man1/glob.1
 man/man1/xfbd.1
 man/man1/xfce.1
 man/man1/xfclock.1
+man/man1/xfglob.1
 man/man1/xfgnome.1
 man/man1/xfhelp.1
 man/man1/xflock.1
@ -56,11 +71,13 @@ 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
 share/locale/da/LC_MESSAGES/xfce.mo
 share/locale/de/LC_MESSAGES/xfce.mo
+share/locale/en_GB/LC_MESSAGES/xfce.mo
 share/locale/es/LC_MESSAGES/xfce.mo
 share/locale/et/LC_MESSAGES/xfce.mo
 share/locale/fi/LC_MESSAGES/xfce.mo
@ -75,16 +92,24 @@ share/locale/pt_BR/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/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
 share/xfce/backdrops/A-Little-Exercise.jpg
 share/xfce/backdrops/Anneaux.xpm
 share/xfce/backdrops/Arena.xpm
+share/xfce/backdrops/Aurora.xpm
+share/xfce/backdrops/BlackStripes.xpm
+share/xfce/backdrops/Blue.list
 share/xfce/backdrops/BlueSatin.xpm
 share/xfce/backdrops/BlueSea.xpm
+share/xfce/backdrops/BlueStripes.xpm
 share/xfce/backdrops/BlueStucco.xpm
 share/xfce/backdrops/Bluedrops.xpm
 share/xfce/backdrops/Bluefalls.xpm
@ -106,29 +131,42 @@ share/xfce/backdrops/Eyes.xpm
 share/xfce/backdrops/Fire.xpm
 share/xfce/backdrops/Flames.xpm
 share/xfce/backdrops/Flow.xpm
+share/xfce/backdrops/Flower.jpg
 share/xfce/backdrops/Funkyblue.xpm
 share/xfce/backdrops/Gallets.xpm
 share/xfce/backdrops/Glasses.xpm
 share/xfce/backdrops/Gold.xpm
 share/xfce/backdrops/Gradient.xpm
+share/xfce/backdrops/Green.xpm
+share/xfce/backdrops/GreenStripes.xpm
 share/xfce/backdrops/GreenStucco.xpm
 share/xfce/backdrops/Greenslate.xpm
 share/xfce/backdrops/Grey.xpm
+share/xfce/backdrops/GreyArena.xpm
 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
 share/xfce/backdrops/Pencils.xpm
 share/xfce/backdrops/Plasma.xpm
+share/xfce/backdrops/Pled.xpm
 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
@ -142,13 +180,16 @@ share/xfce/backdrops/Sky3.jpg
 share/xfce/backdrops/Slate.xpm
 share/xfce/backdrops/Soft.xpm
 share/xfce/backdrops/Softblue.xpm
+share/xfce/backdrops/Softblue2.xpm
 share/xfce/backdrops/Sol.xpm
 share/xfce/backdrops/Solid.xpm
 share/xfce/backdrops/Space.xpm
 share/xfce/backdrops/Space2.xpm
 share/xfce/backdrops/Storm.xpm
+share/xfce/backdrops/Sunny.xpm
 share/xfce/backdrops/Teal.xpm
 share/xfce/backdrops/The-Good-Times.jpg
+share/xfce/backdrops/TheLake.jpg
 share/xfce/backdrops/Tiles.xpm
 share/xfce/backdrops/Tiles2.xpm
 share/xfce/backdrops/Tiles3.xpm
@ -158,49 +199,149 @@ share/xfce/backdrops/Toulouse-1.jpg
 share/xfce/backdrops/Toulouse-2.jpg
 share/xfce/backdrops/Toulouse-3.jpg
 share/xfce/backdrops/Toulouse-4.jpg
+share/xfce/backdrops/Toulouse.list
 share/xfce/backdrops/Ufo.xpm
 share/xfce/backdrops/Wall1.xpm
 share/xfce/backdrops/Wall2.xpm
 share/xfce/backdrops/Wall3.xpm
+share/xfce/backdrops/WaterPurple.xpm
 share/xfce/backdrops/Wax.xpm
 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/help/help.gl.html
-share/xfce/help/help.html
-share/xfce/help/help.nl.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/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
+share/xfce/help/html/adv-wm-defaults.html
+share/xfce/help/html/adv-wm-examples.html
+share/xfce/help/html/adv-wm-general.html
+share/xfce/help/html/adv-wm-management.html
+share/xfce/help/html/adv-wm-menus.html
+share/xfce/help/html/adv-wm-style.html
+share/xfce/help/html/adv-wm-xresources.html
+share/xfce/help/html/advanced-wm.html
+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
+share/xfce/help/html/ln9.html
+share/xfce/help/html/overview.html
+share/xfce/help/html/panel.html
+share/xfce/help/html/resources.html
+share/xfce/help/html/setup-startup.html
+share/xfce/help/html/setup-wm.html
+share/xfce/help/html/setup-xfce.html
+share/xfce/help/html/setup.html
+share/xfce/help/html/stylesheet-images/caution.gif
+share/xfce/help/html/stylesheet-images/home.gif
+share/xfce/help/html/stylesheet-images/important.gif
+share/xfce/help/html/stylesheet-images/next.gif
+share/xfce/help/html/stylesheet-images/note.gif
+share/xfce/help/html/stylesheet-images/prev.gif
+share/xfce/help/html/stylesheet-images/tip.gif
+share/xfce/help/html/stylesheet-images/toc-blank.gif
+share/xfce/help/html/stylesheet-images/toc-minus.gif
+share/xfce/help/html/stylesheet-images/toc-plus.gif
+share/xfce/help/html/stylesheet-images/up.gif
+share/xfce/help/html/stylesheet-images/warning.gif
+share/xfce/help/html/user-manual.html
+share/xfce/help/html/utilities.html
+share/xfce/help/html/utils-xfbdmgr.html
+share/xfce/help/html/utils-xfclock.html
+share/xfce/help/html/utils-xfdiff.html
+share/xfce/help/html/utils-xfglob.html
+share/xfce/help/html/utils-xfgnome.html
+share/xfce/help/html/utils-xfmenu.html
+share/xfce/help/html/utils-xfmouse.html
+share/xfce/help/html/utils-xfpager.html
+share/xfce/help/html/utils-xfrun.html
+share/xfce/help/html/utils-xfsamba.html
+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/icons/3dpaint.xpm
 share/xfce/icons/ABC.xpm
 share/xfce/icons/AZ.xpm
@ -303,68 +444,124 @@ share/xfce/icons/X_server.xpm
 share/xfce/icons/Xmix.xpm
 share/xfce/icons/Xterm.xpm
 share/xfce/icons/Xv.xpm
+share/xfce/icons/xfsamba.xpm
 share/xfce/palettes/Alpine
+share/xfce/palettes/Altxfce
+share/xfce/palettes/Altxfce2
+share/xfce/palettes/Altxfce3
 share/xfce/palettes/Aluminium
 share/xfce/palettes/Analog
 share/xfce/palettes/Anthracite
 share/xfce/palettes/Bahamas
+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
 share/xfce/palettes/HiTech
 share/xfce/palettes/HiTech2
 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
 share/xfce/palettes/Metal
 share/xfce/palettes/Military
 share/xfce/palettes/Modern
+share/xfce/palettes/Modern2
+share/xfce/palettes/Moz9
+share/xfce/palettes/Moz9-2
 share/xfce/palettes/Nature
+share/xfce/palettes/Nemo
 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
 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
@ -419,12 +616,25 @@ 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
 share/xfce/textures/Liquid.xpm
 share/xfce/textures/Modern.xpm
+share/xfce/textures/Moz9.xpm
 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
 share/xfce/textures/craters.xpm
@ -440,7 +650,15 @@ share/xfce/textures/stripe.xpm
@dirrm share/xfce/sounds
@dirrm share/xfce/palettes
@dirrm share/xfce/icons
+@dirrm share/xfce/help/html/stylesheet-images
+@dirrm share/xfce/help/html/images
+@dirrm share/xfce/help/html
@dirrm share/xfce/help
+@dirrm share/xfce/fonts
+@dirrm share/xfce/cursors
@dirrm share/xfce/backdrops
@dirrm share/xfce
@dirrm lib/xfce
+@dirrm lib/gtk/themes/engines
+@dirrm lib/gtk/themes
+@dirrm lib/gtk