Update to 2.6.0. Changes since previous stable branch (2.4.x):

Version 2.6.0
=============

	* New and updated translations.

Version 2.5.93
==============

  Screenshot Taker

	* Use the new file chooser in save mode instead of open mode

  Clock Applet

	* Fix crash with unset/invalid clock format preference

  Translators

	* New and updated translations.


Version 2.5.92
==============

  Panel

	* Fix accessibility issue with the "Force Quit" dialog
	* Correctly launch nautilus for directories from the run dialog

  Clock Applet

	* Use GtkComboBox in the preferences dialog

  Translations

	* New and updated translations.


Version 2.5.91
==============

  Panel

	* Don't resize while autohiding
	* Remove the username from the Log Out menu item again
	* Xinerama fixes for panel position and collision avoidance
	* Make moving launchers with button2 work again
	* Don't allow the panel to be moved when its hidden

  Clock Applet

	* Fix task and appoinment list scrolling
	* Use Fedora's system-config-time if available
	* Fix issue with clock not resizing when date chanes in some locales

  Notification Area

	* Set the window icon on the about dialog

  Translations

	* New and updated translations.


Version 2.5.90
==============

  Panel

	* Fix a typo - "or to to shutdown"
	* Fix issue with autohides not being unqueued on leave notify
	* Allow the hide button's size to be themed
	* Make apps be launched on the correct screen after menus are re-loaded
	* Fixup instance of using an uninitialised variable

  Applets

	* Fix issue with calendar jumping multiple months on click

  Misc

	* Updated help documentation
	* Allow building against an uninstalled build of gnome-panel

  Translations

	* New and updated translations.


Version 2.5.5
=============

  Panel

	* Make applets move a pixel at a time so we can move them to the corner
	* Fix broken keynav with numlock enabled
	* Fix problem with disappearing launchers
	* Correctly test for modifiers throughout the panel

  Notification Area

	* Correctly manage the lifecycle of the about dialog
	* Use the correct icon in the about dialog

  Misc

	* Update help links to point to new user-guie location
	* Add configure flag to disable use of evolution-data-server
	* Update help documentation
	* Make the screenshooter use GtkFileChooser
	* Add documentor credits in applet about dialogs
	* Warnings fixes
	* Un-mark property descriptions for translation

  Translators

	* New and updated translations.


Version 2.5.4
=============

  Panel

	* Add more lockdown support
	* Fix major X leak with translucent panels
	* Use a new "applications" icon for the applications menu
	* Set accessible names for drawers and hide buttons
	* Fix issue with "Log Out blah" menu item and username's with underscore
	* Remove bogus panel_signal_connect_object_while_alive()
	* Fix issue where "Delete this Panel" wasn't visible
	* Only allow resizing the run dialog if the proram list is visible
	* Fix some runtime warnings
	* Fix some portability issues

  libpanel-applet

	* Install enums header and fix signal definitions
	* Build panel-test-applets with -export-dynamic

  Clock Applet

	* Fix bug where selected calendars were out of sync
	* Use UTC time for events if preference set
	* Correctly detect all day events
	* Re-position the calendar popup as the clock is moved around
	* Don't show "Adjust Date & Time" if no config tool available
	* Fix issue with ellipsizing the task description

  Misc

	* Sync with newer version of the recent files implementation
	* Use a themed window icon in the screenshooter
	* Fix issue with unsetting the preferred command for Wanda
	* Set the accessible name on the notification area
	* Fix underquoted definition of AM_PATH_ESD
	* Fix invalid UTF8 in spanish help docs
	* Bump required GTK+ to 2.3.2

  Translators

	* New and updated translations.


Version 2.5.3.1
===============

  libpanel-applet

	* Fix crasher with ORBit 2.9.4

  Translators

	* New and updated translations.


