Update gedit to 2.26.0.

pkgsrc changes:

    * remove libbonobo, libglade, libgnomeui, ORBit2 dependencies

============
gedit 2.26.0
============

New Features and Fixes
======================
- Misc bugfixes

New and updated translations
============================
- Amitakhya Phukan (as)
- Gintautas Miliauskas (lt)
- I. Felix (ta)
- Ignacio Casal Quinteiro (gl)
- Jennie Petoumenou (el)
- Krishnababu K (te)
- Manoj Kumar Giri (or)
- Rajesh Ranjan (hi)
- Runa Bhattacharjee (bn_IN)
- Yuriy Penkin (ru)


============
gedit 2.25.8
============

New Features and Fixes
======================
- Misc bugfixes

New and updated translations
============================
- Baris Cicek (tr)
- Claude Paroz (fr)
- Duarte Loreto (pt)
- Gabor Kelemen (hu)
- Jesse van den Kieboom (nl)
- Mattias Põldaru (et)
- Milo Casagrande (it)
- Philip Withnall (en_GB)
- Rajesh Ranjan (hi)
- Rajesh Ranjan (mai)
- Sandeep Shedmake (mr)
- Sweta Kothari (gu)
- Takeshi AIHANA (ja)
- Theppitak Karoonboonyanan (th)


============
gedit 2.25.7
============

New Features and Fixes
======================
- Misc bugfixes

New and updated translations
============================
- Adi Roiban (ro)
- Alexander Shopov (bg)
- Chao-Hsiung Liao (zh_HK)
- Chao-Hsiung Liao (zh_TW)
- Clytie Siddall (vi)
- Duarte Loreto (pt)
- Ihar Hrachyshka (be@latin)
- Inaki Larranaga Murgoitio (eu)
- Kenneth Nielsen (da)
- Mikel González (ast)
- Sweta Kothari (gu)
- Tomasz Dominikowski (pl)
- Wouter Bolsterlee (nl)


============
gedit 2.25.6
============

New Features and Fixes
======================
- Misc bugfixes

New and updated translations
============================
- Andre Gondim (pt_BR)
- Andre Klapper (de)
- Changwoo Ryu (ko)
- Christian Kirbach (de)
- Gabor Kelemen (hu)
- Gil Forcada (ca)
- Raivis DEjus (lv)
- Yair Hershkovitz (he)
- 甘露(Gan Lu) (zh_CN.po)


============
gedit 2.25.5
============

New Features and Fixes
======================
- Add Fullscreen Mode (Ignacio Casal Quinteiro)
- Add a configuration dialog for the python console (B. Clausius)
- Rescan plugins when opening the preference dialog (Ignacio Casal Quinteiro)
- Misc bugfixes

New and updated translations
============================
- Daniel Nylander (sv)
- Ilkka Tuohela (fi)
- Ivar Smolin (et)
- Joan Duran (ca)
- Jorge Gonzalez (es)
- Kamil Paral (cs)
- Kjartan Maraas (nb)
- Marcel Telka (sk)
- Petr Kovar (cs)
- Shankar Prasad (kn)
- Theppitak Karoonboonyanan (th)


============
gedit 2.25.4
============

New Features and Fixes
======================
- Add quick syntax highlightig and tab width selection in the statusbar (Jesse van den Kieboom)
- More work on the internal bus system (Jesse van den Kieboom)
- Bugfixes and features for the snippets plugin (Jesse van den Kieboom)
- Parse syntax highlighting language from modelines (Sergej Chodarev)
- Misc bugfixes

New and updated translations
============================
- César Veiga (pt_BR)
- Jorge Gonzalez (es)


============
gedit 2.25.3
============

New Features and Fixes
======================
- Win32 port with installer (Ignacio Casal Quinteiro)
- Internal bus system to allow plugin intercomminication (Jesse van den Kieboom)
- Use GtkSourceView to detect language highlighting (Paolo Borelli)
- Misc bugfixes

New and updated translations
============================
- Jorge Gonzalez (es)
- Theppitak Karoonboonyanan (th)
- Alexander Shopov (bg)
- Claude Paroz (fr)


============
gedit 2.25.2
============

