update to 2.26.1

changes:
-bugfixes
-translation updates

6 files changed, 30 insertions, 22 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 06c48c775a6..7371af43068 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2009/03/22 19:01:38 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2009/04/17 18:40:42 drochner Exp $
 #
 
-DISTNAME=		gedit-2.26.0
+DISTNAME=		gedit-2.26.1
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.26/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 63eae62212d..a3298d4cdb1 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2009/03/15 20:13:11 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.35 2009/04/17 18:40:42 drochner Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.20/gedit/gedit-app.h
@@ -105,6 +105,14 @@ 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/el/figures/gedit_format_bold.png
+share/gnome/help/gedit/el/figures/gedit_format_italic.png
+share/gnome/help/gedit/el/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/el/figures/gedit_format_underline.png
+share/gnome/help/gedit/el/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/el/figures/gedit_window.png
+share/gnome/help/gedit/el/gedit.xml
+share/gnome/help/gedit/el/legal.xml
 share/gnome/help/gedit/es/figures/gedit_format_bold.png
 share/gnome/help/gedit/es/figures/gedit_format_italic.png
 share/gnome/help/gedit/es/figures/gedit_format_strikethrough.png
@@ -283,6 +291,7 @@ share/locale/bn_IN/LC_MESSAGES/gedit.mo
 share/locale/br/LC_MESSAGES/gedit.mo
 share/locale/bs/LC_MESSAGES/gedit.mo
 share/locale/ca/LC_MESSAGES/gedit.mo
+share/locale/crh/LC_MESSAGES/gedit.mo
 share/locale/cs/LC_MESSAGES/gedit.mo
 share/locale/cy/LC_MESSAGES/gedit.mo
 share/locale/da/LC_MESSAGES/gedit.mo
@@ -361,6 +370,7 @@ share/omf/gedit/gedit-C.omf
 share/omf/gedit/gedit-bg.omf
 share/omf/gedit/gedit-da.omf
 share/omf/gedit/gedit-de.omf
+share/omf/gedit/gedit-el.omf
 share/omf/gedit/gedit-es.omf
 share/omf/gedit/gedit-fi.omf
 share/omf/gedit/gedit-fr.omf
@@ -412,6 +422,8 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gnome/help/gedit/fi
 @dirrm share/gnome/help/gedit/es/figures
 @dirrm share/gnome/help/gedit/es
+@dirrm share/gnome/help/gedit/el/figures
+@dirrm share/gnome/help/gedit/el
 @dirrm share/gnome/help/gedit/de/figures
 @dirrm share/gnome/help/gedit/de
 @dirrm share/gnome/help/gedit/da/figures
@@ -422,12 +434,10 @@ 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/plugins/time
 @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
+${PLIST.enchant}@dirrm share/gedit-2/plugins/spell
 @dirrm share/gedit-2/plugins/sort
 @exec ${MKDIR} %D/share/gedit-2/plugins/sample
 @dirrm share/gedit-2/plugins/sample
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index b52e8d121ad..4618480591b 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/04/17 18:40:42 drochner Exp $
 
 BUILDLINK_TREE+=	gedit
 
@@ -9,8 +9,6 @@ BUILDLINK_API_DEPENDS.gedit+=	gedit>=2.12.1nb4
 BUILDLINK_ABI_DEPENDS.gedit?=	gedit>=2.20.4nb2
 BUILDLINK_PKGSRCDIR.gedit?=	../../editors/gedit
 
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../x11/gtksourceview2/buildlink3.mk"
 .endif # GEDIT_BUILDLINK3_MK
 
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 4b0edb50947..ac30b2e044c 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.41 2009/03/15 20:13:11 jmcneill Exp $
+$NetBSD: distinfo,v 1.42 2009/04/17 18:40:42 drochner Exp $
 
-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
+SHA1 (gedit-2.26.1.tar.bz2) = 741483dcaa6c92f908f27cb2f3197c3811f4462a
+RMD160 (gedit-2.26.1.tar.bz2) = 90460809013e4c0f657442c55b62cfc6df07cde0
+Size (gedit-2.26.1.tar.bz2) = 4297289 bytes
+SHA1 (patch-aa) = 2042f22ad9a1bffea6dbe6105397bea9ab436705
diff --git a/editors/gedit/options.mk b/editors/gedit/options.mk
index 7cd70f2205d..4edda7eb718 100644
--- a/editors/gedit/options.mk
+++ b/editors/gedit/options.mk
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2009/01/12 21:50:17 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2009/04/17 18:40:42 drochner Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.esound
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gedit
 PKG_SUPPORTED_OPTIONS=	enchant
 #PKG_SUGGESTED_OPTIONS=	enchant
 
diff --git a/editors/gedit/patches/patch-aa b/editors/gedit/patches/patch-aa
index d481a11cabf..488b6dc7621 100644
--- a/editors/gedit/patches/patch-aa
+++ b/editors/gedit/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.9 2009/01/12 21:50:17 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2009/04/17 18:40:42 drochner Exp $
 
---- plugins/taglist/Makefile.in.orig	2009-01-10 18:45:20.000000000 +0100
+--- plugins/taglist/Makefile.in.orig	2009-04-13 17:52:06.000000000 +0200
 +++ plugins/taglist/Makefile.in
-@@ -142,6 +142,7 @@ GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
+@@ -143,6 +143,7 @@ GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTKDOC_MKPDF = @GTKDOC_MKPDF@
+ GTKDOC_REBASE = @GTKDOC_REBASE@
  GZIP = @GZIP@
 +GZIP_ENV = --best
  HELP_DIR = @HELP_DIR@
  HTML_DIR = @HTML_DIR@
  INSTALL = @INSTALL@
-@@ -637,7 +638,7 @@ uninstall-am: uninstall-pluginDATA unins
+@@ -662,7 +663,7 @@ uninstall-am: uninstall-pluginDATA unins
  
  %.tags.gz: %.tags.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
  	LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache