Update to 2.14.0:

===================================================================
GNOME Utilities 2.14.0 (March 13th 2006) - "The Wedding Release"

This is the official 2.14.0 release of the GNOME Utilities package.

In this six months cycle, gnome-utils has received much love, both
in the single components and as a whole: tens of bugs, including
usability and portability issues, have been fixed; new features have
been added; the documentation has been improved by switching to
gnome-doc-utils; better performances have been achieved.  In short,
this is without any doubt the best gnome-utils release ever.

Significant changes in this release as compared to the last stable
release include a faster and more stable than ever System Log Viewer,
new features in the Search Tool like the ability to remember its size
and position or the monitoring of the searched files, and a completely
rewritten Dictionary; also, there have been tons of fixes and updates
to both GNOME Floppy and GNOME Screenshot.

Changes from the last pre-release:

    * Added Traditional Chinese translation (Hong Kong) [Chao-Hsiung Liao]

GNOME Search Tool
GNOME Dictionary
GNOME Floppy
GNOME Screenshot
GNOME Log Viewer

    * Nothing

Translations updates:

    bg [Rostislav Raykov], bn [Runa Bhattacharjee], cs [Petr Tomeš],
    et [Ivar Smolin], fr [Cyprien Le Pannérer], hi [Rajesh Ranjan],
    it [Andrea Zagli], pt_BR [Raphael Higino], pt [Duarte Loreto],
    ro [Mugurel Tudor], sq [Laurent Dhima], sv [Daniel Nylander],
    uk [Maxim Dziumanenko], zh_HK [Lin-Chieh Shangkuan],
    zh_TW [Lin-Chieh Shangkuan]

===================================================================
GNOME Utilities 2.13.94 (March 4th 2006) - "Escape Velocity"

GNOME Search Tool

    * Nuttin'

GNOME Dictionary

    * Fix bug 332035 - Fix transparency of the dictionary
      applet [Michael Hofmann]
    * Fix bug 330584 - Allow using Esc to close the applet's
      window.

GNOME Floppy

    * Nada

GNOME Screenshot

    * Zip

GNOME Log Viewer

    * Nothing

Translations updates:

    ca [Josep Puigdemont], cs [Miloslav Trmac], cy [Rhys Jones],
    de [Hendrik Richter], es [Francisco Javier F. Serrador], et [Priit Laes],
    eu [Iñaki Larrañaga], fi [Ilkka Tuohela], gl [Ignacio Casal Quinteiro],
    gu [Ankit Patel], hu [Gabor Kelemen], ja [Takeshi AIHANA],
    lt [Žygimantas Beručka], nb [Øivind Hoel], nl [Tino Meinen],
    no [Øivind Hoel], ru [Leonid Kanter], sr [Слободан Д. Средојевић],
    th [Theppitak Karoonboonyanan], vi [Clytie Siddall]

===================================================================
GNOME Utilities 2.13.93 (February 24th 2006) - "Asynchronous Beauty"

GNOME Search Tool

    * Fix bug 330176 - make the call to check locate/slocate
      asynchronous in order not to block the UI. [Dennis]
    * Update man page. [Dennis]
    * Fix bug 332457 - do not crash if nautilus is not
      installed. [Frederic Crozat]

GNOME Dictionary

    * Fix bug 331031 - handle the case when a file with the same
      name of the directory we use to store our dictionary sources
      has been found.
    * Do not crash when showing an error message with the
      applet. [Yanko Kaneti, Kjartan Maraas]
    * Fix bug 332383 - use ngettext() and make life of the translators
      easier [Gabor Kelemen]

GNOME Screenshot

    * Nothing

GNOME Floppy

    * Nada

GNOME Log Viewer

    * Zip

Translations updates:

    bg [Rostislav Raykov], cs [Miloslav Trmac], cy [Rhys Jones],
    el [Kostas Papadimas], fi [Ilkka Tuohela], hu [Gabor Kelemen],
    ja [Satoru SATOH], lt [Žygimantas Beručka], nb [Øivind Hoel],
    no [Øivind Hoel], pt_BR [Raphael Higino], pt [Duarte Loreto],
    ru [Leonid Kanter], sr [Слободан Д. Средојевић]
    vi [Clytie Siddall]

