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, 81 insertions, 91 deletions

diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 28598309d72..e5a04ada149 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,45 +1,42 @@
-# $NetBSD: Makefile,v 1.34 2009/08/26 19:57:02 sno Exp $
+# $NetBSD: Makefile,v 1.35 2009/09/16 01:15:35 reed Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
-.include "../../mk/compiler.mk"
 
 DISTNAME=		xfce4-panel-${XFCE4_VERSION}
-PKGREVISION=		2
 CATEGORIES=		x11
 COMMENT=		Xfce panel
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-
-PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
+PKGCONFIG_OVERRIDE=	libxfce4panel/libxfce4panel-1.0.pc.in
 PTHREAD_AUTO_VARS=	yes
 
-OWN_DIRS+=		xdg/xfce4
-OWN_DIRS+=		xdg/xfce4/panel
 PKG_SYSCONFSUBDIR=	xdg/xfce4/panel
 EGDIR=			${XFCE4_EGBASE}/panel
+
+MAKE_DIRS+=	${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4
+MAKE_DIRS+=	${XFCE4_EGBASE:Q} ${PREFIX}/share/xfce4
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc ${PREFIX}/share/xfce4/doc/C
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/C/images
+OWN_DIRS+=	${PKG_SYSCONFDIR}
+OWN_DIRS+=	${PREFIX}/libexec/xfce4/panel-plugins
+# The following are not used in this pkg, but here is a good place to rmdir them
+MAKE_DIRS+=	${PREFIX}/libexec/xfce4
+OWN_DIRS+=	${PREFIX}/share/xfce4/panel-plugins
+
 .for f in clock-14.rc launcher-10.rc launcher-7.rc launcher-8.rc launcher-9.rc \
 	panels.xml systray-4.rc xfce4-menu-5.rc
-CONF_FILES+=		${EGDIR:Q}/$f ${PKG_SYSCONFDIR:Q}/$f
+CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-# If using gcc-4, compile the panel launcher without GCC optimization. See
-# http://bugzilla.xfce.org/show_bug.cgi?id=2262
-
-.if (!empty(CC_VERSION:Mgcc-4.*))
-SUBST_CLASSES+=		launcher
-SUBST_STAGE.launcher=	post-configure
-SUBST_FILES.launcher=	plugins/launcher/Makefile
-SUBST_SED.launcher=	-e 's|-O |-O0 |g'
-SUBST_SED.launcher+=	-e 's|-O[123s] |-O0 |g'
-.endif
-
-post-install:
-	@${ECHO} "Removing the dummy files"
-	rm -f ${PREFIX}/bin/xfce4-iconbox ${PREFIX}/bin/xftaskbar4
-
+.include "../../devel/libwnck/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/xfce4-exo/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index 12b2483cf7c..48381de7592 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 22:06:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $
 bin/xfce4-panel
 bin/xfce4-popup-windowlist
+include/xfce4/libxfce4panel/libxfce4panel-enum-types.h
+include/xfce4/libxfce4panel/libxfce4panel.h
 include/xfce4/libxfce4panel/xfce-arrow-button.h
 include/xfce4/libxfce4panel/xfce-hvbox.h
 include/xfce4/libxfce4panel/xfce-itembar.h
 include/xfce4/libxfce4panel/xfce-panel-convenience.h
-include/xfce4/libxfce4panel/xfce-panel-enum-types.h
 include/xfce4/libxfce4panel/xfce-panel-enums.h
 include/xfce4/libxfce4panel/xfce-panel-external-plugin.h
 include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h
@@ -15,7 +16,6 @@ include/xfce4/libxfce4panel/xfce-panel-plugin.h
 include/xfce4/libxfce4panel/xfce-panel-window.h
 lib/libxfce4panel.la
 lib/pkgconfig/libxfce4panel-1.0.pc
-lib/xfce4/mcs-plugins/libxfce4settings.la
 lib/xfce4/panel-plugins/libactions.la
 lib/xfce4/panel-plugins/libclock.la
 lib/xfce4/panel-plugins/libiconbox.la
@@ -35,34 +35,43 @@ share/examples/xfce4/panel/launcher-9.rc
 share/examples/xfce4/panel/panels.xml
 share/examples/xfce4/panel/systray-4.rc
 share/examples/xfce4/panel/xfce4-menu-5.rc
-share/doc/libxfce4panel/XfceArrowButton.html
-share/doc/libxfce4panel/XfceExternalPanelPlugin.html
-share/doc/libxfce4panel/XfceHVBox.html
-share/doc/libxfce4panel/XfceInternalPanelPlugin.html
-share/doc/libxfce4panel/XfceItembar.html
-share/doc/libxfce4panel/XfcePanelPlugin.html
-share/doc/libxfce4panel/XfcePanelWindow.html
-share/doc/libxfce4panel/ch01.html
-share/doc/libxfce4panel/home.png
-share/doc/libxfce4panel/index.html
-share/doc/libxfce4panel/index.sgml
-share/doc/libxfce4panel/left.png
-share/doc/libxfce4panel/libxfce4panel-Convenience-Functions.html
-share/doc/libxfce4panel/libxfce4panel-Standard-Enumerations.html
-share/doc/libxfce4panel/libxfce4panel-Writing-Plugins.html
-share/doc/libxfce4panel/libxfce4panel.devhelp
-share/doc/libxfce4panel/libxfce4panel.devhelp2
-share/doc/libxfce4panel/right.png
-share/doc/libxfce4panel/style.css
-share/doc/libxfce4panel/up.png
+share/gtk-doc/html/libxfce4panel/XfceArrowButton.html
+share/gtk-doc/html/libxfce4panel/XfceExternalPanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfceHVBox.html
+share/gtk-doc/html/libxfce4panel/XfceInternalPanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfceItembar.html
+share/gtk-doc/html/libxfce4panel/XfcePanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfcePanelWindow.html
+share/gtk-doc/html/libxfce4panel/home.png
+share/gtk-doc/html/libxfce4panel/index.html
+share/gtk-doc/html/libxfce4panel/index.sgml
+share/gtk-doc/html/libxfce4panel/ix01.html
+share/gtk-doc/html/libxfce4panel/ix02.html
+share/gtk-doc/html/libxfce4panel/left.png
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Common-macros.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Convenience-Widgets.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Register-Plugins.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Standard-Enumerations.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-fundamentals.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-panel.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-widgets.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp
+share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp2
+share/gtk-doc/html/libxfce4panel/right.png
+share/gtk-doc/html/libxfce4panel/style.css
+share/gtk-doc/html/libxfce4panel/up.png
 share/icons/hicolor/16x16/apps/xfce-system-exit.png
-share/icons/hicolor/16x16/apps/xfce-system-info.png
 share/icons/hicolor/16x16/apps/xfce-system-lock.png
-share/icons/hicolor/16x16/apps/xfce-system-settings.png
-share/icons/hicolor/48x48/apps/xfce-mail.png
+share/icons/hicolor/16x16/apps/xfce4-panel.png
+share/icons/hicolor/22x22/apps/xfce4-panel.png
+share/icons/hicolor/24x24/apps/xfce4-panel.png
+share/icons/hicolor/32x32/apps/xfce4-panel.png
 share/icons/hicolor/48x48/apps/xfce-mouse.png
+share/icons/hicolor/48x48/apps/xfce4-clock.png
 share/icons/hicolor/48x48/apps/xfce4-iconbox.png
 share/icons/hicolor/48x48/apps/xfce4-panel.png
+share/icons/hicolor/48x48/apps/xfce4-separator.png
+share/icons/hicolor/48x48/apps/xfce4-systray.png
 share/icons/hicolor/48x48/apps/xfce4-taskbar.png
 share/locale/am/LC_MESSAGES/xfce4-panel.mo
 share/locale/ar/LC_MESSAGES/xfce4-panel.mo
@@ -96,21 +105,23 @@ share/locale/it/LC_MESSAGES/xfce4-panel.mo
 share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ka/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
+share/locale/ku/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
 share/locale/lv/LC_MESSAGES/xfce4-panel.mo
 share/locale/mk/LC_MESSAGES/xfce4-panel.mo
 share/locale/mr/LC_MESSAGES/xfce4-panel.mo
 share/locale/ms/LC_MESSAGES/xfce4-panel.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
+share/locale/nb/LC_MESSAGES/xfce4-panel.mo
 share/locale/nl/LC_MESSAGES/xfce4-panel.mo
 share/locale/pa/LC_MESSAGES/xfce4-panel.mo
 share/locale/pl/LC_MESSAGES/xfce4-panel.mo
+share/locale/pt/LC_MESSAGES/xfce4-panel.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
 share/locale/ro/LC_MESSAGES/xfce4-panel.mo
 share/locale/ru/LC_MESSAGES/xfce4-panel.mo
 share/locale/si/LC_MESSAGES/xfce4-panel.mo
 share/locale/sk/LC_MESSAGES/xfce4-panel.mo
+share/locale/sq/LC_MESSAGES/xfce4-panel.mo
 share/locale/sv/LC_MESSAGES/xfce4-panel.mo
 share/locale/ta/LC_MESSAGES/xfce4-panel.mo
 share/locale/tr/LC_MESSAGES/xfce4-panel.mo
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index d13d7c784a8..5d06fc723ef 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,20 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.24 2009/08/26 19:57:02 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:35 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-panel
 
 .if !defined(XFCE4_PANEL_BUILDLINK3_MK)
 XFCE4_PANEL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-panel?=	xfce4-panel>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 .endif # XFCE4_PANEL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-panel
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index f2e0414337a..1b454ad660a 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.18 2008/12/17 12:50:03 hira Exp $
+$NetBSD: distinfo,v 1.19 2009/09/16 01:15:35 reed Exp $
 
-SHA1 (xfce4-panel-4.4.3.tar.bz2) = 6af98ffef4906220c5ffdda17a77409adc7ed353
-RMD160 (xfce4-panel-4.4.3.tar.bz2) = 39c05602e82d3bdeaa152b3820e2f084df6c3759
-Size (xfce4-panel-4.4.3.tar.bz2) = 777979 bytes
-SHA1 (patch-aa) = 0d44c64af2ab3cc5605dfb08baa75d78843af28f
-SHA1 (patch-ab) = c5b1ccf61528bb11aebf63805586621dad4649d1
+SHA1 (xfce4-panel-4.6.1.tar.bz2) = 613c66f6402feba7983a7effb008f091182350d2
+RMD160 (xfce4-panel-4.6.1.tar.bz2) = 47ce1703306e7427d300bb3675e2e8dcd13c459e
+Size (xfce4-panel-4.6.1.tar.bz2) = 868225 bytes
+SHA1 (patch-ab) = 977b38f4e58620b96d28ef2b9992a03169eb7814
diff --git a/x11/xfce4-panel/patches/patch-aa b/x11/xfce4-panel/patches/patch-aa
deleted file mode 100644
index 57cf0252154..00000000000
--- a/x11/xfce4-panel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/03/25 16:13:52 macallan Exp $
-
---- panel/panel-properties.c.orig	2008-03-25 11:45:01.000000000 -0400
-+++ panel/panel-properties.c
-@@ -623,7 +623,7 @@ _set_transparent (Panel    *panel, 
-                   gboolean  transparent)
- {
-     PanelPrivate *priv;
--    guint         opacity;
-+    gulong        opacity;
- 
-     if (!GTK_WIDGET (panel)->window)
-         return;
diff --git a/x11/xfce4-panel/patches/patch-ab b/x11/xfce4-panel/patches/patch-ab
index ef586d510e5..1f810b9bd5a 100644
--- a/x11/xfce4-panel/patches/patch-ab
+++ b/x11/xfce4-panel/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2008/12/17 12:50:03 hira Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:32 reed Exp $
 
---- config/Makefile.in.orig	2008-11-29 18:20:58.000000000 +0900
-+++ config/Makefile.in	2008-11-29 18:21:29.000000000 +0900
-@@ -254,7 +254,7 @@
- 	launcher-10.rc.in
+--- config/Makefile.in.orig	2009-02-24 21:39:18.000000000 +0000
++++ config/Makefile.in
+@@ -263,7 +263,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ confdir = \
+-	$(sysconfdir)/xdg/xfce4/panel
++	$(datadir)/examples/xfce4/panel
  
- conf_files = $(conf_in_files:.rc.in=.rc)
--confdir = $(sysconfdir)/xdg/xfce4/panel
-+confdir = $(datadir)/examples/xfce4/panel
- conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files)
- EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files)
- all: all-am
+ conf_in_files = \
+ 	launcher-7.rc.in						\