Add gtkhtml3 after a repo copy from gtkhtml. GtkHTML-3 is an HTML

rendering and editing API based on GNOME 2.

26 files changed, 546 insertions, 626 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 4fa8c5674f36..42088a36b264 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,54 +1,35 @@
-# New ports collection makefile for:	gtkhtml
-# Date created:				2nd June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for:	gtkhtml3
+# Date created:				12 March 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gtkhtml
-PORTVERSION=	1.1.10
+PORTNAME=	gtkhtml3
+PORTVERSION=	3.0.3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
-DIST_SUBDIR=	gnome
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.0
+DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	soup-2.0.0:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-gconf=yes
+USE_GNOME=	gnomeprefix gnomehack gal2
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-VERSION=	${PORTNAME}-${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
-LIB_DEPENDS+=	soup.6:${PORTSDIR}/devel/soup
-.endif
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-post-configure:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \
-			> ${WRKSRC}/gtkhtmlConf.sh
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
-		${PREFIX}/etc/gtkhtmlConf.sh
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 267c1d793396..7224eca850a0 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.1.10.tar.bz2) = 8647407560e4b61ba4a12653b9cc8869
+MD5 (gnome2/gtkhtml-3.0.3.tar.bz2) = 9a87993cdf87630c510b94e60085383a
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",
diff --git a/www/gtkhtml3/pkg-descr b/www/gtkhtml3/pkg-descr
index abb1b154d544..618f9c253d3b 100644
--- a/www/gtkhtml3/pkg-descr
+++ b/www/gtkhtml3/pkg-descr
@@ -2,4 +2,4 @@ This is GtkHTML, a lightweight HTML rendering/printing/editing engine.
 It was originally based on KHTMLW, but is now being developed
 independently.
 