Version 2.5.3
=============

  Panel

	* Add a shadow around the run dialog applications list
	* Set the accessible name on the run dialog entry
	* Don't allow the creation of empty launchers
	* Change the default panel size from 22px to 24px
	* Put the username in the "Log Out" menu item
	* Fix occassional problem where moving an applet caused the panel to
	  move
	* Use a useless icon for the actions menu until a better one is found
	* Mark a string for translation
	* Use latest versions off egg-recent
	* Fix minor typo in the default panel setup
	* Use GtkFileChooser instead of GtkFileSelection
	* Don't add directories during command completion in the run dialog
	* Fix UTF-8 conversion issue in the run dialog

  Clock Applet

	* Add support for showing Evolution tasks/appointments

	* Allow a custom time format to specified in GConf
	* Make the applet out of process
	* If showing UTC time, select the right day in the calendr
	* Make it easier for translators to swap elements of the time format
	* Schemas terminology fix

  Other Applets

	* Display Notification Area help on the correct screen
	* Don't allow changing the number/names of workspaces if locked down

  Misc

	* Make use of new libgnomeui/gdk functions instead of egg-screen-*
	* Add bugzilla pointers to all applet .server files
	* Build fixes
	* Update Spanish documentation

  Translators

	* New and updated translations.


Version 2.5.2
=============

  Panel

	* Kill some unused functions
	* Be more paranoid about removing dirs from the GConfClient cache
	* Fix some strings to by more translator friendly
	* Make blocking auto-hiding recursive
	* Rename "Open Recent" to "Recent Documents"
	* Use gdk_screen_get_monitor_at_point() instead of a hack
	* Sort the applets in the "Add to panel" menu according to the locale
	* Fix various bugs with autohide with no animations
	* Make schema descriptions of the "screen" and "monitor" keys more
	  expicit
	* Use the monitor size and not the screen size to position the panel
	* Fix bug in menu positioning when the panel is hidden
	* Add labelled-by relation for the slider in the properties dialog
	* Fix the preferences dialog to use the locked_down key
	* Remove invalid assertion about auto_hide_size > 0
	* Don't set invalid tooltips on menu buttons
	* Set the accessible name on drawers
	* Make sure to set the PPosition WM_NORMAL_HINT to keep other WMs happy
	* Make the expander in the run dialog activatable via a mnemonic
	* Use GObject's instance private data
	* Use GConf's standard function for unsetting a hierarchy
	* Make the Menu Bar help point at the correct location
	* Make menu buttons use the correct tooltip
	* Make "Force Quit" confirmation dialog cancel on escape

  Screenshooter

	* Don't crash when using the shape extension on an offscreen window
	* Fix slight performace issue
	* Expand filenames with a tilde when saving
	* Kill crufty printing support

  Applets

	* Simplify the various clock time format GConf keys into one enum
	* Make the clock not display leading zeros in dates
	* Make Wanda not use deprecated functions
	* Rename the Window Menu to "Window Selector"
	* Make the Window Selector's help point at the user guide
	* Destroy the Window Selector's about dialog when the applet is removed
	* Ditto for the Show Desktop button
	* Make the Show Desktop button use SVG icons

  libpanel-applet

	* Fix weird issue caused by not removing the dir from the GConfClient
	  cache

  Misc

	* Many distcheck fixes required for using automake 1.7
	* XML-ize the libpanel-applet docs
	* Man pages updates
	* Update build message to say "2.5"
	* Make sure Wanda's generated .server files get deleted on make clean

  Translators

	* New and updated translations.


Version 2.5.1
=============

  Panel

	* Implement per-panel and global lockdown keys
	* Add a "disabled_applets" key and don't show those applets
	* Fix gnome-panel --help not to show the flags twice
	* Used the folder icon from the icon theme for folders
	* Use the term "Drag and drop" instead of "DnD"
	* Don't allow vertically centered horizontal panels and vice versa
	* Link to help for action buttons
	* Use the "delete" stock icon for "Delete this panel"
	* Fix crashing when gdk_property_get_fails
	* Snap to 0/100% opacity with a 2% tolerance
	* Set revert to insenitive in the launcher editing dialog
	* Remove the bold labels in the panel properties dialog
	* Don't unhide hidden drawers when unhiding the parent panel
	* Use GtkExpander in the run dialog
	* Don't allow the panel to autohide when dragging things around
	* Don't unhide the panel if we quickly move the pointer in and out
	* Get translucent applet backgrounds almost working
	* Remove useless, crufty code
	* Don't allow the panel to unhide when the properties dialog is open

  Applets

	* Hide the preferences menu items when locked down
	* Update help buttons to point to the correct docs
	* Allow the PanelApplet's children to become focusable after focusing itself
	* Fix a memory leak in libpanel-applet

  Window List

 	* Remove "visible" from the descipription of the applet
	* Update to use the new icon from jimmac
	* Disable certain preferences when only showing the current workspace

  Workspace Switcher

	* Add a shadow around the workspace list in the preferences
	* Unselect any selected workspace name when the list is unfocused

  Window Menu

	* Ellipsize the window menu item if its too long
	* Update to use the new icon from jimmac
	* Don't refer to the "Window List" in the about dialog
	* Use the icon theme to lookup the window icon

  Show Desktop Button

	* Lookup the icon according to the icon theme

  Wanda

	* Respect the "inhibit_command_line" lockdown preference
	* Make the "rotate" prefernce false by default - bubbles should go up
	* De-brand Wanda - she's a fish, not a "GNOME fish"

  Clock

	* Show week numbers in the calendar
	* Better schema description for "internet_time"

  Misc

	* Help documentation updates
	* Add a --enable-deprecations build time flag

  Translators

4 files changed, 43 insertions, 48 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 0b2969e9cf5..e047f8d1697 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2004/04/01 18:46:01 jmmv Exp $
 #
 
-DISTNAME=		gnome-panel-2.4.2
-PKGREVISION=		6
+DISTNAME=		gnome-panel-2.6.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -12,7 +11,6 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 panel application
 
 DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
-DEPENDS+=		gnome-icon-theme>=1.0.9:../../graphics/gnome-icon-theme
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
@@ -38,19 +36,24 @@ GCONF2_SCHEMAS+=	workspace-switcher.schemas
 GCONF2_SCHEMAS+=	window-list.schemas
 GCONF2_ENTRIES=		panel-default-setup.entries
 
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.4.0.1nb1
-
 .include "../../devel/GConf2/schemas.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome2-control-center/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index 3ef17619593..61869a9cbd0 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.11 2004/02/16 12:36:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/04/01 18:46:01 jmmv Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/gnome-panel-preferences
 bin/gnome-panel-screenshot
 bin/panel-test-applets
 include/panel-2.0/GNOME_Panel.h
+include/panel-2.0/panel-applet-enums.h
 include/panel-2.0/panel-applet-gconf.h
 include/panel-2.0/panel-applet.h
 lib/bonobo/servers/GNOME_ClockApplet_Factory.server
@@ -12,33 +13,36 @@ lib/bonobo/servers/GNOME_FishApplet_Factory.server
 lib/bonobo/servers/GNOME_NotificationAreaApplet.server
 lib/bonobo/servers/GNOME_Panel.server
 lib/bonobo/servers/GNOME_Wncklet_Factory.server
-lib/libclock-applet-2.a
-lib/libclock-applet-2.la
-lib/libclock-applet-2.so
 lib/libpanel-applet-2.a
 lib/libpanel-applet-2.la
 lib/libpanel-applet-2.so
 lib/libpanel-applet-2.so.0
-lib/libpanel-applet-2.so.0.18
+lib/libpanel-applet-2.so.0.19
 lib/pkgconfig/libpanelapplet-2.0.pc
+libexec/clock-applet
 libexec/fish-applet-2
 libexec/notification-area-applet
 libexec/wnck-applet
 man/man1/gnome-panel-preferences.1
 man/man1/gnome-panel.1
 share/control-center-2.0/capplets/gnome-panel-preferences.desktop
+share/doc/html/panel-applet/PanelApplet.html
 share/doc/html/panel-applet/applet-popups.html
 share/doc/html/panel-applet/applet-porting.html
 share/doc/html/panel-applet/applet-writing.html
+share/doc/html/panel-applet/home.png
+share/doc/html/panel-applet/index.html
 share/doc/html/panel-applet/index.sgml
-share/doc/html/panel-applet/libpanel-applet.html
+share/doc/html/panel-applet/left.png
 share/doc/html/panel-applet/multi-applets.html