===================================================================
GNOME Utilities 2.13.92 (February 12th 2006) - "Gnome-utils vs. Bugzilla"

GNOME Search Tool

    Zip

GNOME Dictionary

    * Fix bug 329126 - warn the user if a file with the same name
      of the data directory is found.
    * Fix bug 329941 - support look up of multiple words from the
      command line.
    * Fix bug 329650 - avoid misplacing of the applet's window.
    * Fix bug 330782 - make the dictionary server response parsing
      a bit more robust.

GNOME Screenshot

    * Fix bug 170171 - translate file name when saving by drag'n'drop.
    * Fix bug 329296 - warn when using a wrong command line argument.

GNOME Floppy

    * Fix bug 329799 - fix HAL include path.

GNOME Log Viewer

    * Code base clean up patch [Paolo Borelli].

Translations updates:

    bg [Rostislav Raykov], ca [Josep Puigdemont],
    es [Francisco Javier F. Serrador], fi [Ilkka Tuohela],
    gl [Ignacio Casal Quinteiro], gu [Ankit Patel], nb [Øivind Hoel]
    nl [Tino Meinen], pt_BR [Raphael Higino], sr [Слободан Д. Средојевић],
    th [Theppitak Karoonboonyanan], zh_CN [Funda Wang]

===================================================================
GNOME Utilities 2.13.91 (January 30th 2006) - "Ain't that a brown paper bag?"

    * "Brown paper bag" release.
    * Fix the inclusion of the translations database.

GNOME Search Tool

GNOME Dictionary

GNOME Floppy

GNOME Log Viewer

    Nothing

Translations updates:

    None.

===================================================================
GNOME Utilities 2.13.90 (January 30th 2006) - "Gnomaean Taxonomy"

    * Fix the version for libgdict, and add a versioning scheme for
      this library; even if not part of the Platform, it will follow
      the API/ABI freeze from now on.
    * Remove the need for the template file for configure.in
    * Fix the categories for the .desktop files used to build the
      menus. [Behdad Esfahbod, Dennis and Emmanuele]

GNOME Search Tool

    Nothing

GNOME Dictionary

    * Reworked the size calculation for the window of the application
      and the applet: now, you should not need to resize it.
    * Code clean ups.
    * Support for the Document Font desktop setting.
    * Slight API addition inside libgdict: GdictDefbox now has a
      "font-name" property and its accessor functions.

GNOME Floppy

    * Fix bug 328956 - build using glibc 2.2 [Jens Granseuer]

GNOME Screenshot

    Nothing

GNOME Log Viewer

    * Begin some code clean ups.
    * Fix bug 327614 - avoid crashing when loading preferences.
    * Fix command line argument parsing, and add a "--version" switch
      to show the version.

Translations updates:

    ca [Josep Puigdemont], en_CA [Adam Weinberger],
    es [Francisco Javier F. Serrador], fi [Ilkka Tuohela],
    gl [Ignacio Casal Quinteiro], gu [Ankit Patel], it [Andrea Zagli],
    ja [Satoru SATOH], nb [Kjartan Maraas], nl [Tino Meinen],
    no [Kjartan Maraas], pt_BR [Evandro Fernandes Giovanini],
    th [Theppitak Karoonboonyanan], vi [Clytie Siddall],
    zh_CN [Funda Wang]

===================================================================
GNOME Utilities 2.13.5 (January 16th 2006) - "Optimized for Size"

    * This release of gnome-utils requires GLib >= 2.9.1 in order
      use GLib's new slab allocator called GSlice.  This will make
      our own allocations faster and with less overhead.

GNOME Search Tool

    * Use the new and faster g_slice_* functions.

GNOME Dictionary

    * Fix bug #324006 - fix a critical warning in bonobo after login
    * Fix bug #325014 - new dictionary supports word as command line
      argument
    * Fix bug #325887 - dictionary remembers the last used window size
      and state
    * Fix bug #327156 - fix a spelling error in the GConf schema
    * Use the new and faster g_slice_* functions
    * Added two new dictionary sources, one for French-based and one for
      Spanish-based dictionaries

