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

============
gedit 2.6.0
============

Documentation
=============

- Add localized documentation from Sun's translation team (Glynn Foster)

New and updated translations
============================

- Åsmund Skjæveland (nn)
- Baris Cicek (tr)
- Alastair McKinstry (ga)
- Andras Timar (hu)
- Abel Cheung (zh_TW)
- Gareth Owen (en_GB)
- Dmitry G. Mastrukov (ru)
- Arafat Medini (ar)
- Stanislav Visnovsky (sk)
- Swapnil Hajare (mr)
- Funda Wang (zh_CN)


============
gedit 2.5.92
============

Fixes
=====

- Bug #136920 (Preferences dialog type hint) (Rob Adams)
- Fix maintainer builds (Thomas Vander Stichele)

New and updated translations
============================

- Dinesh Nadarajah (ta)
- Theppitak Karoonboonyanan (th)
- Ales Nyakhaychyk (be)
- Maxim Dziumanenko (uk)
- Arafat Medini (ar)
- Roberto Rosselli Del Turco (it)
- Rhys Jones (cy)
- Miloslav Trmac (cs)
- Raphael Higino, Gustavo Maciel Dias Vieira (pt_BR)
- Vincent van Adrighem (nl)
- Duarte Loreto (pt)
- Sanlig Badral (mn)


============
gedit 2.5.91
============

Enhancements
============

- Updated On-Line Manual (Breda McColgan)
- Added Paolo Borelli to the list of authors (Paolo Maggi)
- Uses PANGO_UNDERLINE_ERROR in the automatic spell checker (Thomas Voß)

Fixes
=====

- Bug #135824 (Solaris build with pixmap SOURCES) (Glynn Foster)
- Bug #104950 (Right-click unselects text if you click outside the
  selection) (based on patch by Nathan Fredrickson <nathan@silverorange.com>
  backported from gtkspell 2.5.0)
- Bug #135565 (.cgi files no longer highlight) (Paolo M.)
- Bug #135628 ("Enable Syntax Highlighting" checkbox not synched with
  GConf key) (Paolo Borelli)
- Bug #136231 (Should not run the file chooser in a loop to
  enter folders) (Paolo M.)
- Bug #135987 (crash when opening the choosing file window after successfully
  opening a first file in a folder with spaces) (Paolo M.)
- Various portability problems (Albert Chin-A-Young)

New and updated translations
============================

- Alastair McKinstry (ga)
- Amanpreet Singh Alam (pa)
- Arafat Medini (ar)
- Changwoo Ryu (ko)
 -Christophe Merlet (RedFox) (fr)
- Duarte Loreto (pt)
- Funda Wang (zh_CN)
- Mətin Əmirov (az)
- Mugurel Tudor (ro)
- Ole Laursen (da)
- Pablo G. del Campo (es)
- Priit Laes (et)
- Reinout van Schouwen (nl)
- Roberto Rosselli Del Turco (it)
- Takeshi AIHANA (ja)
- Žygimantas Beručka (lt)


=============
gedit 2.5.90"
=============

New features
============

- added a --enable-deprecations flag to configure.in
  to switch on the DISABLE_DEPRECATED cflags (Mark McLoughlin)

Fixes
=====

- Bug #133178 (Underquoted definitions in acinclude.m4) (Alexander Winston)
- Removed unused gconf key
  schemas/apps/gedit-2/preferences/editor/save/save_encoding (Paolo Maggi)
- Removed AC_SUBST(CFLAGS), AC_SUBST(CPPFLAGS) and AC_SUBST(LDFLAGS)
  from configure.in (Tomasz Kłoczko)
- Bug #135000 ("Save the changes to document before closing"
  dialog should have Accessible Role "ALERT") (Padraig O'Briain)
- Uses the new file chooser in the shell_output plugin (Paolo Borelli)
- Disables the menu items when the gedit state is not NORMAL (Paolo M.)
- Bug #133851 (Saves the file on pressing ESC from the
  "Save As" dialog) (Paolo B.)
