Upgrading Xfce to 4.6.1.

This is for PR #40984. This is based on work from
dieter roelants. Thank you Dieter.
Also I had done some work independently on this.
Hopefully, I am getting this all committed at one time.

The changelogs are at
http://www.xfce.org/documentation/changelogs/4.6.1
http://www.xfce.org/documentation/changelogs/4.6.0

Also don't need the xfce4-dev-tools for building. (It is only
needed when building from SVN source.)

6 files changed, 114 insertions, 36 deletions

diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile
index 98ad2243d33..755429ab4fd 100644
--- a/sysutils/xfce4-thunar/Makefile
+++ b/sysutils/xfce4-thunar/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:34 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.9.3
+XFCE4_VERSION=	1.0.1
 
 DISTNAME=	Thunar-${XFCE4_VERSION}
 PKGNAME=	xfce4-thunar-${XFCE4_VERSION}
-PKGREVISION=	3
 CATEGORIES=	sysutils
 COMMENT=	Xfce file manager
 
-#DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-
-
 PKGCONFIG_OVERRIDE+=	thunar-vfs/thunar-vfs-1.pc.in
 PKGCONFIG_OVERRIDE+=	thunarx/thunarx-1.pc.in
 
-PKG_SYSCONFSUBDIR=      xdg/Thunar
-EGDIR=                  ${PREFIX}/share/examples/Thunar
-CONF_FILES=             ${EGDIR:Q}/uca.xml ${PKG_SYSCONFDIR:Q}/uca.xml
+PKG_SYSCONFSUBDIR=	xdg/Thunar
+EGDIR=			${XFCE4_EGBASE}/Thunar
+
+MAKE_DIRS+=	${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins
+MAKE_DIRS+=	${XFCE4_EGBASE} ${PREFIX}/share/xfce4
+MAKE_DIRS+=	${PREFIX}/share/xfce4/panel-plugins
+
+CONF_FILES=	${EGDIR}/uca.xml ${PKG_SYSCONFDIR}/uca.xml
 
 .include "options.mk"
 
@@ -29,11 +30,14 @@ CONF_FILES=             ${EGDIR:Q}/uca.xml ${PKG_SYSCONFDIR:Q}/uca.xml
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-thunar/PLIST b/sysutils/xfce4-thunar/PLIST
index 96eb87d3797..b40619ee979 100644
--- a/sysutils/xfce4-thunar/PLIST
+++ b/sysutils/xfce4-thunar/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:34 reed Exp $
 bin/Thunar
 bin/thunar
+bin/thunar-settings
 include/thunar-vfs-1/thunar-vfs/thunar-vfs-config.h
 include/thunar-vfs-1/thunar-vfs/thunar-vfs-enum-types.h
 include/thunar-vfs-1/thunar-vfs/thunar-vfs-info.h
@@ -37,6 +38,7 @@ lib/pkgconfig/thunarx-1.pc
 lib/thunarx-1/thunar-apr.la
 lib/thunarx-1/thunar-sbr.la
 lib/thunarx-1/thunar-uca.la
+lib/thunarx-1/thunar-wallpaper-plugin.la
 libexec/ThunarBulkRename
 libexec/ThunarHelp
 libexec/thunar-sendto-email
@@ -50,6 +52,7 @@ share/Thunar/sendto/thunar-sendto-email.desktop
 share/applications/Thunar-bulk-rename.desktop
 share/applications/Thunar-folder-handler.desktop
 share/applications/Thunar.desktop
+share/applications/thunar-settings.desktop
 share/dbus-1/services/org.xfce.FileManager.service
 share/dbus-1/services/org.xfce.Thunar.service
 share/doc/Thunar/README.gtkrc
@@ -77,6 +80,27 @@ share/doc/Thunar/html/C/support.html
 share/doc/Thunar/html/C/the-file-manager-window.html
 share/doc/Thunar/html/C/using-removable-media.html
 share/doc/Thunar/html/C/working-with-files-and-folders.html
+share/doc/Thunar/html/da/advanced-topics.html
+share/doc/Thunar/html/da/copyright.html
+share/doc/Thunar/html/da/customizing-thunar.html
+share/doc/Thunar/html/da/faq.html
+share/doc/Thunar/html/da/images/bulk-rename.png
+share/doc/Thunar/html/da/images/file-manager-window.png
+share/doc/Thunar/html/da/images/file-properties.png
+share/doc/Thunar/html/da/images/preferences-advanced.png
+share/doc/Thunar/html/da/images/preferences-behavior.png
+share/doc/Thunar/html/da/images/preferences-side-pane.png
+share/doc/Thunar/html/da/images/preferences-views.png
+share/doc/Thunar/html/da/images/removable-drives-and-media.png
+share/doc/Thunar/html/da/images/removable-media-unmount.png
+share/doc/Thunar/html/da/images/sendto-menu.png
+share/doc/Thunar/html/da/images/visible-columns.png
+share/doc/Thunar/html/da/index.html
+share/doc/Thunar/html/da/preferences.html
+share/doc/Thunar/html/da/support.html
+share/doc/Thunar/html/da/the-file-manager-window.html
+share/doc/Thunar/html/da/using-removable-media.html
+share/doc/Thunar/html/da/working-with-files-and-folders.html
 share/doc/Thunar/html/es/advanced-topics.html
 share/doc/Thunar/html/es/copyright.html
 share/doc/Thunar/html/es/customizing-thunar.html
@@ -140,6 +164,37 @@ share/doc/Thunar/html/fr/support.html
 share/doc/Thunar/html/fr/the-file-manager-window.html
 share/doc/Thunar/html/fr/using-removable-media.html
 share/doc/Thunar/html/fr/working-with-files-and-folders.html
+share/doc/Thunar/html/gl/advanced-topics.html
+share/doc/Thunar/html/gl/copyright.html
+share/doc/Thunar/html/gl/customizing-thunar.html
+share/doc/Thunar/html/gl/faq.html
+share/doc/Thunar/html/gl/index.html
+share/doc/Thunar/html/gl/preferences.html
+share/doc/Thunar/html/gl/support.html
+share/doc/Thunar/html/gl/the-file-manager-window.html
+share/doc/Thunar/html/gl/using-removable-media.html
+share/doc/Thunar/html/gl/working-with-files-and-folders.html
+share/doc/Thunar/html/it/advanced-topics.html
+share/doc/Thunar/html/it/copyright.html
+share/doc/Thunar/html/it/customizing-thunar.html
+share/doc/Thunar/html/it/faq.html
+share/doc/Thunar/html/it/images/bulk-rename.png
+share/doc/Thunar/html/it/images/file-manager-window.png
+share/doc/Thunar/html/it/images/file-properties.png
+share/doc/Thunar/html/it/images/preferences-advanced.png
+share/doc/Thunar/html/it/images/preferences-behavior.png
+share/doc/Thunar/html/it/images/preferences-side-pane.png
+share/doc/Thunar/html/it/images/preferences-views.png
+share/doc/Thunar/html/it/images/removable-drives-and-media.png
+share/doc/Thunar/html/it/images/removable-media-unmount.png
+share/doc/Thunar/html/it/images/sendto-menu.png
+share/doc/Thunar/html/it/images/visible-columns.png
+share/doc/Thunar/html/it/index.html
+share/doc/Thunar/html/it/preferences.html
+share/doc/Thunar/html/it/support.html
+share/doc/Thunar/html/it/the-file-manager-window.html
+share/doc/Thunar/html/it/using-removable-media.html
+share/doc/Thunar/html/it/working-with-files-and-folders.html
 share/doc/Thunar/html/ja/advanced-topics.html
 share/doc/Thunar/html/ja/copyright.html
 share/doc/Thunar/html/ja/customizing-thunar.html
@@ -225,6 +280,27 @@ share/doc/Thunar/html/ru/the-file-manager-window.html
 share/doc/Thunar/html/ru/using-removable-media.html
 share/doc/Thunar/html/ru/working-with-files-and-folders.html
 share/doc/Thunar/html/thunar.css
+share/doc/Thunar/html/tr/advanced-topics.html
+share/doc/Thunar/html/tr/copyright.html
+share/doc/Thunar/html/tr/customizing-thunar.html
+share/doc/Thunar/html/tr/faq.html
+share/doc/Thunar/html/tr/images/bulk-rename.png
+share/doc/Thunar/html/tr/images/file-manager-window.png
+share/doc/Thunar/html/tr/images/file-properties.png
+share/doc/Thunar/html/tr/images/preferences-advanced.png
+share/doc/Thunar/html/tr/images/preferences-behavior.png
+share/doc/Thunar/html/tr/images/preferences-side-pane.png
+share/doc/Thunar/html/tr/images/preferences-views.png
+share/doc/Thunar/html/tr/images/removable-drives-and-media.png
+share/doc/Thunar/html/tr/images/removable-media-unmount.png
+share/doc/Thunar/html/tr/images/sendto-menu.png
+share/doc/Thunar/html/tr/images/visible-columns.png
+share/doc/Thunar/html/tr/index.html
+share/doc/Thunar/html/tr/preferences.html
+share/doc/Thunar/html/tr/support.html
+share/doc/Thunar/html/tr/the-file-manager-window.html
+share/doc/Thunar/html/tr/using-removable-media.html
+share/doc/Thunar/html/tr/working-with-files-and-folders.html
 share/doc/Thunar/html/zh_TW/advanced-topics.html
 share/doc/Thunar/html/zh_TW/copyright.html
 share/doc/Thunar/html/zh_TW/customizing-thunar.html
@@ -246,7 +322,7 @@ share/doc/Thunar/html/zh_TW/support.html
 share/doc/Thunar/html/zh_TW/the-file-manager-window.html
 share/doc/Thunar/html/zh_TW/using-removable-media.html
 share/doc/Thunar/html/zh_TW/working-with-files-and-folders.html
-share/examples/Thunar/uca.xml
+share/examples/xfce4/Thunar/uca.xml
 share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html
 share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html
 share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html
@@ -347,13 +423,13 @@ share/locale/ku/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/nb/LC_MESSAGES/Thunar.mo
 share/locale/nl/LC_MESSAGES/Thunar.mo
-share/locale/nn_NO/LC_MESSAGES/Thunar.mo
+share/locale/nn/LC_MESSAGES/Thunar.mo
 share/locale/pa/LC_MESSAGES/Thunar.mo
 share/locale/pl/LC_MESSAGES/Thunar.mo
+share/locale/pt/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
diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk
index 31872d19c4c..4e164ec81b0 100644
--- a/sysutils/xfce4-thunar/buildlink3.mk
+++ b/sysutils/xfce4-thunar/buildlink3.mk
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/09/16 01:15:34 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-thunar
 
 .if !defined(XFCE4_THUNAR_BUILDLINK3_MK)
 XFCE4_THUNAR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-thunar+=	xfce4-thunar>=0.9.3nb2
-BUILDLINK_ABI_DEPENDS.xfce4-thunar?=	xfce4-thunar>=0.9.3nb3
+BUILDLINK_API_DEPENDS.xfce4-thunar+=	xfce4-thunar>=1.0.0
 BUILDLINK_PKGSRCDIR.xfce4-thunar?=	../../sysutils/xfce4-thunar
 
 pkgbase := xfce4-thunar
@@ -18,15 +17,14 @@ pkgbase := xfce4-thunar
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
 .endif # XFCE4_THUNAR_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-thunar/distinfo b/sysutils/xfce4-thunar/distinfo
index c5711a85870..9e9910e6788 100644
--- a/sysutils/xfce4-thunar/distinfo
+++ b/sysutils/xfce4-thunar/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/12/17 12:50:03 hira Exp $
+$NetBSD: distinfo,v 1.6 2009/09/16 01:15:34 reed Exp $
 
-SHA1 (Thunar-0.9.3.tar.bz2) = bb43fbe5ac3af1204517ed88da1cc3e87c5ec688
-RMD160 (Thunar-0.9.3.tar.bz2) = cc5c17a2841d5778e4832cc21e620ac351c9c57b
-Size (Thunar-0.9.3.tar.bz2) = 6502363 bytes
+SHA1 (Thunar-1.0.1.tar.bz2) = 2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064
+RMD160 (Thunar-1.0.1.tar.bz2) = 203690b9eb05ca8e5248bb026f98b8e3e6881f2c
+Size (Thunar-1.0.1.tar.bz2) = 8802672 bytes
 SHA1 (patch-aa) = c9d9dfb4c177aab2e8a43e46998652cc72daefa5
-SHA1 (patch-ab) = 432284c67bf01960805c2cb2d8458156fd286633
-SHA1 (patch-ac) = 05e9ca2a39923255e84bdc28a082170381b77e17
+SHA1 (patch-ab) = e5c3f1e853bf59f69047c7160a3e29df54298879
+SHA1 (patch-ac) = 745f240ff44b0b21eb727b0a9887c9d8f1ee8a47
diff --git a/sysutils/xfce4-thunar/patches/patch-ab b/sysutils/xfce4-thunar/patches/patch-ab
index c8485ce333e..dbaa69a9dd1 100644
--- a/sysutils/xfce4-thunar/patches/patch-ab
+++ b/sysutils/xfce4-thunar/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2008/12/17 12:50:03 hira Exp $
+$NetBSD: patch-ab,v 1.4 2009/09/16 01:15:34 reed Exp $
 
---- configure.orig	2008-10-27 07:58:27.000000000 +0900
-+++ configure	2008-11-28 05:13:19.000000000 +0900
-@@ -30650,7 +30650,7 @@
-     { $as_echo "$as_me:$LINENO: checking for operating system support" >&5
- $as_echo_n "checking for operating system support... " >&6; }
+--- configure.orig	2009-02-24 21:09:38.000000000 +0000
++++ configure
+@@ -21169,7 +21169,7 @@ fi
+     { echo "$as_me:$LINENO: checking for operating system support" >&5
+ echo $ECHO_N "checking for operating system support... $ECHO_C" >&6; }
    case "$target_os" in
 -  dragonfly*|freebsd*|netbsd*|openbsd*|darwin*)
 +  freebsd*|netbsd*|openbsd*|darwin*)
diff --git a/sysutils/xfce4-thunar/patches/patch-ac b/sysutils/xfce4-thunar/patches/patch-ac
index 42391068ce8..585cf91f0c0 100644
--- a/sysutils/xfce4-thunar/patches/patch-ac
+++ b/sysutils/xfce4-thunar/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2008/12/17 12:50:03 hira Exp $
+$NetBSD: patch-ac,v 1.2 2009/09/16 01:15:34 reed Exp $
 
 --- plugins/thunar-uca/Makefile.in.orig	2008-11-29 17:25:52.000000000 +0900
 +++ plugins/thunar-uca/Makefile.in	2008-11-29 17:27:26.000000000 +0900
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1 2008/12/17 12:50:03 hira Exp $
  	$(PLATFORM_LDFLAGS)
  
 -defaultsdir = $(sysconfdir)/xdg/Thunar
-+defaultsdir = $(datadir)/examples/Thunar
++defaultsdir = $(datadir)/examples/xfce4/Thunar
  defaults_in_files = uca.xml.in
  defaults_DATA = $(defaults_in_files:.xml.in=.xml)
  EXTRA_DIST = \