GNOME Floppy

    * Zip

GNOME Screenshot

    * Fix bug 161030 - Should provide a .desktop file

GNOME Log Viewer

    * Zip

Translations updates:

    bg [Rostislav Raykov], ca [Josep Puigdemont], el [Kostas Papadimas],
    en_CA [Adam Weinberger], es [Francisco Javier F. Serrador],
    fi [Ilkka Tuohela], gl [Ignacio Casal Quinteiro], gu [Ankit Patel],
    ja [Takeshi AIHANA], lt [Žygimantas Beručka], nb [Kjartan Maraas],
    nl [Daniel van Eeden], no [Kjartan Maraas], sr [Слободан Д. Средојевић],
    th [Theppitak Karoonboonyanan], vi [Clytie Siddall]

===================================================================
GNOME Utilities 2.13.4 (January 2nd 2006) - "Ubiquitous X-Ray"

    * Merged the "new-dictionary" branch, containing the new Dictionary
      application and applet [Emmanuele]

GNOME Search Tool

    * Fix bug #324552 - use g_date_set_time_t [Kjartan Maraas]
    * Fix bug #324097 - save window size and state [Dennis]

GNOME Dictionary

    * Complete rewrite of the application and the applet [Emmanuele]
    * Exports the Gdict library, for accessing the dictionary sources
      used by GNOME Dictionary.
    * Tons on features: new user interface; save the definitions to
      a text file; new print output; supports multiple dictionary
      sources; "search-as-you-type" find style; improved window
      handling; better error messages.

GNOME Floppy

    * Fix bug #324552 - compiler warnings [Kjartan Maraas]

GNOME Screenshot

    * Fix bug #324552 - compiler warnings [Kjartan Maraas]
    * Fix bug #319188 - fix a crasher due to unescaped characters
    inside the path [Sebastien Bacher]

GNOME Log Viewer

    * Nada

Translations updates:

    ca [Josep Puigdemont], en_CA [Adam Weinberger],
    es [Francisco Javier F. Serrador], fi [Ilkka Tuohela],
    gl [Ignacio Casal Quinteiro], gu [Ankit Patel], ja [Takeshi AIHANA],
    la [Žygimantas Beručka], th [Theppitak Karoonboonyanan],
    vi [Clytie Siddall], zh_CN [Funda Wang]

===================================================================
GNOME Utilities 2.13.3 (December 12th 2005)

    * New co-maintainer - Emmanuele Bassi
    * Ported the whole documentation system to gnome-doc-utils [Emmanuele]

GNOME Search Tool

    * Fix bug #322529 - Show hidden files if searching in hidden
      folder. [Dennis]
    * Fix bug #322763 - gnome-search-tool does not monitor files
      for removal [Dennis, Vincent]

GNOME Dictionary

    * Fix bug #323863 - Typo [Vincent]

GNOME Floppy

    * Nada

GNOME Screenshot

    * Walou

GNOME Log Viewer

    * Bold updated/new lines in log for 5 seconds [Vincent]
    * Add a tree view in the side bar to group logs by folder [Vincent]
    * Show a busy cursor while loading logs [Vincent]
    * Remove hints in main treeview [Vincent]
    * Store position when switching logs [Vincent]
    * Update log stats when log is modified [Vincent]
    * Fix bug #322132 - Add Monitor category to .desktop [Matthias Clasen]
    * Fix bug #323141 - GConf key descriptions. [Vincent]

Translation updates :

    bg [Vladimir Petkov], cs [Miloslav Trmac], en_CA [Adam
    Weinberger], es [Francisco Javier F. Serrador], et
    [Priit Laes], fi [Ilkka Tuohela], gl [Ignacio Casal Quinteiro],
    gu [Ankit Patel], ja [Takeshi AIHANA], lt [Žygimantas
    Beručka], nb [Kjartan Maraas], no [Kjartan Maraas], nl
    [Vincent van Adrighem], sk [Marcel Telka], th [Theppitak
    Karoonboonyanan], zh_CN [Funda Wang]

