6 files changed, 228 insertions, 252 deletions

diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 915051e023f3..b9afe8083bf4 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,26 +6,27 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.0.10
-PORTREVISION=	1
+PORTVERSION=	3.2.3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.2
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-LIB_DEPENDS=	soup-2.0.0:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.2.7:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gal2 gail
+USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_SUB=	VERSION="3.1"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 045fb89e752c..d9435284ee39 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.0.10.tar.bz2) = b05b8551f7803f32ecfcf505a6310f3f
-SIZE (gnome2/gtkhtml-3.0.10.tar.bz2) = 1074973
+MD5 (gnome2/gtkhtml-3.2.3.tar.bz2) = fe7aa0259a4cd7c99280c076711f8f80
+SIZE (gnome2/gtkhtml-3.2.3.tar.bz2) = 1304520
diff --git a/www/gtkhtml38/files/patch-ltmain.sh b/www/gtkhtml38/files/patch-ltmain.sh
deleted file mode 100644
index 1c2fba5d533f..000000000000
--- a/www/gtkhtml38/files/patch-ltmain.sh
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
index 1747affa3007..902c39e8ecb1 100644
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ b/www/gtkhtml38/files/patch-src_gtkhtml.c
@@ -1,11 +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 @@
+--- src/gtkhtml.c.orig	Mon Aug  2 11:21:24 2004
++++ src/gtkhtml.c	Tue Aug  3 15:19:41 2004
+@@ -2955,7 +2955,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");
+-	gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
++	gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/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 618f9c253d3b..38451dc0178d 100644
--- a/www/gtkhtml38/pkg-descr
+++ b/www/gtkhtml38/pkg-descr
@@ -1,5 +1,3 @@
-This is GtkHTML, a lightweight HTML rendering/printing/editing engine.
-It was originally based on KHTMLW, but is now being developed
-independently.
+GtkHTML is a lightweight HTML rendering, printing, and editing engine.
 
 WWW: http://www.ximian.com/
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 573bde598d33..a6ecb1a29789 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -1,194 +1,213 @@
-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.4
-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-emacs.xml
-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/be/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/sr/LC_MESSAGES/gtkhtml-3.0.mo
-share/locale/sr@Latn/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
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
+lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
+lib/libgtkhtml-%%VERSION%%.a
+lib/libgtkhtml-%%VERSION%%.so
+lib/libgtkhtml-%%VERSION%%.so.11
+libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
+libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
+share/gnome/gtkhtml-%%VERSION%%/Editor.idl
+share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png
+share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png
+share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png
+share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png
+share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png
+share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png
+share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
+share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
+share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png
+share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
+share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png
+share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png
+share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
+@dirrm share/gnome/gtkhtml-%%VERSION%%
 @dirrm lib/gtkhtml
-@dirrm include/libgtkhtml-3.0/gtkhtml
-@dirrm include/libgtkhtml-3.0
+@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
+@dirrm include/libgtkhtml-%%VERSION%%