update xfce4 to 4.4.2

Approved by:    portmgr (linimon)
Security:       CVE-2007-6531, CVE-2007-6532

5 files changed, 117 insertions, 52 deletions

diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 02ac628e6829..1a22212fc546 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	Thunar
-PORTVERSION=	0.8.0
-PORTREVISION=	5
+PORTVERSION=	0.9.0
+PORTREVISION=	0
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -17,6 +17,9 @@ COMMENT=	XFce 4 file manager
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+PATCHFILES=	Thunar-0.9.0-missing-audio-cds-for-volman.patch
+PATCH_SITES=	http://thunar.xfce.org/download/sources/Thunar/0.9.0/
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
 USE_BZIP2=	yes
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index a0be29d53044..66de33cdcaa0 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4/Thunar-0.8.0.tar.bz2) = 9f7b0945d6a235391049f6818fb4d188
-SHA256 (xfce4/Thunar-0.8.0.tar.bz2) = 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9
-SIZE (xfce4/Thunar-0.8.0.tar.bz2) = 6205993
+MD5 (xfce4/Thunar-0.9.0.tar.bz2) = 0fc5008858661c0abd0399acbe30ef28
+SHA256 (xfce4/Thunar-0.9.0.tar.bz2) = 26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037
+SIZE (xfce4/Thunar-0.9.0.tar.bz2) = 6403785
+MD5 (xfce4/Thunar-0.9.0-missing-audio-cds-for-volman.patch) = 113e748cc7f391a409608dc896dbac82
+SHA256 (xfce4/Thunar-0.9.0-missing-audio-cds-for-volman.patch) = 5a42f8cbaeaf172c6eca62fad260e16cdcc8adfc70efdf1ab426dac4aeaf202e
+SIZE (xfce4/Thunar-0.9.0-missing-audio-cds-for-volman.patch) = 4278
diff --git a/x11-fm/thunar/files/patch-thunar-vfs-thunar-vfs-thumb-jpeg.c b/x11-fm/thunar/files/patch-thunar-vfs-thunar-vfs-thumb-jpeg.c
deleted file mode 100644
index b439f323c740..000000000000
--- a/x11-fm/thunar/files/patch-thunar-vfs-thunar-vfs-thumb-jpeg.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- thunar-vfs/thunar-vfs-thumb-jpeg.c.orig	Mon Jan 22 09:54:27 2007
-+++ thunar-vfs/thunar-vfs-thumb-jpeg.c	Mon Jan 22 12:59:03 2007
-@@ -306,22 +306,13 @@
-   guint         data_len;
- 
-   guint         thumb_compression;
--  union
--  {
--    struct /* thumbnail JPEG */
--    {
-       guint     thumb_jpeg_length;
-       guint     thumb_jpeg_offset;
--    };
--    struct /* thumbnail TIFF */
--    {
-       guint     thumb_tiff_length;
-       guint     thumb_tiff_offset;
-       guint     thumb_tiff_interp;
-       guint     thumb_tiff_height;
-       guint     thumb_tiff_width;
--    };
--  };
- 
-   gboolean      big_endian;
- } TvtjExif;
diff --git a/x11-fm/thunar/files/patch-thunar-vfs-thunar-vfs-thumb.c b/x11-fm/thunar/files/patch-thunar-vfs-thunar-vfs-thumb.c
deleted file mode 100644
index 3113e0aa1daf..000000000000
--- a/x11-fm/thunar/files/patch-thunar-vfs-thunar-vfs-thumb.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- thunar-vfs/thunar-vfs-thumb.c.orig	Thu Sep  7 15:22:21 2006
-+++ thunar-vfs/thunar-vfs-thumb.c	Thu Sep  7 15:22:32 2006
-@@ -28,14 +28,14 @@
- #ifdef HAVE_SYS_MMAN_H
- #include <sys/mman.h>
- #endif
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
- #ifdef HAVE_SYS_RESOURCE_H
- #include <sys/resource.h>
- #endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
--#endif
--#ifdef HAVE_SYS_TIME_H
--#include <sys/time.h>
- #endif
- #ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index 7a9df8ec6bec..647554489b53 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -32,10 +32,10 @@ include/thunarx-1/thunarx/thunarx-renamer.h
 include/thunarx-1/thunarx/thunarx.h
 lib/libthunar-vfs-1.la
 lib/libthunar-vfs-1.so
-lib/libthunar-vfs-1.so.4
+lib/libthunar-vfs-1.so.5
 lib/libthunarx-1.la
 lib/libthunarx-1.so
-lib/libthunarx-1.so.4
+lib/libthunarx-1.so.5
 %%PLUGIN_APR%%lib/thunarx-1/thunar-apr.la
 %%PLUGIN_APR%%lib/thunarx-1/thunar-apr.so
 %%PLUGIN_SBR%%lib/thunarx-1/thunar-sbr.la
