Update to 2.4.1

Changes:

	o Fixed the --help messages translation problem (Paolo Maggi)
	o Used the new docs build system (John Fleck)
	o Managed unknown current locale encodings (Paolo)
	o Other minor bugs (Paolo and Eric Ritezel)

And more... review Changelog to see a full list of changes.

4 files changed, 129 insertions, 97 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 922ddb2a1f9..c2d760ac5e5 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/15 00:16:02 xtraeme Exp $
 #
 
-DISTNAME=		gedit-2.2.1
-PKGREVISION=		5
+DISTNAME=		gedit-2.4.1
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -25,6 +24,9 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GCONF2_SCHEMAS=		gedit.schemas
 
+CONFIGURE_ARGS+=	--enable-schemas-install
+
+.if 0
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../print/libgnomeprintui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
@@ -32,4 +34,6 @@ GCONF2_SCHEMAS=		gedit.schemas
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/eel2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
+.include "../../x11/gtksourceview/buildlink2.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 73910008036..137c3fa2f0c 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,21 +1,38 @@
-@comment $NetBSD: PLIST,v 1.6 2003/05/30 16:19:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/12/15 00:16:02 xtraeme 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
+lib/bonobo/libgedit-control.a
+lib/bonobo/libgedit-control.la
+lib/bonobo/libgedit-control.so
 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
-lib/gedit-2/plugins/libcvschangelog.a
-lib/gedit-2/plugins/libcvschangelog.la
-lib/gedit-2/plugins/libcvschangelog.so
-lib/gedit-2/plugins/libdiff.a
-lib/gedit-2/plugins/libdiff.la
-lib/gedit-2/plugins/libdiff.so
 lib/gedit-2/plugins/libdocinfo.a
 lib/gedit-2/plugins/libdocinfo.la
 lib/gedit-2/plugins/libdocinfo.so
@@ -42,16 +59,16 @@ 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
+lib/pkgconfig/gedit-2.4.pc
 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/page-setup-dialog.glade2
 share/gedit-2/glade/plugin-manager.glade2
 share/gedit-2/glade/program-location-dialog.glade2
 share/gedit-2/glade/replace.glade2
@@ -63,85 +80,110 @@ 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-2.0/ui/gedit-viewer-ui.xml
 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/gedit.xml
+share/gnome/help/gedit/de/legal.xml
+share/gnome/help/gedit/es/gedit.xml
+share/gnome/help/gedit/es/legal.xml
+share/gnome/help/gedit/fr/gedit.xml
+share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/it/gedit.xml
+share/gnome/help/gedit/it/legal.xml
+share/gnome/help/gedit/ja/gedit.xml
+share/gnome/help/gedit/ja/legal.xml
+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/gedit.xml
+share/gnome/help/gedit/sv/legal.xml
+share/gnome/help/gedit/zh_CN/gedit.xml
+share/gnome/help/gedit/zh_CN/legal.xml
+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.2.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gedit-2.2.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
+${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
 share/mime-info/gedit.keys
 share/omf/gedit/gedit-C.omf
+share/omf/gedit/gedit-de.omf
+share/omf/gedit/gedit-es.omf
+share/omf/gedit/gedit-fr.omf
+share/omf/gedit/gedit-it.omf
+share/omf/gedit/gedit-ja.omf
+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_TW.omf
 share/pixmaps/gedit-icon.png
 share/pixmaps/gedit-logo.png
 share/pixmaps/gedit-plugin-manager.png
 @dirrm share/omf/gedit
-@comment in scrollkeeper: @dirrm share/omf
-@comment in gnome2-dirs: @dirrm share/mime-info
 @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
-@comment in bonobo-activation: @dirrm lib/bonobo/servers
+@dirrm include/gedit-2.4/gedit/recent-files
+@dirrm include/gedit-2.4/gedit
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index f8cc44c93e8..05bb5e52b9d 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/03/12 16:41:01 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/12/15 00:16:02 xtraeme Exp $
 
-SHA1 (gedit-2.2.1.tar.bz2) = 32ef1d0692a69f3a00c2278a7aa253b4a4a09d95
-Size (gedit-2.2.1.tar.bz2) = 1522500 bytes
-SHA1 (patch-aa) = d27d5614e73e7fa6be9e439e3260b4010f3cf621
+SHA1 (gedit-2.4.1.tar.bz2) = 3a766110513428cde1886e43f31930e03307fd0b
+Size (gedit-2.4.1.tar.bz2) = 1860967 bytes
diff --git a/editors/gedit/patches/patch-aa b/editors/gedit/patches/patch-aa
deleted file mode 100644
index 2d5158f0913..00000000000
--- a/editors/gedit/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/02/18 20:52:06 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)
-