===================================================================
GNOME Utilities 2.13.2 (November 14th 2005)

GNOME Search Tool

    * replace g_return_if_fail with g_assert in static functions [Dennis]
    * Fix bug #320161 - wrong focus after search [Dennis]
    * Allow columns reordering [Dennis]

GNOME Dictionary

    * Nuthin

GNOME Floppy

    * Nuthin

GNOME Screenshot

    * Nuthin

GNOME Log Viewer

    * Big speedups, esp. with large logs [Vincent]
    * replace g_return_if_fail with g_assert in static functions [Vincent]
    * use strptime to convert strings to dates [Vincent]
    * Lots of refactoring and cleaning up [Vincent]
    * Replace the find bar with a filter bar [Vincent]
    * Don't use column headers in the main tree view (more speedup) [Vincent]
    * Sync menu description and key shortcuts with evince [Vincent]
    * Remove the properties window [Vincent]
    * Don't convert in utf8 when the locale is utf8 [Vincent]

Translation updates :

    * cs [Miloslav Trmac], en_CA [Adam Weinberger], es [Francisco Javier
      F. Serrador], et [Priit Laes], ja [Takeshi AIHANA], ku [Erdal Ronahi],
      sk [Marcel Telka], th [Theppitak Karoonboonyanan], zh_CN [Funda Wang]

===================================================================
GNOME Utilities 2.13.1 (October 21st 2005)

GNOME Search Tool

    * CPU optimization [Dennis]
    * Fix bug #317147 - Search for file also search in parent [patch from
      Emmanuel Touzery]

GNOME Dictionary

    * Fix bug #318095 - Missing includes [patch from Stanislav Brabec]
    * Fix bug #319331 - Leaks [Kjartan Maraas]

GNOME Floppy

    * Fig bug #318095 - Missing includes [patch from Stanislav Brabec]
    * Fix an include [patch from Jens Granseuer]
    * Fix bug #316770 - invalid documentation [Takeshi AIHANA]

GNOME Screenshot

    * Fix bug #167158 - it's in gnome-utils now [Sebastien Bacher]
    * Fix bug #319191 - Remove a g_print statement [Sebastien Bacher]
    * Fix bug #162534 - "screenshooter" term [Christian Persch]

GNOME Log Viewer

    * Fix bug #156507 - Make session management work again [Vincent]
    * Fix bug #318689 - only open real files [Frederic Crozat]
    * Use monospace font by default and follow the pref [Vincent]
    * Use gnome-vfs for monitoring [Vincent]
    * Monitor logs by default [Vincent]
    * Use fixed height mode for the treeview [Vincent]
    * Bold log names when new lines are added [Vincent]
    * Huge speedups when displaying big logs [Vincent]
    * Don't huge fixed-size buffers - 30% memory gain [Vincent]
    * Append lines at the end of the log when monitoring [Vincent]
    * Plugged huge memory leaks [Vincent]
    * Simplify internal handling of dates, big speedup [Vincent]
    * Fix bug #157769 - updated documentation [Vincent]
    * Fix bug #318609 - line selection is too slow [Vincent]
    * Fix bug #316738 - crash when exiting without any opened log
      [patch from Luke Macken]
    * Fix bug #316829 - crash when switching to default font size [Vincent]
    * Fix bug #317208 - C99-ism [patch from Jens Granseuer]
    * Fix bug #318095 - cast warning [patch from Stanislav Brabec]
    * Fix bug #310110 - when selecting a log line, select its date
      in the calendar [Vincent]
    * Lots of plumbing work [Vincent]

Translation updates :

    * et [Priit Laes], eu [Inaki Larranaga], fr [Christophe Merlet], gl
      [Ignacio Casal Quinteiro], it [Andrea Zagli], nl [Vincent van Adrighem], sv
      [Christian Rose], vi [Clytie Siddall], zh_TW [Chao-Hsiung Liao]

5 files changed, 98 insertions, 189 deletions

diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 85511237e26..68565ed505e 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2006/03/21 06:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/03/30 21:33:32 jmmv Exp $
 #
 
-DISTNAME=		gnome-utils-2.12.2
-PKGREVISION=		4
+DISTNAME=		gnome-utils-2.14.0
 CATEGORIES=		misc gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.12/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.14/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -19,27 +18,33 @@ USE_MSGFMT_PLURALS=	yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
+PKGCONFIG_OVERRIDE=	gnome-dictionary/libgdict/gdict-1.0.pc.in
+PKGCONFIG_OVERRIDE+=	gnome-dictionary/libgdict/gdict-1.0-uninstalled.pc.in
+
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-GCONF2_SCHEMAS+=	gdict.schemas
+GCONF2_SCHEMAS+=	gnome-dictionary.schemas
 GCONF2_SCHEMAS+=	gnome-screenshot.schemas
 GCONF2_SCHEMAS+=	gnome-search-tool.schemas
 GCONF2_SCHEMAS+=	logview.schemas
 
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.9.1
 BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.4
+BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.13.7
+BUILDLINK_DEPENDS.libgnomeui+=	libgnomeui>=2.13.2
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/GConf2-ui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../lang/guile/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/misc/gnome2-utils/PLIST b/misc/gnome2-utils/PLIST
index 37f9976bd41..4b2cd8982f9 100644
--- a/misc/gnome2-utils/PLIST
+++ b/misc/gnome2-utils/PLIST
@@ -1,104 +1,95 @@
-@comment $NetBSD: PLIST,v 1.11 2005/10/16 12:13:48 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/30 21:33:32 jmmv Exp $
 bin/gnome-dictionary
 bin/gnome-panel-screenshot
 bin/gnome-screenshot
 bin/gnome-search-tool
 bin/gnome-system-log
-lib/bonobo/servers/GNOME_GDictApplet.server
-libexec/gdict-applet
+include/gdict-1.0/gdict/gdict-client-context.h
+include/gdict-1.0/gdict/gdict-context.h
+include/gdict-1.0/gdict/gdict-defbox.h
+include/gdict-1.0/gdict/gdict-entry.h
+include/gdict-1.0/gdict/gdict-enum-types.h
+include/gdict-1.0/gdict/gdict-source-loader.h
+include/gdict-1.0/gdict/gdict-source.h
+include/gdict-1.0/gdict/gdict-utils.h
+include/gdict-1.0/gdict/gdict-version.h
+include/gdict-1.0/gdict/gdict.h
+lib/bonobo/servers/GNOME_DictionaryApplet.server
+lib/libgdict-1.0.la
+lib/pkgconfig/gdict-1.0.pc
+libexec/gnome-dictionary-applet
 man/man1/gnome-dictionary.1
 man/man1/gnome-search-tool.1
 man/man1/gnome-system-log.1
 share/applications/gnome-dictionary.desktop
+share/applications/gnome-screenshot.desktop
 share/applications/gnome-search-tool.desktop
 share/applications/gnome-system-log.desktop
-share/gconf/schemas/gdict.schemas
+share/doc/gdict/gdict-GdictClientContext.html
+share/doc/gdict/gdict-GdictContext.html
+share/doc/gdict/gdict-GdictDefbox.html
+share/doc/gdict/gdict-GdictEntry.html
+share/doc/gdict/gdict-GdictSource.html
+share/doc/gdict/gdict-GdictSourceLoader.html
+share/doc/gdict/gdict.devhelp
+share/doc/gdict/gdict.devhelp2
+share/doc/gdict/gdict.html
+share/doc/gdict/gdictui.html
+share/doc/gdict/home.png
+share/doc/gdict/index.html
+share/doc/gdict/index.sgml
+share/doc/gdict/introduction.html
+share/doc/gdict/left.png
+share/doc/gdict/right.png
+share/doc/gdict/sources-loader.html
+share/doc/gdict/sources.html
+share/doc/gdict/style.css
+share/doc/gdict/up.png
+share/gconf/schemas/gnome-dictionary.schemas
 share/gconf/schemas/gnome-screenshot.schemas
 share/gconf/schemas/gnome-search-tool.schemas
 share/gconf/schemas/logview.schemas