@@ -58,6 +58,73 @@ share/applications/Thunar-folder-handler.desktop
 share/applications/Thunar.desktop
 %%WITH_DBUS%%share/dbus-1/services/org.xfce.FileManager.service
 %%WITH_DBUS%%share/dbus-1/services/org.xfce.Thunar.service
+share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsMimeApplication.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsMimeDatabase.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsMimeHandler.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsMonitor.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsUser.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsUserManager.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsVolume.html
+share/gtk-doc/html/thunar-vfs/ThunarVfsVolumeManager.html
+share/gtk-doc/html/thunar-vfs/filesystem-monitoring.html
+share/gtk-doc/html/thunar-vfs/fundamentals.html
+share/gtk-doc/html/thunar-vfs/home.png
+share/gtk-doc/html/thunar-vfs/index.html
+share/gtk-doc/html/thunar-vfs/index.sgml
+share/gtk-doc/html/thunar-vfs/introduction.html
+share/gtk-doc/html/thunar-vfs/ix01.html
+share/gtk-doc/html/thunar-vfs/jobs.html
+share/gtk-doc/html/thunar-vfs/left.png
+share/gtk-doc/html/thunar-vfs/mime-types.html
+share/gtk-doc/html/thunar-vfs/right.png
+share/gtk-doc/html/thunar-vfs/style.css
+share/gtk-doc/html/thunar-vfs/thunar-vfs-Basic-Types.html
+share/gtk-doc/html/thunar-vfs/thunar-vfs-Initialization-and-Shutdown.html
+share/gtk-doc/html/thunar-vfs/thunar-vfs-Jobs.html
+share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsInfo.html
+share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsMimeInfo.html
+share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsPath.html
+share/gtk-doc/html/thunar-vfs/thunar-vfs-Utility-Functions.html
+share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp
+share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp2
+share/gtk-doc/html/thunar-vfs/up.png
+share/gtk-doc/html/thunar-vfs/users-and-groups-handling.html
+share/gtk-doc/html/thunar-vfs/volume-handling.html
+share/gtk-doc/html/thunarx/ThunarxFileInfo.html
+share/gtk-doc/html/thunarx/ThunarxMenuProvider.html
+share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html
+share/gtk-doc/html/thunarx/ThunarxPropertyPage.html
+share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html
+share/gtk-doc/html/thunarx/ThunarxProviderFactory.html
+share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html
+share/gtk-doc/html/thunarx/ThunarxRenamer.html
+share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html
+share/gtk-doc/html/thunarx/abstraction.png
+share/gtk-doc/html/thunarx/bulk-rename.png
+share/gtk-doc/html/thunarx/home.png
+share/gtk-doc/html/thunarx/index.html
+share/gtk-doc/html/thunarx/index.sgml
+share/gtk-doc/html/thunarx/ix01.html
+share/gtk-doc/html/thunarx/left.png
+share/gtk-doc/html/thunarx/menu-provider.png
+share/gtk-doc/html/thunarx/right.png
+share/gtk-doc/html/thunarx/say-hello.png
+share/gtk-doc/html/thunarx/style.css
+share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html
+share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html
+share/gtk-doc/html/thunarx/thunarx-fundamentals.html
+share/gtk-doc/html/thunarx/thunarx-overview.html
+share/gtk-doc/html/thunarx/thunarx-providers.html
+share/gtk-doc/html/thunarx/thunarx-using-extensions.html
+share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html
+share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html
+share/gtk-doc/html/thunarx/thunarx-writing-extensions.html
+share/gtk-doc/html/thunarx/thunarx.devhelp
+share/gtk-doc/html/thunarx/thunarx.devhelp2
+share/gtk-doc/html/thunarx/up.png
 %%PLUGIN_TPA%%share/xfce4/panel-plugins/thunar-tpa.desktop
 %%DOCSDIR%%/README.gtkrc
 %%DOCSDIR%%/README.thunarrc
@@ -168,6 +235,27 @@ share/applications/Thunar.desktop
 %%DOCSDIR%%/html/ja/the-file-manager-window.html
 %%DOCSDIR%%/html/ja/using-removable-media.html
 %%DOCSDIR%%/html/ja/working-with-files-and-folders.html
