update to 2.20.3

This switches to the new gnome-2.20 branch.

4 files changed, 65 insertions, 39 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index aabbcf517b5..7887d06c114 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:40 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2007/11/03 16:27:40 drochner Exp $
 #
 
-DISTNAME=		gedit-2.18.2
-PKGREVISION=		2
+DISTNAME=		gedit-2.20.3
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -29,7 +28,7 @@ CONFIGURE_ARGS+=	--enable-schemas-install
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.12.0
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
-BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.8.0
+#BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.8.0
 BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.6.0
 BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.12.1
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.16.0
@@ -48,5 +47,5 @@ BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtksourceview/buildlink3.mk"
+.include "../../x11/gtksourceview2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 5fbdba06e0c..54ec2c87bf2 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,29 +1,27 @@
-@comment $NetBSD: PLIST,v 1.28 2007/09/25 10:54:11 hira Exp $
+@comment $NetBSD: PLIST,v 1.29 2007/11/03 16:27:40 drochner Exp $
 bin/gedit
 bin/gnome-text-editor
-include/gedit-2.16/gedit/gedit-app.h
-include/gedit-2.16/gedit/gedit-convert.h
-include/gedit-2.16/gedit/gedit-debug.h
-include/gedit-2.16/gedit/gedit-document.h
-include/gedit-2.16/gedit/gedit-encodings-option-menu.h
-include/gedit-2.16/gedit/gedit-encodings.h
-include/gedit-2.16/gedit/gedit-file-chooser-dialog.h
-include/gedit-2.16/gedit/gedit-help.h
-include/gedit-2.16/gedit/gedit-message-area.h
-include/gedit-2.16/gedit/gedit-metadata-manager.h
-include/gedit-2.16/gedit/gedit-notebook.h
-include/gedit-2.16/gedit/gedit-panel.h
-include/gedit-2.16/gedit/gedit-plugin.h
-include/gedit-2.16/gedit/gedit-prefs-manager-app.h
-include/gedit-2.16/gedit/gedit-prefs-manager.h
-include/gedit-2.16/gedit/gedit-print-job-preview.h
-include/gedit-2.16/gedit/gedit-print.h
-include/gedit-2.16/gedit/gedit-progress-message-area.h
-include/gedit-2.16/gedit/gedit-statusbar.h
-include/gedit-2.16/gedit/gedit-tab.h
-include/gedit-2.16/gedit/gedit-utils.h
-include/gedit-2.16/gedit/gedit-view.h
-include/gedit-2.16/gedit/gedit-window.h
+include/gedit-2.20/gedit/gedit-app.h
+include/gedit-2.20/gedit/gedit-convert.h
+include/gedit-2.20/gedit/gedit-debug.h
+include/gedit-2.20/gedit/gedit-document.h
+include/gedit-2.20/gedit/gedit-encodings-option-menu.h
+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-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.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-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/gedit-bugreport.sh
 lib/gedit-2/plugins/changecase.gedit-plugin
 lib/gedit-2/plugins/docinfo.gedit-plugin
@@ -33,17 +31,19 @@ lib/gedit-2/plugins/libchangecase.la
 lib/gedit-2/plugins/libdocinfo.la
 lib/gedit-2/plugins/libfilebrowser.la
 lib/gedit-2/plugins/libindent.la
+lib/gedit-2/plugins/libmodelines.la
 lib/gedit-2/plugins/libsample.la
 lib/gedit-2/plugins/libsort.la
 lib/gedit-2/plugins/libspell.la
 lib/gedit-2/plugins/libtaglist.la
 lib/gedit-2/plugins/libtime.la
+lib/gedit-2/plugins/modelines.gedit-plugin
 lib/gedit-2/plugins/sample.gedit-plugin
 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.16.pc
+lib/pkgconfig/gedit-2.20.pc
 man/man1/gedit.1
 share/applications/gedit.desktop
 share/gconf/schemas/gedit-file-browser.schemas