-WWW: http://www.gnome.org/
+WWW: http://www.ximian.com/
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 8bb643b123b2..9de21df7d89f 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -1,201 +1,193 @@
-bin/ebrowser
-bin/gnome-gtkhtml-editor-1.1
-bin/gtkhtml-properties-capplet
-etc/gtkhtmlConf.sh
-include/gtkhtml-1.1/gtkhtml/gtkhtml-compat.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-embedded.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-enums.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-im.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-keybinding.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-private.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-properties.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-propmanager.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-search.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-stream.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-types.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml.h
-include/gtkhtml-1.1/gtkhtml/gtkhtmldebug.h
-include/gtkhtml-1.1/gtkhtml/gtkhtmlfontstyle.h
-include/gtkhtml-1.1/gtkhtml/htmlanchor.h
-include/gtkhtml-1.1/gtkhtml/htmlbutton.h
-include/gtkhtml-1.1/gtkhtml/htmlcheckbox.h
-include/gtkhtml-1.1/gtkhtml/htmlclue.h
-include/gtkhtml-1.1/gtkhtml/htmlcluealigned.h
-include/gtkhtml-1.1/gtkhtml/htmlclueflow.h
-include/gtkhtml-1.1/gtkhtml/htmlclueh.h
-include/gtkhtml-1.1/gtkhtml/htmlcluev.h
-include/gtkhtml-1.1/gtkhtml/htmlcolor.h
-include/gtkhtml-1.1/gtkhtml/htmlcolorset.h
-include/gtkhtml-1.1/gtkhtml/htmlcursor.h
-include/gtkhtml-1.1/gtkhtml/htmldrawqueue.h
-include/gtkhtml-1.1/gtkhtml/htmlembedded.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cursor.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-fontstyle.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-images.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-movement.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-rule.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-selection-updater.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-table.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-tablecell.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-text.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-print.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-save.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-search.h
-include/gtkhtml-1.1/gtkhtml/htmlengine.h
-include/gtkhtml-1.1/gtkhtml/htmlentity.h
-include/gtkhtml-1.1/gtkhtml/htmlenums.h
-include/gtkhtml-1.1/gtkhtml/htmlenumutils.h
-include/gtkhtml-1.1/gtkhtml/htmlfontmanager.h
-include/gtkhtml-1.1/gtkhtml/htmlform.h
-include/gtkhtml-1.1/gtkhtml/htmlframe.h
-include/gtkhtml-1.1/gtkhtml/htmlframeset.h
-include/gtkhtml-1.1/gtkhtml/htmlgdkpainter.h
-include/gtkhtml-1.1/gtkhtml/htmlhidden.h
-include/gtkhtml-1.1/gtkhtml/htmlhspace.h
-include/gtkhtml-1.1/gtkhtml/htmliframe.h
-include/gtkhtml-1.1/gtkhtml/htmlimage.h
-include/gtkhtml-1.1/gtkhtml/htmlimageinput.h
-include/gtkhtml-1.1/gtkhtml/htmlinterval.h
-include/gtkhtml-1.1/gtkhtml/htmllinktext.h
-include/gtkhtml-1.1/gtkhtml/htmllist.h
-include/gtkhtml-1.1/gtkhtml/htmlmap.h
-include/gtkhtml-1.1/gtkhtml/htmlobject.h
-include/gtkhtml-1.1/gtkhtml/htmlpainter.h
-include/gtkhtml-1.1/gtkhtml/htmlplainpainter.h
-include/gtkhtml-1.1/gtkhtml/htmlprinter.h
-include/gtkhtml-1.1/gtkhtml/htmlradio.h
-include/gtkhtml-1.1/gtkhtml/htmlreplace.h
-include/gtkhtml-1.1/gtkhtml/htmlrule.h
-include/gtkhtml-1.1/gtkhtml/htmlsearch.h
-include/gtkhtml-1.1/gtkhtml/htmlselect.h
-include/gtkhtml-1.1/gtkhtml/htmlselection.h
-include/gtkhtml-1.1/gtkhtml/htmlsettings.h
-include/gtkhtml-1.1/gtkhtml/htmlshape.h
-include/gtkhtml-1.1/gtkhtml/htmlstack.h
-include/gtkhtml-1.1/gtkhtml/htmlstringtokenizer.h
-include/gtkhtml-1.1/gtkhtml/htmltable.h
-include/gtkhtml-1.1/gtkhtml/htmltablecell.h
-include/gtkhtml-1.1/gtkhtml/htmltablepriv.h
-include/gtkhtml-1.1/gtkhtml/htmltext.h
-include/gtkhtml-1.1/gtkhtml/htmltextarea.h
-include/gtkhtml-1.1/gtkhtml/htmltextinput.h
-include/gtkhtml-1.1/gtkhtml/htmltextslave.h
-include/gtkhtml-1.1/gtkhtml/htmltokenizer.h
-include/gtkhtml-1.1/gtkhtml/htmltype.h
-include/gtkhtml-1.1/gtkhtml/htmltypes.h
-include/gtkhtml-1.1/gtkhtml/htmlundo-action.h
-include/gtkhtml-1.1/gtkhtml/htmlundo.h
-include/gtkhtml-1.1/gtkhtml/htmlvspace.h
-lib/bonobo/plugin/libstorage_http.so
-lib/libgtkhtml-1.1.so.3
-lib/libgtkhtml-1.1.a
-lib/libgtkhtml-1.1.so
-libdata/pkgconfig/gtkhtml-1.1.pc
-share/doc/gtkhtml/gtkhtml-decl.txt
-share/doc/gtkhtml/gtkhtml-sections.txt
-share/doc/gtkhtml/gtkhtml.hierarchy
-share/doc/gtkhtml/gtkhtml.sgml
-share/doc/gtkhtml/gtkhtml.types
-share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
-share/gnome/control-center/Documents/gtkhtml-properties.desktop
-share/gnome/gtkhtml-1.1/Editor.idl
-share/gnome/gtkhtml-1.1/gtkhtml-capplet.glade
-share/gnome/gtkhtml-1.1/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-1.1/icons/16_copy.png
-share/gnome/gtkhtml-1.1/icons/16_cut.png
-share/gnome/gtkhtml-1.1/icons/16_paste.png
-share/gnome/gtkhtml-1.1/icons/24_copy.png
-share/gnome/gtkhtml-1.1/icons/24_cut.png
-share/gnome/gtkhtml-1.1/icons/24_paste.png
-share/gnome/gtkhtml-1.1/icons/bulb.png
-share/gnome/gtkhtml-1.1/icons/empty_image.png
-share/gnome/gtkhtml-1.1/icons/flowers.png
-share/gnome/gtkhtml-1.1/icons/html-viewer.png
-share/gnome/gtkhtml-1.1/icons/insert-image-16.png
-share/gnome/gtkhtml-1.1/icons/insert-image-24.png
-share/gnome/gtkhtml-1.1/icons/insert-link-16.png
-share/gnome/gtkhtml-1.1/icons/insert-link-24.png
-share/gnome/gtkhtml-1.1/icons/insert-object-16.png
-share/gnome/gtkhtml-1.1/icons/insert-object-24.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-16.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-24.png
-share/gnome/gtkhtml-1.1/icons/insert-table-16.png
-share/gnome/gtkhtml-1.1/icons/insert-table-24.png
-share/gnome/gtkhtml-1.1/icons/paper.png
-share/gnome/gtkhtml-1.1/icons/properties-16.png
-share/gnome/gtkhtml-1.1/icons/rect.png
-share/gnome/gtkhtml-1.1/icons/redo-16.png
-share/gnome/gtkhtml-1.1/icons/redo-24.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-center.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-left.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-right.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-1.1/icons/search-16.png
-share/gnome/gtkhtml-1.1/icons/search-24.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-16.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-24.png
-share/gnome/gtkhtml-1.1/icons/smiley-1.png
-share/gnome/gtkhtml-1.1/icons/smiley-10.png
-share/gnome/gtkhtml-1.1/icons/smiley-11.png
-share/gnome/gtkhtml-1.1/icons/smiley-2.png
-share/gnome/gtkhtml-1.1/icons/smiley-3.png
-share/gnome/gtkhtml-1.1/icons/smiley-4.png
-share/gnome/gtkhtml-1.1/icons/smiley-5.png
-share/gnome/gtkhtml-1.1/icons/smiley-6.png
-share/gnome/gtkhtml-1.1/icons/smiley-8.png
-share/gnome/gtkhtml-1.1/icons/smiley-9.png
-share/gnome/gtkhtml-1.1/icons/texture.png
-share/gnome/gtkhtml-1.1/icons/transparent.png
-share/gnome/gtkhtml-1.1/icons/undo-16.png
-share/gnome/gtkhtml-1.1/icons/undo-24.png
-share/gnome/gtkhtml-1.1/keybindingsrc.emacs
-share/gnome/gtkhtml-1.1/keybindingsrc.ms
-share/gnome/gtkhtml-1.1/keybindingsrc.xemacs
-share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
-share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
-share/gnome/ui/GNOME_GtkHTML_Editor.xml
-share/locale/az/LC_MESSAGES/gtkhtml.mo
-share/locale/ca/LC_MESSAGES/gtkhtml.mo
-share/locale/cs/LC_MESSAGES/gtkhtml.mo
-share/locale/da/LC_MESSAGES/gtkhtml.mo
-share/locale/de/LC_MESSAGES/gtkhtml.mo
-share/locale/el/LC_MESSAGES/gtkhtml.mo
-share/locale/es/LC_MESSAGES/gtkhtml.mo
-share/locale/et/LC_MESSAGES/gtkhtml.mo
-share/locale/eu/LC_MESSAGES/gtkhtml.mo
-share/locale/fi/LC_MESSAGES/gtkhtml.mo
-share/locale/fr/LC_MESSAGES/gtkhtml.mo
-share/locale/gl/LC_MESSAGES/gtkhtml.mo
-share/locale/hu/LC_MESSAGES/gtkhtml.mo
-share/locale/it/LC_MESSAGES/gtkhtml.mo
-share/locale/ja/LC_MESSAGES/gtkhtml.mo
-share/locale/ko/LC_MESSAGES/gtkhtml.mo
-share/locale/lt/LC_MESSAGES/gtkhtml.mo
-share/locale/lv/LC_MESSAGES/gtkhtml.mo
-share/locale/ms/LC_MESSAGES/gtkhtml.mo
-share/locale/nl/LC_MESSAGES/gtkhtml.mo
-share/locale/nn/LC_MESSAGES/gtkhtml.mo
-share/locale/no/LC_MESSAGES/gtkhtml.mo
-share/locale/pl/LC_MESSAGES/gtkhtml.mo
-share/locale/pt/LC_MESSAGES/gtkhtml.mo
-share/locale/pt_BR/LC_MESSAGES/gtkhtml.mo
-share/locale/ru/LC_MESSAGES/gtkhtml.mo
-share/locale/sk/LC_MESSAGES/gtkhtml.mo
-share/locale/sl/LC_MESSAGES/gtkhtml.mo
-share/locale/sv/LC_MESSAGES/gtkhtml.mo
-share/locale/tr/LC_MESSAGES/gtkhtml.mo
-share/locale/uk/LC_MESSAGES/gtkhtml.mo
-share/locale/vi/LC_MESSAGES/gtkhtml.mo
-share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
-share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/gtkhtml-1.1/icons
-@dirrm share/gnome/gtkhtml-1.1
-@dirrm share/doc/gtkhtml/gtkhtml
-@dirrm share/doc/gtkhtml
-@dirrm include/gtkhtml-1.1/gtkhtml
-@dirrm include/gtkhtml-1.1
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-compat.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-embedded.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-enums.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-keybinding.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-private.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-properties.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-search.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-stream.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-types.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtmldebug.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtmlfontstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmlanchor.h
+include/libgtkhtml-3.0/gtkhtml/htmlbutton.h
+include/libgtkhtml-3.0/gtkhtml/htmlcheckbox.h
+include/libgtkhtml-3.0/gtkhtml/htmlclue.h
+include/libgtkhtml-3.0/gtkhtml/htmlcluealigned.h
+include/libgtkhtml-3.0/gtkhtml/htmlclueflow.h
+include/libgtkhtml-3.0/gtkhtml/htmlclueh.h
+include/libgtkhtml-3.0/gtkhtml/htmlcluev.h
+include/libgtkhtml-3.0/gtkhtml/htmlcolor.h
+include/libgtkhtml-3.0/gtkhtml/htmlcolorset.h
+include/libgtkhtml-3.0/gtkhtml/htmlcursor.h
+include/libgtkhtml-3.0/gtkhtml/htmldrawqueue.h
+include/libgtkhtml-3.0/gtkhtml/htmlembedded.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-clueflowstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cursor.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cut-and-paste.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-fontstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-images.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-movement.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-rule.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-selection-updater.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-table.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-tablecell.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-text.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-print.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-save.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-search.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine.h
+include/libgtkhtml-3.0/gtkhtml/htmlentity.h
+include/libgtkhtml-3.0/gtkhtml/htmlenums.h
+include/libgtkhtml-3.0/gtkhtml/htmlenumutils.h
+include/libgtkhtml-3.0/gtkhtml/htmlfontmanager.h
+include/libgtkhtml-3.0/gtkhtml/htmlform.h
+include/libgtkhtml-3.0/gtkhtml/htmlframe.h
+include/libgtkhtml-3.0/gtkhtml/htmlframeset.h
+include/libgtkhtml-3.0/gtkhtml/htmlgdkpainter.h
+include/libgtkhtml-3.0/gtkhtml/htmlhidden.h
+include/libgtkhtml-3.0/gtkhtml/htmliframe.h
+include/libgtkhtml-3.0/gtkhtml/htmlimage.h
+include/libgtkhtml-3.0/gtkhtml/htmlimageinput.h
+include/libgtkhtml-3.0/gtkhtml/htmlinterval.h
+include/libgtkhtml-3.0/gtkhtml/htmllinktext.h
+include/libgtkhtml-3.0/gtkhtml/htmllist.h
+include/libgtkhtml-3.0/gtkhtml/htmlmap.h
+include/libgtkhtml-3.0/gtkhtml/htmlmarshal.h
+include/libgtkhtml-3.0/gtkhtml/htmlobject.h
+include/libgtkhtml-3.0/gtkhtml/htmlpainter.h
+include/libgtkhtml-3.0/gtkhtml/htmlplainpainter.h
+include/libgtkhtml-3.0/gtkhtml/htmlprinter.h
+include/libgtkhtml-3.0/gtkhtml/htmlradio.h
+include/libgtkhtml-3.0/gtkhtml/htmlreplace.h
+include/libgtkhtml-3.0/gtkhtml/htmlrule.h
+include/libgtkhtml-3.0/gtkhtml/htmlsearch.h
+include/libgtkhtml-3.0/gtkhtml/htmlselect.h
+include/libgtkhtml-3.0/gtkhtml/htmlselection.h
+include/libgtkhtml-3.0/gtkhtml/htmlsettings.h
+include/libgtkhtml-3.0/gtkhtml/htmlshape.h
+include/libgtkhtml-3.0/gtkhtml/htmlstack.h
+include/libgtkhtml-3.0/gtkhtml/htmlstringtokenizer.h
+include/libgtkhtml-3.0/gtkhtml/htmlstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmltable.h
+include/libgtkhtml-3.0/gtkhtml/htmltablecell.h
+include/libgtkhtml-3.0/gtkhtml/htmltablepriv.h
+include/libgtkhtml-3.0/gtkhtml/htmltext.h
+include/libgtkhtml-3.0/gtkhtml/htmltextarea.h
+include/libgtkhtml-3.0/gtkhtml/htmltextinput.h
+include/libgtkhtml-3.0/gtkhtml/htmltextslave.h
+include/libgtkhtml-3.0/gtkhtml/htmltokenizer.h
+include/libgtkhtml-3.0/gtkhtml/htmltype.h
+include/libgtkhtml-3.0/gtkhtml/htmltypes.h
+include/libgtkhtml-3.0/gtkhtml/htmlundo-action.h
+include/libgtkhtml-3.0/gtkhtml/htmlundo.h
+lib/gtkhtml/libgnome-gtkhtml-editor-3.0.so
+lib/libgtkhtml-3.0.a
+lib/libgtkhtml-3.0.so
+lib/libgtkhtml-3.0.so.1
+lib/libgtkhtml-a11y-3.0.a
+lib/libgtkhtml-a11y-3.0.so
+lib/libgtkhtml-a11y-3.0.so.1
+libdata/bonobo/servers/GNOME_GtkHTML_Editor.server
+libdata/pkgconfig/libgtkhtml-3.0.pc
+share/gnome/gtkhtml-3.0/Editor.idl
+share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor.xml
+share/gnome/gtkhtml-3.0/gtkhtml-editor-properties.glade
+share/gnome/gtkhtml-3.0/icons/16_copy.png
+share/gnome/gtkhtml-3.0/icons/16_cut.png
+share/gnome/gtkhtml-3.0/icons/16_paste.png
+share/gnome/gtkhtml-3.0/icons/24_copy.png
+share/gnome/gtkhtml-3.0/icons/24_cut.png
+share/gnome/gtkhtml-3.0/icons/24_paste.png
+share/gnome/gtkhtml-3.0/icons/bulb.png
+share/gnome/gtkhtml-3.0/icons/empty_image.png
+share/gnome/gtkhtml-3.0/icons/flowers.png
+share/gnome/gtkhtml-3.0/icons/font-tt-16.png
+share/gnome/gtkhtml-3.0/icons/font-tt-24.png
+share/gnome/gtkhtml-3.0/icons/html-viewer.png
+share/gnome/gtkhtml-3.0/icons/info_bulb.png
+share/gnome/gtkhtml-3.0/icons/insert-image-16.png
+share/gnome/gtkhtml-3.0/icons/insert-image-24.png
+share/gnome/gtkhtml-3.0/icons/insert-link-16.png
+share/gnome/gtkhtml-3.0/icons/insert-link-24.png
+share/gnome/gtkhtml-3.0/icons/insert-object-16.png
+share/gnome/gtkhtml-3.0/icons/insert-object-24.png
+share/gnome/gtkhtml-3.0/icons/insert-rule-16.png
+share/gnome/gtkhtml-3.0/icons/insert-rule-24.png
+share/gnome/gtkhtml-3.0/icons/insert-table-16.png
+share/gnome/gtkhtml-3.0/icons/insert-table-24.png
+share/gnome/gtkhtml-3.0/icons/paper.png
+share/gnome/gtkhtml-3.0/icons/properties-16.png
+share/gnome/gtkhtml-3.0/icons/rect.png
+share/gnome/gtkhtml-3.0/icons/redo-16.png
+share/gnome/gtkhtml-3.0/icons/redo-24.png
+share/gnome/gtkhtml-3.0/icons/rule-blue-center.png
+share/gnome/gtkhtml-3.0/icons/rule-blue-left.png
+share/gnome/gtkhtml-3.0/icons/rule-blue-right.png
+share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-center.png
+share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-left.png
+share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-right.png
+share/gnome/gtkhtml-3.0/icons/search-16.png
+share/gnome/gtkhtml-3.0/icons/search-24.png
+share/gnome/gtkhtml-3.0/icons/search-and-replace-16.png
+share/gnome/gtkhtml-3.0/icons/search-and-replace-24.png
+share/gnome/gtkhtml-3.0/icons/smiley-1.png
+share/gnome/gtkhtml-3.0/icons/smiley-10.png
+share/gnome/gtkhtml-3.0/icons/smiley-11.png
+share/gnome/gtkhtml-3.0/icons/smiley-2.png
+share/gnome/gtkhtml-3.0/icons/smiley-3.png
+share/gnome/gtkhtml-3.0/icons/smiley-4.png
+share/gnome/gtkhtml-3.0/icons/smiley-5.png
+share/gnome/gtkhtml-3.0/icons/smiley-6.png
+share/gnome/gtkhtml-3.0/icons/smiley-8.png
+share/gnome/gtkhtml-3.0/icons/smiley-9.png
+share/gnome/gtkhtml-3.0/icons/texture.png
+share/gnome/gtkhtml-3.0/icons/transparent.png
+share/gnome/gtkhtml-3.0/icons/undo-16.png
+share/gnome/gtkhtml-3.0/icons/undo-24.png
+share/gnome/gtkhtml-3.0/keybindingsrc.emacs
+share/locale/am/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ar/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/az/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ca/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/cs/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/da/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/de/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/el/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/es/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/et/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/eu/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/fi/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/fr/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/gl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/he/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/hi/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/hu/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/it/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ja/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ko/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/lt/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/lv/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ms/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/nl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/nn/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/no/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/pl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/pt/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ru/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/sk/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/sl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/sv/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/tr/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/uk/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/vi/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/gtkhtml-3.0.mo
+@dirrm share/gnome/gtkhtml-3.0/icons
+@dirrm share/gnome/gtkhtml-3.0
+@dirrm lib/gtkhtml
+@dirrm include/libgtkhtml-3.0/gtkhtml
+@dirrm include/libgtkhtml-3.0
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 4fa8c5674f36..42088a36b264 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -1,54 +1,35 @@
-# New ports collection makefile for:	gtkhtml
-# Date created:				2nd June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for:	gtkhtml3
+# Date created:				12 March 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gtkhtml
-PORTVERSION=	1.1.10
+PORTNAME=	gtkhtml3
+PORTVERSION=	3.0.3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
-DIST_SUBDIR=	gnome
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.0
+DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	soup-2.0.0:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-gconf=yes
+USE_GNOME=	gnomeprefix gnomehack gal2
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-VERSION=	${PORTNAME}-${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
-LIB_DEPENDS+=	soup.6:${PORTSDIR}/devel/soup
-.endif
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-post-configure:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \
-			> ${WRKSRC}/gtkhtmlConf.sh
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
-		${PREFIX}/etc/gtkhtmlConf.sh
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 267c1d793396..7224eca850a0 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.1.10.tar.bz2) = 8647407560e4b61ba4a12653b9cc8869
+MD5 (gnome2/gtkhtml-3.0.3.tar.bz2) = 9a87993cdf87630c510b94e60085383a
diff --git a/www/gtkhtml38/files/gtkhtmlConf.sh b/www/gtkhtml38/files/gtkhtmlConf.sh
deleted file mode 100644
index 0aec8fc497b8..000000000000
--- a/www/gtkhtml38/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/gtkhtml38/files/patch-ad b/www/gtkhtml38/files/patch-ad
deleted file mode 100644
index 863d79c3bdf9..000000000000
--- a/www/gtkhtml38/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/gtkhtml38/files/patch-af b/www/gtkhtml38/files/patch-af
deleted file mode 100644
index 473c4820bbcf..000000000000
--- a/www/gtkhtml38/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/gtkhtml38/files/patch-components::http-storage-module::Makefile.in b/www/gtkhtml38/files/patch-components::http-storage-module::Makefile.in
deleted file mode 100644
index 6f238102e76a..000000000000
--- a/www/gtkhtml38/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/gtkhtml38/files/patch-components_html-editor_Makefile.in b/www/gtkhtml38/files/patch-components_html-editor_Makefile.in
new file mode 100644
index 000000000000..5a43e3150fa9
--- /dev/null
+++ b/www/gtkhtml38/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/gtkhtml38/files/patch-doc::Makefile.in b/www/gtkhtml38/files/patch-doc::Makefile.in
deleted file mode 100644
index 575490af80ea..000000000000
--- a/www/gtkhtml38/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/gtkhtml38/files/patch-ltmain.sh b/www/gtkhtml38/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1c2fba5d533f
--- /dev/null
+++ b/www/gtkhtml38/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/gtkhtml38/files/patch-po::Makefile.in.in b/www/gtkhtml38/files/patch-po::Makefile.in.in
deleted file mode 100644
index 42f683d3e699..000000000000
--- a/www/gtkhtml38/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/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
new file mode 100644
index 000000000000..1747affa3007
--- /dev/null
+++ b/www/gtkhtml38/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",
diff --git a/www/gtkhtml38/pkg-descr b/www/gtkhtml38/pkg-descr
index abb1b154d544..618f9c253d3b 100644
--- a/www/gtkhtml38/pkg-descr
+++ b/www/gtkhtml38/pkg-descr
@@ -2,4 +2,4 @@ This is GtkHTML, a lightweight HTML rendering/printing/editing engine.
 It was originally based on KHTMLW, but is now being developed
 independently.
 
