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, 70 insertions, 60 deletions

diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index b994d1786f9..cb3af8daa3a 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,32 +1,46 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:35 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=		xfce4-session-${XFCE4_VERSION}
-PKGREVISION=		3
 CATEGORIES=		x11
 COMMENT=		Xfce session manager
 
-EGDIR=			${XFCE4_EGBASE}/session
-CONF_FILES=		${EGDIR:Q}/xfce4-session.rc \
-			${PKG_SYSCONFDIR:Q}/xdg/xfce4-session/xfce4-session.rc
-CONF_FILES+= ${PREFIX}/share/xdg/autostart/xfce4-tips-autostart.desktop \
-	     ${PKG_SYSCONFDIR:Q}/xdg/autostart/xfce4-tips-autostart.desktop
+PKGCONFIG_OVERRIDE+=	libxfsm/xfce4-session-2.0.pc.in
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	ICEAUTH=${TOOLS_PATH.iceauth:Q}
-
-REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR} ${PREFIX}/share/xdg/autostart
 BUILD_DEFS+=		PKG_SYSCONFBASE
 
-OWN_DIRS+=              ${PKG_SYSCONFDIR}/xdg
-OWN_DIRS+=              ${PKG_SYSCONFDIR}/xdg/xfce4-session
-OWN_DIRS+=              ${PKG_SYSCONFDIR}/xdg/autostart
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	ICEAUTH=${TOOLS_PATH.iceauth}
 
 USE_TOOLS+=		iceauth:run
 