- Don't highlight single column lists (Jeroen Zwartepoorte)
- Uses latest libegg recent-files code (Paolo M.)
- Bug #133604 (The name of filters are not marked for translation) (Paolo M.)
- Bug #133269 (check box check or uncheck is not having any bearing) (Paolo M.)
- Bug #133481 (check box selection is not habing any bearing) (Paolo M.)
- Fixed a lot of bugs in the preferences dialog (Paolo B. and Paolo M.)
- Fixed a lot of bugs in the Open/Save As dialog (Paolo M.)

New and updated translations
============================

- Adam Weinberger (en_CA)
- Alastair McKinstry (ga)
- Åsmund Skjæveland (nn)
- Chanchai Junlouchai (th)
- Changwoo Ryu (ko)
- Christian Neumair (de)
- Christian Rose (sv)
- Christophe Merlet (RedFox) (fr)
- Duarte Loreto (pt)
- GNOME PL Team (pl)
- Hasbullah Bin Pit (ms)
- Jarkko Ranta (fi)
- Joao Emanuel (pt_BR)
- John C Barstow (mi)
- Kjartan Maraas (no)
- Kostas Papadimas (el)
- Laurent Dhima (sq)
- Miloslav Trmac (cs)
- Mətin Əmirov (az)
- Ole Laursen (da)
- Pablo G. del Campo (es)
- Reinout van Schouwen (nl)
- Sanlig Badral (mn)
- Takeshi AIHANA (ja)
- Данило Шеган (sr)


=============================
gedit 2.5.[0123] - "I'm lazy"
=============================

New Features
============
- New preferences dialog (now you can also configure
  syntax highlighting) (Paolo Maggi)
- Uses ngettext where appropriate (Danilo Segan, Paolo)
- Uses the new gtk+ 2.3 GtkFileChooser (Jan Arne Petersen, Paolo)
- New close all dialog (Paolo, Paolo Borelli)
- Don't use EelInputEventBox, use gtk+ instead (Anders Carlsson)
- Async loading of remote files (Paolo)

Fixes
=====
- Bug #117365 - Alternate path for diff command is not
  configurable (Balamurali Viswanathan, Paolo)
- Bug #117443 - Help from "Compare Files" plugin page
  opens Gedit "Copyright" page (Leena Gunda, Paolo)
- Bug #122790 - Compilation error in gedit-2.4.0 (Mariano Suarez-Alvarez,
  Ettore Perazzoli)
- Bug #117056 - Preferences/Plugins/Manager has mystery button (Paolo)
- s/Gnome/the GNOME Desktop in the about dialog
- Bug #124769 - Crash in gedit print/printpreview code (Alexander Nedotsukov)
- Bug #117360 - Troublesome strings in gedit (Dafydd Harries)
- Partially fixed bug #115633 - Don't split sentences in gedit (Dafydd)
- Partially fixed bug #124238 - Compilation fails on Darwin (Jerry Talkington)
- Bug #117518 - Shouldn't say "string" in "search for string" tooltip (Paolo)
- Bug #102543 - Add statusbar hints to the recent files menu (Paolo)
- Bug #118935 - Can't find and replace \ (backslash) (Eric Ritezel)
- Added icon to the Edit->Delete menu entry (Paolo)
- Bug #128379 - highlighting sometimes fails (Paolo)
- Bug #128810 - HIGgify close confirmation dialog (Paolo B.)
- Bug #130226 - HIGify replace confirmation dialog (Paolo B.)
- Bug #127638 - Window tabs should truncate filenames if its to long (Paolo)
- Bug #87172 - Should never disable (unsensitive) the Revert functions (Paolo)
- Bug #120727 - Unnecessary calls to gtk_window_set_title (Padraig O'Briain)
- Removed separator from dialog (Paolo B.)
- Bug #129994 - gedit can't deal with double clicks on a tabs (Paolo B.)
- Bug #127693 - Bug in gedit.1 manual page (Eric S. Raymond)
- Bug #123007 - Help from date/time plugin points to Gedit copyright page (Leena)
- Bug #122611 - gedit spell plugin lacks Ukrainian support (Maxim Dzumanenko)
- Bug #124052 - shell_output problems with 'pos' return value (Owen Taylor)
- Bug #121377 - shell_output: G_IO_HUP is not enough to detect broken pipe
  (Laurent Vivier)