-WWW: http://www.gnome.org/
+WWW: http://www.ximian.com/
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 8bb643b123b2..9de21df7d89f 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -1,201 +1,193 @@
-bin/ebrowser
-bin/gnome-gtkhtml-editor-1.1
-bin/gtkhtml-properties-capplet
-etc/gtkhtmlConf.sh
-include/gtkhtml-1.1/gtkhtml/gtkhtml-compat.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-embedded.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-enums.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-im.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-keybinding.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-private.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-properties.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-propmanager.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-search.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-stream.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml-types.h
-include/gtkhtml-1.1/gtkhtml/gtkhtml.h
-include/gtkhtml-1.1/gtkhtml/gtkhtmldebug.h
-include/gtkhtml-1.1/gtkhtml/gtkhtmlfontstyle.h
-include/gtkhtml-1.1/gtkhtml/htmlanchor.h
-include/gtkhtml-1.1/gtkhtml/htmlbutton.h
-include/gtkhtml-1.1/gtkhtml/htmlcheckbox.h
-include/gtkhtml-1.1/gtkhtml/htmlclue.h
-include/gtkhtml-1.1/gtkhtml/htmlcluealigned.h
-include/gtkhtml-1.1/gtkhtml/htmlclueflow.h
-include/gtkhtml-1.1/gtkhtml/htmlclueh.h
-include/gtkhtml-1.1/gtkhtml/htmlcluev.h
-include/gtkhtml-1.1/gtkhtml/htmlcolor.h
-include/gtkhtml-1.1/gtkhtml/htmlcolorset.h
-include/gtkhtml-1.1/gtkhtml/htmlcursor.h
-include/gtkhtml-1.1/gtkhtml/htmldrawqueue.h
-include/gtkhtml-1.1/gtkhtml/htmlembedded.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cursor.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-fontstyle.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-images.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-movement.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-rule.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-selection-updater.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-table.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-tablecell.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit-text.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-edit.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-print.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-save.h
-include/gtkhtml-1.1/gtkhtml/htmlengine-search.h
-include/gtkhtml-1.1/gtkhtml/htmlengine.h
-include/gtkhtml-1.1/gtkhtml/htmlentity.h
-include/gtkhtml-1.1/gtkhtml/htmlenums.h
-include/gtkhtml-1.1/gtkhtml/htmlenumutils.h
-include/gtkhtml-1.1/gtkhtml/htmlfontmanager.h
-include/gtkhtml-1.1/gtkhtml/htmlform.h
-include/gtkhtml-1.1/gtkhtml/htmlframe.h
-include/gtkhtml-1.1/gtkhtml/htmlframeset.h
-include/gtkhtml-1.1/gtkhtml/htmlgdkpainter.h
-include/gtkhtml-1.1/gtkhtml/htmlhidden.h
-include/gtkhtml-1.1/gtkhtml/htmlhspace.h
-include/gtkhtml-1.1/gtkhtml/htmliframe.h
-include/gtkhtml-1.1/gtkhtml/htmlimage.h
-include/gtkhtml-1.1/gtkhtml/htmlimageinput.h
-include/gtkhtml-1.1/gtkhtml/htmlinterval.h
-include/gtkhtml-1.1/gtkhtml/htmllinktext.h
-include/gtkhtml-1.1/gtkhtml/htmllist.h
-include/gtkhtml-1.1/gtkhtml/htmlmap.h
-include/gtkhtml-1.1/gtkhtml/htmlobject.h
-include/gtkhtml-1.1/gtkhtml/htmlpainter.h
-include/gtkhtml-1.1/gtkhtml/htmlplainpainter.h
-include/gtkhtml-1.1/gtkhtml/htmlprinter.h
-include/gtkhtml-1.1/gtkhtml/htmlradio.h
-include/gtkhtml-1.1/gtkhtml/htmlreplace.h
-include/gtkhtml-1.1/gtkhtml/htmlrule.h
-include/gtkhtml-1.1/gtkhtml/htmlsearch.h
-include/gtkhtml-1.1/gtkhtml/htmlselect.h
-include/gtkhtml-1.1/gtkhtml/htmlselection.h
-include/gtkhtml-1.1/gtkhtml/htmlsettings.h
-include/gtkhtml-1.1/gtkhtml/htmlshape.h
-include/gtkhtml-1.1/gtkhtml/htmlstack.h
-include/gtkhtml-1.1/gtkhtml/htmlstringtokenizer.h
-include/gtkhtml-1.1/gtkhtml/htmltable.h
-include/gtkhtml-1.1/gtkhtml/htmltablecell.h
-include/gtkhtml-1.1/gtkhtml/htmltablepriv.h
-include/gtkhtml-1.1/gtkhtml/htmltext.h
-include/gtkhtml-1.1/gtkhtml/htmltextarea.h
-include/gtkhtml-1.1/gtkhtml/htmltextinput.h
-include/gtkhtml-1.1/gtkhtml/htmltextslave.h
-include/gtkhtml-1.1/gtkhtml/htmltokenizer.h
-include/gtkhtml-1.1/gtkhtml/htmltype.h
-include/gtkhtml-1.1/gtkhtml/htmltypes.h
-include/gtkhtml-1.1/gtkhtml/htmlundo-action.h
-include/gtkhtml-1.1/gtkhtml/htmlundo.h
-include/gtkhtml-1.1/gtkhtml/htmlvspace.h
-lib/bonobo/plugin/libstorage_http.so
-lib/libgtkhtml-1.1.so.3
-lib/libgtkhtml-1.1.a
-lib/libgtkhtml-1.1.so
-libdata/pkgconfig/gtkhtml-1.1.pc
-share/doc/gtkhtml/gtkhtml-decl.txt
-share/doc/gtkhtml/gtkhtml-sections.txt
-share/doc/gtkhtml/gtkhtml.hierarchy
-share/doc/gtkhtml/gtkhtml.sgml
-share/doc/gtkhtml/gtkhtml.types
-share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
-share/gnome/control-center/Documents/gtkhtml-properties.desktop
-share/gnome/gtkhtml-1.1/Editor.idl
-share/gnome/gtkhtml-1.1/gtkhtml-capplet.glade
-share/gnome/gtkhtml-1.1/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-1.1/icons/16_copy.png
-share/gnome/gtkhtml-1.1/icons/16_cut.png
-share/gnome/gtkhtml-1.1/icons/16_paste.png
-share/gnome/gtkhtml-1.1/icons/24_copy.png
-share/gnome/gtkhtml-1.1/icons/24_cut.png
-share/gnome/gtkhtml-1.1/icons/24_paste.png
-share/gnome/gtkhtml-1.1/icons/bulb.png
-share/gnome/gtkhtml-1.1/icons/empty_image.png
-share/gnome/gtkhtml-1.1/icons/flowers.png
-share/gnome/gtkhtml-1.1/icons/html-viewer.png
-share/gnome/gtkhtml-1.1/icons/insert-image-16.png
-share/gnome/gtkhtml-1.1/icons/insert-image-24.png
-share/gnome/gtkhtml-1.1/icons/insert-link-16.png
-share/gnome/gtkhtml-1.1/icons/insert-link-24.png
-share/gnome/gtkhtml-1.1/icons/insert-object-16.png
-share/gnome/gtkhtml-1.1/icons/insert-object-24.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-16.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-24.png
-share/gnome/gtkhtml-1.1/icons/insert-table-16.png
-share/gnome/gtkhtml-1.1/icons/insert-table-24.png
-share/gnome/gtkhtml-1.1/icons/paper.png
-share/gnome/gtkhtml-1.1/icons/properties-16.png
-share/gnome/gtkhtml-1.1/icons/rect.png
-share/gnome/gtkhtml-1.1/icons/redo-16.png
-share/gnome/gtkhtml-1.1/icons/redo-24.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-center.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-left.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-right.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-1.1/icons/search-16.png
-share/gnome/gtkhtml-1.1/icons/search-24.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-16.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-24.png
-share/gnome/gtkhtml-1.1/icons/smiley-1.png
-share/gnome/gtkhtml-1.1/icons/smiley-10.png
-share/gnome/gtkhtml-1.1/icons/smiley-11.png
-share/gnome/gtkhtml-1.1/icons/smiley-2.png
-share/gnome/gtkhtml-1.1/icons/smiley-3.png
-share/gnome/gtkhtml-1.1/icons/smiley-4.png
-share/gnome/gtkhtml-1.1/icons/smiley-5.png
-share/gnome/gtkhtml-1.1/icons/smiley-6.png
-share/gnome/gtkhtml-1.1/icons/smiley-8.png
-share/gnome/gtkhtml-1.1/icons/smiley-9.png
-share/gnome/gtkhtml-1.1/icons/texture.png
-share/gnome/gtkhtml-1.1/icons/transparent.png
-share/gnome/gtkhtml-1.1/icons/undo-16.png
-share/gnome/gtkhtml-1.1/icons/undo-24.png
-share/gnome/gtkhtml-1.1/keybindingsrc.emacs
-share/gnome/gtkhtml-1.1/keybindingsrc.ms
-share/gnome/gtkhtml-1.1/keybindingsrc.xemacs
-share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
-share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
-share/gnome/ui/GNOME_GtkHTML_Editor.xml
-share/locale/az/LC_MESSAGES/gtkhtml.mo
-share/locale/ca/LC_MESSAGES/gtkhtml.mo
-share/locale/cs/LC_MESSAGES/gtkhtml.mo
-share/locale/da/LC_MESSAGES/gtkhtml.mo
-share/locale/de/LC_MESSAGES/gtkhtml.mo
-share/locale/el/LC_MESSAGES/gtkhtml.mo
-share/locale/es/LC_MESSAGES/gtkhtml.mo
-share/locale/et/LC_MESSAGES/gtkhtml.mo
-share/locale/eu/LC_MESSAGES/gtkhtml.mo
-share/locale/fi/LC_MESSAGES/gtkhtml.mo
-share/locale/fr/LC_MESSAGES/gtkhtml.mo
-share/locale/gl/LC_MESSAGES/gtkhtml.mo
-share/locale/hu/LC_MESSAGES/gtkhtml.mo
-share/locale/it/LC_MESSAGES/gtkhtml.mo
-share/locale/ja/LC_MESSAGES/gtkhtml.mo
-share/locale/ko/LC_MESSAGES/gtkhtml.mo
-share/locale/lt/LC_MESSAGES/gtkhtml.mo
-share/locale/lv/LC_MESSAGES/gtkhtml.mo
-share/locale/ms/LC_MESSAGES/gtkhtml.mo
-share/locale/nl/LC_MESSAGES/gtkhtml.mo
-share/locale/nn/LC_MESSAGES/gtkhtml.mo
-share/locale/no/LC_MESSAGES/gtkhtml.mo
-share/locale/pl/LC_MESSAGES/gtkhtml.mo
-share/locale/pt/LC_MESSAGES/gtkhtml.mo
-share/locale/pt_BR/LC_MESSAGES/gtkhtml.mo
-share/locale/ru/LC_MESSAGES/gtkhtml.mo
-share/locale/sk/LC_MESSAGES/gtkhtml.mo
-share/locale/sl/LC_MESSAGES/gtkhtml.mo
-share/locale/sv/LC_MESSAGES/gtkhtml.mo
-share/locale/tr/LC_MESSAGES/gtkhtml.mo
-share/locale/uk/LC_MESSAGES/gtkhtml.mo
-share/locale/vi/LC_MESSAGES/gtkhtml.mo
-share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
-share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/gtkhtml-1.1/icons
-@dirrm share/gnome/gtkhtml-1.1
-@dirrm share/doc/gtkhtml/gtkhtml
-@dirrm share/doc/gtkhtml
-@dirrm include/gtkhtml-1.1/gtkhtml
-@dirrm include/gtkhtml-1.1
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-compat.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-embedded.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-enums.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-keybinding.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-private.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-properties.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-search.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-stream.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml-types.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtml.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtmldebug.h
+include/libgtkhtml-3.0/gtkhtml/gtkhtmlfontstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmlanchor.h
+include/libgtkhtml-3.0/gtkhtml/htmlbutton.h
+include/libgtkhtml-3.0/gtkhtml/htmlcheckbox.h
+include/libgtkhtml-3.0/gtkhtml/htmlclue.h
+include/libgtkhtml-3.0/gtkhtml/htmlcluealigned.h
+include/libgtkhtml-3.0/gtkhtml/htmlclueflow.h
+include/libgtkhtml-3.0/gtkhtml/htmlclueh.h
+include/libgtkhtml-3.0/gtkhtml/htmlcluev.h
+include/libgtkhtml-3.0/gtkhtml/htmlcolor.h
+include/libgtkhtml-3.0/gtkhtml/htmlcolorset.h
+include/libgtkhtml-3.0/gtkhtml/htmlcursor.h
+include/libgtkhtml-3.0/gtkhtml/htmldrawqueue.h
+include/libgtkhtml-3.0/gtkhtml/htmlembedded.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-clueflowstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cursor.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cut-and-paste.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-fontstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-images.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-movement.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-rule.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-selection-updater.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-table.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-tablecell.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-text.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-edit.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-print.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-save.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine-search.h
+include/libgtkhtml-3.0/gtkhtml/htmlengine.h
+include/libgtkhtml-3.0/gtkhtml/htmlentity.h
+include/libgtkhtml-3.0/gtkhtml/htmlenums.h
+include/libgtkhtml-3.0/gtkhtml/htmlenumutils.h
+include/libgtkhtml-3.0/gtkhtml/htmlfontmanager.h
+include/libgtkhtml-3.0/gtkhtml/htmlform.h
+include/libgtkhtml-3.0/gtkhtml/htmlframe.h
+include/libgtkhtml-3.0/gtkhtml/htmlframeset.h
+include/libgtkhtml-3.0/gtkhtml/htmlgdkpainter.h
+include/libgtkhtml-3.0/gtkhtml/htmlhidden.h
+include/libgtkhtml-3.0/gtkhtml/htmliframe.h
+include/libgtkhtml-3.0/gtkhtml/htmlimage.h
+include/libgtkhtml-3.0/gtkhtml/htmlimageinput.h
+include/libgtkhtml-3.0/gtkhtml/htmlinterval.h
+include/libgtkhtml-3.0/gtkhtml/htmllinktext.h
+include/libgtkhtml-3.0/gtkhtml/htmllist.h
+include/libgtkhtml-3.0/gtkhtml/htmlmap.h
+include/libgtkhtml-3.0/gtkhtml/htmlmarshal.h
+include/libgtkhtml-3.0/gtkhtml/htmlobject.h
+include/libgtkhtml-3.0/gtkhtml/htmlpainter.h
+include/libgtkhtml-3.0/gtkhtml/htmlplainpainter.h
+include/libgtkhtml-3.0/gtkhtml/htmlprinter.h
+include/libgtkhtml-3.0/gtkhtml/htmlradio.h
+include/libgtkhtml-3.0/gtkhtml/htmlreplace.h
+include/libgtkhtml-3.0/gtkhtml/htmlrule.h
+include/libgtkhtml-3.0/gtkhtml/htmlsearch.h
+include/libgtkhtml-3.0/gtkhtml/htmlselect.h
+include/libgtkhtml-3.0/gtkhtml/htmlselection.h
+include/libgtkhtml-3.0/gtkhtml/htmlsettings.h
+include/libgtkhtml-3.0/gtkhtml/htmlshape.h
+include/libgtkhtml-3.0/gtkhtml/htmlstack.h
+include/libgtkhtml-3.0/gtkhtml/htmlstringtokenizer.h
+include/libgtkhtml-3.0/gtkhtml/htmlstyle.h
+include/libgtkhtml-3.0/gtkhtml/htmltable.h
+include/libgtkhtml-3.0/gtkhtml/htmltablecell.h
+include/libgtkhtml-3.0/gtkhtml/htmltablepriv.h
+include/libgtkhtml-3.0/gtkhtml/htmltext.h
+include/libgtkhtml-3.0/gtkhtml/htmltextarea.h
+include/libgtkhtml-3.0/gtkhtml/htmltextinput.h
+include/libgtkhtml-3.0/gtkhtml/htmltextslave.h
+include/libgtkhtml-3.0/gtkhtml/htmltokenizer.h
+include/libgtkhtml-3.0/gtkhtml/htmltype.h
+include/libgtkhtml-3.0/gtkhtml/htmltypes.h
+include/libgtkhtml-3.0/gtkhtml/htmlundo-action.h
+include/libgtkhtml-3.0/gtkhtml/htmlundo.h
+lib/gtkhtml/libgnome-gtkhtml-editor-3.0.so
+lib/libgtkhtml-3.0.a
+lib/libgtkhtml-3.0.so
+lib/libgtkhtml-3.0.so.1
+lib/libgtkhtml-a11y-3.0.a
+lib/libgtkhtml-a11y-3.0.so
+lib/libgtkhtml-a11y-3.0.so.1
+libdata/bonobo/servers/GNOME_GtkHTML_Editor.server
+libdata/pkgconfig/libgtkhtml-3.0.pc
+share/gnome/gtkhtml-3.0/Editor.idl
+share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor.xml
+share/gnome/gtkhtml-3.0/gtkhtml-editor-properties.glade
+share/gnome/gtkhtml-3.0/icons/16_copy.png
+share/gnome/gtkhtml-3.0/icons/16_cut.png
+share/gnome/gtkhtml-3.0/icons/16_paste.png
+share/gnome/gtkhtml-3.0/icons/24_copy.png
+share/gnome/gtkhtml-3.0/icons/24_cut.png
+share/gnome/gtkhtml-3.0/icons/24_paste.png
+share/gnome/gtkhtml-3.0/icons/bulb.png
+share/gnome/gtkhtml-3.0/icons/empty_image.png
+share/gnome/gtkhtml-3.0/icons/flowers.png
+share/gnome/gtkhtml-3.0/icons/font-tt-16.png
+share/gnome/gtkhtml-3.0/icons/font-tt-24.png
+share/gnome/gtkhtml-3.0/icons/html-viewer.png
+share/gnome/gtkhtml-3.0/icons/info_bulb.png
+share/gnome/gtkhtml-3.0/icons/insert-image-16.png
+share/gnome/gtkhtml-3.0/icons/insert-image-24.png
+share/gnome/gtkhtml-3.0/icons/insert-link-16.png
+share/gnome/gtkhtml-3.0/icons/insert-link-24.png
+share/gnome/gtkhtml-3.0/icons/insert-object-16.png
+share/gnome/gtkhtml-3.0/icons/insert-object-24.png
+share/gnome/gtkhtml-3.0/icons/insert-rule-16.png
+share/gnome/gtkhtml-3.0/icons/insert-rule-24.png
+share/gnome/gtkhtml-3.0/icons/insert-table-16.png
+share/gnome/gtkhtml-3.0/icons/insert-table-24.png
+share/gnome/gtkhtml-3.0/icons/paper.png
+share/gnome/gtkhtml-3.0/icons/properties-16.png
+share/gnome/gtkhtml-3.0/icons/rect.png
+share/gnome/gtkhtml-3.0/icons/redo-16.png
+share/gnome/gtkhtml-3.0/icons/redo-24.png
+share/gnome/gtkhtml-3.0/icons/rule-blue-center.png
+share/gnome/gtkhtml-3.0/icons/rule-blue-left.png
+share/gnome/gtkhtml-3.0/icons/rule-blue-right.png
+share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-center.png
+share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-left.png
+share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-right.png
+share/gnome/gtkhtml-3.0/icons/search-16.png
+share/gnome/gtkhtml-3.0/icons/search-24.png
+share/gnome/gtkhtml-3.0/icons/search-and-replace-16.png
+share/gnome/gtkhtml-3.0/icons/search-and-replace-24.png
+share/gnome/gtkhtml-3.0/icons/smiley-1.png
+share/gnome/gtkhtml-3.0/icons/smiley-10.png
+share/gnome/gtkhtml-3.0/icons/smiley-11.png
+share/gnome/gtkhtml-3.0/icons/smiley-2.png
+share/gnome/gtkhtml-3.0/icons/smiley-3.png
+share/gnome/gtkhtml-3.0/icons/smiley-4.png
+share/gnome/gtkhtml-3.0/icons/smiley-5.png
+share/gnome/gtkhtml-3.0/icons/smiley-6.png
+share/gnome/gtkhtml-3.0/icons/smiley-8.png
+share/gnome/gtkhtml-3.0/icons/smiley-9.png
+share/gnome/gtkhtml-3.0/icons/texture.png
+share/gnome/gtkhtml-3.0/icons/transparent.png
+share/gnome/gtkhtml-3.0/icons/undo-16.png
+share/gnome/gtkhtml-3.0/icons/undo-24.png
+share/gnome/gtkhtml-3.0/keybindingsrc.emacs
+share/locale/am/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ar/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/az/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ca/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/cs/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/da/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/de/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/el/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/es/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/et/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/eu/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/fi/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/fr/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/gl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/he/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/hi/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/hu/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/it/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ja/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ko/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/lt/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/lv/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ms/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/nl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/nn/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/no/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/pl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/pt/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/ru/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/sk/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/sl/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/sv/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/tr/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/uk/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/vi/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/gtkhtml-3.0.mo
+@dirrm share/gnome/gtkhtml-3.0/icons
+@dirrm share/gnome/gtkhtml-3.0
+@dirrm lib/gtkhtml
+@dirrm include/libgtkhtml-3.0/gtkhtml
+@dirrm include/libgtkhtml-3.0