5 files changed, 95 insertions, 87 deletions
diff --git a/editors/gedit2/files/patch-ai b/editors/gedit2/files/patch-ai
deleted file mode 100644
index e429c0495572..000000000000
--- a/editors/gedit2/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Tue Apr 18 14:25:43 2000
-+++ po/Makefile.in.in	Wed Apr 19 19:06:53 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/editors/gedit2/files/patch-an b/editors/gedit2/files/patch-an
deleted file mode 100644
index b78c1188906c..000000000000
--- a/editors/gedit2/files/patch-an
+++ /dev/null
@@ -1,8 +0,0 @@
---- app-docs.make.orig	Fri May  5 14:35:51 2000
-+++ app-docs.make	Sun Jun 11 11:11:24 2000
-@@ -1,4 +1,4 @@
--helpdir = $(datadir)/gnome/help/$(app)/$(lang)
-+helpdir = $(datadir)/help/$(app)/$(lang)
- help_DATA = \
- 	index.html	\
- 	topic.dat	\
diff --git a/editors/gedit2/files/patch-ao b/editors/gedit2/files/patch-ao
index fc344883c147..ad5d4deae5af 100644
--- a/editors/gedit2/files/patch-ao
+++ b/editors/gedit2/files/patch-ao
@@ -1,56 +1,88 @@
---- plugins/browse/Makefile.in.orig	Sun Jun 11 03:00:15 2000
-+++ plugins/browse/Makefile.in	Sun Jun 11 11:15:17 2000
-@@ -138,3 +138,3 @@
- LIBS = @LIBS@
--libbrowse_la_LDFLAGS = 
-+libbrowse_la_LDFLAGS = -avoid-version
- libbrowse_la_LIBADD = 
---- plugins/convert/Makefile.in.orig	Sun Jun 11 03:00:17 2000
-+++ plugins/convert/Makefile.in	Sun Jun 11 11:15:25 2000
-@@ -147,3 +147,3 @@
- LIBS = @LIBS@
--libconvert_la_LDFLAGS = 
-+libconvert_la_LDFLAGS = -avoid-version
- libconvert_la_LIBADD = 
---- plugins/diff/Makefile.in.orig	Sun Jul  9 17:12:13 2000
-+++ plugins/diff/Makefile.in	Mon Jul 10 09:32:42 2000
-@@ -144,3 +144,3 @@
+--- plugins/cvschangelog/Makefile.in.orig	Wed May 15 00:20:07 2002
++++ plugins/cvschangelog/Makefile.in	Wed May 15 00:20:22 2002
+@@ -138,7 +138,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libcvschangelog_la_LDFLAGS = 
++libcvschangelog_la_LDFLAGS = -avoid-version
+ libcvschangelog_la_LIBADD = 
+ libcvschangelog_la_OBJECTS =  cvschangelog.lo
+ CFLAGS = @CFLAGS@
+--- plugins/ASCII/Makefile.in.orig	Wed May 15 00:20:47 2002
++++ plugins/ASCII/Makefile.in	Wed May 15 00:20:55 2002
+@@ -143,7 +143,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libasciitable_la_LDFLAGS = 
++libasciitable_la_LDFLAGS = -avoid-version
+ libasciitable_la_LIBADD = 
+ libasciitable_la_OBJECTS =  ascii.lo
+ CFLAGS = @CFLAGS@
+--- plugins/diff/Makefile.in.orig	Wed May 15 00:21:11 2002
++++ plugins/diff/Makefile.in	Wed May 15 00:21:20 2002
+@@ -143,7 +143,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -libdiff_la_LDFLAGS = 
 +libdiff_la_LDFLAGS = -avoid-version
  libdiff_la_LIBADD = 
