summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/libxfce4gui/Makefile5
-rw-r--r--x11/libxfce4gui/PLIST76
-rw-r--r--x11/libxfce4gui/buildlink3.mk5
-rw-r--r--x11/libxfce4gui/distinfo6
-rw-r--r--x11/libxfce4mcs/Makefile3
-rw-r--r--x11/libxfce4mcs/PLIST14
-rw-r--r--x11/libxfce4mcs/buildlink3.mk5
-rw-r--r--x11/libxfce4mcs/distinfo6
-rw-r--r--x11/libxfce4util/Makefile3
-rw-r--r--x11/libxfce4util/PLIST39
-rw-r--r--x11/libxfce4util/buildlink3.mk5
-rw-r--r--x11/libxfce4util/distinfo6
-rw-r--r--x11/xfce4-desktop/Makefile6
-rw-r--r--x11/xfce4-desktop/PLIST92
-rw-r--r--x11/xfce4-desktop/buildlink3.mk4
-rw-r--r--x11/xfce4-desktop/distinfo6
-rw-r--r--x11/xfce4-gtk2-engines/Makefile6
-rw-r--r--x11/xfce4-gtk2-engines/PLIST21
-rw-r--r--x11/xfce4-gtk2-engines/buildlink3.mk4
-rw-r--r--x11/xfce4-gtk2-engines/distinfo6
-rw-r--r--x11/xfce4-mcs-manager/Makefile3
-rw-r--r--x11/xfce4-mcs-manager/PLIST31
-rw-r--r--x11/xfce4-mcs-manager/buildlink3.mk4
-rw-r--r--x11/xfce4-mcs-manager/distinfo6
-rw-r--r--x11/xfce4-mcs-plugins/Makefile3
-rw-r--r--x11/xfce4-mcs-plugins/PLIST39
-rw-r--r--x11/xfce4-mcs-plugins/buildlink3.mk4
-rw-r--r--x11/xfce4-mcs-plugins/distinfo6
-rw-r--r--x11/xfce4-menueditor/DESCR1
-rw-r--r--x11/xfce4-menueditor/Makefile20
-rw-r--r--x11/xfce4-menueditor/PLIST3
-rw-r--r--x11/xfce4-menueditor/buildlink3.mk22
-rw-r--r--x11/xfce4-menueditor/distinfo4
-rw-r--r--x11/xfce4-panel/Makefile3
-rw-r--r--x11/xfce4-panel/PLIST254
-rw-r--r--x11/xfce4-panel/buildlink3.mk4
-rw-r--r--x11/xfce4-panel/distinfo6
-rw-r--r--x11/xfce4-themes/DESCR1
-rw-r--r--x11/xfce4-themes/Makefile12
-rw-r--r--x11/xfce4-themes/PLIST117
-rw-r--r--x11/xfce4-themes/buildlink3.mk22
-rw-r--r--x11/xfce4-themes/distinfo4
-rw-r--r--x11/xfce4-toys/Makefile3
-rw-r--r--x11/xfce4-toys/PLIST19
-rw-r--r--x11/xfce4-toys/buildlink3.mk4
-rw-r--r--x11/xfce4-toys/distinfo6
-rw-r--r--x11/xfce4-trigger-launcher/Makefile4
-rw-r--r--x11/xfce4-trigger-launcher/PLIST17
-rw-r--r--x11/xfce4-trigger-launcher/buildlink3.mk4
-rw-r--r--x11/xfce4-trigger-launcher/distinfo6
-rw-r--r--x11/xfce4-utils/Makefile3
-rw-r--r--x11/xfce4-utils/PLIST75
-rw-r--r--x11/xfce4-utils/buildlink3.mk4
-rw-r--r--x11/xfce4-utils/distinfo6
54 files changed, 465 insertions, 573 deletions
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index 234183733c9..d0718aa47af 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/17 12:56:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= libxfcegui4-${XFCE4_VERSION}
PKGNAME= libxfce4gui-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 widget library
PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in
+.include "../../databases/dbh/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/libxfce4util/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST
index e9f1defe304..d335033b1fd 100644
--- a/x11/libxfce4gui/PLIST
+++ b/x11/libxfce4gui/PLIST
@@ -1,11 +1,35 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:10:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/01/17 12:56:13 martti Exp $
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libxfcegui4.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo
include/xfce4/libxfcegui4/dialogs.h
include/xfce4/libxfcegui4/gtk_style.h
include/xfce4/libxfcegui4/gtktoxevent.h
include/xfce4/libxfcegui4/icons.h
include/xfce4/libxfcegui4/libnetk.h
+include/xfce4/libxfcegui4/libxfcegui4-config.h
include/xfce4/libxfcegui4/libxfcegui4.h
include/xfce4/libxfcegui4/netk-application.h
+include/xfce4/libxfcegui4/netk-class-group.h
include/xfce4/libxfcegui4/netk-enum-types.h
include/xfce4/libxfcegui4/netk-marshal.h
include/xfce4/libxfcegui4/netk-pager.h
@@ -13,11 +37,20 @@ include/xfce4/libxfcegui4/netk-screen.h
include/xfce4/libxfcegui4/netk-tasklist.h
include/xfce4/libxfcegui4/netk-trayicon.h
include/xfce4/libxfcegui4/netk-util.h
+include/xfce4/libxfcegui4/netk-window-action-menu.h
include/xfce4/libxfcegui4/netk-window-menu.h
include/xfce4/libxfcegui4/netk-window.h
include/xfce4/libxfcegui4/netk-workspace.h
include/xfce4/libxfcegui4/preview_filesel.h
include/xfce4/libxfcegui4/session-client.h
+include/xfce4/libxfcegui4/xfce-appmenuitem.h
+include/xfce4/libxfcegui4/xfce-colorbutton.h
+include/xfce4/libxfcegui4/xfce-exec.h
+include/xfce4/libxfcegui4/xfce-filechooser.h
+include/xfce4/libxfcegui4/xfce-gdk-extensions.h
+include/xfce4/libxfcegui4/xfce-gtk-extensions.h
+include/xfce4/libxfcegui4/xfce-icontheme.h
+include/xfce4/libxfcegui4/xfce_aboutdialog.h
include/xfce4/libxfcegui4/xfce_clock.h
include/xfce4/libxfcegui4/xfce_decorbutton.h
include/xfce4/libxfcegui4/xfce_decortoggle.h
@@ -30,6 +63,47 @@ include/xfce4/libxfcegui4/xfce_scaled_image.h
include/xfce4/libxfcegui4/xfce_systemtray.h
include/xfce4/libxfcegui4/xfce_togglebutton.h
include/xfce4/libxfcegui4/xinerama.h
+include/xfce4/xfce4-modules/combo.h
+include/xfce4/xfce4-modules/constants.h
+include/xfce4/xfce4-modules/mime.h
+include/xfce4/xfce4-modules/mime_icons.h
lib/libxfcegui4.la
lib/pkgconfig/libxfcegui4-1.0.pc
+lib/xfce4/modules/libxfce4_combo.la
+lib/xfce4/modules/libxfce4_mime.la
+lib/xfce4/modules/libxfce4_mime_icons.la
+share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
+share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
+share/gtk-doc/html/libxfcegui4/XfceFramebox.html
+share/gtk-doc/html/libxfcegui4/XfceIconTheme.html
+share/gtk-doc/html/libxfcegui4/home.png
+share/gtk-doc/html/libxfcegui4/index.html
+share/gtk-doc/html/libxfcegui4/index.sgml
+share/gtk-doc/html/libxfcegui4/left.png
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
+share/gtk-doc/html/libxfcegui4/reference.html
+share/gtk-doc/html/libxfcegui4/right.png
+share/gtk-doc/html/libxfcegui4/up.png
+share/xfce4/hicolor-index.theme
+share/xfce4/mime/applications.xml
+share/xfce4/mime/freedesktop.org.xml
+share/xfce4/mime/gnome.mime.xml
+share/xfce4/mime/hicolor.mime.xml
+share/xfce4/mime/types.xml
+share/xfce4/mime/xfce.org.xml
+share/xfce4/xfce-svg-test.svg
+@dirrm include/xfce4/xfce4-modules
@dirrm include/xfce4/libxfcegui4
+@dirrm lib/xfce4/modules
+@dirrm lib/xfce4
+@dirrm share/gtk-doc/html/libxfcegui4
+@dirrm share/xfce4/mime
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 5ed06b35f33..0298ee3f342 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4gui}
BUILDLINK_PACKAGES+= libxfce4gui
.if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4gui+= libxfce4gui>=4.0.6
-BUILDLINK_RECOMMENDED.libxfce4gui+= libxfce4gui>=4.0.6nb1
+BUILDLINK_DEPENDS.libxfce4gui+= libxfce4gui>=4.2.0
BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui
.endif # LIBXFCE4GUI_BUILDLINK3_MK
diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo
index e5f6f01b374..98af11ff1b0 100644
--- a/x11/libxfce4gui/distinfo
+++ b/x11/libxfce4gui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $
-SHA1 (libxfcegui4-4.0.6.tar.gz) = 15ea22d08b600c4b08be97b5397151c4c8d98097
-Size (libxfcegui4-4.0.6.tar.gz) = 443253 bytes
+SHA1 (libxfcegui4-4.2.0.tar.gz) = 89ccadf493bab68b04a38fcf9dcc3c33d9bf7617
+Size (libxfcegui4-4.2.0.tar.gz) = 827660 bytes
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 5057a42326b..d36f7a2be03 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/17 12:56:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= libxfce4mcs-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 settings management library
diff --git a/x11/libxfce4mcs/PLIST b/x11/libxfce4mcs/PLIST
index 33c6eb08d66..3c554c05e91 100644
--- a/x11/libxfce4mcs/PLIST
+++ b/x11/libxfce4mcs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:10:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/17 12:56:13 martti Exp $
include/xfce4/libxfce4mcs/mcs-client.h
include/xfce4/libxfce4mcs/mcs-common.h
include/xfce4/libxfce4mcs/mcs-manager.h
@@ -6,4 +6,16 @@ lib/libxfce4mcs-client.la
lib/libxfce4mcs-manager.la
lib/pkgconfig/libxfce4mcs-client-1.0.pc
lib/pkgconfig/libxfce4mcs-manager-1.0.pc
+share/gtk-doc/html/libxfce4mcs/ch01.html
+share/gtk-doc/html/libxfce4mcs/home.png
+share/gtk-doc/html/libxfce4mcs/index.html
+share/gtk-doc/html/libxfce4mcs/index.sgml
+share/gtk-doc/html/libxfce4mcs/left.png
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-client.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
+share/gtk-doc/html/libxfce4mcs/libxfce4mcs.devhelp
+share/gtk-doc/html/libxfce4mcs/right.png
+share/gtk-doc/html/libxfce4mcs/up.png
+@dirrm share/gtk-doc/html/libxfce4mcs
@dirrm include/xfce4/libxfce4mcs
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index 381f636ba33..58cc67b529d 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4mcs}
BUILDLINK_PACKAGES+= libxfce4mcs
.if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.0.6
-BUILDLINK_RECOMMENDED.libxfce4mcs+= libxfce4mcs>=4.0.6nb1
+BUILDLINK_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.2.0
BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs
.endif # LIBXFCE4MCS_BUILDLINK3_MK
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index d8bd152d801..33d11d4f954 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $
-SHA1 (libxfce4mcs-4.0.6.tar.gz) = fd19dbec87eaddb3693603b5c20dd7f6ceda7181
-Size (libxfce4mcs-4.0.6.tar.gz) = 330016 bytes
+SHA1 (libxfce4mcs-4.2.0.tar.gz) = f26d6d6c127b91bcb80246f07a2ba7ecc04c725b
+Size (libxfce4mcs-4.2.0.tar.gz) = 369645 bytes
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index a5b3da83ef7..7f59bbe7e07 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/17 12:56:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= libxfce4util-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 basic library
diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST
index a49f57104a5..f33da3f2675 100644
--- a/x11/libxfce4util/PLIST
+++ b/x11/libxfce4util/PLIST
@@ -1,19 +1,50 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:10:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/17 12:56:13 martti Exp $
include/xfce4/libxfce4util/debug.h
include/xfce4/libxfce4util/i18n.h
-include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/libxfce4util-config.h
+include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/utf8.h
include/xfce4/libxfce4util/util.h
+include/xfce4/libxfce4util/xfce-desktopentry.h
+include/xfce4/libxfce4util/xfce-fileutils.h
+include/xfce4/libxfce4util/xfce-generics.h
+include/xfce4/libxfce4util/xfce-kiosk.h
+include/xfce4/libxfce4util/xfce-miscutils.h
+include/xfce4/libxfce4util/xfce-rc.h
+include/xfce4/libxfce4util/xfce-resource.h
lib/libxfce4util.la
lib/pkgconfig/libxfce4util-1.0.pc
-share/xfce4/i18n/nls.alias
+sbin/xfce4-kiosk-query
+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-Resource-Config-File-Support.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Standard-Macros.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.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/reference.html
+share/gtk-doc/html/libxfce4util/right.png
+share/gtk-doc/html/libxfce4util/up.png
share/xfce4/m4/X11.m4
share/xfce4/m4/debug.m4
share/xfce4/m4/depends.m4
share/xfce4/m4/i18n.m4
@dirrm include/xfce4/libxfce4util
@dirrm include/xfce4
-@dirrm share/xfce4/i18n
@dirrm share/xfce4/m4
@dirrm share/xfce4
+@dirrm share/gtk-doc/html/libxfce4util
+@unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || ${TRUE}
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 9fd25f0bb18..37a0a6bee41 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxfce4util}
BUILDLINK_PACKAGES+= libxfce4util
.if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4util+= libxfce4util>=4.0.6
-BUILDLINK_RECOMMENDED.libxfce4util+= libxfce4util>=4.0.6nb1
+BUILDLINK_DEPENDS.libxfce4util+= libxfce4util>=4.2.0
BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util
.endif # LIBXFCE4UTIL_BUILDLINK3_MK
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 8b37232ffb7..1a10bc750f0 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $
-SHA1 (libxfce4util-4.0.6.tar.gz) = 68f59c1631d17d67442c7b4c70999e16af0e8afe
-Size (libxfce4util-4.0.6.tar.gz) = 314842 bytes
+SHA1 (libxfce4util-4.2.0.tar.gz) = 011d4c73c8a6ae9b80dc30e00378768b459c85a1
+Size (libxfce4util-4.2.0.tar.gz) = 447408 bytes
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 4246712c674..841255b2481 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfdesktop-${XFCE4_VERSION}
PKGNAME= xfce4-desktop-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 desktop background manager
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index d78b5bb2afb..2aa8fd0114a 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,33 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:07 jlam Exp $
-bin/xfdesktop
-etc/xfce4/menu.xml
-etc/xfce4/menu.xml.az
-etc/xfce4/menu.xml.ca
-etc/xfce4/menu.xml.de
-etc/xfce4/menu.xml.fr
-etc/xfce4/menu.xml.hu
-etc/xfce4/menu.xml.it
-etc/xfce4/menu.xml.nl
-etc/xfce4/menu.xml.ta
-etc/xfce4/menu.xml.tr
-etc/xfce4/menu.xml.vi
-etc/xfce4/menu.xml.zh_CN
-etc/xfce4/menu.xml.zh_TW
-lib/xfce4/mcs-plugins/backdrop_settings.la
-lib/xfce4/mcs-plugins/workspaces_settings.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:13 martti Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfdesktop.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfdesktop.mo
@@ -35,12 +23,15 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/nb_NO/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfdesktop.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfdesktop.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfdesktop.mo
@@ -48,8 +39,59 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
+bin/xfce4-menueditor
+bin/xfdesktop
+etc/xdg/xfce4/desktop/menu.xml
+etc/xdg/xfce4/desktop/menu.xml.az
+etc/xdg/xfce4/desktop/menu.xml.ca
+etc/xdg/xfce4/desktop/menu.xml.de
+etc/xdg/xfce4/desktop/menu.xml.es
+etc/xdg/xfce4/desktop/menu.xml.et
+etc/xdg/xfce4/desktop/menu.xml.eu
+etc/xdg/xfce4/desktop/menu.xml.fa_IR
+etc/xdg/xfce4/desktop/menu.xml.fr
+etc/xdg/xfce4/desktop/menu.xml.he
+etc/xdg/xfce4/desktop/menu.xml.hu
+etc/xdg/xfce4/desktop/menu.xml.ko
+etc/xdg/xfce4/desktop/menu.xml.ms
+etc/xdg/xfce4/desktop/menu.xml.nl
+etc/xdg/xfce4/desktop/menu.xml.pt_BR
+etc/xdg/xfce4/desktop/menu.xml.ro
+etc/xdg/xfce4/desktop/menu.xml.ru
+etc/xdg/xfce4/desktop/menu.xml.sk
+etc/xdg/xfce4/desktop/menu.xml.ta
+etc/xdg/xfce4/desktop/menu.xml.tr
+etc/xdg/xfce4/desktop/menu.xml.uk
+etc/xdg/xfce4/desktop/menu.xml.vi
+etc/xdg/xfce4/desktop/menu.xml.zh_CN
+etc/xdg/xfce4/desktop/menu.xml.zh_TW
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
+lib/xfce4/mcs-plugins/backdrop_settings.la
+lib/xfce4/modules/xfce4_desktop_menu.la
+lib/xfce4/panel-plugins/libdesktopmenu.la
+man/man1/xfdesktop.1
+share/applications/xfce-backdrop-settings.desktop
+share/applications/xfce-menueditor.desktop
+share/icons/hicolor/32x32/apps/xfce4-backdrop.png
+share/icons/hicolor/32x32/apps/xfce4-menueditor.png
+share/icons/hicolor/48x48/apps/xfce4-backdrop.png
+share/icons/hicolor/48x48/apps/xfce4-menueditor.png
+share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
+share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
+share/pixmaps/xfce4_xicon.png
+share/pixmaps/xfce4_xicon1.png
+share/pixmaps/xfce4_xicon2.png
+share/pixmaps/xfce4_xicon3.png
+share/pixmaps/xfce4_xicon4.png
share/xfce4/backdrops/flower.png
+share/xfce4/backdrops/xfce-in-a-grid.png
share/xfce4/backdrops/xfce-in-the-moon.png
+share/xfce4/backdrops/xfce-smoke.png
share/xfce4/backdrops/xfce-stellar-tile.png
share/xfce4/backdrops/xfce-stripes.png
share/xfce4/backdrops/xfce-turbulence.png
@@ -59,14 +101,10 @@ share/xfce4/doc/C/images/root_menu.png
share/xfce4/doc/C/images/root_menu2.png
share/xfce4/doc/C/images/select_bg_color.png
share/xfce4/doc/C/images/xfdesktop-background.png
+share/xfce4/doc/C/images/xfdesktop-editor.png
share/xfce4/doc/C/images/xfdesktop-list.png
-share/xfce4/doc/C/images/xfdesktop-workspace.png
+share/xfce4/doc/C/images/xfdesktop-menu-tab.png
share/xfce4/doc/C/xfdesktop.html
-share/xfce4/doc/fr/images/root_menu.png
-share/xfce4/doc/fr/images/root_menu2.png
-share/xfce4/doc/fr/images/select_bg_color.png
-share/xfce4/doc/fr/images/xfdesktop-background.png
-share/xfce4/doc/fr/images/xfdesktop-list.png
-share/xfce4/doc/fr/images/xfdesktop-workspace.png
-share/xfce4/doc/fr/xfdesktop.html
@dirrm share/xfce4/backdrops
+@dirrm etc/xdg/xfce4/desktop
+@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index 82db0a543fe..9b860a51b79 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-desktop}
BUILDLINK_PACKAGES+= xfce4-desktop
.if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.0.6
+BUILDLINK_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.2.0
BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop
.endif # XFCE4_DESKTOP_BUILDLINK3_MK
diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo
index 757a1d35ef9..16f2baf62a3 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $
-SHA1 (xfdesktop-4.0.6.tar.gz) = 4ee72bb077eefa94bad604d58a0bbeb008e5522a
-Size (xfdesktop-4.0.6.tar.gz) = 2134301 bytes
+SHA1 (xfdesktop-4.2.0.tar.gz) = 25309305ec5e20db4f1537e5e36be7755b55ea1d
+Size (xfdesktop-4.2.0.tar.gz) = 2593021 bytes
diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile
index 3bd1cfbd06d..546f8f2cb8b 100644
--- a/x11/xfce4-gtk2-engines/Makefile
+++ b/x11/xfce4-gtk2-engines/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/17 12:56:13 martti Exp $
#
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 2.1.10
+XFCE4_VERSION= 2.2.5
DISTNAME= gtk-xfce-engine-${XFCE4_VERSION}
PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 GTK2 themes
-DIST_SUBDIR= ${PKGNAME_NOREV}
USE_DIRS+= xdg-1.1
diff --git a/x11/xfce4-gtk2-engines/PLIST b/x11/xfce4-gtk2-engines/PLIST
index 2a16e36965d..ecd21e704c7 100644
--- a/x11/xfce4-gtk2-engines/PLIST
+++ b/x11/xfce4-gtk2-engines/PLIST
@@ -1,14 +1,23 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:10:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/01/17 12:56:13 martti Exp $
lib/gtk-2.0/2.4.0/engines/libxfce.la
+share/themes/Xfce-4.0/ICON.png
+share/themes/Xfce-4.0/README.html
+share/themes/Xfce-4.0/gtk-2.0/gtkrc
share/themes/Xfce-b5/ICON.png
share/themes/Xfce-b5/README.html
share/themes/Xfce-b5/gtk-2.0/gtkrc
share/themes/Xfce-basic/ICON.png
share/themes/Xfce-basic/README.html
share/themes/Xfce-basic/gtk-2.0/gtkrc
+share/themes/Xfce-cadmium/ICON.png
+share/themes/Xfce-cadmium/README.html
+share/themes/Xfce-cadmium/gtk-2.0/gtkrc
share/themes/Xfce-curve/ICON.png
share/themes/Xfce-curve/README.html
share/themes/Xfce-curve/gtk-2.0/gtkrc
+share/themes/Xfce-dawn/ICON.png
+share/themes/Xfce-dawn/README.html
+share/themes/Xfce-dawn/gtk-2.0/gtkrc
share/themes/Xfce-kde2/ICON.png
share/themes/Xfce-kde2/README.html
share/themes/Xfce-kde2/gtk-2.0/gtkrc
@@ -53,12 +62,16 @@ share/themes/Xfce/gtk-2.0/gtkrc
@dirrm share/themes/Xfce-kolors
@dirrm share/themes/Xfce-kde2/gtk-2.0
@dirrm share/themes/Xfce-kde2
+@dirrm share/themes/Xfce-dawn/gtk-2.0
+@dirrm share/themes/Xfce-dawn
@dirrm share/themes/Xfce-curve/gtk-2.0
@dirrm share/themes/Xfce-curve
+@dirrm share/themes/Xfce-cadmium/gtk-2.0
+@dirrm share/themes/Xfce-cadmium
@dirrm share/themes/Xfce-basic/gtk-2.0
@dirrm share/themes/Xfce-basic
@dirrm share/themes/Xfce-b5/gtk-2.0
@dirrm share/themes/Xfce-b5
-@dirrm share/themes/Xfce
-@comment in xdg-dirs: @dirrm share/themes
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
+@dirrm share/themes/Xfce-4.0/gtk-2.0
+@dirrm share/themes/Xfce-4.0
+@unexec ${RMDIR} share/themes/Xfce 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-gtk2-engines/buildlink3.mk b/x11/xfce4-gtk2-engines/buildlink3.mk
index a0ee8d8e06a..8e5f7515c09 100644
--- a/x11/xfce4-gtk2-engines/buildlink3.mk
+++ b/x11/xfce4-gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/01/17 12:56:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
BUILDLINK_PACKAGES+= xfce4-gtk2-engine
.if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.1.10
+BUILDLINK_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.2.5
BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engines
.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK
diff --git a/x11/xfce4-gtk2-engines/distinfo b/x11/xfce4-gtk2-engines/distinfo
index 84bb2000b73..8310622353a 100644
--- a/x11/xfce4-gtk2-engines/distinfo
+++ b/x11/xfce4-gtk2-engines/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.9 2005/01/17 12:56:13 martti Exp $
-SHA1 (xfce4-gtk2-engine-2.1.10/gtk-xfce-engine-2.1.10.tar.gz) = a5dfa34a34e8703f52b661f7573c81df072b41c8
-Size (xfce4-gtk2-engine-2.1.10/gtk-xfce-engine-2.1.10.tar.gz) = 352524 bytes
+SHA1 (gtk-xfce-engine-2.2.5.tar.gz) = 979cd98f8a06ef8c49379f5c1d0ac089f4424bdd
+Size (gtk-xfce-engine-2.2.5.tar.gz) = 373900 bytes
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index 0cffff0fbc4..e2e4dd0d83f 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/12/04 23:09:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-mcs-manager-${XFCE4_VERSION}
PKGNAME= xfce4-mcs-manager-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 settings manager
diff --git a/x11/xfce4-mcs-manager/PLIST b/x11/xfce4-mcs-manager/PLIST
index fbfed602876..c4a3b4131f2 100644
--- a/x11/xfce4-mcs-manager/PLIST
+++ b/x11/xfce4-mcs-manager/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.7 2004/07/12 08:25:11 martti Exp $
-bin/xfce-mcs-manager
-bin/xfce-setting-show
-include/xfce4/xfce-mcs-manager/manager-plugin.h
-lib/pkgconfig/xfce-mcs-manager.pc
+@comment $NetBSD: PLIST,v 1.8 2005/01/17 12:56:13 martti Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfce-mcs-manager.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfce-mcs-manager.mo
@@ -23,12 +23,15 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/nb_NO/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfce-mcs-manager.mo
@@ -36,19 +39,17 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce-mcs-manager.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce-mcs-manager.mo
+bin/xfce-mcs-manager
+bin/xfce-setting-show
+include/xfce4/xfce-mcs-manager/manager-plugin.h
+lib/pkgconfig/xfce-mcs-manager.pc
+share/applications/xfce-settings-manager.desktop
+share/icons/hicolor/48x48/apps/xfce4-settings.png
share/xfce4/doc/C/images/settings_manager.png
-share/xfce4/doc/C/images/smgr_from_panel.png
share/xfce4/doc/C/images/smgr_from_root_menu.png
share/xfce4/doc/C/images/smgr_from_setup_button.png
-share/xfce4/doc/fr/images/settings_manager.png
-share/xfce4/doc/fr/images/smgr_from_panel.png
-share/xfce4/doc/fr/images/smgr_from_root_menu.png
-share/xfce4/doc/fr/images/smgr_from_setup_button.png
-share/xfce4/doc/fr/xfce-mcs-manager.html
share/xfce4/doc/C/xfce-mcs-manager.html
@dirrm share/xfce4/doc/C/images
@dirrm share/xfce4/doc/C
-@dirrm share/xfce4/doc/fr/images
-@dirrm share/xfce4/doc/fr
@dirrm share/xfce4/doc
@dirrm include/xfce4/xfce-mcs-manager
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index d1e7bf8790b..d7008ed2daf 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
BUILDLINK_PACKAGES+= xfce4-mcs-manager
.if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.0.6
+BUILDLINK_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.2.0
BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager
.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK
diff --git a/x11/xfce4-mcs-manager/distinfo b/x11/xfce4-mcs-manager/distinfo
index ad544803e1f..6489f9b21eb 100644
--- a/x11/xfce4-mcs-manager/distinfo
+++ b/x11/xfce4-mcs-manager/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $
-SHA1 (xfce-mcs-manager-4.0.6.tar.gz) = 83f8e7be30863d919ecb217634406667027defbf
-Size (xfce-mcs-manager-4.0.6.tar.gz) = 538545 bytes
+SHA1 (xfce-mcs-manager-4.2.0.tar.gz) = 7a5bde436dee811c970dacba6b14b01e7ebddee0
+Size (xfce-mcs-manager-4.2.0.tar.gz) = 503492 bytes
diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile
index 090ab28f19c..89e3af785a0 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/17 12:56:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-mcs-plugins-${XFCE4_VERSION}
PKGNAME= xfce4-mcs-plugins-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 settings manager plugins
diff --git a/x11/xfce4-mcs-plugins/PLIST b/x11/xfce4-mcs-plugins/PLIST
index 0349f168467..a2e55d8044d 100644
--- a/x11/xfce4-mcs-plugins/PLIST
+++ b/x11/xfce4-mcs-plugins/PLIST
@@ -1,20 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:08 jlam Exp $
-lib/xfce4/mcs-plugins/keyboard_plugin.la
-lib/xfce4/mcs-plugins/mouse_plugin.la
-lib/xfce4/mcs-plugins/ui_plugin.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:13 martti Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfce-mcs-plugins.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -22,12 +23,14 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -35,14 +38,28 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce-mcs-plugins.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce-mcs-plugins.mo
+lib/xfce4/mcs-plugins/display_plugin.la
+lib/xfce4/mcs-plugins/keyboard_plugin.la
+lib/xfce4/mcs-plugins/mouse_plugin.la
+lib/xfce4/mcs-plugins/screensaver_plugin.la
+lib/xfce4/mcs-plugins/ui_plugin.la
+share/applications/xfce-display-settings.desktop
+share/applications/xfce-keyboard-settings.desktop
+share/applications/xfce-mouse-settings.desktop
+share/applications/xfce-ui-settings.desktop
+share/icons/hicolor/48x48/apps/xfce4-display.png
+share/icons/hicolor/48x48/apps/xfce4-keyboard.png
+share/icons/hicolor/48x48/apps/xfce4-mouse.png
+share/icons/hicolor/48x48/apps/xfce4-ui.png
+share/icons/hicolor/scalable/apps/xfce4-display.svg
+share/icons/hicolor/scalable/apps/xfce4-keyboard.svg
+share/icons/hicolor/scalable/apps/xfce4-mouse.svg
+share/icons/hicolor/scalable/apps/xfce4-ui.svg
+share/xfce4/doc/C/images/display_preferences.png
share/xfce4/doc/C/images/font_selection.png
share/xfce4/doc/C/images/keyboard_settings.png
share/xfce4/doc/C/images/mouse_settings.png
share/xfce4/doc/C/images/user_interface_settings.png
+share/xfce4/doc/C/images/user_interface_settings_icons.png
share/xfce4/doc/C/xfce-mcs-plugins.html
-share/xfce4/doc/fr/images/font_selection.png
-share/xfce4/doc/fr/images/keyboard_settings.png
-share/xfce4/doc/fr/images/mouse_settings.png
-share/xfce4/doc/fr/images/user_interface_settings.png
-share/xfce4/doc/fr/xfce-mcs-plugins.html
@dirrm lib/xfce4/mcs-plugins
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index 511a2bf335a..dba40ff604b 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
BUILDLINK_PACKAGES+= xfce4-mcs-plugins
.if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.0.6
+BUILDLINK_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.2.0
BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins
.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK
diff --git a/x11/xfce4-mcs-plugins/distinfo b/x11/xfce4-mcs-plugins/distinfo
index 1c30ef09cb9..5520cc7b3cf 100644
--- a/x11/xfce4-mcs-plugins/distinfo
+++ b/x11/xfce4-mcs-plugins/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $
-SHA1 (xfce-mcs-plugins-4.0.6.tar.gz) = 6a6d124ef86730cbfd69942cd64c74e194a6dee5
-Size (xfce-mcs-plugins-4.0.6.tar.gz) = 615696 bytes
+SHA1 (xfce-mcs-plugins-4.2.0.tar.gz) = 896701b1c8746dbbe1035386d8d19b6268d12f73
+Size (xfce-mcs-plugins-4.2.0.tar.gz) = 661118 bytes
diff --git a/x11/xfce4-menueditor/DESCR b/x11/xfce4-menueditor/DESCR
deleted file mode 100644
index 8335168bcaa..00000000000
--- a/x11/xfce4-menueditor/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XFce4 menu editor.
diff --git a/x11/xfce4-menueditor/Makefile b/x11/xfce4-menueditor/Makefile
deleted file mode 100644
index 35c343af747..00000000000
--- a/x11/xfce4-menueditor/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:18:39 tv Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-XFCE4_VERSION= 1.05
-
-DISTNAME= xfce4-menueditor-${XFCE4_VERSION}
-PKGREVISION= 3
-CATEGORIES= x11
-MASTER_SITES= http://users.skynet.be/p0llux/files/
-COMMENT= XFce4 menu editor
-
-EXTRACT_SUFX= .tar.bz2
-WRKSRC= ${WRKDIR}/xfce4-menueditor
-
-CONFIGURE_ARGS+=--disable-cvs
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libxfce4gui/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-menueditor/PLIST b/x11/xfce4-menueditor/PLIST
deleted file mode 100644
index 0bb89e8aaa1..00000000000
--- a/x11/xfce4-menueditor/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 16:33:37 martti Exp $
-bin/xfce4-menueditor
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce4-menueditor.mo
diff --git a/x11/xfce4-menueditor/buildlink3.mk b/x11/xfce4-menueditor/buildlink3.mk
deleted file mode 100644
index 81429ae36c7..00000000000
--- a/x11/xfce4-menueditor/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/04/02 10:07:26 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_MENUEDITOR_BUILDLINK3_MK:= ${XFCE4_MENUEDITOR_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= xfce4-menueditor
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-menueditor}
-BUILDLINK_PACKAGES+= xfce4-menueditor
-
-.if !empty(XFCE4_MENUEDITOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-menueditor+= xfce4-menueditor>=1.0.5
-BUILDLINK_PKGSRCDIR.xfce4-menueditor?= ../../x11/xfce4-menueditor
-.endif # XFCE4_MENUEDITOR_BUILDLINK3_MK
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libxfce4gui/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-menueditor/distinfo b/x11/xfce4-menueditor/distinfo
deleted file mode 100644
index 6beff2eb7b3..00000000000
--- a/x11/xfce4-menueditor/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2004/04/02 10:07:26 martti Exp $
-
-SHA1 (xfce4-menueditor-1.05.tar.bz2) = 4e1d7380a2148bb61bcb51e18026c4822e858bf1
-Size (xfce4-menueditor-1.05.tar.bz2) = 222093 bytes
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 7718eadba1b..5be2204abea 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/12/04 23:09:07 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/17 12:56:14 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-panel-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 panel
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index f5cf947200b..deba2e92ff0 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,45 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:08 jlam Exp $
-bin/xfce4-panel
-etc/xfce4/xfce4rc
-etc/xfce4/xfce4rc.ar
-etc/xfce4/xfce4rc.az
-etc/xfce4/xfce4rc.ca
-etc/xfce4/xfce4rc.fr
-etc/xfce4/xfce4rc.hu
-etc/xfce4/xfce4rc.it
-etc/xfce4/xfce4rc.nl
-etc/xfce4/xfce4rc.vi
-include/xfce4/panel/controls.h
-include/xfce4/panel/global.h
-include/xfce4/panel/icons.h
-include/xfce4/panel/item.h
-include/xfce4/panel/item_dialog.h
-include/xfce4/panel/main.h
-include/xfce4/panel/panel.h
-include/xfce4/panel/plugins.h
-include/xfce4/panel/xfce.h
-include/xfce4/panel/xfce_support.h
-lib/pkgconfig/xfce4-panel-1.0.pc
-lib/xfce4/mcs-plugins/libxfce4settings.la
-lib/xfce4/panel-plugins/libclock.la
-lib/xfce4/panel-plugins/libmailcheck.la
-lib/xfce4/panel-plugins/libpager.la
-lib/xfce4/panel-plugins/libseparator.la
-lib/xfce4/panel-plugins/libswitcher.la
-lib/xfce4/panel-plugins/libsystembuttons.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfce4-panel.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfce4-panel.mo
@@ -47,19 +23,81 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfce4-panel.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfce4-panel.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
+bin/xfce4-panel
+etc/xdg/xfce4/panel/contents.xml
+etc/xdg/xfce4/panel/contents.xml.ar
+etc/xdg/xfce4/panel/contents.xml.az
+etc/xdg/xfce4/panel/contents.xml.ca
+etc/xdg/xfce4/panel/contents.xml.eu
+etc/xdg/xfce4/panel/contents.xml.fr
+etc/xdg/xfce4/panel/contents.xml.he
+etc/xdg/xfce4/panel/contents.xml.hu
+etc/xdg/xfce4/panel/contents.xml.it
+etc/xdg/xfce4/panel/contents.xml.ko
+etc/xdg/xfce4/panel/contents.xml.lt
+etc/xdg/xfce4/panel/contents.xml.ms
+etc/xdg/xfce4/panel/contents.xml.nl
+etc/xdg/xfce4/panel/contents.xml.ro
+etc/xdg/xfce4/panel/contents.xml.ru
+etc/xdg/xfce4/panel/contents.xml.sk
+etc/xdg/xfce4/panel/contents.xml.tr
+etc/xdg/xfce4/panel/contents.xml.vi
+etc/xdg/xfce4/panel/contents.xml.zh_TW
+include/xfce4/panel/add-control-dialog.h
+include/xfce4/panel/controls.h
+include/xfce4/panel/global.h
+include/xfce4/panel/icons.h
+include/xfce4/panel/item.h
+include/xfce4/panel/item_dialog.h
+include/xfce4/panel/main.h
+include/xfce4/panel/panel.h
+include/xfce4/panel/plugins.h
+include/xfce4/panel/xfce.h
+include/xfce4/panel/xfce_support.h
+lib/pkgconfig/xfce4-panel-1.0.pc
+lib/xfce4/mcs-plugins/libxfce4settings.la
+lib/xfce4/panel-plugins/libclock.la
+lib/xfce4/panel-plugins/libmailcheck.la
+lib/xfce4/panel-plugins/libpager.la
+lib/xfce4/panel-plugins/libseparator.la
+lib/xfce4/panel-plugins/libswitcher.la
+lib/xfce4/panel-plugins/libsystembuttons.la
+share/applications/xfce-panel-settings.desktop
+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-edit.png
+share/icons/hicolor/48x48/apps/xfce-filemanager.png
+share/icons/hicolor/48x48/apps/xfce-games.png
+share/icons/hicolor/48x48/apps/xfce-graphics.png
+share/icons/hicolor/48x48/apps/xfce-internet.png
+share/icons/hicolor/48x48/apps/xfce-mail.png
+share/icons/hicolor/48x48/apps/xfce-man.png
+share/icons/hicolor/48x48/apps/xfce-multimedia.png
+share/icons/hicolor/48x48/apps/xfce-printer.png
+share/icons/hicolor/48x48/apps/xfce-schedule.png
+share/icons/hicolor/48x48/apps/xfce-sound.png
+share/icons/hicolor/48x48/apps/xfce-terminal.png
+share/icons/hicolor/48x48/apps/xfce-unknown.png
+share/icons/hicolor/48x48/apps/xfce-utils.png
+share/icons/hicolor/48x48/apps/xfce4-panel.png
+share/xfce4/doc/C/images/add-item-dialog.png
share/xfce4/doc/C/images/clock-properties.png
share/xfce4/doc/C/images/default_panel.png
share/xfce4/doc/C/images/handle-popup.png
@@ -68,157 +106,11 @@ share/xfce4/doc/C/images/launcher-properties.png
share/xfce4/doc/C/images/mailcheck-properties.png
share/xfce4/doc/C/images/menuitem-properties.png
share/xfce4/doc/C/images/nooptions-properties.png
+share/xfce4/doc/C/images/pager-properties.png
share/xfce4/doc/C/images/panel-settings.png
share/xfce4/doc/C/images/systembuttons-properties.png
share/xfce4/doc/C/xfce4-panel.html
-share/xfce4/doc/fr/images/clock-properties.png
-share/xfce4/doc/fr/images/default_panel.png
-share/xfce4/doc/fr/images/handle-popup.png
-share/xfce4/doc/fr/images/item-popup.png
-share/xfce4/doc/fr/images/launcher-properties.png
-share/xfce4/doc/fr/images/mailcheck-properties.png
-share/xfce4/doc/fr/images/menuitem-properties.png
-share/xfce4/doc/fr/images/nooptions-properties.png
-share/xfce4/doc/fr/images/panel-settings.png
-share/xfce4/doc/fr/images/systembuttons-properties.png
-share/xfce4/doc/fr/xfce4-panel.html
-share/xfce4/themes/Crystal/README
-share/xfce4/themes/Crystal/edit.png
-share/xfce4/themes/Crystal/file1.png
-share/xfce4/themes/Crystal/file2.png
-share/xfce4/themes/Crystal/games.png
-share/xfce4/themes/Crystal/man.png
-share/xfce4/themes/Crystal/miniinfo.png
-share/xfce4/themes/Crystal/minilock.png
-share/xfce4/themes/Crystal/minipalet.png
-share/xfce4/themes/Crystal/minipower.png
-share/xfce4/themes/Crystal/multimedia.png
-share/xfce4/themes/Crystal/network.png
-share/xfce4/themes/Crystal/newmail.png
-share/xfce4/themes/Crystal/nomail.png
-share/xfce4/themes/Crystal/oldmail.png
-share/xfce4/themes/Crystal/paint.png
-share/xfce4/themes/Crystal/print.png
-share/xfce4/themes/Crystal/schedule.png
-share/xfce4/themes/Crystal/sound.png
-share/xfce4/themes/Crystal/terminal.png
-share/xfce4/themes/Crystal/trash_empty.png
-share/xfce4/themes/Crystal/trash_full.png
-share/xfce4/themes/Crystal/unknown.png
-share/xfce4/themes/Curve/README
-share/xfce4/themes/Curve/edit.png
-share/xfce4/themes/Curve/file1.png
-share/xfce4/themes/Curve/file2.png
-share/xfce4/themes/Curve/games.png
-share/xfce4/themes/Curve/man.png
-share/xfce4/themes/Curve/miniinfo.png
-share/xfce4/themes/Curve/minilock.png
-share/xfce4/themes/Curve/minipalet.png
-share/xfce4/themes/Curve/minipower.png
-share/xfce4/themes/Curve/multimedia.png
-share/xfce4/themes/Curve/network.png
-share/xfce4/themes/Curve/newmail.png
-share/xfce4/themes/Curve/nomail.png
-share/xfce4/themes/Curve/oldmail.png
-share/xfce4/themes/Curve/paint.png
-share/xfce4/themes/Curve/print.png
-share/xfce4/themes/Curve/schedule.png
-share/xfce4/themes/Curve/sound.png
-share/xfce4/themes/Curve/terminal.png
-share/xfce4/themes/Curve/trash_empty.png
-share/xfce4/themes/Curve/trash_full.png
-share/xfce4/themes/Curve/unknown.png
-share/xfce4/themes/FreeIcons/README
-share/xfce4/themes/FreeIcons/edit.png
-share/xfce4/themes/FreeIcons/file1.png
-share/xfce4/themes/FreeIcons/file2.png
-share/xfce4/themes/FreeIcons/games.png
-share/xfce4/themes/FreeIcons/man.png
-share/xfce4/themes/FreeIcons/miniinfo.png
-share/xfce4/themes/FreeIcons/minilock.png
-share/xfce4/themes/FreeIcons/minipalet.png
-share/xfce4/themes/FreeIcons/minipower.png
-share/xfce4/themes/FreeIcons/multimedia.png
-share/xfce4/themes/FreeIcons/network.png
-share/xfce4/themes/FreeIcons/newmail.png
-share/xfce4/themes/FreeIcons/nomail.png
-share/xfce4/themes/FreeIcons/oldmail.png
-share/xfce4/themes/FreeIcons/paint.png
-share/xfce4/themes/FreeIcons/print.png
-share/xfce4/themes/FreeIcons/schedule.png
-share/xfce4/themes/FreeIcons/sound.png
-share/xfce4/themes/FreeIcons/terminal.png
-share/xfce4/themes/FreeIcons/unknown.png
-share/xfce4/themes/Gnome/edit.png
-share/xfce4/themes/Gnome/file1.png
-share/xfce4/themes/Gnome/file2.png
-share/xfce4/themes/Gnome/games.png
-share/xfce4/themes/Gnome/man.png
-share/xfce4/themes/Gnome/miniinfo.png
-share/xfce4/themes/Gnome/minilock.png
-share/xfce4/themes/Gnome/minipalet.png
-share/xfce4/themes/Gnome/minipower.png
-share/xfce4/themes/Gnome/multimedia.png
-share/xfce4/themes/Gnome/network.png
-share/xfce4/themes/Gnome/paint.png
-share/xfce4/themes/Gnome/print.png
-share/xfce4/themes/Gnome/schedule.png
-share/xfce4/themes/Gnome/sound.png
-share/xfce4/themes/Gnome/terminal.png
-share/xfce4/themes/Gnome/trash_empty.png
-share/xfce4/themes/Gnome/trash_full.png
-share/xfce4/themes/Gnome/unknown.png
-share/xfce4/themes/Noia/README
-share/xfce4/themes/Noia/edit.png
-share/xfce4/themes/Noia/file1.png
-share/xfce4/themes/Noia/file2.png
-share/xfce4/themes/Noia/games.png
-share/xfce4/themes/Noia/man.png
-share/xfce4/themes/Noia/miniinfo.png
-share/xfce4/themes/Noia/minilock.png
-share/xfce4/themes/Noia/minipalet.png
-share/xfce4/themes/Noia/minipower.png
-share/xfce4/themes/Noia/multimedia.png
-share/xfce4/themes/Noia/network.png
-share/xfce4/themes/Noia/newmail.png
-share/xfce4/themes/Noia/nomail.png
-share/xfce4/themes/Noia/oldmail.png
-share/xfce4/themes/Noia/paint.png
-share/xfce4/themes/Noia/print.png
-share/xfce4/themes/Noia/schedule.png
-share/xfce4/themes/Noia/sound.png
-share/xfce4/themes/Noia/terminal.png
-share/xfce4/themes/Noia/trash_empty.png
-share/xfce4/themes/Noia/trash_full.png
-share/xfce4/themes/Noia/unknown.png
-share/xfce4/themes/XFce/edit.xpm
-share/xfce4/themes/XFce/file1.xpm
-share/xfce4/themes/XFce/file2.xpm
-share/xfce4/themes/XFce/games.xpm
-share/xfce4/themes/XFce/man.xpm
-share/xfce4/themes/XFce/miniinfo.xpm
-share/xfce4/themes/XFce/minilock.xpm
-share/xfce4/themes/XFce/minipalet.xpm
-share/xfce4/themes/XFce/minipower.xpm
-share/xfce4/themes/XFce/multimedia.xpm
-share/xfce4/themes/XFce/network.xpm
-share/xfce4/themes/XFce/newmail.xpm
-share/xfce4/themes/XFce/nomail.xpm
-share/xfce4/themes/XFce/oldmail.xpm
-share/xfce4/themes/XFce/paint.xpm
-share/xfce4/themes/XFce/print.xpm
-share/xfce4/themes/XFce/schedule.xpm
-share/xfce4/themes/XFce/sound.xpm
-share/xfce4/themes/XFce/terminal.xpm
-share/xfce4/themes/XFce/trash_empty.xpm
-share/xfce4/themes/XFce/trash_full.xpm
-share/xfce4/themes/XFce/unknown.xpm
-@dirrm share/xfce4/themes/XFce
-@dirrm share/xfce4/themes/Noia
-@dirrm share/xfce4/themes/Gnome
-@dirrm share/xfce4/themes/FreeIcons
-@dirrm share/xfce4/themes/Curve
-@dirrm share/xfce4/themes/Crystal
-@dirrm share/xfce4/themes
@dirrm lib/xfce4/panel-plugins
@dirrm include/xfce4/panel
+@dirrm etc/xdg/xfce4/panel
+@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 235a3e0e2c3..c0ba8b888be 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:14 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PANEL_BUILDLINK3_MK:= ${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-panel}
BUILDLINK_PACKAGES+= xfce4-panel
.if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-panel+= xfce4-panel>=4.0.6
+BUILDLINK_DEPENDS.xfce4-panel+= xfce4-panel>=4.2.0
BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel
.endif # XFCE4_PANEL_BUILDLINK3_MK
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index 15fca7a63f2..d8acc610dc5 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:14 martti Exp $
-SHA1 (xfce4-panel-4.0.6.tar.gz) = 230de7f05f9ee6e7aedb7b4c09155988f30caf11
-Size (xfce4-panel-4.0.6.tar.gz) = 1277648 bytes
+SHA1 (xfce4-panel-4.2.0.tar.gz) = d4975b117bbe8eafc27eebfe557a423398d35e76
+Size (xfce4-panel-4.2.0.tar.gz) = 871179 bytes
diff --git a/x11/xfce4-themes/DESCR b/x11/xfce4-themes/DESCR
deleted file mode 100644
index 51760bb4062..00000000000
--- a/x11/xfce4-themes/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Additional themes for XFce4.
diff --git a/x11/xfce4-themes/Makefile b/x11/xfce4-themes/Makefile
deleted file mode 100644
index 0397451b22b..00000000000
--- a/x11/xfce4-themes/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:18:39 tv Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-DISTNAME= xfce4-themes-${XFCE4_VERSION}
-PKGREVISION= 1
-CATEGORIES= x11
-COMMENT= XFce4 themes
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-themes/PLIST b/x11/xfce4-themes/PLIST
deleted file mode 100644
index 5208c84a38c..00000000000
--- a/x11/xfce4-themes/PLIST
+++ /dev/null
@@ -1,117 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/26 10:58:25 martti Exp $
-share/xfce4/themes/BeOS/LICENSE
-share/xfce4/themes/BeOS/README
-share/xfce4/themes/BeOS/edit.png
-share/xfce4/themes/BeOS/edit.svg
-share/xfce4/themes/BeOS/file1.png
-share/xfce4/themes/BeOS/file1.svg
-share/xfce4/themes/BeOS/file2.png
-share/xfce4/themes/BeOS/file2.svg
-share/xfce4/themes/BeOS/games.png
-share/xfce4/themes/BeOS/games.svg
-share/xfce4/themes/BeOS/man.png
-share/xfce4/themes/BeOS/man.svg
-share/xfce4/themes/BeOS/miniinfo.png
-share/xfce4/themes/BeOS/miniinfo.svg
-share/xfce4/themes/BeOS/minilock.png
-share/xfce4/themes/BeOS/minilock.svg
-share/xfce4/themes/BeOS/minipalet.png
-share/xfce4/themes/BeOS/minipalet.svg
-share/xfce4/themes/BeOS/minipower.png
-share/xfce4/themes/BeOS/minipower.svg
-share/xfce4/themes/BeOS/multimedia.png
-share/xfce4/themes/BeOS/multimedia.svg
-share/xfce4/themes/BeOS/network.png
-share/xfce4/themes/BeOS/network.svg
-share/xfce4/themes/BeOS/newmail.png
-share/xfce4/themes/BeOS/newmail.svg
-share/xfce4/themes/BeOS/nomail.png
-share/xfce4/themes/BeOS/nomail.svg
-share/xfce4/themes/BeOS/oldmail.png
-share/xfce4/themes/BeOS/oldmail.svg
-share/xfce4/themes/BeOS/paint.png
-share/xfce4/themes/BeOS/paint.svg
-share/xfce4/themes/BeOS/print.png
-share/xfce4/themes/BeOS/print.svg
-share/xfce4/themes/BeOS/schedule.png
-share/xfce4/themes/BeOS/schedule.svg
-share/xfce4/themes/BeOS/sound.png
-share/xfce4/themes/BeOS/sound.svg
-share/xfce4/themes/BeOS/terminal.png
-share/xfce4/themes/BeOS/terminal.svg
-share/xfce4/themes/BeOS/trash_empty.png
-share/xfce4/themes/BeOS/trash_empty.svg
-share/xfce4/themes/BeOS/trash_full.png
-share/xfce4/themes/BeOS/trash_full.svg
-share/xfce4/themes/BeOS/unknown.png
-share/xfce4/themes/BeOS/unknown.svg
-share/xfce4/themes/Lush/LICENSE
-share/xfce4/themes/Lush/README
-share/xfce4/themes/Lush/edit.png
-share/xfce4/themes/Lush/edit.svg
-share/xfce4/themes/Lush/file1.png
-share/xfce4/themes/Lush/file1.svg
-share/xfce4/themes/Lush/file2.png
-share/xfce4/themes/Lush/file2.svg
-share/xfce4/themes/Lush/games.png
-share/xfce4/themes/Lush/games.svg
-share/xfce4/themes/Lush/man.png
-share/xfce4/themes/Lush/man.svg
-share/xfce4/themes/Lush/miniinfo.png
-share/xfce4/themes/Lush/miniinfo.svg
-share/xfce4/themes/Lush/minilock.png
-share/xfce4/themes/Lush/minilock.svg
-share/xfce4/themes/Lush/minipalet.png
-share/xfce4/themes/Lush/minipalet.svg
-share/xfce4/themes/Lush/minipower.png
-share/xfce4/themes/Lush/minipower.svg
-share/xfce4/themes/Lush/multimedia.png
-share/xfce4/themes/Lush/multimedia.svg
-share/xfce4/themes/Lush/network.png
-share/xfce4/themes/Lush/network.svg
-share/xfce4/themes/Lush/newmail.png
-share/xfce4/themes/Lush/newmail.svg
-share/xfce4/themes/Lush/nomail.png
-share/xfce4/themes/Lush/nomail.svg
-share/xfce4/themes/Lush/oldmail.png
-share/xfce4/themes/Lush/oldmail.svg
-share/xfce4/themes/Lush/paint.png
-share/xfce4/themes/Lush/paint.svg
-share/xfce4/themes/Lush/print.png
-share/xfce4/themes/Lush/print.svg
-share/xfce4/themes/Lush/schedule.png
-share/xfce4/themes/Lush/schedule.svg
-share/xfce4/themes/Lush/sound.png
-share/xfce4/themes/Lush/sound.svg
-share/xfce4/themes/Lush/terminal.png
-share/xfce4/themes/Lush/terminal.svg
-share/xfce4/themes/Lush/trash_empty.png
-share/xfce4/themes/Lush/trash_empty.svg
-share/xfce4/themes/Lush/trash_full.png
-share/xfce4/themes/Lush/trash_full.svg
-share/xfce4/themes/Lush/unknown.png
-share/xfce4/themes/Lush/unknown.svg
-share/xfce4/themes/Sky/AUTHOR
-share/xfce4/themes/Sky/LICENSE
-share/xfce4/themes/Sky/README
-share/xfce4/themes/Sky/edit.png
-share/xfce4/themes/Sky/file1.png
-share/xfce4/themes/Sky/file2.png
-share/xfce4/themes/Sky/games.png
-share/xfce4/themes/Sky/man.png
-share/xfce4/themes/Sky/miniinfo.png
-share/xfce4/themes/Sky/minilock.png
-share/xfce4/themes/Sky/minipalet.png
-share/xfce4/themes/Sky/minipower.png
-share/xfce4/themes/Sky/multimedia.png
-share/xfce4/themes/Sky/network.png
-share/xfce4/themes/Sky/newmail.png
-share/xfce4/themes/Sky/nomail.png
-share/xfce4/themes/Sky/oldmail.png
-share/xfce4/themes/Sky/paint.png
-share/xfce4/themes/Sky/sound.png
-share/xfce4/themes/Sky/terminal.png
-share/xfce4/themes/Sky/unknown.png
-@dirrm share/xfce4/themes/BeOS
-@dirrm share/xfce4/themes/Lush
-@dirrm share/xfce4/themes/Sky
diff --git a/x11/xfce4-themes/buildlink3.mk b/x11/xfce4-themes/buildlink3.mk
deleted file mode 100644
index e715905bef8..00000000000
--- a/x11/xfce4-themes/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_THEMES_BUILDLINK3_MK:= ${XFCE4_THEMES_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= xfce4-themes
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-themes}
-BUILDLINK_PACKAGES+= xfce4-themes
-
-.if !empty(XFCE4_THEMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-themes+= xfce4-themes>=4.0.6
-BUILDLINK_PKGSRCDIR.xfce4-themes?= ../../x11/xfce4-themes
-.endif # XFCE4_THEMES_BUILDLINK3_MK
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-themes/distinfo b/x11/xfce4-themes/distinfo
deleted file mode 100644
index 84cd3c2df3f..00000000000
--- a/x11/xfce4-themes/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2004/07/12 08:25:11 martti Exp $
-
-SHA1 (xfce4-themes-4.0.6.tar.gz) = 199e5df4d55d0f873042b942f01285f513e46bea
-Size (xfce4-themes-4.0.6.tar.gz) = 451603 bytes
diff --git a/x11/xfce4-toys/Makefile b/x11/xfce4-toys/Makefile
index 9430599e201..2e6e161fa15 100644
--- a/x11/xfce4-toys/Makefile
+++ b/x11/xfce4-toys/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:14 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-toys-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 toys
diff --git a/x11/xfce4-toys/PLIST b/x11/xfce4-toys/PLIST
index cd975839009..a47382090d6 100644
--- a/x11/xfce4-toys/PLIST
+++ b/x11/xfce4-toys/PLIST
@@ -1,29 +1,36 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:08 jlam Exp $
-bin/xfce4-tips
-lib/xfce4/panel-plugins/libeyes.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfce4-toys.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/nb_NO/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfce4-toys.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfce4-toys.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfce4-toys.mo
@@ -31,6 +38,8 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce4-toys.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce4-toys.mo
+bin/xfce4-tips
+lib/xfce4/panel-plugins/libeyes.la
share/xfce4/eyes/themes/Bizarre/Bizarre-eye.png
share/xfce4/eyes/themes/Bizarre/Bizarre-pupil.png
share/xfce4/eyes/themes/Bizarre/config
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 89582c5180f..a657b032508 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/01/17 12:56:14 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_TOYS_BUILDLINK3_MK:= ${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-toys}
BUILDLINK_PACKAGES+= xfce4-toys
.if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-toys+= xfce4-toys>=4.0.6
+BUILDLINK_DEPENDS.xfce4-toys+= xfce4-toys>=4.2.0
BUILDLINK_PKGSRCDIR.xfce4-toys?= ../../x11/xfce4-toys
.endif # XFCE4_TOYS_BUILDLINK3_MK
diff --git a/x11/xfce4-toys/distinfo b/x11/xfce4-toys/distinfo
index aa313637db9..a3b6c458cca 100644
--- a/x11/xfce4-toys/distinfo
+++ b/x11/xfce4-toys/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:14 martti Exp $
-SHA1 (xfce4-toys-4.0.6.tar.gz) = f67016b1401ceab3ccde5812bc4bc65b1418d9c4
-Size (xfce4-toys-4.0.6.tar.gz) = 391511 bytes
+SHA1 (xfce4-toys-4.2.0.tar.gz) = cfbd42ae8f7b0f6e38ccec6a771961eafd0df8f2
+Size (xfce4-toys-4.2.0.tar.gz) = 403655 bytes
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 9cb3cedf62a..9b82c8a1d7b 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:14 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-trigger-launcher-${XFCE4_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 trigger-launcher
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-trigger-launcher/PLIST b/x11/xfce4-trigger-launcher/PLIST
index 7ee4812d0fe..014448a8dea 100644
--- a/x11/xfce4-trigger-launcher/PLIST
+++ b/x11/xfce4-trigger-launcher/PLIST
@@ -1,28 +1,36 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:08 jlam Exp $
-lib/xfce4/panel-plugins/libtriggerlauncher.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfce4-trigger-launcher.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfce4-trigger-launcher.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfce4-trigger-launcher.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfce4-trigger-launcher.mo
@@ -30,3 +38,4 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce4-trigger-launcher.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce4-trigger-launcher.mo
+lib/xfce4/panel-plugins/libtriggerlauncher.la
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index db4dc4b3f0b..4b3c91fb1eb 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:14 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:= ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
BUILDLINK_PACKAGES+= xfce4-trigger-launcher
.if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-trigger-launcher+= xfce4-trigger-launcher>=4.0.6
+BUILDLINK_DEPENDS.xfce4-trigger-launcher+= xfce4-trigger-launcher>=4.2.0
BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?= ../../x11/xfce4-trigger-launcher
.endif # XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo
index cb1e83b4993..6c64c913720 100644
--- a/x11/xfce4-trigger-launcher/distinfo
+++ b/x11/xfce4-trigger-launcher/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:14 martti Exp $
-SHA1 (xfce4-trigger-launcher-4.0.6.tar.gz) = 33841d0a4b146ac5d36d2469760871325f374478
-Size (xfce4-trigger-launcher-4.0.6.tar.gz) = 335379 bytes
+SHA1 (xfce4-trigger-launcher-4.2.0.tar.gz) = a732c7ea0b52cc8400cb1fa38de5a6c12accbe6d
+Size (xfce4-trigger-launcher-4.2.0.tar.gz) = 345902 bytes
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 7e4f04846ff..9d00fc3af77 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/10/05 09:58:52 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/01/17 12:56:14 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-utils-${XFCE4_VERSION}
PKGNAME= xfce4-utils-${XFCE4_VERSION}
-PKGREVISION= 2
CATEGORIES= x11
COMMENT= XFce4 utilities
diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST
index 72d960adbdc..7c01bc022ed 100644
--- a/x11/xfce4-utils/PLIST
+++ b/x11/xfce4-utils/PLIST
@@ -1,27 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:10:08 jlam Exp $
-bin/startxfce4
-bin/xfce4-about
-bin/xfhelp4
-bin/xflock4
-bin/xfmountdev4
-bin/xfrun4
-bin/xftaskbar4
-bin/xfterm4
-etc/xfce4/xinitrc
-lib/xfce4/mcs-plugins/xftaskbar_plugin.la
+@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfce-utils.mo
-${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xfce-utils.mo
@@ -30,11 +24,13 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xfce-utils.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xfce-utils.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xfce-utils.mo
@@ -42,13 +38,27 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
+bin/startxfce4
+bin/xfce4-about
+bin/xfhelp4
+bin/xflock4
+bin/xfmountdev4
+bin/xfrun4
+bin/xftaskbar4
+bin/xfterm4
+etc/xdg/xfce4/xinitrc
+lib/xfce4/mcs-plugins/xftaskbar_plugin.la
+share/applications/xfce-taskbar-settings.desktop
+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/xfce4/AUTHORS
share/xfce4/AUTHORS.az
share/xfce4/AUTHORS.ca
share/xfce4/AUTHORS.de
share/xfce4/AUTHORS.es
share/xfce4/AUTHORS.fr
-share/xfce4/AUTHORS.it
+share/xfce4/AUTHORS.he
share/xfce4/AUTHORS.html
share/xfce4/AUTHORS.html.az
share/xfce4/AUTHORS.html.ca
@@ -56,6 +66,17 @@ share/xfce4/AUTHORS.html.de
share/xfce4/AUTHORS.html.es
share/xfce4/AUTHORS.html.fr
share/xfce4/AUTHORS.html.it
+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.it
+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/BSD
share/xfce4/BSD.html
@@ -68,13 +89,20 @@ share/xfce4/INFO
share/xfce4/INFO.ca
share/xfce4/INFO.es
share/xfce4/INFO.fr
-share/xfce4/INFO.it
share/xfce4/INFO.html
share/xfce4/INFO.html.ca
share/xfce4/INFO.html.de
share/xfce4/INFO.html.es
share/xfce4/INFO.html.fr
share/xfce4/INFO.html.it
+share/xfce4/INFO.html.lt
+share/xfce4/INFO.html.ro
+share/xfce4/INFO.html.ru
+share/xfce4/INFO.it
+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
@@ -85,25 +113,14 @@ share/xfce4/doc/C/images/about-dialog.png
share/xfce4/doc/C/images/default-session.png
share/xfce4/doc/C/images/link_xfce.jpg
share/xfce4/doc/C/images/run-dialog.png
+share/xfce4/doc/C/images/taskbar_settings.png
share/xfce4/doc/C/index.html
share/xfce4/doc/C/xfce-utils.html
+share/xfce4/doc/C/xfce4-components.html
share/xfce4/doc/C/xfce4-copyright.html
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/index.html
-share/xfce4/doc/fr/xfce-utils.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/xfce-mouse.png
share/xfce4/doc/xfce.css
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 46be9dec75c..f02b0a27737 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/05 09:58:52 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/01/17 12:56:14 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-utils}
BUILDLINK_PACKAGES+= xfce4-utils
.if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-utils+= xfce4-utils>=4.0.6
+BUILDLINK_DEPENDS.xfce4-utils+= xfce4-utils>=4.2.0
BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils
.endif # XFCE4_UTILS_BUILDLINK3_MK
diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo
index 1d49aae2f11..78dea1f2a00 100644
--- a/x11/xfce4-utils/distinfo
+++ b/x11/xfce4-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/01/17 12:56:14 martti Exp $
-SHA1 (xfce-utils-4.0.6.tar.gz) = f239d2437469f127fc3a4e8f767badd9a54db23a
-Size (xfce-utils-4.0.6.tar.gz) = 974783 bytes
+SHA1 (xfce-utils-4.2.0.tar.gz) = bbcf8b5d4e816caf4fd6ae0bd24e32a0e117dbd0
+Size (xfce-utils-4.2.0.tar.gz) = 740252 bytes