New and updated translations
============================

- Alastair McKinstry (ga)
- Arafat Medini (ar)
- Åsmund Skjæveland (nn)
- Changwoo Ryu (ko)
- Christian Neumair (de)
- Christian Rose (sv)
- Dafydd Harries (cy)
- Duarte Loreto (pt)
- Gabor Sari (hu)
- GNOME PL Team (pl)
- Jarkko Ranta (fi)
- KAMAGASASAKO Masatoshi (ja)
- Kjartan Maraas (no)
- Kostas Papadimas (el)
- Laurent Dhima (sq)
- Miloslav Trmac (cs)
- Mətin Əmirov (az)
- Ole Laursen (da)
- Pablo G. del Campo (es)
- Pawan (ne)
- Pramod (kn)
- Reinout van Schouwen (nl)
- Robert Sedak (hr)
- Sanlig Badral (mn)
- Sébastien Bacher (fr)
- Žygimantas Beručka (lt)
- Данило Шеган (sr)

3 files changed, 151 insertions, 94 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 1cc4ae732f8..25a0e907066 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2004/03/26 02:27:39 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2004/04/01 18:51:56 jmmv Exp $
 #
 
-DISTNAME=		gedit-2.4.1
-PKGREVISION=		8
+DISTNAME=		gedit-2.6.0
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -22,6 +21,8 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
+PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
+
 GCONF2_SCHEMAS=		gedit.schemas
 
 CONFIGURE_ARGS+=	--enable-schemas-install
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 5d9ce16ccc6..cedbf55f049 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,32 +1,32 @@
-@comment $NetBSD: PLIST,v 1.8 2003/12/15 01:04:06 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/04/01 18:51:56 jmmv Exp $
 bin/gedit
 bin/gnome-text-editor
-include/gedit-2.4/gedit/bonobo-mdi-child.h
-include/gedit-2.4/gedit/bonobo-mdi.h
-include/gedit-2.4/gedit/gedit-convert.h
-include/gedit-2.4/gedit/gedit-debug.h
-include/gedit-2.4/gedit/gedit-document.h
-include/gedit-2.4/gedit/gedit-encodings.h
-include/gedit-2.4/gedit/gedit-file.h
-include/gedit-2.4/gedit/gedit-mdi-child.h
-include/gedit-2.4/gedit/gedit-mdi.h
-include/gedit-2.4/gedit/gedit-menus.h
-include/gedit-2.4/gedit/gedit-metadata-manager.h
-include/gedit-2.4/gedit/gedit-output-window.h
-include/gedit-2.4/gedit/gedit-plugin.h
-include/gedit-2.4/gedit/gedit-prefs-manager-app.h
-include/gedit-2.4/gedit/gedit-prefs-manager.h
-include/gedit-2.4/gedit/gedit-print.h
-include/gedit-2.4/gedit/gedit-recent.h
-include/gedit-2.4/gedit/gedit-utils.h
-include/gedit-2.4/gedit/gedit-view.h
-include/gedit-2.4/gedit/gedit2.h
-include/gedit-2.4/gedit/recent-files/egg-recent-item.h
-include/gedit-2.4/gedit/recent-files/egg-recent-model.h
-include/gedit-2.4/gedit/recent-files/egg-recent-util.h
-include/gedit-2.4/gedit/recent-files/egg-recent-view-bonobo.h
-include/gedit-2.4/gedit/recent-files/egg-recent-view-gtk.h
-include/gedit-2.4/gedit/recent-files/egg-recent-view.h
+include/gedit-2.6/gedit/bonobo-mdi-child.h
+include/gedit-2.6/gedit/bonobo-mdi.h
+include/gedit-2.6/gedit/gedit-convert.h
+include/gedit-2.6/gedit/gedit-debug.h
+include/gedit-2.6/gedit/gedit-document.h
+include/gedit-2.6/gedit/gedit-encodings.h
+include/gedit-2.6/gedit/gedit-file.h
+include/gedit-2.6/gedit/gedit-mdi-child.h
+include/gedit-2.6/gedit/gedit-mdi.h
+include/gedit-2.6/gedit/gedit-menus.h
+include/gedit-2.6/gedit/gedit-metadata-manager.h
+include/gedit-2.6/gedit/gedit-output-window.h
+include/gedit-2.6/gedit/gedit-plugin.h
+include/gedit-2.6/gedit/gedit-prefs-manager-app.h
+include/gedit-2.6/gedit/gedit-prefs-manager.h
+include/gedit-2.6/gedit/gedit-print.h
+include/gedit-2.6/gedit/gedit-recent.h
+include/gedit-2.6/gedit/gedit-utils.h
+include/gedit-2.6/gedit/gedit-view.h
+include/gedit-2.6/gedit/gedit2.h
+include/gedit-2.6/gedit/recent-files/egg-recent-item.h
+include/gedit-2.6/gedit/recent-files/egg-recent-model.h
+include/gedit-2.6/gedit/recent-files/egg-recent-util.h
+include/gedit-2.6/gedit/recent-files/egg-recent-view-bonobo.h
+include/gedit-2.6/gedit/recent-files/egg-recent-view-gtk.h
+include/gedit-2.6/gedit/recent-files/egg-recent-view.h
 lib/bonobo/libgedit-control.a
 lib/bonobo/libgedit-control.la
 lib/bonobo/libgedit-control.so
@@ -63,7 +63,7 @@ lib/gedit-2/plugins/sort.gedit-plugin
 lib/gedit-2/plugins/spell.gedit-plugin
 lib/gedit-2/plugins/taglist.gedit-plugin
 lib/gedit-2/plugins/time.gedit-plugin
-lib/pkgconfig/gedit-2.4.pc
+lib/pkgconfig/gedit-2.6.pc
 man/man1/gedit.1
 share/application-registry/gedit.applications
 share/applications/gedit.desktop
@@ -87,88 +87,120 @@ share/gedit-2/taglist/Latex.tags
 share/gedit-2/taglist/XSLT.tags
 share/gedit-2/ui/gedit-ui.xml
 share/gnome-2.0/ui/gedit-viewer-ui.xml
+share/gnome/help/gedit/C/figures/gedit_format_bold.png
+share/gnome/help/gedit/C/figures/gedit_format_italic.png
+share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/C/figures/gedit_format_underline.png
 share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/C/figures/gedit_window.png
 share/gnome/help/gedit/C/gedit.xml
 share/gnome/help/gedit/C/legal.xml
+share/gnome/help/gedit/de/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/de/figures/gedit_window.png
 share/gnome/help/gedit/de/gedit.xml
 share/gnome/help/gedit/de/legal.xml
+share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/es/figures/gedit_window.png
 share/gnome/help/gedit/es/gedit.xml
 share/gnome/help/gedit/es/legal.xml
+share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/fr/figures/gedit_window.png
 share/gnome/help/gedit/fr/gedit.xml
 share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/it/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/it/figures/gedit_window.png
 share/gnome/help/gedit/it/gedit.xml
 share/gnome/help/gedit/it/legal.xml
+share/gnome/help/gedit/ja/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/ja/figures/gedit_window.png
 share/gnome/help/gedit/ja/gedit.xml
 share/gnome/help/gedit/ja/legal.xml
+share/gnome/help/gedit/ko/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/ko/figures/gedit_window.png
 share/gnome/help/gedit/ko/gedit.xml
 share/gnome/help/gedit/ko/legal.xml
 share/gnome/help/gedit/ro/figures/gedit_window.png
 share/gnome/help/gedit/ro/gedit.xml
 share/gnome/help/gedit/ro/legal.xml
+share/gnome/help/gedit/sv/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/sv/figures/gedit_window.png
 share/gnome/help/gedit/sv/gedit.xml
 share/gnome/help/gedit/sv/legal.xml
+share/gnome/help/gedit/zh_CN/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/zh_CN/figures/gedit_window.png
 share/gnome/help/gedit/zh_CN/gedit.xml
 share/gnome/help/gedit/zh_CN/legal.xml
+share/gnome/help/gedit/zh_HK/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/zh_HK/figures/gedit_window.png
+share/gnome/help/gedit/zh_HK/gedit.xml
+share/gnome/help/gedit/zh_HK/legal.xml
+share/gnome/help/gedit/zh_TW/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/zh_TW/figures/gedit_window.png
 share/gnome/help/gedit/zh_TW/gedit.xml
 share/gnome/help/gedit/zh_TW/legal.xml
 share/idl/GNOME_Gedit.idl
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gedit-2.4.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gedit-2.4.mo
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gedit-2.6.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gedit-2.6.mo
 share/mime-info/gedit.keys
 share/omf/gedit/gedit-C.omf
 share/omf/gedit/gedit-de.omf
@@ -180,30 +212,54 @@ share/omf/gedit/gedit-ko.omf
 share/omf/gedit/gedit-ro.omf
 share/omf/gedit/gedit-sv.omf
 share/omf/gedit/gedit-zh_CN.omf
+share/omf/gedit/gedit-zh_HK.omf
 share/omf/gedit/gedit-zh_TW.omf
 share/pixmaps/gedit-icon.png
 share/pixmaps/gedit-logo.png
 share/pixmaps/gedit-plugin-manager.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gedit
+@comment in scrollkeeper: @dirrm share/omf
+@comment in xdg-dirs: @dirrm share/mime-info
+@comment in ORBit2: @dirrm share/idl
+@dirrm share/gnome/help/gedit/zh_TW/figures
 @dirrm share/gnome/help/gedit/zh_TW
+@dirrm share/gnome/help/gedit/zh_HK/figures
+@dirrm share/gnome/help/gedit/zh_HK
+@dirrm share/gnome/help/gedit/zh_CN/figures
 @dirrm share/gnome/help/gedit/zh_CN
+@dirrm share/gnome/help/gedit/sv/figures
 @dirrm share/gnome/help/gedit/sv
 @dirrm share/gnome/help/gedit/ro/figures
 @dirrm share/gnome/help/gedit/ro
+@dirrm share/gnome/help/gedit/ko/figures
 @dirrm share/gnome/help/gedit/ko
+@dirrm share/gnome/help/gedit/ja/figures
 @dirrm share/gnome/help/gedit/ja
+@dirrm share/gnome/help/gedit/it/figures
 @dirrm share/gnome/help/gedit/it
+@dirrm share/gnome/help/gedit/fr/figures
 @dirrm share/gnome/help/gedit/fr
+@dirrm share/gnome/help/gedit/es/figures
 @dirrm share/gnome/help/gedit/es
+@dirrm share/gnome/help/gedit/de/figures
 @dirrm share/gnome/help/gedit/de
 @dirrm share/gnome/help/gedit/C/figures
 @dirrm share/gnome/help/gedit/C
+@dirrm share/gnome/help/gedit
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @dirrm share/gedit-2/ui
 @dirrm share/gedit-2/taglist
 @dirrm share/gedit-2/glade
 @dirrm share/gedit-2
+@comment in GConf2: @dirrm share/gconf/schemas
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry
 @dirrm lib/gedit-2/plugins
 @dirrm lib/gedit-2
-@dirrm include/gedit-2.4/gedit/recent-files
-@dirrm include/gedit-2.4/gedit
-@dirrm include/gedit-2.4
+@comment in libbonobo: @dirrm lib/bonobo/servers
+@comment in libbonobo: @dirrm lib/bonobo
+@dirrm include/gedit-2.6/gedit/recent-files
+@dirrm include/gedit-2.6/gedit
+@dirrm include/gedit-2.6
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 05bb5e52b9d..8e89825ced7 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/12/15 00:16:02 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2004/04/01 18:51:56 jmmv Exp $
 
-SHA1 (gedit-2.4.1.tar.bz2) = 3a766110513428cde1886e43f31930e03307fd0b
-Size (gedit-2.4.1.tar.bz2) = 1860967 bytes
+SHA1 (gedit-2.6.0.tar.bz2) = 63d770b6642df4c14512e55ecb406e69e708e957
+Size (gedit-2.6.0.tar.bz2) = 2261888 bytes