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.)

5 files changed, 51 insertions, 30 deletions

diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 4da26520472..6aef2a64997 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:36 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,23 +6,34 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Xfce utilities
 
-PKG_SYSCONFSUBDIR=	xdg/xfce4
-EGDIR=			${XFCE4_EGBASE}
-CONF_FILES=		${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc
-USE_TOOLS+=		xinit:run
+DEPENDS+=	p5-XML-Parser>=2.36:../../textproc/p5-XML-Parser
 
-REQD_DIRS+=		${EGDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--with-xsession-prefix=${PREFIX}
 
 BUILD_DEFS+=		PKG_SYSCONFBASE
+USE_TOOLS+=		xinit:run
+
+PKG_SYSCONFSUBDIR=	xdg
+EGDIR=			${XFCE4_EGBASE}
+
+MAKE_DIRS+=	${PREFIX}/libexec/xfce4 ${EGDIR} ${EGDIR}/autostart
+MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/it
+MAKE_DIRS+=	${PREFIX}/share/xsessions
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
+CONF_FILES=		${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xfce4/xinitrc
+CONF_FILES+=		${EGDIR}/autostart/xfconf-migration-4.6.desktop \
+			${PKG_SYSCONFDIR}/autostart/xfconf-migration-4.6.desktop
 
 .include "options.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST
index ddad204f40a..2563d39250a 100644
--- a/x11/xfce4-utils/PLIST
+++ b/x11/xfce4-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2008/12/18 14:09:26 hira Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:36 reed Exp $
 bin/startxfce4
 bin/xfbrowser4
 bin/xfce4-about
@@ -7,7 +7,10 @@ bin/xflock4
 bin/xfmountdev4
 bin/xfrun4
 bin/xfterm4
+libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+share/dbus-1/services/org.xfce.RunDialog.service
 share/examples/xfce4/Xft.xrdb
+share/examples/xfce4/autostart/xfconf-migration-4.6.desktop
 share/examples/xfce4/xinitrc
 share/icons/hicolor/48x48/apps/xfce4-logo.png
 share/locale/af/LC_MESSAGES/xfce-utils.mo
@@ -49,16 +52,17 @@ share/locale/lv/LC_MESSAGES/xfce-utils.mo
 share/locale/mk/LC_MESSAGES/xfce-utils.mo
 share/locale/mr/LC_MESSAGES/xfce-utils.mo
 share/locale/ms/LC_MESSAGES/xfce-utils.mo
-share/locale/nb_NO/LC_MESSAGES/xfce-utils.mo
+share/locale/nb/LC_MESSAGES/xfce-utils.mo
 share/locale/nl/LC_MESSAGES/xfce-utils.mo
 share/locale/pa/LC_MESSAGES/xfce-utils.mo
 share/locale/pl/LC_MESSAGES/xfce-utils.mo
+share/locale/pt/LC_MESSAGES/xfce-utils.mo
 share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
-share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo
 share/locale/ro/LC_MESSAGES/xfce-utils.mo
 share/locale/ru/LC_MESSAGES/xfce-utils.mo
 share/locale/si/LC_MESSAGES/xfce-utils.mo
 share/locale/sk/LC_MESSAGES/xfce-utils.mo
+share/locale/sq/LC_MESSAGES/xfce-utils.mo
 share/locale/sv/LC_MESSAGES/xfce-utils.mo
 share/locale/ta/LC_MESSAGES/xfce-utils.mo
 share/locale/tr/LC_MESSAGES/xfce-utils.mo
@@ -73,6 +77,7 @@ share/xfce4/COPYING
 share/xfce4/GPL
 share/xfce4/INFO
 share/xfce4/INFO.ca
+share/xfce4/INFO.de
 share/xfce4/INFO.es
 share/xfce4/INFO.fi
 share/xfce4/INFO.fr
@@ -103,3 +108,4 @@ share/xfce4/doc/it/index.html
 share/xfce4/doc/xfce-chunk.css
 share/xfce4/doc/xfce-mouse.png
 share/xfce4/doc/xfce.css
+share/xsessions/xfce.desktop
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 4fe7ef7940e..52a0601f0c1 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,18 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.27 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2009/09/16 01:15:36 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-utils
 
 .if !defined(XFCE4_UTILS_BUILDLINK3_MK)
 XFCE4_UTILS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-utils?=	xfce4-utils>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif # XFCE4_UTILS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-utils
diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo
index c977d2cce4c..dc319a11a57 100644
--- a/x11/xfce4-utils/distinfo
+++ b/x11/xfce4-utils/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2008/12/17 12:50:04 hira Exp $
+$NetBSD: distinfo,v 1.20 2009/09/16 01:15:36 reed Exp $
 
-SHA1 (xfce-utils-4.4.3.tar.bz2) = 71290af79f63bb2511d27b0313ec4cd7bc4a81b4
-RMD160 (xfce-utils-4.4.3.tar.bz2) = 62c337cdd40aebe58abca4689a444ab3b5b3e1e6
-Size (xfce-utils-4.4.3.tar.bz2) = 644408 bytes
-SHA1 (patch-aa) = aff3c61c25944ae7e106cecc9e22a4f2f230741f
+SHA1 (xfce-utils-4.6.1.tar.bz2) = 0bdb5b6e494f15372d8c0826ac93baca476c9f16
+RMD160 (xfce-utils-4.6.1.tar.bz2) = 4446c3882716e841c00e398df62b9d54046b9d26
+Size (xfce-utils-4.6.1.tar.bz2) = 614143 bytes
+SHA1 (patch-aa) = 0bcfc2173ddb61d8ee04260fb99d57cd7f0704ba
diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa
index a9a1a87e175..221c9fa330d 100644
--- a/x11/xfce4-utils/patches/patch-aa
+++ b/x11/xfce4-utils/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.3 2007/12/07 19:43:32 martti Exp $
+$NetBSD: patch-aa,v 1.4 2009/09/16 01:15:36 reed Exp $
 
---- scripts/Makefile.in.orig	2007-12-04 10:55:10.000000000 +0000
-+++ scripts/Makefile.in	2007-12-04 10:55:21.000000000 +0000
-@@ -240,7 +240,7 @@
- 	-e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \
- 	-e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g'
+--- scripts/Makefile.in.orig	2009-02-25 22:27:44.000000000 +0000
++++ scripts/Makefile.in
+@@ -268,7 +268,7 @@ edit = sed \
+ 	-e "s,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g" \
+ 	-e "s,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g"
  
 -conffilesdir = @sysconfdir@/xdg/xfce4
 +conffilesdir = @datadir@/examples/xfce4
  conffiles_DATA = \
  	xinitrc \
  	Xft.xrdb
+@@ -276,7 +276,7 @@ conffiles_DATA = \
+ @XFCONF_MIGRATION_TRUE@migrationscriptdir = $(libexecdir)/xfce4/xfconf-migration
+ @XFCONF_MIGRATION_TRUE@migrationscript_in_files = xfconf-migration-4.6.pl.in
+ @XFCONF_MIGRATION_TRUE@migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl)
+-@XFCONF_MIGRATION_TRUE@autostartdir = $(sysconfdir)/xdg/autostart
++@XFCONF_MIGRATION_TRUE@autostartdir = $(datadir)/examples/xfce4/autostart
+ @XFCONF_MIGRATION_TRUE@autostart_in_files = xfconf-migration-4.6.desktop.in
+ @XFCONF_MIGRATION_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ EXTRA_DIST = \