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

4 files changed, 44 insertions, 45 deletions

diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 60856aae585..0727cd919b1 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.16 2008/12/18 13:45:58 hira Exp $
+# $NetBSD: Makefile,v 1.17 2009/09/16 01:15:35 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	libxfce4util-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce basic library
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-
 PKGCONFIG_OVERRIDE=	libxfce4util/libxfce4util-1.0.pc.in
 
+MAKE_DIRS+=	${PREFIX}/include/xfce4
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST
index ce53d18b47f..7deda984b84 100644
--- a/x11/libxfce4util/PLIST
+++ b/x11/libxfce4util/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:25:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/09/16 01:15:35 reed Exp $
 include/xfce4/libxfce4util/debug.h
 include/xfce4/libxfce4util/i18n.h
 include/xfce4/libxfce4util/libxfce4util-config.h
@@ -13,45 +13,49 @@ include/xfce4/libxfce4util/xfce-i18n.h
 include/xfce4/libxfce4util/xfce-kiosk.h
 include/xfce4/libxfce4util/xfce-license.h
 include/xfce4/libxfce4util/xfce-miscutils.h
+include/xfce4/libxfce4util/xfce-posix-signal-handler.h
 include/xfce4/libxfce4util/xfce-rc.h
 include/xfce4/libxfce4util/xfce-resource.h
 include/xfce4/libxfce4util/xfce-utf8.h
 lib/libxfce4util.la
 lib/pkgconfig/libxfce4util-1.0.pc
 sbin/xfce4-kiosk-query
-share/doc/libxfce4util/home.png
-share/doc/libxfce4util/index.html
-share/doc/libxfce4util/index.sgml
-share/doc/libxfce4util/left.png
-share/doc/libxfce4util/libxfce4util-Desktop-entries.html
-share/doc/libxfce4util/libxfce4util-File-Utilities.html
-share/doc/libxfce4util/libxfce4util-Internationalisation.html
-share/doc/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
-share/doc/libxfce4util/libxfce4util-Resource-Config-File-Support.html
-share/doc/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/doc/libxfce4util/libxfce4util-Software-Licenses.html
-share/doc/libxfce4util/libxfce4util-Unicode-Support-Functions.html
-share/doc/libxfce4util/libxfce4util-Version-Information.html
-share/doc/libxfce4util/libxfce4util-Xfce-Generics.html
-share/doc/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
-share/doc/libxfce4util/libxfce4util-core.html
-share/doc/libxfce4util/libxfce4util-datatypes.html
-share/doc/libxfce4util/libxfce4util-fundamentals.html
-share/doc/libxfce4util/libxfce4util-utilities.html
-share/doc/libxfce4util/libxfce4util.devhelp
-share/doc/libxfce4util/libxfce4util.devhelp2
-share/doc/libxfce4util/reference.html
-share/doc/libxfce4util/right.png
-share/doc/libxfce4util/style.css
-share/doc/libxfce4util/up.png
+share/gtk-doc/html/libxfce4util/home.png
+share/gtk-doc/html/libxfce4util/index.html
+share/gtk-doc/html/libxfce4util/index.sgml
+share/gtk-doc/html/libxfce4util/left.png
+share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
+share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-core.html
+share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
+share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
+share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
+share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
+share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2
+share/gtk-doc/html/libxfce4util/reference.html
+share/gtk-doc/html/libxfce4util/right.png
+share/gtk-doc/html/libxfce4util/style.css
+share/gtk-doc/html/libxfce4util/up.png
 share/locale/am/LC_MESSAGES/libxfce4util.mo
 share/locale/ar/LC_MESSAGES/libxfce4util.mo
 share/locale/ca/LC_MESSAGES/libxfce4util.mo
 share/locale/cs/LC_MESSAGES/libxfce4util.mo
 share/locale/cy/LC_MESSAGES/libxfce4util.mo