@@ -110,6 +110,14 @@ 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/hu/figures/gedit_format_bold.png
+share/gnome/help/gedit/hu/figures/gedit_format_italic.png
+share/gnome/help/gedit/hu/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/hu/figures/gedit_format_underline.png
+share/gnome/help/gedit/hu/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/hu/figures/gedit_window.png
+share/gnome/help/gedit/hu/gedit.xml
+share/gnome/help/gedit/hu/legal.xml
 share/gnome/help/gedit/it/figures/gedit_format_bold.png
 share/gnome/help/gedit/it/figures/gedit_format_italic.png
 share/gnome/help/gedit/it/figures/gedit_format_strikethrough.png
@@ -126,10 +134,22 @@ 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_format_bold.png
+share/gnome/help/gedit/ko/figures/gedit_format_italic.png
+share/gnome/help/gedit/ko/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/ko/figures/gedit_format_underline.png
 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/oc/figures/gedit_format_bold.png
+share/gnome/help/gedit/oc/figures/gedit_format_italic.png
+share/gnome/help/gedit/oc/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/oc/figures/gedit_format_underline.png
+share/gnome/help/gedit/oc/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/oc/figures/gedit_window.png
+share/gnome/help/gedit/oc/gedit.xml
+share/gnome/help/gedit/oc/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
@@ -219,6 +239,7 @@ share/locale/am/LC_MESSAGES/gedit.mo
 share/locale/ar/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
 share/locale/bg/LC_MESSAGES/gedit.mo
 share/locale/bn/LC_MESSAGES/gedit.mo
 share/locale/bn_IN/LC_MESSAGES/gedit.mo
@@ -302,9 +323,11 @@ share/omf/gedit/gedit-de.omf
 share/omf/gedit/gedit-es.omf
 share/omf/gedit/gedit-eu.omf
 share/omf/gedit/gedit-fr.omf
+share/omf/gedit/gedit-hu.omf
 share/omf/gedit/gedit-it.omf
 share/omf/gedit/gedit-ja.omf
 share/omf/gedit/gedit-ko.omf
+share/omf/gedit/gedit-oc.omf
 share/omf/gedit/gedit-ro.omf
 share/omf/gedit/gedit-ru.omf
 share/omf/gedit/gedit-sv.omf
@@ -329,12 +352,16 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gnome/help/gedit/ru
 @dirrm share/gnome/help/gedit/ro/figures
 @dirrm share/gnome/help/gedit/ro
+@dirrm share/gnome/help/gedit/oc/figures
+@dirrm share/gnome/help/gedit/oc
 @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/hu/figures
+@dirrm share/gnome/help/gedit/hu
 @dirrm share/gnome/help/gedit/fr/figures
 @dirrm share/gnome/help/gedit/fr
 @dirrm share/gnome/help/gedit/eu/figures
@@ -361,5 +388,5 @@ share/omf/gedit/gedit-zh_TW.omf
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/gedit-2/plugins
 @dirrm lib/gedit-2
-@dirrm include/gedit-2.16/gedit
-@dirrm include/gedit-2.16
+@dirrm include/gedit-2.20/gedit
+@dirrm include/gedit-2.20
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index 98dae80bc0a..bd67b777c81 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/09/21 13:03:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/11/03 16:27:40 drochner Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GEDIT_BUILDLINK3_MK:=	${GEDIT_BUILDLINK3_MK}+
@@ -20,6 +20,6 @@ BUILDLINK_PKGSRCDIR.gedit?=	../../editors/gedit
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../x11/gtksourceview/buildlink3.mk"
+.include "../../x11/gtksourceview2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 6fc3fe5da15..bc50196c422 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.30 2007/07/13 16:35:14 drochner Exp $
+$NetBSD: distinfo,v 1.31 2007/11/03 16:27:40 drochner Exp $
 
-SHA1 (gedit-2.18.2.tar.bz2) = 3f6a39eea007f4a89f25897b5d99530139032ce6
-RMD160 (gedit-2.18.2.tar.bz2) = d9845a95ace6dfaf1afb7a3f3e515c48baaf0743
-Size (gedit-2.18.2.tar.bz2) = 3454560 bytes
+SHA1 (gedit-2.20.3.tar.bz2) = ccbb9bad00101ed465c39da05b0dcaf8ea881120
+RMD160 (gedit-2.20.3.tar.bz2) = e3747bbafca099ae5567005b5bd6af3ba2704c3d
+Size (gedit-2.20.3.tar.bz2) = 3812377 bytes