-share/gnome-2.0/ui/GNOME_GDictApplet.xml
+share/gdict-1.0/sources/default.desktop
+share/gdict-1.0/sources/french.desktop
+share/gdict-1.0/sources/spanish.desktop
+share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
+share/gnome-dictionary/gnome-dictionary-preferences.glade
+share/gnome-dictionary/gnome-dictionary-ui.xml
 share/gnome-screenshot/glade/gnome-screenshot.glade
 share/gnome-system-log/gnome-system-log-actions.db
 share/gnome-system-log/gnome-system-log-descript.db
 share/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/C/legal.xml
-share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/ja/legal.xml
-share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/uk/legal.xml
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/es/legal.xml
-share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/fr/legal.xml
 share/gnome/help/gnome-search-tool/it/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/it/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/it/legal.xml
-share/gnome/help/gnome-search-tool/ja/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ja/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ja/legal.xml
-share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ko/legal.xml
-share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/sv/legal.xml
-share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/uk/legal.xml
-share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_CN/legal.xml
-share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_HK/legal.xml
-share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_TW/legal.xml
 share/gnome/help/gnome-system-log/C/figures/syslog_window.png
 share/gnome/help/gnome-system-log/C/gnome-system-log.xml
 share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/help/gnome-system-log/de/figures/syslog_window.png
-share/gnome/help/gnome-system-log/de/gnome-system-log.xml
-share/gnome/help/gnome-system-log/de/legal.xml
 share/gnome/help/gnome-system-log/es/figures/syslog_window.png
 share/gnome/help/gnome-system-log/es/gnome-system-log.xml
-share/gnome/help/gnome-system-log/es/legal.xml
-share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
-share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
-share/gnome/help/gnome-system-log/fr/legal.xml
-share/gnome/help/gnome-system-log/it/figures/syslog_window.png
-share/gnome/help/gnome-system-log/it/gnome-system-log.xml
-share/gnome/help/gnome-system-log/it/legal.xml
-share/gnome/help/gnome-system-log/ja/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ja/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ja/legal.xml
-share/gnome/help/gnome-system-log/ko/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ko/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ko/legal.xml
-share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
-share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
-share/gnome/help/gnome-system-log/sv/legal.xml
-share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
-share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
-share/gnome/help/gnome-system-log/uk/legal.xml
-share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_CN/legal.xml
-share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_TW/legal.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
@@ -131,6 +122,7 @@ ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
@@ -163,86 +155,37 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-share/omf/gnome-utils/gnome-dictionary-C.omf
-share/omf/gnome-utils/gnome-dictionary-ja.omf
-share/omf/gnome-utils/gnome-dictionary-uk.omf
-share/omf/gnome-utils/gnome-search-tool-C.omf
-share/omf/gnome-utils/gnome-search-tool-es.omf
-share/omf/gnome-utils/gnome-search-tool-fr.omf
-share/omf/gnome-utils/gnome-search-tool-it.omf
-share/omf/gnome-utils/gnome-search-tool-ja.omf
-share/omf/gnome-utils/gnome-search-tool-ko.omf
-share/omf/gnome-utils/gnome-search-tool-sv.omf
-share/omf/gnome-utils/gnome-search-tool-uk.omf
-share/omf/gnome-utils/gnome-search-tool-zh_CN.omf
-share/omf/gnome-utils/gnome-search-tool-zh_HK.omf
-share/omf/gnome-utils/gnome-search-tool-zh_TW.omf
-share/omf/gnome-utils/gnome-system-log-C.omf
-share/omf/gnome-utils/gnome-system-log-de.omf
-share/omf/gnome-utils/gnome-system-log-es.omf
-share/omf/gnome-utils/gnome-system-log-fr.omf
-share/omf/gnome-utils/gnome-system-log-it.omf
-share/omf/gnome-utils/gnome-system-log-ja.omf
-share/omf/gnome-utils/gnome-system-log-ko.omf
-share/omf/gnome-utils/gnome-system-log-sv.omf
-share/omf/gnome-utils/gnome-system-log-uk.omf
-share/omf/gnome-utils/gnome-system-log-zh_CN.omf
-share/omf/gnome-utils/gnome-system-log-zh_TW.omf
+share/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/omf/gnome-search-tool/gnome-search-tool-C.omf
+share/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/omf/gnome-search-tool/gnome-search-tool-it.omf
+share/omf/gnome-system-log/gnome-system-log-C.omf
+share/omf/gnome-system-log/gnome-system-log-es.omf
+share/pixmaps/gnome-dictionary.png
 share/pixmaps/gsearchtool/thumbnail_frame.png
 @dirrm share/pixmaps/gsearchtool
