Update to 2.2.0.1. Changes include:

- Fixed an egg-recent related bug (James Willcox)
- Make sure to include <config.h> in all *.c files (Paolo Maggi)
- Allow svg icons in tabs and recent files list (James Willcox)
- Code cleanup in the Open page of the preferences dialog (Paolo)
- Updated gedit guide (Breda McColgan)
- Updated to latest recent-files code (James Willcox)
- Updated about box (Paolo Mggi)
- Fixed mem leaks (Paolo)
- Fixed several bugs in the diff plugin (Paolo)
- Fixed default fonts for printing (Paolo Maggi)
- Updating docs to newest build template (John Fleck)
- Updated gedit man file (James Willcox, Paolo)
- Requires libgnomeprintui-2.2 >= 2.1.7 (Paolo)
- Revamped about dialog (Christian Neumair)
- Added ISO-8859-2 to the list of supported
  encodings (Marcin Malinowski)
- Fixed problems with line numbers (Paolo)
- Improved key navigability of output window (Paolo)
- Remember printer configuration/settings (Paolo)
- Fixed various little problems in the plugin
  engine (Paolo)
- Enabled startup notification (James)
- Fixed icon sizes for recent-files menus and
  document tabs (James).
- Fixed a crash bug related to recent files (James)
- Lots of new and updated translations.

Changes in the package:
- Depend on gnome2-dirs.
- Use the new schemas.mk framework to handle GConf2 schemas.

4 files changed, 73 insertions, 79 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 3fd62df931c..1c40f91ce8f 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 06:09:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/14 21:10:14 jmmv Exp $
 #
 
-DISTNAME=		gedit-2.0.6
-PKGREVISION=		1
+DISTNAME=		gedit-2.2.0.1
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
@@ -12,6 +11,7 @@ HOMEPAGE=		http://gedit.sourceforge.net/
 COMMENT=		lightweight GNOME2 text editor
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 USE_PERL5=		build
 USE_BUILDLINK2=		YES
@@ -23,9 +23,12 @@ GNU_CONFIGURE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
+GCONF2_SCHEMAS=		gedit.schemas
+
 .include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../print/libgnomeprintui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/eel2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 1297391ef95..9f7d2f538e1 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,42 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/18 19:26:23 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:10:14 jmmv Exp $
 bin/gedit
 bin/gnome-text-editor
-etc/gconf/gconf.xml.defaults/apps/gedit-2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/recents/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/statusbar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/toolbar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar/%gconf.xml
-etc/gconf/schemas/gedit.schemas
 lib/bonobo/servers/GNOME_Gedit.server
+lib/gedit-2/plugins/ascii.gedit-plugin
+lib/gedit-2/plugins/cvschangelog.gedit-plugin
+lib/gedit-2/plugins/diff.gedit-plugin
+lib/gedit-2/plugins/docinfo.gedit-plugin
+lib/gedit-2/plugins/indent.gedit-plugin
 lib/gedit-2/plugins/libasciitable.a
 lib/gedit-2/plugins/libasciitable.la
 lib/gedit-2/plugins/libasciitable.so
@@ -49,39 +19,60 @@ lib/gedit-2/plugins/libdiff.so
 lib/gedit-2/plugins/libdocinfo.a
 lib/gedit-2/plugins/libdocinfo.la
 lib/gedit-2/plugins/libdocinfo.so
+lib/gedit-2/plugins/libindent.a
+lib/gedit-2/plugins/libindent.la
+lib/gedit-2/plugins/libindent.so
 lib/gedit-2/plugins/libsample.a
 lib/gedit-2/plugins/libsample.la
 lib/gedit-2/plugins/libsample.so
 lib/gedit-2/plugins/libshell_output.a
 lib/gedit-2/plugins/libshell_output.la
 lib/gedit-2/plugins/libshell_output.so
+lib/gedit-2/plugins/libsort.a
+lib/gedit-2/plugins/libsort.la
+lib/gedit-2/plugins/libsort.so
+lib/gedit-2/plugins/libsort.so.0
+lib/gedit-2/plugins/libsort.so.0.0
 lib/gedit-2/plugins/libtaglist.a
 lib/gedit-2/plugins/libtaglist.la
 lib/gedit-2/plugins/libtaglist.so
 lib/gedit-2/plugins/libtime.a
 lib/gedit-2/plugins/libtime.la
 lib/gedit-2/plugins/libtime.so
