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

7 files changed, 80 insertions, 125 deletions

diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index a15028494ae..9e258078dcb 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/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:35 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,33 +6,39 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Xfce desktop background manager
 
-PKG_SYSCONFSUBDIR=	xdg/xfce4/desktop
-EGDIR=			${XFCE4_EGBASE}/desktop
-CONF_FILES=		${EGDIR:Q}/menu.xml ${PKG_SYSCONFDIR:Q}/menu.xml
-.for l in ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR pt_PT ro ru sk \
-	sv uk vi zh_TW
-CONF_FILES+=		${EGDIR:Q}/menu.xml.${l:Q} \
-			${PKG_SYSCONFDIR:Q}/menu.xml.${l:Q}
-.endfor
-CONF_FILES+=		${EGDIR:Q}/xfce-registered-categories.xml \
-			${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml
-.for l in ca cs de el es eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW
-CONF_FILES+=		${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \
-			${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml.${l:Q}
-.endfor
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
-
-REQD_DIRS+=		${XFCE4_EGBASE:Q} ${EGDIR:Q}
-BUILD_DEFS+=		PKG_SYSCONFBASE
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 
+BUILD_DEFS+=	PKG_SYSCONFBASE
+
+PKG_SYSCONFSUBDIR=	xdg/menus
+
+OWN_DIRS+=	${PKG_SYSCONFDIR}
+MAKE_DIRS+=	${PREFIX}/lib/xfce4 ${PREFIX}/libexec/xfce4
+MAKE_DIRS+=	${PREFIX}/libexec/panel-plugins ${XFCE4_EGBASE:Q}
+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/da
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/ja ${PREFIX}/share/xfce4/doc/ja/images
+MAKE_DIRS+=	${PREFIX}/share/xfce4/panel-plugins
+
+CONF_FILES=	${XFCE4_EGBASE:Q}/menus/xfce-applications.menu \
+		${PKG_SYSCONFDIR}/xfce-applications.menu
+
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
+.include "../../devel/xfconf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/xfce4-thunar/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4menu/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/xfce4-exo/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index b38df50f021..51ea08f43b5 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,68 +1,31 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 22:06:42 joerg Exp $
-bin/xfce4-menueditor
+@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $
 bin/xfce4-popup-menu
 bin/xfdesktop
-lib/xfce4/mcs-plugins/backdrop_settings.la
+bin/xfdesktop-settings
 lib/xfce4/modules/xfce4_desktop_menu.la
 libexec/xfce4/panel-plugins/xfce4-menu-plugin
 man/man1/xfdesktop.1
 share/applications/xfce-backdrop-settings.desktop
-share/applications/xfce-menueditor.desktop
-share/examples/xfce4/desktop/menu.xml
-share/examples/xfce4/desktop/menu.xml.be
-share/examples/xfce4/desktop/menu.xml.ca
-share/examples/xfce4/desktop/menu.xml.cs
-share/examples/xfce4/desktop/menu.xml.da
-share/examples/xfce4/desktop/menu.xml.de
-share/examples/xfce4/desktop/menu.xml.el
-share/examples/xfce4/desktop/menu.xml.es
-share/examples/xfce4/desktop/menu.xml.et
-share/examples/xfce4/desktop/menu.xml.eu
-share/examples/xfce4/desktop/menu.xml.fi
-share/examples/xfce4/desktop/menu.xml.fr
-share/examples/xfce4/desktop/menu.xml.he
-share/examples/xfce4/desktop/menu.xml.hu
-share/examples/xfce4/desktop/menu.xml.it
-share/examples/xfce4/desktop/menu.xml.ja
-share/examples/xfce4/desktop/menu.xml.ko
-share/examples/xfce4/desktop/menu.xml.nb_NO
-share/examples/xfce4/desktop/menu.xml.nl
-share/examples/xfce4/desktop/menu.xml.pa
-share/examples/xfce4/desktop/menu.xml.pl
-share/examples/xfce4/desktop/menu.xml.pt_BR
-share/examples/xfce4/desktop/menu.xml.pt_PT
-share/examples/xfce4/desktop/menu.xml.ro
-share/examples/xfce4/desktop/menu.xml.ru
-share/examples/xfce4/desktop/menu.xml.sk
-share/examples/xfce4/desktop/menu.xml.sv
-share/examples/xfce4/desktop/menu.xml.tr
-share/examples/xfce4/desktop/menu.xml.uk
-share/examples/xfce4/desktop/menu.xml.vi
-share/examples/xfce4/desktop/menu.xml.zh_TW
-share/examples/xfce4/desktop/xfce-registered-categories.xml
-share/examples/xfce4/desktop/xfce-registered-categories.xml.ca
-share/examples/xfce4/desktop/xfce-registered-categories.xml.cs
-share/examples/xfce4/desktop/xfce-registered-categories.xml.de
-share/examples/xfce4/desktop/xfce-registered-categories.xml.el
-share/examples/xfce4/desktop/xfce-registered-categories.xml.es
-share/examples/xfce4/desktop/xfce-registered-categories.xml.eu
-share/examples/xfce4/desktop/xfce-registered-categories.xml.fi
-share/examples/xfce4/desktop/xfce-registered-categories.xml.fr
-share/examples/xfce4/desktop/xfce-registered-categories.xml.he
-share/examples/xfce4/desktop/xfce-registered-categories.xml.hu
-share/examples/xfce4/desktop/xfce-registered-categories.xml.it
-share/examples/xfce4/desktop/xfce-registered-categories.xml.ja
-share/examples/xfce4/desktop/xfce-registered-categories.xml.nb_NO
-share/examples/xfce4/desktop/xfce-registered-categories.xml.nl
-share/examples/xfce4/desktop/xfce-registered-categories.xml.pl
-share/examples/xfce4/desktop/xfce-registered-categories.xml.pt_BR
-share/examples/xfce4/desktop/xfce-registered-categories.xml.ro
-share/examples/xfce4/desktop/xfce-registered-categories.xml.ru
-share/examples/xfce4/desktop/xfce-registered-categories.xml.sk
-share/examples/xfce4/desktop/xfce-registered-categories.xml.sv
-share/examples/xfce4/desktop/xfce-registered-categories.xml.tr
-share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN
-share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW
+share/applications/xfce4-about-xfce.desktop
+share/applications/xfce4-file-manager.desktop
+share/applications/xfce4-help.desktop
+share/applications/xfce4-logout.desktop
+share/applications/xfce4-run-program.desktop
+share/applications/xfce4-terminal.desktop
+share/applications/xfce4-web-browser.desktop
+share/desktop-directories/xfce-accessories.directory
+share/desktop-directories/xfce-development.directory
+share/desktop-directories/xfce-education.directory
+share/desktop-directories/xfce-games.directory
+share/desktop-directories/xfce-graphics.directory
+share/desktop-directories/xfce-multimedia.directory
+share/desktop-directories/xfce-network.directory
+share/desktop-directories/xfce-office.directory
+share/desktop-directories/xfce-other.directory
+share/desktop-directories/xfce-screensavers.directory
+share/desktop-directories/xfce-settings.directory
+share/desktop-directories/xfce-system.directory
+share/examples/xfce4/menus/xfce-applications.menu
 share/icons/hicolor/32x32/apps/xfce4-backdrop.png
 share/icons/hicolor/32x32/apps/xfce4-menueditor.png
 share/icons/hicolor/48x48/apps/xfce4-backdrop.png
@@ -106,15 +69,16 @@ share/locale/lv/LC_MESSAGES/xfdesktop.mo
 share/locale/mk/LC_MESSAGES/xfdesktop.mo
 share/locale/mr/LC_MESSAGES/xfdesktop.mo
 share/locale/ms/LC_MESSAGES/xfdesktop.mo
-share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo
+share/locale/nb/LC_MESSAGES/xfdesktop.mo
 share/locale/nl/LC_MESSAGES/xfdesktop.mo
 share/locale/pa/LC_MESSAGES/xfdesktop.mo
 share/locale/pl/LC_MESSAGES/xfdesktop.mo
+share/locale/pt/LC_MESSAGES/xfdesktop.mo
 share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
-share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
 share/locale/ro/LC_MESSAGES/xfdesktop.mo
 share/locale/ru/LC_MESSAGES/xfdesktop.mo
 share/locale/sk/LC_MESSAGES/xfdesktop.mo
+share/locale/sq/LC_MESSAGES/xfdesktop.mo
 share/locale/sv/LC_MESSAGES/xfdesktop.mo
 share/locale/ta/LC_MESSAGES/xfdesktop.mo
 share/locale/tr/LC_MESSAGES/xfdesktop.mo
@@ -130,7 +94,6 @@ share/pixmaps/xfce4_xicon2.png
 share/pixmaps/xfce4_xicon3.png
 share/pixmaps/xfce4_xicon4.png
 share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
-share/xfce4-menueditor/xfce4-menueditor.ui
 share/xfce4/backdrops/flower.png
 share/xfce4/backdrops/xfce-in-a-grid.png
 share/xfce4/backdrops/xfce-in-the-moon.png
@@ -148,6 +111,7 @@ share/xfce4/doc/C/images/xfdesktop-behavior-tab.png
 share/xfce4/doc/C/images/xfdesktop-editor.png
 share/xfce4/doc/C/images/xfdesktop-list.png
 share/xfce4/doc/C/xfdesktop.html
+share/xfce4/doc/da/xfdesktop.html
 share/xfce4/doc/fr/images/root_menu.png
 share/xfce4/doc/fr/images/root_menu2.png
 share/xfce4/doc/fr/images/select_bg_color.png
@@ -156,4 +120,11 @@ share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png
 share/xfce4/doc/fr/images/xfdesktop-editor.png
 share/xfce4/doc/fr/images/xfdesktop-list.png
 share/xfce4/doc/fr/xfdesktop.html
+share/xfce4/doc/ja/images/root_menu.png
+share/xfce4/doc/ja/images/root_menu2.png
+share/xfce4/doc/ja/images/select_bg_color.png
+share/xfce4/doc/ja/images/xfdesktop-background-tab.png
+share/xfce4/doc/ja/images/xfdesktop-icons-tab.png
+share/xfce4/doc/ja/images/xfdesktop-menus-tab.png
+share/xfce4/doc/ja/xfdesktop.html
 share/xfce4/panel-plugins/xfce4-menu.desktop
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index 8d0dbf38e2e..13d3ac8824b 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2009/09/16 01:15:35 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-desktop
 
 .if !defined(XFCE4_DESKTOP_BUILDLINK3_MK)
 XFCE4_DESKTOP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-desktop?=	xfce4-desktop>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/xfce4-thunar/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif # XFCE4_DESKTOP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-desktop
diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo
index b1b24d0f544..2a50f17c981 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2008/12/17 12:50:03 hira Exp $
+$NetBSD: distinfo,v 1.20 2009/09/16 01:15:35 reed Exp $
 
-SHA1 (xfdesktop-4.4.3.tar.bz2) = 6ba60fd7f8f57104195e3e17551315d0c3c2381e
-RMD160 (xfdesktop-4.4.3.tar.bz2) = 490749cc579a30ea3689ab65c099d284ecffff56
-Size (xfdesktop-4.4.3.tar.bz2) = 3095897 bytes
-SHA1 (patch-aa) = 72eb8d6810d0a680f49fa03f45a73fe4f124d02d
-SHA1 (patch-ab) = 0816049644f48d4057b20d32f88629552216f5fc
+SHA1 (xfdesktop-4.6.1.tar.bz2) = c2c1b54acaae924077caa3cdffe449e3bb34b2bd
+RMD160 (xfdesktop-4.6.1.tar.bz2) = 86785f706a65e443c5521179b68309b9aca0cb32
+Size (xfdesktop-4.6.1.tar.bz2) = 3671378 bytes
+SHA1 (patch-ac) = 1d63ec32443690ac989a88704079999894a67ad5
diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa
deleted file mode 100644
index 214c2bd2498..00000000000
--- a/x11/xfce4-desktop/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/12/07 19:43:27 martti Exp $
-
---- Makefile.in.orig	2007-11-17 19:52:57.000000000 +0000
-+++ Makefile.in	2007-12-04 13:28:52.000000000 +0000
-@@ -314,7 +314,7 @@
- 	modules \
- 	pixmaps
- 
--confdir = $(sysconfdir)/xdg/xfce4/desktop
-+confdir = $(datadir)/examples/xfce4/desktop
- conf_DATA = \
- 	menu.xml	\
- 	menu.xml.be	\
diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab
deleted file mode 100644
index 9ef1c37f9b2..00000000000
--- a/x11/xfce4-desktop/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/12/07 19:43:27 martti Exp $
-
---- modules/menu/Makefile.in.orig	2007-11-17 19:52:57.000000000 +0000
-+++ modules/menu/Makefile.in	2007-12-04 13:29:15.000000000 +0000
-@@ -337,7 +337,7 @@
- 	$(LIBX11_LIBS) \
- 	$(LIBXFCEGUI4_LIBS)
- 
--xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop
-+xfceconfdir = $(datadir)/examples/xfce4/desktop
- xfceconf_DATA = \
- 	xfce-registered-categories.xml \
- 	xfce-registered-categories.xml.ca \
diff --git a/x11/xfce4-desktop/patches/patch-ac b/x11/xfce4-desktop/patches/patch-ac
new file mode 100644
index 00000000000..637db20cc5e
--- /dev/null
+++ b/x11/xfce4-desktop/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2009/09/16 01:15:33 reed Exp $
+
+--- modules/menu/menu-data/Makefile.in.orig	2009-03-09 11:13:35.000000000 +0000
++++ modules/menu/menu-data/Makefile.in
+@@ -291,7 +291,7 @@ desktop_in_files = \
+ 	xfce4-web-browser.desktop.in
+ 
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-menudir = $(sysconfdir)/xdg/menus
++menudir = $(datadir)/examples/xfce4/menus
+ menu_DATA = xfce-applications.menu
+ EXTRA_DIST = $(desktop_in_files) $(menu_DATA)
+ DISTCLEANFILES = $(desktop_DATA)