---- plugins/email/Makefile.in.orig	Sun Jun 11 03:00:16 2000
-+++ plugins/email/Makefile.in	Sun Jun 11 11:15:33 2000
-@@ -147,3 +147,3 @@
- LIBS = @LIBS@
--libemail_la_LDFLAGS = 
-+libemail_la_LDFLAGS = -avoid-version
- libemail_la_LIBADD = 
---- plugins/reverse/Makefile.in.orig	Sun Jun 11 03:00:18 2000
-+++ plugins/reverse/Makefile.in	Sun Jun 11 11:15:40 2000
-@@ -140,3 +140,3 @@
- LIBS = @LIBS@
--libreverse_la_LDFLAGS = 
-+libreverse_la_LDFLAGS = -avoid-version
- libreverse_la_LIBADD = 
---- plugins/sample/Makefile.in.orig	Sun Jul  9 17:12:15 2000
-+++ plugins/sample/Makefile.in	Mon Jul 10 09:33:18 2000
-@@ -140,3 +140,3 @@
+ libdiff_la_OBJECTS =  diff.lo
+ CFLAGS = @CFLAGS@
+--- plugins/docinfo/Makefile.in.orig	Wed May 15 00:21:29 2002
++++ plugins/docinfo/Makefile.in	Wed May 15 00:21:36 2002
+@@ -143,7 +143,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libdocinfo_la_LDFLAGS = 
++libdocinfo_la_LDFLAGS = -avoid-version
+ libdocinfo_la_LIBADD = 
+ libdocinfo_la_OBJECTS =  docinfo.lo
+ CFLAGS = @CFLAGS@
+--- plugins/sample/Makefile.in.orig	Wed May 15 00:21:44 2002
++++ plugins/sample/Makefile.in	Wed May 15 00:21:51 2002
+@@ -138,7 +138,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -libsample_la_LDFLAGS = 
 +libsample_la_LDFLAGS = -avoid-version
  libsample_la_LIBADD = 
---- plugins/shell_output/Makefile.in.orig	Sun Jul  9 17:12:19 2000
-+++ plugins/shell_output/Makefile.in	Mon Jul 10 09:38:40 2000
-@@ -147,3 +147,3 @@
+ libsample_la_OBJECTS =  sample.lo
+ CFLAGS = @CFLAGS@
+--- plugins/shell_output/Makefile.in.orig	Wed May 15 00:21:58 2002
++++ plugins/shell_output/Makefile.in	Wed May 15 00:22:05 2002
+@@ -143,7 +143,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -libshell_output_la_LDFLAGS = 
 +libshell_output_la_LDFLAGS = -avoid-version
  libshell_output_la_LIBADD = 
---- plugins/time/Makefile.in.orig	Sun Jul  9 17:12:16 2000
-+++ plugins/time/Makefile.in	Mon Jul 10 09:33:38 2000
-@@ -140,3 +140,3 @@
+ libshell_output_la_OBJECTS =  shell_output.lo
+ CFLAGS = @CFLAGS@
+--- plugins/taglist/Makefile.in.orig	Wed May 15 00:22:12 2002
++++ plugins/taglist/Makefile.in	Wed May 15 00:22:18 2002
+@@ -145,7 +145,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libtaglist_la_LDFLAGS = 
++libtaglist_la_LDFLAGS = -avoid-version
+ libtaglist_la_LIBADD = 
+ libtaglist_la_OBJECTS =  gedit-taglist-plugin-parser.lo \
+ gedit-taglist-plugin-window.lo gedit-taglist-plugin.lo
+--- plugins/time/Makefile.in.orig	Wed May 15 00:22:24 2002
++++ plugins/time/Makefile.in	Wed May 15 00:22:30 2002
+@@ -143,7 +143,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -libtime_la_LDFLAGS = 
 +libtime_la_LDFLAGS = -avoid-version
  libtime_la_LIBADD = 
+ libtime_la_OBJECTS =  time.lo
+ CFLAGS = @CFLAGS@
diff --git a/editors/gedit2/files/patch-configure b/editors/gedit2/files/patch-configure
new file mode 100644
index 000000000000..816545988e64
--- /dev/null
+++ b/editors/gedit2/files/patch-configure
@@ -0,0 +1,23 @@
+--- configure.orig	Wed May 15 00:43:11 2002
++++ configure	Wed May 15 00:45:35 2002
+@@ -6547,6 +6547,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -9358,10 +9359,10 @@
+   pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
+ else
+   cat >>confdefs.h <<EOF
+-#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
++#define PIXMAPS_DIR "${datadir}/pixmaps"
+ EOF
+ 
+-  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-ltmain.sh b/editors/gedit2/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/editors/gedit2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"