Updated to Xfce 4.4.1

See http://www.xfce.org/documentation/changelogs/4.4.1 for details.

8 files changed, 26 insertions, 153 deletions

diff --git a/x11/xfce4-utils/MESSAGE b/x11/xfce4-utils/MESSAGE
index 47807c3d2c7..08929999385 100644
--- a/x11/xfce4-utils/MESSAGE
+++ b/x11/xfce4-utils/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/10/05 09:58:52 martti Exp $
+$NetBSD: MESSAGE,v 1.2 2007/04/12 09:55:26 martti Exp $
 
 You may want to install one of these packages:
 
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 763524eebf2..ef069436b29 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2007/01/23 17:42:27 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2007/04/12 09:55:26 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
-#PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce utilities
 
-
 PKG_SYSCONFSUBDIR=	xdg/xfce4
 EGDIR=			${XFCE4_EGBASE}
 CONF_FILES=		${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc
@@ -16,15 +14,12 @@ USE_TOOLS+=		xinit:run
 
 REQD_DIRS+=		${EGDIR}
 
+BUILD_DEFS+=		PKG_SYSCONFBASE
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 .include "options.mk"
 
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST
index 94fb74474fc..b2f473e4b53 100644
--- a/x11/xfce4-utils/PLIST
+++ b/x11/xfce4-utils/PLIST
@@ -1,18 +1,14 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:48 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:26 martti Exp $
 bin/startxfce4
+bin/xfbrowser4
 bin/xfce4-about
 bin/xfhelp4
 bin/xflock4
 bin/xfmountdev4
 bin/xfrun4
-bin/xftaskbar4
 bin/xfterm4
-lib/xfce4/mcs-plugins/xftaskbar_plugin.la
-share/applications/xfce-taskbar-settings.desktop
 share/examples/xfce4/xinitrc
 share/icons/hicolor/48x48/apps/xfce4-logo.png
-share/icons/hicolor/48x48/apps/xfce4-taskbar.png
-share/icons/hicolor/scalable/apps/xfce4-taskbar.svg
 share/locale/af/LC_MESSAGES/xfce-utils.mo
 share/locale/ar/LC_MESSAGES/xfce-utils.mo
 share/locale/az/LC_MESSAGES/xfce-utils.mo
@@ -21,8 +17,8 @@ share/locale/bg/LC_MESSAGES/xfce-utils.mo
 share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
 share/locale/ca/LC_MESSAGES/xfce-utils.mo
 share/locale/cs/LC_MESSAGES/xfce-utils.mo
-share/locale/da/LC_MESSAGES/xfce-utils.mo
 share/locale/de/LC_MESSAGES/xfce-utils.mo
+share/locale/dz/LC_MESSAGES/xfce-utils.mo
 share/locale/el/LC_MESSAGES/xfce-utils.mo
 share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
 share/locale/eo/LC_MESSAGES/xfce-utils.mo
@@ -33,6 +29,7 @@ share/locale/eu/LC_MESSAGES/xfce-utils.mo
 share/locale/fa/LC_MESSAGES/xfce-utils.mo
 share/locale/fi/LC_MESSAGES/xfce-utils.mo
 share/locale/fr/LC_MESSAGES/xfce-utils.mo
+share/locale/gl/LC_MESSAGES/xfce-utils.mo
 share/locale/gu/LC_MESSAGES/xfce-utils.mo
 share/locale/he/LC_MESSAGES/xfce-utils.mo
 share/locale/hi/LC_MESSAGES/xfce-utils.mo
@@ -40,9 +37,10 @@ share/locale/hu/LC_MESSAGES/xfce-utils.mo
 share/locale/hy/LC_MESSAGES/xfce-utils.mo
 share/locale/it/LC_MESSAGES/xfce-utils.mo
 share/locale/ja/LC_MESSAGES/xfce-utils.mo
+share/locale/ka/LC_MESSAGES/xfce-utils.mo
 share/locale/ko/LC_MESSAGES/xfce-utils.mo
-share/locale/ku/LC_MESSAGES/xfce-utils.mo
 share/locale/lt/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/nl/LC_MESSAGES/xfce-utils.mo
@@ -53,8 +51,6 @@ 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/sk/LC_MESSAGES/xfce-utils.mo
-share/locale/sl/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
@@ -63,71 +59,20 @@ share/locale/vi/LC_MESSAGES/xfce-utils.mo
 share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
 share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
 share/xfce4/AUTHORS
-share/xfce4/AUTHORS.az
-share/xfce4/AUTHORS.ca
-share/xfce4/AUTHORS.de
-share/xfce4/AUTHORS.es
-share/xfce4/AUTHORS.eu
-share/xfce4/AUTHORS.fi
-share/xfce4/AUTHORS.fr
-share/xfce4/AUTHORS.he
-share/xfce4/AUTHORS.html
-share/xfce4/AUTHORS.html.az
-share/xfce4/AUTHORS.html.ca
-share/xfce4/AUTHORS.html.de
-share/xfce4/AUTHORS.html.es
-share/xfce4/AUTHORS.html.eu
-share/xfce4/AUTHORS.html.fi
-share/xfce4/AUTHORS.html.fr
-share/xfce4/AUTHORS.html.it
-share/xfce4/AUTHORS.html.ja
-share/xfce4/AUTHORS.html.lt
-share/xfce4/AUTHORS.html.ro
-share/xfce4/AUTHORS.html.ru
-share/xfce4/AUTHORS.html.sk
-share/xfce4/AUTHORS.html.vi
-share/xfce4/AUTHORS.html.zh_TW
-share/xfce4/AUTHORS.it
-share/xfce4/AUTHORS.ja
-share/xfce4/AUTHORS.lt
-share/xfce4/AUTHORS.ro
-share/xfce4/AUTHORS.ru
-share/xfce4/AUTHORS.sk
-share/xfce4/AUTHORS.uk
-share/xfce4/AUTHORS.vi
-share/xfce4/AUTHORS.zh_TW
 share/xfce4/BSD
-share/xfce4/BSD.html
 share/xfce4/COPYING
-share/xfce4/COPYING.html
-share/xfce4/COPYING.vi
 share/xfce4/GPL
-share/xfce4/GPL.html
 share/xfce4/INFO
 share/xfce4/INFO.ca
 share/xfce4/INFO.es
 share/xfce4/INFO.fi
 share/xfce4/INFO.fr
-share/xfce4/INFO.html
-share/xfce4/INFO.html.ca
-share/xfce4/INFO.html.de
-share/xfce4/INFO.html.es
-share/xfce4/INFO.html.fi
-share/xfce4/INFO.html.fr
-share/xfce4/INFO.html.it
-share/xfce4/INFO.html.ja
-share/xfce4/INFO.html.lt
-share/xfce4/INFO.html.ro
-share/xfce4/INFO.html.ru
 share/xfce4/INFO.it
 share/xfce4/INFO.ja
-share/xfce4/INFO.lt
-share/xfce4/INFO.ro
 share/xfce4/INFO.ru
 share/xfce4/INFO.uk
 share/xfce4/INFO.vi
 share/xfce4/LGPL
-share/xfce4/LGPL.html
 share/xfce4/doc/C/BSD.html
 share/xfce4/doc/C/GPL.html
 share/xfce4/doc/C/LGPL.html
@@ -144,38 +89,8 @@ share/xfce4/doc/C/xfce4-install.html
 share/xfce4/doc/C/xfce4-intro.html
 share/xfce4/doc/C/xfce4-use.html
 share/xfce4/doc/C/xfce4-user-guide.html
-share/xfce4/doc/fr/BSD.html
-share/xfce4/doc/fr/GPL.html
-share/xfce4/doc/fr/LGPL.html
-share/xfce4/doc/fr/images/about-dialog.png
-share/xfce4/doc/fr/images/default-session.png
-share/xfce4/doc/fr/images/link_xfce.jpg
-share/xfce4/doc/fr/images/run-dialog.png
-share/xfce4/doc/fr/images/taskbar_settings.png
 share/xfce4/doc/fr/index.html
-share/xfce4/doc/fr/xfce-utils.html
-share/xfce4/doc/fr/xfce4-components.html
-share/xfce4/doc/fr/xfce4-copyright.html
-share/xfce4/doc/fr/xfce4-install.html
-share/xfce4/doc/fr/xfce4-intro.html
-share/xfce4/doc/fr/xfce4-use.html
-share/xfce4/doc/fr/xfce4-user-guide.html
-share/xfce4/doc/he/BSD.html
-share/xfce4/doc/he/GPL.html
-share/xfce4/doc/he/LGPL.html
-share/xfce4/doc/he/images/about-dialog.png
-share/xfce4/doc/he/images/default-session.png
-share/xfce4/doc/he/images/link_xfce.jpg
-share/xfce4/doc/he/images/run-dialog.png
-share/xfce4/doc/he/images/taskbar_settings.png
-share/xfce4/doc/he/index.html
-share/xfce4/doc/he/xfce-utils.html
-share/xfce4/doc/he/xfce4-components.html
-share/xfce4/doc/he/xfce4-copyright.html
-share/xfce4/doc/he/xfce4-install.html
-share/xfce4/doc/he/xfce4-intro.html
-share/xfce4/doc/he/xfce4-use.html
-share/xfce4/doc/he/xfce4-user-guide.html
+share/xfce4/doc/it/index.html
+share/xfce4/doc/xfce-chunk.css
 share/xfce4/doc/xfce-mouse.png
-share/xfce4/doc/xfce-rtl.css
 share/xfce4/doc/xfce.css
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 9ecc6b0fac5..f220fbc109f 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2007/01/23 11:53:48 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2007/04/12 09:55:26 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -12,12 +12,13 @@ BUILDLINK_PACKAGES+=	xfce4-utils
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-utils
 
 .if ${XFCE4_UTILS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.4.1
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 .endif	# XFCE4_UTILS_BUILDLINK3_MK
 
 .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"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo
index 52c801a3b31..867fcd7f6e2 100644
--- a/x11/xfce4-utils/distinfo
+++ b/x11/xfce4-utils/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.16 2007/01/23 11:53:48 martti Exp $
+$NetBSD: distinfo,v 1.17 2007/04/12 09:55:26 martti Exp $
 
-SHA1 (xfce-utils-4.2.4.tar.gz) = eebc2f5ea2de22d6afab259476feb4f0e5cc54c2
-RMD160 (xfce-utils-4.2.4.tar.gz) = e415bebb909dfcc382e9b261378eb60d7bad6f00
-Size (xfce-utils-4.2.4.tar.gz) = 1295235 bytes
-SHA1 (patch-aa) = deafbcd8b3c367d377aa25416c9d25043f907e60
-SHA1 (patch-ab) = 39c4fd41775cefc4cc2f10bc86060d9bbcc7b795
-SHA1 (patch-ac) = 5eb98ebc693c677dbd1e39efbf6016fb3fbf5f90
+SHA1 (xfce-utils-4.4.1.tar.bz2) = 69ab30d45bbe252993f783e2f4d7f184226cacbb
+RMD160 (xfce-utils-4.4.1.tar.bz2) = 65ed96acb6491829d0f97e8b1e4b5cba64a73e63
+Size (xfce-utils-4.4.1.tar.bz2) = 608154 bytes
+SHA1 (patch-aa) = 9fba43b9ee2314743b19c0b72bd1a67ecb92ee29
diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa
index b57ffe0c515..a91f41fe58d 100644
--- a/x11/xfce4-utils/patches/patch-aa
+++ b/x11/xfce4-utils/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2005/06/15 09:04:32 hira Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:26 martti Exp $
 
---- scripts/Makefile.in.orig	2005-06-13 18:05:51.000000000 +0900
-+++ scripts/Makefile.in	2005-06-13 18:07:08.000000000 +0900
-@@ -233,7 +233,7 @@
-         -e 's,@sysconfdir\@,$(sysconfdir),g' \
- 	-e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g'
+--- scripts/Makefile.in.orig	2006-11-05 11:08:43.000000000 +0000
++++ scripts/Makefile.in	2006-11-06 12:47:55.000000000 +0000
+@@ -239,7 +239,7 @@
+ 	-e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \
+ 	-e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g'
  
 -conffilesdir = @sysconfdir@/xdg/xfce4
 +conffilesdir = @datadir@/examples/xfce4
diff --git a/x11/xfce4-utils/patches/patch-ab b/x11/xfce4-utils/patches/patch-ab
deleted file mode 100644
index 31352f30591..00000000000
--- a/x11/xfce4-utils/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/03/20 06:29:09 martti Exp $
-
---- scripts/xinitrc.orig	2005-11-05 19:03:34.000000000 +0200
-+++ scripts/xinitrc	2006-03-20 06:20:23.000000000 +0200
-@@ -1,8 +1,17 @@
- #!/bin/sh
- 
- # fix broken $UID on some system...
-+OPSYS=`uname -s`
-+case "$OPSYS" in
-+	*SunOS*)
-+		ID_EXEC=/usr/xpg4/bin/id
-+		;;
-+	*)
-+		ID_EXEC=id
-+		;;
-+esac
- if test "x$UID" = "x"; then
--	UID=`id -u`
-+	UID=`$ID_EXEC -u`
- fi
- 
- # create temp file for X resources
diff --git a/x11/xfce4-utils/patches/patch-ac b/x11/xfce4-utils/patches/patch-ac
deleted file mode 100644
index c838e09147c..00000000000
--- a/x11/xfce4-utils/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/12/12 06:19:34 martti Exp $
-
---- xfce4-about/info.c.orig	2006-12-12 08:11:49.000000000 +0000
-+++ xfce4-about/info.c	2006-12-12 08:12:02.000000000 +0000
-@@ -140,7 +140,7 @@
-     gchar *path;
-     gchar *hfilename;
-     gchar *buf;
--    int n;
-+    gsize n;
- 
-     err = NULL;
-