New Features and Fixes
======================
- Fixes to the new plugin system (Paolo Borelli)

New and updated translations
============================
- Daniel Nylander (sv)


============
gedit 2.25.1
============

New Features and Fixes
======================
- Rework the plugin system to have loaders as shared objects (Jesse van den Kieboom)
- Fix build on OSX (Jesse van den Kieboom)

New and updated translations
============================
- Jorge Gonzalez (es)
- Yuriy Penkin (ru)

4 files changed, 66 insertions, 35 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index bc7c52ead74..e94ae886e1b 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.90 2009/01/12 21:50:16 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2009/03/15 20:13:11 jmcneill Exp $
 #
 
-DISTNAME=		gedit-2.24.3
+DISTNAME=		gedit-2.26.0
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.24/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.26/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -22,21 +22,21 @@ PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
 
 GCONF_SCHEMAS=		gedit.schemas gedit-file-browser.schemas
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/help/*/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 .include "options.mk"
 
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.6.0
-.include "../../devel/libglade/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.16.0
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-#BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
-#.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.13.0
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index bcfba21ad3b..63eae62212d 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2009/01/12 21:50:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.34 2009/03/15 20:13:11 jmcneill Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.20/gedit/gedit-app.h
@@ -10,18 +10,24 @@ include/gedit-2.20/gedit/gedit-encodings.h
 include/gedit-2.20/gedit/gedit-file-chooser-dialog.h
 include/gedit-2.20/gedit/gedit-help.h
 include/gedit-2.20/gedit/gedit-message-area.h
+include/gedit-2.20/gedit/gedit-message-bus.h
+include/gedit-2.20/gedit/gedit-message-type.h
+include/gedit-2.20/gedit/gedit-message.h
 include/gedit-2.20/gedit/gedit-metadata-manager.h
 include/gedit-2.20/gedit/gedit-notebook.h
 include/gedit-2.20/gedit/gedit-panel.h
+include/gedit-2.20/gedit/gedit-plugin-loader.h
 include/gedit-2.20/gedit/gedit-plugin.h
 include/gedit-2.20/gedit/gedit-prefs-manager-app.h
 include/gedit-2.20/gedit/gedit-prefs-manager.h
 include/gedit-2.20/gedit/gedit-progress-message-area.h
+include/gedit-2.20/gedit/gedit-status-combo-box.h
 include/gedit-2.20/gedit/gedit-statusbar.h
 include/gedit-2.20/gedit/gedit-tab.h
 include/gedit-2.20/gedit/gedit-utils.h
 include/gedit-2.20/gedit/gedit-view.h
 include/gedit-2.20/gedit/gedit-window.h
+lib/gedit-2/plugin-loaders/libcloader.la
 lib/gedit-2/plugins/changecase.gedit-plugin
 lib/gedit-2/plugins/docinfo.gedit-plugin
 lib/gedit-2/plugins/filebrowser.gedit-plugin
@@ -52,14 +58,15 @@ share/gedit-2/icons/gedit-plugin.png
 share/gedit-2/logo/gedit-logo.png
 share/gedit-2/plugins/docinfo/docinfo.ui
 share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
+share/gedit-2/plugins/modelines/language-mappings
 share/gedit-2/plugins/sort/sort.ui
 ${PLIST.enchant}share/gedit-2/plugins/spell/languages-dialog.ui
 ${PLIST.enchant}share/gedit-2/plugins/spell/spell-checker.ui
+share/gedit-2/plugins/taglist/HTML.tags.gz
+share/gedit-2/plugins/taglist/Latex.tags.gz
+share/gedit-2/plugins/taglist/XSLT.tags.gz
+share/gedit-2/plugins/taglist/XUL.tags.gz
 share/gedit-2/plugins/time/time.ui
-share/gedit-2/taglist/HTML.tags.gz
-share/gedit-2/taglist/Latex.tags.gz
-share/gedit-2/taglist/XSLT.tags.gz
-share/gedit-2/taglist/XUL.tags.gz
 share/gedit-2/ui/gedit-encodings-dialog.ui
 share/gedit-2/ui/gedit-open-location-dialog.ui
 share/gedit-2/ui/gedit-preferences-dialog.ui
@@ -106,10 +113,6 @@ 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/eu/figures/gedit_recent_files_menu_icon.png
-share/gnome/help/gedit/eu/figures/gedit_window.png
-share/gnome/help/gedit/eu/gedit.xml
-share/gnome/help/gedit/eu/legal.xml
 share/gnome/help/gedit/fi/figures/gedit_format_bold.png
 share/gnome/help/gedit/fi/figures/gedit_format_italic.png
 share/gnome/help/gedit/fi/figures/gedit_format_strikethrough.png
@@ -174,9 +177,6 @@ share/gnome/help/gedit/pt_BR/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/pt_BR/figures/gedit_window.png
 share/gnome/help/gedit/pt_BR/gedit.xml
 share/gnome/help/gedit/pt_BR/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/ru/figures/gedit_format_bold.png
 share/gnome/help/gedit/ru/figures/gedit_format_italic.png
 share/gnome/help/gedit/ru/figures/gedit_format_strikethrough.png
@@ -193,6 +193,14 @@ 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/th/figures/gedit_format_bold.png
+share/gnome/help/gedit/th/figures/gedit_format_italic.png
+share/gnome/help/gedit/th/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/th/figures/gedit_format_underline.png
+share/gnome/help/gedit/th/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/th/figures/gedit_window.png
+share/gnome/help/gedit/th/gedit.xml
+share/gnome/help/gedit/th/legal.xml
 share/gnome/help/gedit/uk/figures/gedit_format_bold.png
 share/gnome/help/gedit/uk/figures/gedit_format_italic.png
 share/gnome/help/gedit/uk/figures/gedit_format_strikethrough.png
@@ -229,7 +237,9 @@ share/gtk-doc/html/gedit/GeditApp.html
 share/gtk-doc/html/gedit/GeditDocument.html
 share/gtk-doc/html/gedit/GeditEncodingsOptionMenu.html
 share/gtk-doc/html/gedit/GeditFileChooserDialog.html
+share/gtk-doc/html/gedit/GeditMessage.html
 share/gtk-doc/html/gedit/GeditMessageArea.html
+share/gtk-doc/html/gedit/GeditMessageBus.html
 share/gtk-doc/html/gedit/GeditNotebook.html
 share/gtk-doc/html/gedit/GeditPanel.html
 share/gtk-doc/html/gedit/GeditPlugin.html
@@ -239,6 +249,7 @@ share/gtk-doc/html/gedit/GeditTab.html
 share/gtk-doc/html/gedit/GeditView.html
 share/gtk-doc/html/gedit/GeditWindow.html
 share/gtk-doc/html/gedit/ch01.html
+share/gtk-doc/html/gedit/gedit-GeditMessageType.html
 share/gtk-doc/html/gedit/gedit-GeditPrintJob.html
 share/gtk-doc/html/gedit/gedit-GeditPrintJobPreview.html
 share/gtk-doc/html/gedit/gedit-gedit-convert.html
@@ -262,6 +273,7 @@ share/locale/af/LC_MESSAGES/gedit.mo
 share/locale/am/LC_MESSAGES/gedit.mo
 share/locale/ar/LC_MESSAGES/gedit.mo
 share/locale/as/LC_MESSAGES/gedit.mo
+share/locale/ast/LC_MESSAGES/gedit.mo
 share/locale/az/LC_MESSAGES/gedit.mo
 share/locale/be/LC_MESSAGES/gedit.mo
 share/locale/be@latin/LC_MESSAGES/gedit.mo
@@ -350,7 +362,6 @@ share/omf/gedit/gedit-bg.omf
 share/omf/gedit/gedit-da.omf
 share/omf/gedit/gedit-de.omf
 share/omf/gedit/gedit-es.omf
-share/omf/gedit/gedit-eu.omf
 share/omf/gedit/gedit-fi.omf
 share/omf/gedit/gedit-fr.omf
 share/omf/gedit/gedit-hu.omf
@@ -359,9 +370,9 @@ share/omf/gedit/gedit-ja.omf
 share/omf/gedit/gedit-ko.omf
 share/omf/gedit/gedit-oc.omf
 share/omf/gedit/gedit-pt_BR.omf
-share/omf/gedit/gedit-ro.omf
 share/omf/gedit/gedit-ru.omf
 share/omf/gedit/gedit-sv.omf
+share/omf/gedit/gedit-th.omf
 share/omf/gedit/gedit-uk.omf
 share/omf/gedit/gedit-zh_CN.omf
 share/omf/gedit/gedit-zh_HK.omf
@@ -377,12 +388,12 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gnome/help/gedit/zh_CN
 @dirrm share/gnome/help/gedit/uk/figures
 @dirrm share/gnome/help/gedit/uk
+@dirrm share/gnome/help/gedit/th/figures
+@dirrm share/gnome/help/gedit/th
 @dirrm share/gnome/help/gedit/sv/figures
 @dirrm share/gnome/help/gedit/sv
 @dirrm share/gnome/help/gedit/ru/figures
 @dirrm share/gnome/help/gedit/ru
-@dirrm share/gnome/help/gedit/ro/figures
-@dirrm share/gnome/help/gedit/ro
 @dirrm share/gnome/help/gedit/pt_BR/figures
 @dirrm share/gnome/help/gedit/pt_BR
 @dirrm share/gnome/help/gedit/oc/figures
@@ -399,8 +410,6 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gnome/help/gedit/fr
 @dirrm share/gnome/help/gedit/fi/figures
 @dirrm share/gnome/help/gedit/fi
-@dirrm share/gnome/help/gedit/eu/figures
-@dirrm share/gnome/help/gedit/eu
 @dirrm share/gnome/help/gedit/es/figures
 @dirrm share/gnome/help/gedit/es
 @dirrm share/gnome/help/gedit/de/figures
@@ -413,13 +422,16 @@ share/omf/gedit/gedit-zh_TW.omf
 @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
 @dirrm share/gedit-2/ui
-@dirrm share/gedit-2/taglist
 @dirrm share/gedit-2/plugins/time
-${PLIST.enchant}@dirrm share/gedit-2/plugins/spell
+@dirrm share/gedit-2/plugins/taglist
+${PLIST.enchant}share/gedit-2/plugins/spell/languages-dialog.ui
+${PLIST.enchant}share/gedit-2/plugins/spell/spell-checker.ui
 @dirrm share/gedit-2/plugins/sort
 @exec ${MKDIR} %D/share/gedit-2/plugins/sample
 @dirrm share/gedit-2/plugins/sample
+@dirrm share/gedit-2/plugins/modelines
 @exec ${MKDIR} %D/share/gedit-2/plugins/indent
 @dirrm share/gedit-2/plugins/indent
 @dirrm share/gedit-2/plugins/filebrowser
@@ -434,6 +446,7 @@ ${PLIST.enchant}@dirrm share/gedit-2/plugins/spell
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm libexec/gedit-2
 @dirrm lib/gedit-2/plugins
+@dirrm lib/gedit-2/plugin-loaders
 @dirrm lib/gedit-2
 @dirrm include/gedit-2.20/gedit
 @dirrm include/gedit-2.20
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index d3170118dda..4b0edb50947 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.40 2009/01/12 21:50:17 wiz Exp $
+$NetBSD: distinfo,v 1.41 2009/03/15 20:13:11 jmcneill Exp $
 
-SHA1 (gedit-2.24.3.tar.bz2) = 93738961fac2228dbf425009828299520d8bc06e
-RMD160 (gedit-2.24.3.tar.bz2) = f16efeacf7c1ad66f07c72311eb2567930876969
-Size (gedit-2.24.3.tar.bz2) = 4078641 bytes
+SHA1 (gedit-2.26.0.tar.bz2) = f4760bed0659029ea8492eb1e530bf4272dfa7f9
+RMD160 (gedit-2.26.0.tar.bz2) = 2fead2713c63943e7a304e4d35a4b54beb4bcdd1
+Size (gedit-2.26.0.tar.bz2) = 4198506 bytes
 SHA1 (patch-aa) = ea4b076c14260c35298bc9a8875887b6c626a068
diff --git a/editors/gedit/files/msgfmtstrip b/editors/gedit/files/msgfmtstrip
new file mode 100644
index 00000000000..d32a547cde8
--- /dev/null
+++ b/editors/gedit/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/15 20:13:11 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}