Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

5 files changed, 76 insertions, 15 deletions

diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 7c24dab07e60..0b2d61edb2b2 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	gedit2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.2.0.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
 DISTNAME=	gedit-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		eel-2.2:${PORTSDIR}/x11-toolkits/eel2
+LIB_DEPENDS=	gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+		eel-2.4:${PORTSDIR}/x11-toolkits/eel2 \
+		pspell.15:${PORTSDIR}/textproc/aspell
 
 WRKSRC=	${WRKDIR}/gedit-${PORTVERSION}
 
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 3d9b91f2eb43..2c967280e35e 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gedit-2.0.6.tar.bz2) = 4dd4016136b0f45c7b4cc767bba77972
+MD5 (gnome2/gedit-2.2.0.1.tar.bz2) = 2756cba802d1ee0c3abb93fa5d77deb5
diff --git a/editors/gedit2/files/patch-configure b/editors/gedit2/files/patch-configure
index 816545988e64..843cf5e98068 100644
--- a/editors/gedit2/files/patch-configure
+++ b/editors/gedit2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 15 00:43:11 2002
-+++ configure	Wed May 15 00:45:35 2002
-@@ -6547,6 +6547,7 @@
+--- configure.orig	Tue Dec 17 05:27:57 2002
++++ configure	Sun Dec 22 17:31:25 2002
+@@ -7270,6 +7270,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,16 +8,24 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9358,10 +9359,10 @@
+@@ -10758,17 +10759,17 @@
+ if test "x${prefix}" = "xNONE"; then
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
++
+ _ACEOF
+ 
    pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
  else
-   cat >>confdefs.h <<EOF
+ 
+ cat >>confdefs.h <<_ACEOF
 -#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
 +#define PIXMAPS_DIR "${datadir}/pixmaps"
- EOF
+ _ACEOF
  
 -  pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
 +  pixmapsdir="${datadir}/pixmaps"
  fi
  
- # Extract the first word of "glib-genmarshal", so it can be a program name with args.
+ 
diff --git a/editors/gedit2/files/patch-plugins_sort_Makefile.in b/editors/gedit2/files/patch-plugins_sort_Makefile.in
new file mode 100644
index 000000000000..374734fd7883
--- /dev/null
+++ b/editors/gedit2/files/patch-plugins_sort_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/sort/Makefile.in.orig	Tue Oct 15 01:25:09 2002
++++ plugins/sort/Makefile.in	Tue Oct 15 01:25:22 2002
+@@ -152,7 +152,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libsort_la_LDFLAGS = 
++libsort_la_LDFLAGS = -module -avoid-version
+ libsort_la_LIBADD = 
+ libsort_la_OBJECTS =  sort.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index 15f97d2bda55..1aab77737705 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -3,9 +3,11 @@ 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/auto_indent/%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/load/%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
@@ -20,9 +22,11 @@ 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/auto_indent/%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/load/%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
@@ -35,41 +39,66 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf.
 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/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.so
 lib/gedit-2/plugins/libcvschangelog.so
 lib/gedit-2/plugins/libdiff.so
 lib/gedit-2/plugins/libdocinfo.so
+lib/gedit-2/plugins/libindent.so
 lib/gedit-2/plugins/libsample.so
 lib/gedit-2/plugins/libshell_output.so
+lib/gedit-2/plugins/libsort.so
+lib/gedit-2/plugins/libspell.so
 lib/gedit-2/plugins/libtaglist.so
 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/spell.gedit-plugin
+lib/gedit-2/plugins/taglist.gedit-plugin
+lib/gedit-2/plugins/time.gedit-plugin
 libdata/bonobo/servers/GNOME_Gedit.server
+share/gnome/application-registry/gedit.applications
 share/gnome/applications/gedit.desktop
 share/gnome/gedit-2/glade/asciitable.glade2
 share/gnome/gedit-2/glade/diff.glade2
 share/gnome/gedit-2/glade/docinfo.glade2