-@dirrm share/omf/gnome-utils
+@comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/omf/gnome-system-log
+@dirrm share/omf/gnome-search-tool
+@dirrm share/omf/gnome-dictionary
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/gnome/help/gnome-system-log/zh_TW/figures
-@dirrm share/gnome/help/gnome-system-log/zh_TW
-@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
-@dirrm share/gnome/help/gnome-system-log/zh_CN
-@dirrm share/gnome/help/gnome-system-log/uk/figures
-@dirrm share/gnome/help/gnome-system-log/uk
-@dirrm share/gnome/help/gnome-system-log/sv/figures
-@dirrm share/gnome/help/gnome-system-log/sv
-@dirrm share/gnome/help/gnome-system-log/ko/figures
-@dirrm share/gnome/help/gnome-system-log/ko
-@dirrm share/gnome/help/gnome-system-log/ja/figures
-@dirrm share/gnome/help/gnome-system-log/ja
-@dirrm share/gnome/help/gnome-system-log/it/figures
-@dirrm share/gnome/help/gnome-system-log/it
-@dirrm share/gnome/help/gnome-system-log/fr/figures
-@dirrm share/gnome/help/gnome-system-log/fr
 @dirrm share/gnome/help/gnome-system-log/es/figures
 @dirrm share/gnome/help/gnome-system-log/es
-@dirrm share/gnome/help/gnome-system-log/de/figures
-@dirrm share/gnome/help/gnome-system-log/de
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
-@dirrm share/gnome/help/gnome-search-tool/zh_TW/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_TW
-@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_HK
-@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_CN
-@dirrm share/gnome/help/gnome-search-tool/uk/figures
-@dirrm share/gnome/help/gnome-search-tool/uk
-@dirrm share/gnome/help/gnome-search-tool/sv/figures
-@dirrm share/gnome/help/gnome-search-tool/sv
-@dirrm share/gnome/help/gnome-search-tool/ko/figures
-@dirrm share/gnome/help/gnome-search-tool/ko
-@dirrm share/gnome/help/gnome-search-tool/ja/figures
-@dirrm share/gnome/help/gnome-search-tool/ja
 @dirrm share/gnome/help/gnome-search-tool/it/figures
 @dirrm share/gnome/help/gnome-search-tool/it
-@dirrm share/gnome/help/gnome-search-tool/fr/figures
-@dirrm share/gnome/help/gnome-search-tool/fr
 @dirrm share/gnome/help/gnome-search-tool/es/figures
 @dirrm share/gnome/help/gnome-search-tool/es
 @dirrm share/gnome/help/gnome-search-tool/C/figures
 @dirrm share/gnome/help/gnome-search-tool/C
 @dirrm share/gnome/help/gnome-search-tool
-@dirrm share/gnome/help/gnome-dictionary/uk/figures
-@dirrm share/gnome/help/gnome-dictionary/uk
-@dirrm share/gnome/help/gnome-dictionary/ja/figures
-@dirrm share/gnome/help/gnome-dictionary/ja
+@dirrm share/gnome/help/gnome-dictionary/es/figures
+@dirrm share/gnome/help/gnome-dictionary/es
 @dirrm share/gnome/help/gnome-dictionary/C/figures
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
@@ -250,7 +193,13 @@ share/pixmaps/gsearchtool/thumbnail_frame.png
 @dirrm share/gnome-system-log
 @dirrm share/gnome-screenshot/glade
 @dirrm share/gnome-screenshot