+%%DOCSDIR%%/html/nl/images/bulk-rename.png
+%%DOCSDIR%%/html/nl/images/file-manager-window.png
+%%DOCSDIR%%/html/nl/images/file-properties.png
+%%DOCSDIR%%/html/nl/images/preferences-advanced.png
+%%DOCSDIR%%/html/nl/images/preferences-behavior.png
+%%DOCSDIR%%/html/nl/images/preferences-side-pane.png
+%%DOCSDIR%%/html/nl/images/preferences-views.png
+%%DOCSDIR%%/html/nl/images/removable-drives-and-media.png
+%%DOCSDIR%%/html/nl/images/removable-media-unmount.png
+%%DOCSDIR%%/html/nl/images/sendto-menu.png
+%%DOCSDIR%%/html/nl/images/visible-columns.png
+%%DOCSDIR%%/html/nl/advanced-topics.html
+%%DOCSDIR%%/html/nl/copyright.html
+%%DOCSDIR%%/html/nl/customizing-thunar.html
+%%DOCSDIR%%/html/nl/faq.html
+%%DOCSDIR%%/html/nl/index.html
+%%DOCSDIR%%/html/nl/preferences.html
+%%DOCSDIR%%/html/nl/support.html
+%%DOCSDIR%%/html/nl/the-file-manager-window.html
+%%DOCSDIR%%/html/nl/using-removable-media.html
+%%DOCSDIR%%/html/nl/working-with-files-and-folders.html
 %%DOCSDIR%%/html/pl/advanced-topics.html
 %%DOCSDIR%%/html/pl/copyright.html
 %%DOCSDIR%%/html/pl/customizing-thunar.html
@@ -238,12 +326,14 @@ share/icons/hicolor/16x16/stock/navigation/stock_thunar-templates.png
 share/icons/hicolor/24x24/apps/Thunar.png
 share/icons/hicolor/48x48/apps/Thunar.png
 share/icons/hicolor/scalable/apps/Thunar.svg
+share/locale/ar/LC_MESSAGES/Thunar.mo
 share/locale/be/LC_MESSAGES/Thunar.mo
 share/locale/ca/LC_MESSAGES/Thunar.mo
 share/locale/cs/LC_MESSAGES/Thunar.mo
 share/locale/de/LC_MESSAGES/Thunar.mo
 share/locale/dz/LC_MESSAGES/Thunar.mo
 share/locale/el/LC_MESSAGES/Thunar.mo
+share/locale/en_GB/LC_MESSAGES/Thunar.mo
 share/locale/eo/LC_MESSAGES/Thunar.mo
 share/locale/es/LC_MESSAGES/Thunar.mo
 share/locale/et/LC_MESSAGES/Thunar.mo
@@ -258,14 +348,22 @@ share/locale/ja/LC_MESSAGES/Thunar.mo
 share/locale/ka/LC_MESSAGES/Thunar.mo
 share/locale/ko/LC_MESSAGES/Thunar.mo
 share/locale/lt/LC_MESSAGES/Thunar.mo
+share/locale/lv/LC_MESSAGES/Thunar.mo
 share/locale/mk/LC_MESSAGES/Thunar.mo
+share/locale/nb_NO/LC_MESSAGES/Thunar.mo
 share/locale/nl/LC_MESSAGES/Thunar.mo
+share/locale/pa/LC_MESSAGES/Thunar.mo
 share/locale/pl/LC_MESSAGES/Thunar.mo
 share/locale/pt_BR/LC_MESSAGES/Thunar.mo
+share/locale/pt_PT/LC_MESSAGES/Thunar.mo
 share/locale/ro/LC_MESSAGES/Thunar.mo
 share/locale/ru/LC_MESSAGES/Thunar.mo
+share/locale/sk/LC_MESSAGES/Thunar.mo
+share/locale/sq/LC_MESSAGES/Thunar.mo
 share/locale/sv/LC_MESSAGES/Thunar.mo
+share/locale/tr/LC_MESSAGES/Thunar.mo
 share/locale/uk/LC_MESSAGES/Thunar.mo
+share/locale/ur/LC_MESSAGES/Thunar.mo
 share/locale/zh_CN/LC_MESSAGES/Thunar.mo
 share/locale/zh_TW/LC_MESSAGES/Thunar.mo
 share/pixmaps/Thunar/Thunar-about-logo.png
@@ -281,6 +379,10 @@ share/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
 %%PLUGIN_TPA%%@dirrmtry libexec/xfce4/panel-plugins
 %%PLUGIN_TPA%%@dirrmtry libexec/xfce4
 @dirrmtry share/applications
+@dirrm share/gtk-doc/html/thunar-vfs
+@dirrm share/gtk-doc/html/thunarx
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
 %%PLUGIN_TPA%%@dirrmtry share/xfce4/panel-plugins
 %%PLUGIN_TPA%%@dirrmtry share/xfce4
 @dirrmtry %%DOCSDIR%%/html/C/images
@@ -293,6 +395,8 @@ share/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
 @dirrm %%DOCSDIR%%/html/fr
 @dirrmtry %%DOCSDIR%%/html/ja/images
 @dirrm %%DOCSDIR%%/html/ja
+@dirrmtry %%DOCSDIR%%/html/nl/images
+@dirrm %%DOCSDIR%%/html/nl
 @dirrmtry %%DOCSDIR%%/html/pl/images
 @dirrm %%DOCSDIR%%/html/pl
 @dirrmtry %%DOCSDIR%%/html/ru/images