+lib/gedit-2/plugins/sample.gedit-plugin
+lib/gedit-2/plugins/shell_output.gedit-plugin
+lib/gedit-2/plugins/sort.gedit-plugin
+lib/gedit-2/plugins/taglist.gedit-plugin
+lib/gedit-2/plugins/time.gedit-plugin
 man/man1/gedit.1
+share/application-registry/gedit.applications
 share/applications/gedit.desktop
+share/gconf/schemas/gedit.schemas
 share/gedit-2/glade/asciitable.glade2
 share/gedit-2/glade/diff.glade2
 share/gedit-2/glade/docinfo.glade2
+share/gedit-2/glade/gedit-encodings-dialog.glade2
 share/gedit-2/glade/gedit-preferences.glade2
 share/gedit-2/glade/goto-line.glade2
 share/gedit-2/glade/plugin-manager.glade2
 share/gedit-2/glade/program-location-dialog.glade2
 share/gedit-2/glade/replace.glade2
 share/gedit-2/glade/shell_output.glade2
+share/gedit-2/glade/sort.glade2
 share/gedit-2/glade/time.glade2
 share/gedit-2/glade/uri.glade2
 share/gedit-2/taglist/HTML.tags
 share/gedit-2/taglist/Latex.tags
+share/gedit-2/taglist/XSLT.tags
 share/gedit-2/ui/gedit-ui.xml
 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/C/topic.dat
+share/gnome/help/gedit/ro/figures/gedit_window.png
+share/gnome/help/gedit/ro/gedit.xml
+share/gnome/help/gedit/ro/legal.xml
 share/idl/GNOME_Gedit.idl
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gedit-2.0.mo
@@ -98,6 +89,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gedit-2.0.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gedit-2.0.mo
@@ -105,6 +97,8 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gedit-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gedit-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gedit-2.0.mo
@@ -118,6 +112,7 @@ ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gedit-2.0.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gedit-2.0.mo
@@ -126,51 +121,24 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gedit-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo
 share/mime-info/gedit.keys
 share/omf/gedit/gedit-C.omf
+share/omf/gedit/gedit-ro.omf
 share/pixmaps/gedit-icon.png
 share/pixmaps/gedit-logo.png
 share/pixmaps/gedit-plugin-manager.png
-share/pixmaps/shell-output-logo.png
 @dirrm share/omf/gedit
+@dirrm share/gnome/help/gedit/ro/figures
+@dirrm share/gnome/help/gedit/ro
 @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
 @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 gnome2-dirs: @dirrm share/applications
+@comment in gnome2-dirs: @dirrm share/application-registry
 @dirrm lib/gedit-2/plugins
 @dirrm lib/gedit-2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/toolbar
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/statusbar
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/recents
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2
+@comment in bonobo-activation: @dirrm lib/bonobo/servers
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index c982794f814..7ef64879726 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/12/18 19:26:23 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/14 21:10:14 jmmv Exp $
 
-SHA1 (gedit-2.0.6.tar.bz2) = afeb68fb7bf8933b38e2c4ba129a5c411ee7c9ce
-Size (gedit-2.0.6.tar.bz2) = 1175264 bytes
+SHA1 (gedit-2.2.0.1.tar.bz2) = 79ebfc22882706938c53658c3f5d02f3f052926c
+Size (gedit-2.2.0.1.tar.bz2) = 1456472 bytes
+SHA1 (patch-aa) = 908ebb3c7aca809f151dc80b7adda44d72491b46
diff --git a/editors/gedit/patches/patch-aa b/editors/gedit/patches/patch-aa
new file mode 100644
index 00000000000..d2877497d6f
--- /dev/null
+++ b/editors/gedit/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2003/02/14 21:10:14 jmmv Exp $
+
+--- data/Makefile.in.orig	2003-02-14 17:59:17.000000000 +0100
++++ data/Makefile.in
+@@ -140,7 +140,7 @@ keysdir = $(datadir)/mime-info
+ keys_in_files = gedit.keys.in
+ keys_DATA = $(keys_in_files:.keys.in=.keys) 
+ 
+-schemasdir = $(sysconfdir)/gconf/schemas
++schemasdir = $(datadir)/gconf/schemas
+ schemas_in_files = gedit.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+ 
+@@ -412,7 +412,7 @@ maintainer-clean-generic clean mostlycle
+ @INTLTOOL_SERVER_RULE@
+ 
+ install-data-local:
+-	        if test -z "$(DESTDIR)" ; then \
++	        if false; then \
+ 	                for p in $(schemas_DATA) ; do \
+ 	                        GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+ 	                done \