+@dirrm share/gnome-dictionary
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
+@dirrm share/gdict-1.0/sources
+@dirrm share/gdict-1.0
 @comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/doc/gdict
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
+@dirrm include/gdict-1.0/gdict
+@dirrm include/gdict-1.0
diff --git a/misc/gnome2-utils/distinfo b/misc/gnome2-utils/distinfo
index 3d65f53c8e0..cb1fd276fb9 100644
--- a/misc/gnome2-utils/distinfo
+++ b/misc/gnome2-utils/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.14 2006/01/20 14:19:48 jmmv Exp $
+$NetBSD: distinfo,v 1.15 2006/03/30 21:33:32 jmmv Exp $
 
-SHA1 (gnome-utils-2.12.2.tar.bz2) = b02f12c4a5c505f324b48c236c2523ea795bfbbc
-RMD160 (gnome-utils-2.12.2.tar.bz2) = 99616aab970e7ba65f156cafc038405f9de0a5fb
-Size (gnome-utils-2.12.2.tar.bz2) = 1726889 bytes
-SHA1 (patch-aa) = b7b08b7b1fa16b7a2a8980459c121e83255b7a6a
-SHA1 (patch-ab) = 2b04e92d0000d30ea9d83af2385a1686b94d142b
+SHA1 (gnome-utils-2.14.0.tar.bz2) = 96dc3d95ab6ea0057a081403146209f4b7657034
+RMD160 (gnome-utils-2.14.0.tar.bz2) = 799c47e836ed478734e3c42359b0c97fa3e3f319
+Size (gnome-utils-2.14.0.tar.bz2) = 1881962 bytes
 SHA1 (patch-ac) = 331b43a0f5d79555f79d448c6ea2a36ce6783ea5
diff --git a/misc/gnome2-utils/patches/patch-aa b/misc/gnome2-utils/patches/patch-aa
deleted file mode 100644
index de3b25a367a..00000000000
--- a/misc/gnome2-utils/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/20 03:16:14 joerg Exp $
-
---- logview/logrtns.c.orig	2005-06-14 22:11:16.000000000 +0000
-+++ logview/logrtns.c
-@@ -613,7 +613,7 @@ ReadLogStats (Log *log, gchar **buffer_l
- 	   if (IsLeapYear (curmark->year - lastyear + thisyear))
- 		   curmark->time += 24 * 60 * 60;		/*  Add one day */
- 	   
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- 	   curmark->time += correction - tmptm->tm_gmtoff;
- #else
- 	   curmark->time += correction - timezone;
-@@ -637,7 +637,7 @@ ReadLogStats (Log *log, gchar **buffer_l
-    if (IsLeapYear (thisyear))
- 	   log->lstats.enddate += 24 * 60 * 60;	/*  Add one day */
-    
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-    log->lstats.enddate += correction - tmptm->tm_gmtoff;
- #else
-    log->lstats.enddate += correction - timezone;
-@@ -648,7 +648,7 @@ ReadLogStats (Log *log, gchar **buffer_l
-    if (IsLeapYear (thisyear - lastyear))
- 	   log->lstats.startdate += 24 * 60 * 60;	/*  Add one day */
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-    log->lstats.startdate += correction - tmptm->tm_gmtoff;
- #else
-    log->lstats.startdate += correction - timezone;
diff --git a/misc/gnome2-utils/patches/patch-ab b/misc/gnome2-utils/patches/patch-ab
deleted file mode 100644
index 579ef50ed1e..00000000000
--- a/misc/gnome2-utils/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/01/20 03:16:14 joerg Exp $
-
---- gsearchtool/gsearchtool-support.c.orig	2006-01-20 02:44:25.000000000 +0000
-+++ gsearchtool/gsearchtool-support.c
-@@ -29,6 +29,7 @@
- #  include <config.h>
- #endif
- 
-+#include <sys/types.h>
- #include <glib/gi18n.h>
- #include <regex.h>
- #include <gdk/gdkx.h>