update to 2.22.1

This switches to the gnome-2.22 release branch.

4 files changed, 27 insertions, 18 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index ba92d16af8a..3fe803431ee 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2008/04/14 11:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2008/04/15 18:37:22 drochner Exp $
 #
 
-DISTNAME=		gedit-2.20.4
-PKGREVISION=		3
+DISTNAME=		gedit-2.22.1
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -31,7 +30,6 @@ 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.libglade+=	libglade>=2.6.0
-BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.12.1
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.16.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
 
@@ -42,7 +40,6 @@ BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 54ec2c87bf2..37602b261f9 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2007/11/03 16:27:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.30 2008/04/15 18:37:22 drochner Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.20/gedit/gedit-app.h
@@ -22,7 +22,6 @@ 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
 lib/gedit-2/plugins/filebrowser.gedit-plugin
@@ -44,6 +43,7 @@ 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.20.pc
+libexec/gedit-2/gedit-bugreport.sh
 man/man1/gedit.1
 share/applications/gedit.desktop
 share/gconf/schemas/gedit-file-browser.schemas
@@ -51,8 +51,8 @@ share/gconf/schemas/gedit.schemas
 share/gedit-2/glade/docinfo.glade2
 share/gedit-2/glade/gedit-encodings-dialog.glade
 share/gedit-2/glade/gedit-open-location-dialog.glade
-share/gedit-2/glade/gedit-page-setup-dialog.glade
 share/gedit-2/glade/gedit-preferences-dialog.glade
+share/gedit-2/glade/gedit-print-preferences.glade
 share/gedit-2/glade/gedit-search-dialog.glade
 share/gedit-2/glade/languages-dialog.glade2
 share/gedit-2/glade/sort.glade2
@@ -150,6 +150,14 @@ 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/pt_BR/figures/gedit_format_bold.png
+share/gnome/help/gedit/pt_BR/figures/gedit_format_italic.png
+share/gnome/help/gedit/pt_BR/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/pt_BR/figures/gedit_format_underline.png
+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
@@ -209,14 +217,14 @@ share/gtk-doc/html/gedit/GeditMessageArea.html
 share/gtk-doc/html/gedit/GeditNotebook.html
 share/gtk-doc/html/gedit/GeditPanel.html
 share/gtk-doc/html/gedit/GeditPlugin.html
-share/gtk-doc/html/gedit/GeditPrintJob.html
-share/gtk-doc/html/gedit/GeditPrintJobPreview.html
 share/gtk-doc/html/gedit/GeditProgressMessageArea.html
 share/gtk-doc/html/gedit/GeditStatusbar.html
 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-GeditPrintJob.html
+share/gtk-doc/html/gedit/gedit-GeditPrintJobPreview.html
 share/gtk-doc/html/gedit/gedit-gedit-convert.html
 share/gtk-doc/html/gedit/gedit-gedit-debug.html
 share/gtk-doc/html/gedit/gedit-gedit-encodings.html
@@ -237,6 +245,7 @@ share/gtk-doc/html/gedit/up.png
 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/az/LC_MESSAGES/gedit.mo
 share/locale/be/LC_MESSAGES/gedit.mo
 share/locale/be@latin/LC_MESSAGES/gedit.mo
@@ -328,6 +337,7 @@ 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-pt_BR.omf
 share/omf/gedit/gedit-ro.omf
 share/omf/gedit/gedit-ru.omf
 share/omf/gedit/gedit-sv.omf
@@ -336,7 +346,7 @@ share/omf/gedit/gedit-zh_CN.omf
 share/omf/gedit/gedit-zh_HK.omf
 share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/omf/gedit
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @dirrm share/gtk-doc/html/gedit
 @dirrm share/gnome/help/gedit/zh_TW/figures
 @dirrm share/gnome/help/gedit/zh_TW
@@ -352,6 +362,8 @@ 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/pt_BR/figures
+@dirrm share/gnome/help/gedit/pt_BR
 @dirrm share/gnome/help/gedit/oc/figures
 @dirrm share/gnome/help/gedit/oc
 @dirrm share/gnome/help/gedit/ko/figures
@@ -386,6 +398,7 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gedit-2
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm libexec/gedit-2
 @dirrm lib/gedit-2/plugins
 @dirrm lib/gedit-2
 @dirrm include/gedit-2.20/gedit
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index fe2a644580b..afaf889a459 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2008/04/15 18:37:22 drochner Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GEDIT_BUILDLINK3_MK:=	${GEDIT_BUILDLINK3_MK}+
@@ -19,7 +19,6 @@ BUILDLINK_PKGSRCDIR.gedit?=	../../editors/gedit
 
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../x11/gtksourceview2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index ff4fe396216..3dc588f358f 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.32 2007/11/29 20:33:01 drochner Exp $
+$NetBSD: distinfo,v 1.33 2008/04/15 18:37:22 drochner Exp $
 
-SHA1 (gedit-2.20.4.tar.bz2) = 82bf5fe2e119018936fca0b89196c9e86c69ee3f
-RMD160 (gedit-2.20.4.tar.bz2) = 8f87871f2ab5c9f5747dd990aaa5eaad2f30215a
-Size (gedit-2.20.4.tar.bz2) = 3809006 bytes
+SHA1 (gedit-2.22.1.tar.bz2) = 146e2da6ffa2e7b821a44ec19f3ff074fc50a5ca
+RMD160 (gedit-2.22.1.tar.bz2) = 91ddb86b4c1b6cd04839f3b1f603a19ba862e1a9
+Size (gedit-2.22.1.tar.bz2) = 3883851 bytes