9 files changed, 64 insertions, 77 deletions
diff --git a/www/gtkhtml3/files/gtkhtmlConf.sh b/www/gtkhtml3/files/gtkhtmlConf.sh
deleted file mode 100644
index 0aec8fc497b8..000000000000
--- a/www/gtkhtml3/files/gtkhtmlConf.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-GTKHTML_LIBDIR="-L%%PREFIX%%/lib"
-GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk12 -lgdk12 -lgmodule12 -lglib12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk12 -lgdk12 -lgmodule12 -lglib12 -lintl -lXi -lXext -lX11 -lm"
-GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%X11BASE%%/include/gdk-pixbuf-1.0 -I%%X11BASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%X11BASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%X11BASE%%/include/libglade-1.0 -I%%X11BASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
-GTKHTML_DATADIR="%%PREFIX%%/share/gnome"
-MODULE_VERSION="%%VERSION%%"
diff --git a/www/gtkhtml3/files/patch-ad b/www/gtkhtml3/files/patch-ad
deleted file mode 100644
index 863d79c3bdf9..000000000000
--- a/www/gtkhtml3/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Wed Sep  4 20:00:35 2002
-+++ src/gtkhtml.c	Wed Sep 18 21:40:55 2002
-@@ -4353,7 +4353,7 @@
- {
- 	gchar *rcfile;
- 
--	rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
-+	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
- 			      (from_share ? "" : "/.gnome/"), name, NULL);
- 
- 	if (g_file_test (rcfile, G_FILE_TEST_ISFILE))
diff --git a/www/gtkhtml3/files/patch-af b/www/gtkhtml3/files/patch-af
deleted file mode 100644
index 473c4820bbcf..000000000000
--- a/www/gtkhtml3/files/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Mon Mar 31 13:06:33 2003
-+++ configure	Fri Apr  4 22:43:24 2003
-@@ -5895,6 +5895,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'
-@@ -7736,7 +7737,7 @@
- 
- if test "x$enable_xim" = "xyes"; then
- 	BACKUP_LDFLAGS=$LDFLAGS
--	LDFLAGS="$LDFLAGS `gtk-config --libs`"
-+	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6
- echo "configure:7742: checking for gdk_im_begin" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gdk_im_begin'+set}'`\" = set"; then
diff --git a/www/gtkhtml3/files/patch-components::http-storage-module::Makefile.in b/www/gtkhtml3/files/patch-components::http-storage-module::Makefile.in
deleted file mode 100644
index 6f238102e76a..000000000000
--- a/www/gtkhtml3/files/patch-components::http-storage-module::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- components/http-storage-module/Makefile.in	2002/01/22 14:05:48	1.1
-+++ components/http-storage-module/Makefile.in	2002/01/22 14:06:05
-@@ -154,7 +154,7 @@
- INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)					-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		        -I$(includedir)                                 	$(EXTRA_GNOME_CFLAGS)
- 
- 
--common_ldflags = -avoid-version
-+common_ldflags = -avoid-version -module
- 
- bonobo_plugindir = $(PLUGIN_DIR)
- bonobo_plugin_LTLIBRARIES = libstorage_http.la
diff --git a/www/gtkhtml3/files/patch-components_html-editor_Makefile.in b/www/gtkhtml3/files/patch-components_html-editor_Makefile.in
new file mode 100644
index 000000000000..5a43e3150fa9
--- /dev/null
+++ b/www/gtkhtml3/files/patch-components_html-editor_Makefile.in
@@ -0,0 +1,11 @@
+--- components/html-editor/Makefile.in.orig	Wed May  7 00:13:34 2003
++++ components/html-editor/Makefile.in	Wed May  7 00:14:21 2003
+@@ -307,7 +307,7 @@
+ 
+ 
+ libgnome_gtkhtml_editor_3_0_la_LDFLAGS = \
+-	-avoid-version -no-undefined
++	-avoid-version -module -no-undefined
+ 
+ 
+ libgnome_gtkhtml_editor_3_0_la_LIBADD = \
diff --git a/www/gtkhtml3/files/patch-doc::Makefile.in b/www/gtkhtml3/files/patch-doc::Makefile.in
deleted file mode 100644
index 575490af80ea..000000000000
--- a/www/gtkhtml3/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in	2002/05/01 09:15:00	1.1
-+++ doc/Makefile.in	2002/05/01 09:16:10
-@@ -151,7 +151,7 @@
- CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
- LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
- 
--HTML_DIR = $(datadir)/html
-+HTML_DIR = $(prefix)/share/doc/gtkhtml
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/www/gtkhtml3/files/patch-ltmain.sh b/www/gtkhtml3/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1c2fba5d533f
--- /dev/null
+++ b/www/gtkhtml3/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+--- ltmain.sh.orig	Fri Sep 13 15:38:11 2002
++++ ltmain.sh	Fri Oct 11 01:44:24 2002
+@@ -1073,8 +1073,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2502,6 +2510,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4286,10 +4297,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"
diff --git a/www/gtkhtml3/files/patch-po::Makefile.in.in b/www/gtkhtml3/files/patch-po::Makefile.in.in
deleted file mode 100644
index 42f683d3e699..000000000000
--- a/www/gtkhtml3/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/03/25 14:35:10	1.1
-+++ po/Makefile.in.in	2002/03/25 14:35:35
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
new file mode 100644
index 000000000000..1747affa3007
--- /dev/null
+++ b/www/gtkhtml3/files/patch-src_gtkhtml.c
@@ -0,0 +1,11 @@
+--- src/gtkhtml.c.orig	Wed Apr 16 01:52:24 2003
++++ src/gtkhtml.c	Wed Apr 16 01:52:35 2003
+@@ -2677,7 +2677,7 @@
+ 	add_bindings (klass);
+ 	gtk_html_accessibility_init ();
+ 
+-	gtk_rc_parse (PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs");
++	gtk_rc_parse (PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs");
+ 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
+ 	read_key_theme (html_class);
+ 	gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme",