Updated XFce to 4.0.3

- Leak in window manager's pixmap management
- Various file manager fixes
- Translation updates
- Support for KDE system tray was added

10 files changed, 21 insertions, 25 deletions

diff --git a/sysutils/xfce4-fm-icons/Makefile b/sysutils/xfce4-fm-icons/Makefile
index 3c7bdd1ab1b..99f2a365302 100644
--- a/sysutils/xfce4-fm-icons/Makefile
+++ b/sysutils/xfce4-fm-icons/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/08 08:11:41 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	4.0.0
-
 PKGNAME=	xfce4-fm-icons-${XFCE4_VERSION}
-PKREVISION=	2
 DISTNAME=	xffm-icons-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager icons
 
diff --git a/sysutils/xfce4-fm-icons/buildlink2.mk b/sysutils/xfce4-fm-icons/buildlink2.mk
index d14295f0da9..fc15b9dc372 100644
--- a/sysutils/xfce4-fm-icons/buildlink2.mk
+++ b/sysutils/xfce4-fm-icons/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/01/08 08:11:41 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-fm-icons.
 #
@@ -9,7 +9,7 @@
 XFCE4_FM_ICONS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-fm-icons
-BUILDLINK_DEPENDS.xfce4-fm-icons?=		xfce4-fm-icons>=4.0.0nb1
+BUILDLINK_DEPENDS.xfce4-fm-icons?=		xfce4-fm-icons>=4.0.3
 BUILDLINK_PKGSRCDIR.xfce4-fm-icons?=		../../sysutils/xfce4-fm-icons
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-fm-icons=xfce4-fm-icons
diff --git a/sysutils/xfce4-fm-icons/distinfo b/sysutils/xfce4-fm-icons/distinfo
index 81f41cb66bf..c6029a6021f 100644
--- a/sysutils/xfce4-fm-icons/distinfo
+++ b/sysutils/xfce4-fm-icons/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/12/22 08:50:39 martti Exp $
+$NetBSD: distinfo,v 1.3 2004/01/08 08:11:41 martti Exp $
 
-SHA1 (xffm-icons-4.0.0.tar.gz) = bf91f0d845d54034885ec8834bc1e9b77b81c001
-Size (xffm-icons-4.0.0.tar.gz) = 4799290 bytes
+SHA1 (xffm-icons-4.0.3.tar.gz) = a44f65c94a37c9fa1aee4a26092f2ac80e9dbdce
+Size (xffm-icons-4.0.3.tar.gz) = 4799552 bytes
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index c1b4d8340ca..79bc56143ac 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/08 08:11:41 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xffm-${XFCE4_VERSION}
 PKGNAME=	xfce4-fm-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager
 
diff --git a/sysutils/xfce4-fm/PLIST b/sysutils/xfce4-fm/PLIST
index 821de726ce2..21b4374a2b6 100644
--- a/sysutils/xfce4-fm/PLIST
+++ b/sysutils/xfce4-fm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/22 08:50:39 martti Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/01/08 08:11:41 martti Exp $
 bin/fgr
 bin/scramble
 bin/xfapps
@@ -76,6 +76,8 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xffm.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xffm.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xffm.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xffm.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xffm.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xffm.mo
 ${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xffm.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xffm.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xffm.mo
diff --git a/sysutils/xfce4-fm/buildlink2.mk b/sysutils/xfce4-fm/buildlink2.mk
index a550c7af25d..f430d405bef 100644
--- a/sysutils/xfce4-fm/buildlink2.mk
+++ b/sysutils/xfce4-fm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/01/08 08:11:41 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-fm.
 #
@@ -9,7 +9,7 @@
 XFCE4_FM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-fm
-BUILDLINK_DEPENDS.xfce4-fm?=		xfce4-fm>=4.0.2nb1
+BUILDLINK_DEPENDS.xfce4-fm?=		xfce4-fm>=4.0.3
 BUILDLINK_PKGSRCDIR.xfce4-fm?=		../../sysutils/xfce4-fm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-fm=xfce4-fm
diff --git a/sysutils/xfce4-fm/distinfo b/sysutils/xfce4-fm/distinfo
index 669a104bb8c..2eeac62372a 100644
--- a/sysutils/xfce4-fm/distinfo
+++ b/sysutils/xfce4-fm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/12/22 08:50:39 martti Exp $
+$NetBSD: distinfo,v 1.4 2004/01/08 08:11:41 martti Exp $
 
-SHA1 (xffm-4.0.2.tar.gz) = 5bed30a458ad687a84a7f9d06440e81e20a70f4c
-Size (xffm-4.0.2.tar.gz) = 1438399 bytes
+SHA1 (xffm-4.0.3.tar.gz) = 46be2f9fd138446dbb5ec02430d0b9ba0a7691af
+Size (xffm-4.0.3.tar.gz) = 1501305 bytes
diff --git a/sysutils/xfce4-systray/Makefile b/sysutils/xfce4-systray/Makefile
index 10d1d7bf07a..580e4b1244e 100644
--- a/sysutils/xfce4-systray/Makefile
+++ b/sysutils/xfce4-systray/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/08 08:11:41 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-systray-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	XFce4 systray plugin
 
diff --git a/sysutils/xfce4-systray/buildlink2.mk b/sysutils/xfce4-systray/buildlink2.mk
index 2e8abda0ad3..2e9c38524d4 100644
--- a/sysutils/xfce4-systray/buildlink2.mk
+++ b/sysutils/xfce4-systray/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/01/08 08:11:41 martti Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-systray.
 #
@@ -9,7 +9,7 @@
 XFCE4_SYSTRAY_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-systray
-BUILDLINK_DEPENDS.xfce4-systray?=		xfce4-systray>=4.0.2nb1
+BUILDLINK_DEPENDS.xfce4-systray?=		xfce4-systray>=4.0.3
 BUILDLINK_PKGSRCDIR.xfce4-systray?=		../../sysutils/xfce4-systray
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-systray=xfce4-systray
diff --git a/sysutils/xfce4-systray/distinfo b/sysutils/xfce4-systray/distinfo
index 7c08ed87412..4f5f8ff7bc5 100644
--- a/sysutils/xfce4-systray/distinfo
+++ b/sysutils/xfce4-systray/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/12/22 08:50:40 martti Exp $
+$NetBSD: distinfo,v 1.4 2004/01/08 08:11:41 martti Exp $
 
-SHA1 (xfce4-systray-4.0.2.tar.gz) = 52a3d10230a7e115cb5d54e98eae5d67df077e37
-Size (xfce4-systray-4.0.2.tar.gz) = 299517 bytes
+SHA1 (xfce4-systray-4.0.3.tar.gz) = daf18a16596042a493d9781656970d091d02762a
+Size (xfce4-systray-4.0.3.tar.gz) = 299653 bytes