+EGDIR=			${XFCE4_EGBASE}
+PKG_SYSCONFSUBDIR=	xdg
+
+MAKE_DIRS+=	${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/autostart
+MAKE_DIRS+=	${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4
+MAKE_DIRS+=	${EGDIR} ${EGDIR}/autostart ${EGDIR}/xfconf
+MAKE_DIRS+=	${EGDIR}/xfconf/xfce-perchannel-xml
+MAKE_DIRS+=	${EGDIR}/share/themes/Default
+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/fr/images
+
+CONF_FILES=	${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \
+	${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+CONF_FILES+=	${EGDIR}/autostart/xfce4-tips-autostart.desktop \
+		${PKG_SYSCONFDIR}/autostart/xfce4-tips-autostart.desktop
+
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
+.include "../../devel/xfconf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index 3090da2ad99..4e087e769d8 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,14 +1,12 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 22:06:43 joerg Exp $
-bin/xfce4-autostart-editor
+@comment $NetBSD: PLIST,v 1.15 2009/09/16 01:15:36 reed Exp $
 bin/xfce4-session
 bin/xfce4-session-logout
+bin/xfce4-session-settings
 bin/xfce4-tips
-include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
-include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
-lib/libxfsm-4.2.la
-lib/pkgconfig/xfce4-session-1.0.pc
-lib/xfce4/mcs-plugins/session_settings.la
-lib/xfce4/mcs-plugins/splash_settings.la
+include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h
+include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h
+lib/libxfsm-4.6.la
+lib/pkgconfig/xfce4-session-2.0.pc
 lib/xfce4/splash/engines/libbalou.la
 lib/xfce4/splash/engines/libmice.la
 lib/xfce4/splash/engines/libsimple.la
@@ -18,16 +16,17 @@ libexec/xfsm-shutdown-helper
 man/man1/xfce4-session-logout.1
 man/man1/xfce4-session.1
 share/applications/xfce-session-settings.desktop
-share/applications/xfce-splash-settings.desktop
-share/applications/xfce4-autostart-editor.desktop
-share/examples/xfce4/session/xfce4-session.rc
+share/examples/xfce4/autostart/xfce4-tips-autostart.desktop
+share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 share/icons/hicolor/128x128/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png
 share/icons/hicolor/48x48/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-splash.png
+share/icons/hicolor/48x48/apps/xfsm-hibernate.png
 share/icons/hicolor/48x48/apps/xfsm-logout.png
 share/icons/hicolor/48x48/apps/xfsm-reboot.png
 share/icons/hicolor/48x48/apps/xfsm-shutdown.png
+share/icons/hicolor/48x48/apps/xfsm-suspend.png
 share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
 share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
 share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
@@ -63,22 +62,22 @@ share/locale/it/LC_MESSAGES/xfce4-session.mo
 share/locale/ja/LC_MESSAGES/xfce4-session.mo
 share/locale/ka/LC_MESSAGES/xfce4-session.mo
 share/locale/ko/LC_MESSAGES/xfce4-session.mo
-share/locale/ku/LC_MESSAGES/xfce4-session.mo
 share/locale/lt/LC_MESSAGES/xfce4-session.mo
 share/locale/lv/LC_MESSAGES/xfce4-session.mo
 share/locale/mk/LC_MESSAGES/xfce4-session.mo
 share/locale/mr/LC_MESSAGES/xfce4-session.mo
 share/locale/ms/LC_MESSAGES/xfce4-session.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo
+share/locale/nb/LC_MESSAGES/xfce4-session.mo
 share/locale/nl/LC_MESSAGES/xfce4-session.mo
 share/locale/pa/LC_MESSAGES/xfce4-session.mo
 share/locale/pl/LC_MESSAGES/xfce4-session.mo
+share/locale/pt/LC_MESSAGES/xfce4-session.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo
 share/locale/ro/LC_MESSAGES/xfce4-session.mo
 share/locale/ru/LC_MESSAGES/xfce4-session.mo
 share/locale/si/LC_MESSAGES/xfce4-session.mo
 share/locale/sk/LC_MESSAGES/xfce4-session.mo
+share/locale/sq/LC_MESSAGES/xfce4-session.mo
 share/locale/sv/LC_MESSAGES/xfce4-session.mo
 share/locale/ta/LC_MESSAGES/xfce4-session.mo
 share/locale/tr/LC_MESSAGES/xfce4-session.mo
@@ -89,7 +88,6 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
 share/themes/Default/balou/logo.png
 share/themes/Default/balou/themerc
-share/xdg/autostart/xfce4-tips-autostart.desktop
 share/xfce4/doc/C/images/xfsm-advanced.png
 share/xfce4/doc/C/images/xfsm-general.png
 share/xfce4/doc/C/images/xfsm-splash.png
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index 7e1cb8f8fe9..3ffbd0c7986 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,18 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/09/16 01:15:36 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-session
 
 .if !defined(XFCE4_SESSION_BUILDLINK3_MK)
 XFCE4_SESSION_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.4.3nb2
-BUILDLINK_ABI_DEPENDS.xfce4-session?=	xfce4-session>=4.4.3nb3
+BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 
-.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"
+.include "../../devel/xfconf/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
 .endif # XFCE4_SESSION_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-session
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 2b50170454f..bf378ebe382 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2008/12/19 23:58:18 hira Exp $
+$NetBSD: distinfo,v 1.12 2009/09/16 01:15:36 reed Exp $
 
-SHA1 (xfce4-session-4.4.3.tar.bz2) = 609cf888548e1dc7f2b2318698ab86ac73fb0f4d
-RMD160 (xfce4-session-4.4.3.tar.bz2) = e0aa16b9089ae00a34f5e1df5b1b9af7a104f922
-Size (xfce4-session-4.4.3.tar.bz2) = 1276089 bytes
-SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195
-SHA1 (patch-ab) = d87076b003dd7e7ee74251199d4a1af0a5c5a355
+SHA1 (xfce4-session-4.6.1.tar.bz2) = 760e05bf73783521b3ce34e91aa187c74018ab8c
+RMD160 (xfce4-session-4.6.1.tar.bz2) = 0cab4a0ca2b0d7718cde546d98bac1c87a7ba4f0
+Size (xfce4-session-4.6.1.tar.bz2) = 1365247 bytes
+SHA1 (patch-ab) = f1c7a041a91f91a56ac7c8cf64e74a203be905f5
+SHA1 (patch-ac) = 549dccc70ae31f14291d3bf2c191ad8379139c63
diff --git a/x11/xfce4-session/patches/patch-aa b/x11/xfce4-session/patches/patch-aa
deleted file mode 100644
index af69a182f1d..00000000000
--- a/x11/xfce4-session/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:24 martti Exp $
-
---- Makefile.in.orig	2006-07-10 12:12:02.000000000 +0000
-+++ Makefile.in	2006-07-14 09:28:20.000000000 +0000
-@@ -278,7 +278,7 @@
- 	xfce4-tips							\
- 	xfsm-shutdown-helper
- 
--configdir = $(sysconfdir)/xdg/xfce4-session
-+configdir = $(datadir)/examples/xfce4/session
- config_DATA = xfce4-session.rc
- EXTRA_DIST = \
- 	BUGS								\
diff --git a/x11/xfce4-session/patches/patch-ab b/x11/xfce4-session/patches/patch-ab
index 0b11449f41d..59043a5e889 100644
--- a/x11/xfce4-session/patches/patch-ab
+++ b/x11/xfce4-session/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2008/12/19 23:58:18 hira Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:33 reed Exp $
 
---- xfce4-tips/Makefile.in.orig	2008-12-20 08:38:59.000000000 +0900
-+++ xfce4-tips/Makefile.in	2008-12-20 08:39:31.000000000 +0900
-@@ -299,7 +299,7 @@
+--- xfce4-tips/Makefile.in.orig	2009-02-25 20:29:50.000000000 +0000
++++ xfce4-tips/Makefile.in
+@@ -309,7 +309,7 @@ xfce4_tips_CFLAGS = \
  xfce4_tips_LDADD = \
  	@LIBXFCEGUI4_LIBS@
  
 -desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/xdg/autostart
++desktopdir = $(datadir)/examples/xfce4/autostart
  desktop_in_files = xfce4-tips-autostart.desktop.in
  desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
  EXTRA_DIST = \
diff --git a/x11/xfce4-session/patches/patch-ac b/x11/xfce4-session/patches/patch-ac
new file mode 100644
index 00000000000..019de5feb4d
--- /dev/null
+++ b/x11/xfce4-session/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/09/16 01:15:33 reed Exp $
+
+--- settings/Makefile.in.orig	2009-02-25 20:29:49.000000000 +0000
++++ settings/Makefile.in
+@@ -334,7 +334,7 @@ xfce4_session_settings_LDADD = \
+ xfce4_session_settings_DEPENDENCIES = \
+ 	$(top_builddir)/libxfsm/libxfsm-4.6.la
+ 
+-settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
++settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml
+ settings_DATA = xfce4-session.xml
+ desktopdir = $(datadir)/applications
+ desktop_in_files = xfce-session-settings.desktop.in