+share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2
 share/gnome/gedit-2/glade/gedit-preferences.glade2
 share/gnome/gedit-2/glade/goto-line.glade2
+share/gnome/gedit-2/glade/languages-dialog.glade2
 share/gnome/gedit-2/glade/plugin-manager.glade2
 share/gnome/gedit-2/glade/program-location-dialog.glade2
 share/gnome/gedit-2/glade/replace.glade2
 share/gnome/gedit-2/glade/shell_output.glade2
+share/gnome/gedit-2/glade/sort.glade2
+share/gnome/gedit-2/glade/spell-checker.glade2
 share/gnome/gedit-2/glade/time.glade2
 share/gnome/gedit-2/glade/uri.glade2
 share/gnome/gedit-2/taglist/HTML.tags
 share/gnome/gedit-2/taglist/Latex.tags
+share/gnome/gedit-2/taglist/XSLT.tags
 share/gnome/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/gnome/idl/GNOME_Gedit.idl
 share/gnome/mime-info/gedit.keys
 share/gnome/omf/gedit/gedit-C.omf
+share/gnome/omf/gedit/gedit-ro.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gedit-icon.png
 share/gnome/pixmaps/gedit-logo.png
 share/gnome/pixmaps/gedit-plugin-manager.png
-share/gnome/pixmaps/shell-output-logo.png
+share/locale/am/LC_MESSAGES/gedit-2.0.mo
 share/locale/ar/LC_MESSAGES/gedit-2.0.mo
 share/locale/az/LC_MESSAGES/gedit-2.0.mo
 share/locale/be/LC_MESSAGES/gedit-2.0.mo
@@ -86,6 +115,7 @@ share/locale/fi/LC_MESSAGES/gedit-2.0.mo
 share/locale/fr/LC_MESSAGES/gedit-2.0.mo
 share/locale/ga/LC_MESSAGES/gedit-2.0.mo
 share/locale/gl/LC_MESSAGES/gedit-2.0.mo
+share/locale/he/LC_MESSAGES/gedit-2.0.mo
 share/locale/hi/LC_MESSAGES/gedit-2.0.mo
 share/locale/hu/LC_MESSAGES/gedit-2.0.mo
 share/locale/it/LC_MESSAGES/gedit-2.0.mo
@@ -93,6 +123,8 @@ share/locale/ja/LC_MESSAGES/gedit-2.0.mo
 share/locale/ko/LC_MESSAGES/gedit-2.0.mo
 share/locale/lt/LC_MESSAGES/gedit-2.0.mo
 share/locale/lv/LC_MESSAGES/gedit-2.0.mo
+share/locale/mk/LC_MESSAGES/gedit-2.0.mo
+share/locale/mn/LC_MESSAGES/gedit-2.0.mo
 share/locale/ms/LC_MESSAGES/gedit-2.0.mo
 share/locale/nl/LC_MESSAGES/gedit-2.0.mo
 share/locale/nn/LC_MESSAGES/gedit-2.0.mo
@@ -106,6 +138,7 @@ share/locale/sk/LC_MESSAGES/gedit-2.0.mo
 share/locale/sl/LC_MESSAGES/gedit-2.0.mo
 share/locale/sv/LC_MESSAGES/gedit-2.0.mo
 share/locale/ta/LC_MESSAGES/gedit-2.0.mo
+share/locale/th/LC_MESSAGES/gedit-2.0.mo
 share/locale/tr/LC_MESSAGES/gedit-2.0.mo
 share/locale/uk/LC_MESSAGES/gedit-2.0.mo
 share/locale/vi/LC_MESSAGES/gedit-2.0.mo
@@ -113,6 +146,8 @@ share/locale/wa/LC_MESSAGES/gedit-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gedit-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo
 @dirrm share/gnome/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/gedit-2/ui
 @dirrm share/gnome/gedit-2/taglist
@@ -132,8 +167,10 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo
 @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/load
 @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/auto_indent
 @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
@@ -149,8 +186,12 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo
 @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/load
 @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/auto_indent
 @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
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true