-share/doc/html/panel-applet/panel-applet-panel-applet-gconf-utilities.html
+share/doc/html/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html
+share/doc/html/panel-applet/panel-applet.devhelp
 share/doc/html/panel-applet/panel-applet.html
 share/doc/html/panel-applet/panel-signals.html
-share/doc/html/panel-applet/panelapplet.html
+share/doc/html/panel-applet/right.png
 share/doc/html/panel-applet/server-files.html
 share/doc/html/panel-applet/session-saving.html
+share/doc/html/panel-applet/up.png
 share/gconf/schemas/clock.schemas
 share/gconf/schemas/fish.schemas
 share/gconf/schemas/gnome-panel-screenshot.schemas
@@ -87,9 +91,6 @@ share/gnome/help/clock/ko/legal.xml
 share/gnome/help/clock/sv/clock.xml
 share/gnome/help/clock/sv/figures/clock_applet.png
 share/gnome/help/clock/sv/legal.xml
-share/gnome/help/clock/uk/clock.xml
-share/gnome/help/clock/uk/figures/clock_applet.png
-share/gnome/help/clock/uk/legal.xml
 share/gnome/help/clock/zh_CN/clock.xml
 share/gnome/help/clock/zh_CN/figures/clock_applet.png
 share/gnome/help/clock/zh_CN/legal.xml
@@ -126,9 +127,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png
 share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
 share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
 share/gnome/help/fish-applet-2/sv/legal.xml
-share/gnome/help/fish-applet-2/uk/figures/fish_applet.png
-share/gnome/help/fish-applet-2/uk/fish-applet-2.xml
-share/gnome/help/fish-applet-2/uk/legal.xml
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -175,10 +173,6 @@ share/gnome/help/window-list/sv/figures/window_list_group.png
 share/gnome/help/window-list/sv/figures/window_list_group_applet.png
 share/gnome/help/window-list/sv/legal.xml
 share/gnome/help/window-list/sv/window-list.xml
-share/gnome/help/window-list/uk/figures/window_list_applet.png
-share/gnome/help/window-list/uk/figures/window_list_group_applet.png
-share/gnome/help/window-list/uk/legal.xml
-share/gnome/help/window-list/uk/window-list.xml
 share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
 share/gnome/help/window-list/zh_CN/figures/window_list_group.png
 share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
@@ -219,9 +213,6 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/sv/legal.xml
 share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
-share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/uk/legal.xml
-share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
 share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_CN/legal.xml
@@ -247,6 +238,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-panel-2.0.mo
@@ -259,6 +251,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
@@ -270,10 +263,12 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
@@ -284,8 +279,10 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo
@@ -301,7 +298,6 @@ share/omf/gnome-panel/clock-it.omf
 share/omf/gnome-panel/clock-ja.omf
 share/omf/gnome-panel/clock-ko.omf
 share/omf/gnome-panel/clock-sv.omf
-share/omf/gnome-panel/clock-uk.omf
 share/omf/gnome-panel/clock-zh_CN.omf
 share/omf/gnome-panel/clock-zh_TW.omf
 share/omf/gnome-panel/fish-applet-2-C.omf
@@ -312,7 +308,6 @@ share/omf/gnome-panel/fish-applet-2-it.omf
 share/omf/gnome-panel/fish-applet-2-ja.omf
 share/omf/gnome-panel/fish-applet-2-ko.omf
 share/omf/gnome-panel/fish-applet-2-sv.omf
-share/omf/gnome-panel/fish-applet-2-uk.omf
 share/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/omf/gnome-panel/fish-applet-2-zh_TW.omf
 share/omf/gnome-panel/window-list-C.omf
@@ -323,7 +318,6 @@ share/omf/gnome-panel/window-list-it.omf
 share/omf/gnome-panel/window-list-ja.omf
 share/omf/gnome-panel/window-list-ko.omf
 share/omf/gnome-panel/window-list-sv.omf
-share/omf/gnome-panel/window-list-uk.omf
 share/omf/gnome-panel/window-list-zh_CN.omf
 share/omf/gnome-panel/window-list-zh_TW.omf
 share/omf/gnome-panel/workspace-switcher-C.omf
