Update to GNOME 2.2.

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

2 files changed, 26 insertions, 7 deletions

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)