+share/locale/da/LC_MESSAGES/libxfce4util.mo
 share/locale/de/LC_MESSAGES/libxfce4util.mo
 share/locale/dz/LC_MESSAGES/libxfce4util.mo
 share/locale/en_GB/LC_MESSAGES/libxfce4util.mo
+share/locale/es/LC_MESSAGES/libxfce4util.mo
 share/locale/et/LC_MESSAGES/libxfce4util.mo
 share/locale/eu/LC_MESSAGES/libxfce4util.mo
 share/locale/fi/LC_MESSAGES/libxfce4util.mo
@@ -59,23 +63,23 @@ share/locale/fr/LC_MESSAGES/libxfce4util.mo
 share/locale/gl/LC_MESSAGES/libxfce4util.mo
 share/locale/he/LC_MESSAGES/libxfce4util.mo
 share/locale/id/LC_MESSAGES/libxfce4util.mo
-share/locale/it/LC_MESSAGES/libxfce4util.mo
 share/locale/ja/LC_MESSAGES/libxfce4util.mo
 share/locale/ka/LC_MESSAGES/libxfce4util.mo
 share/locale/ko/LC_MESSAGES/libxfce4util.mo
 share/locale/lt/LC_MESSAGES/libxfce4util.mo
 share/locale/lv/LC_MESSAGES/libxfce4util.mo
 share/locale/mk/LC_MESSAGES/libxfce4util.mo
-share/locale/nb_NO/LC_MESSAGES/libxfce4util.mo
+share/locale/nb/LC_MESSAGES/libxfce4util.mo
 share/locale/nl/LC_MESSAGES/libxfce4util.mo
 share/locale/pl/LC_MESSAGES/libxfce4util.mo
+share/locale/pt/LC_MESSAGES/libxfce4util.mo
 share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
-share/locale/pt_PT/LC_MESSAGES/libxfce4util.mo
 share/locale/ro/LC_MESSAGES/libxfce4util.mo
 share/locale/si/LC_MESSAGES/libxfce4util.mo
-share/locale/sk/LC_MESSAGES/libxfce4util.mo
+share/locale/sl/LC_MESSAGES/libxfce4util.mo
 share/locale/sq/LC_MESSAGES/libxfce4util.mo
-share/locale/th/LC_MESSAGES/libxfce4util.mo
+share/locale/sv/LC_MESSAGES/libxfce4util.mo
 share/locale/tr/LC_MESSAGES/libxfce4util.mo
 share/locale/uk/LC_MESSAGES/libxfce4util.mo
 share/locale/ur/LC_MESSAGES/libxfce4util.mo
+share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index e8ea79b240d..0cbd23a79fe 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,17 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/08/26 19:57:02 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2009/09/16 01:15:35 reed Exp $
 
 BUILDLINK_TREE+=	libxfce4util
 
 .if !defined(LIBXFCE4UTIL_BUILDLINK3_MK)
 LIBXFCE4UTIL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.libxfce4util?=	libxfce4util>=4.4.3nb1
+BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.6.0
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
 
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .endif # LIBXFCE4UTIL_BUILDLINK3_MK
 
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 5074289231c..b8fc9f050ef 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,5 +1,5 @@
-$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 (libxfce4util-4.4.3.tar.bz2) = 08e9d64e4c66ea2420a9a0ab678cf5a064585b37
-RMD160 (libxfce4util-4.4.3.tar.bz2) = 256f4e759562113be2dc82265752a218340deeda
-Size (libxfce4util-4.4.3.tar.bz2) = 390566 bytes
+SHA1 (libxfce4util-4.6.1.tar.bz2) = 6d14099aa095b2f5d9b6a4348968b741b9ad661d
+RMD160 (libxfce4util-4.6.1.tar.bz2) = e54d6c7291bbd7e658bc612b52b1c8d02c47d5ae
+Size (libxfce4util-4.6.1.tar.bz2) = 405327 bytes