@@ -334,7 +328,6 @@ share/omf/gnome-panel/workspace-switcher-it.omf
 share/omf/gnome-panel/workspace-switcher-ja.omf
 share/omf/gnome-panel/workspace-switcher-ko.omf
 share/omf/gnome-panel/workspace-switcher-sv.omf
-share/omf/gnome-panel/workspace-switcher-uk.omf
 share/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/omf/gnome-panel/workspace-switcher-zh_TW.omf
 share/pixmaps/cdeappmenu.png
@@ -357,10 +350,10 @@ share/pixmaps/gnome-panel-type-sliding.png
 share/pixmaps/gnome-panel.png
 share/pixmaps/gnome-run.png
 share/pixmaps/gnome-screenshot.png
-share/pixmaps/gnome-show-desktop.png
 share/pixmaps/panel-drawer.png
 share/pixmaps/panel-force-quit.png
 @dirrm share/pixmaps/fish
+@comment in xdg-dirs: share/pixmaps
 @dirrm share/omf/gnome-panel
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/idl/gnome-panel-2.0
@@ -370,8 +363,6 @@ share/pixmaps/panel-force-quit.png
 @dirrm share/gnome/help/workspace-switcher/zh_TW
 @dirrm share/gnome/help/workspace-switcher/zh_CN/figures
 @dirrm share/gnome/help/workspace-switcher/zh_CN
-@dirrm share/gnome/help/workspace-switcher/uk/figures
-@dirrm share/gnome/help/workspace-switcher/uk
 @dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
 @dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -393,8 +384,6 @@ share/pixmaps/panel-force-quit.png
 @dirrm share/gnome/help/window-list/zh_TW
 @dirrm share/gnome/help/window-list/zh_CN/figures
 @dirrm share/gnome/help/window-list/zh_CN
-@dirrm share/gnome/help/window-list/uk/figures
-@dirrm share/gnome/help/window-list/uk
 @dirrm share/gnome/help/window-list/sv/figures
 @dirrm share/gnome/help/window-list/sv
 @dirrm share/gnome/help/window-list/ko/figures
@@ -416,8 +405,6 @@ share/pixmaps/panel-force-quit.png
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
 @dirrm share/gnome/help/fish-applet-2/zh_CN
-@dirrm share/gnome/help/fish-applet-2/uk/figures
-@dirrm share/gnome/help/fish-applet-2/uk
 @dirrm share/gnome/help/fish-applet-2/sv/figures
 @dirrm share/gnome/help/fish-applet-2/sv
 @dirrm share/gnome/help/fish-applet-2/ko/figures
@@ -439,8 +426,6 @@ share/pixmaps/panel-force-quit.png
 @dirrm share/gnome/help/clock/zh_TW
 @dirrm share/gnome/help/clock/zh_CN/figures
 @dirrm share/gnome/help/clock/zh_CN
-@dirrm share/gnome/help/clock/uk/figures
-@dirrm share/gnome/help/clock/uk
 @dirrm share/gnome/help/clock/sv/figures
 @dirrm share/gnome/help/clock/sv
 @dirrm share/gnome/help/clock/ko/figures
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 8b6db8bf274..6b9dc727d61 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:46:01 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -11,19 +11,26 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-panel}
 BUILDLINK_PACKAGES+=	gnome-panel
 
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.4.1nb3
-BUILDLINK_RECOMMENDED.gnome-panel?=	gnome-panel>=2.4.2nb6
+BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.6.0
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .endif	# GNOME_PANEL_BUILDLINK3_MK
 
+.include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/scrollkeeper/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome2-control-center/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index f79cba6761e..d40fed4e0cc 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/01/16 02:30:30 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2004/04/01 18:46:01 jmmv Exp $
 
-SHA1 (gnome-panel-2.4.2.tar.bz2) = 2a5ca30d88207bc3e8b68a8605bfc5ac8310a535
-Size (gnome-panel-2.4.2.tar.bz2) = 2662404 bytes
+SHA1 (gnome-panel-2.6.0.tar.bz2) = dfa7d85ec105749fc11b6f6933bd99221157ae85
+Size (gnome-panel-2.6.0.tar.bz2) = 2933581 bytes