8 files changed, 223 insertions, 232 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 69edaa3d3a9c..0fe4de245fe3 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtkhtml/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell \
+		soup.5:${PORTSDIR}/devel/soup
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww gal libghttp libcapplet
+USE_GNOME=	gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
@@ -30,8 +30,21 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+VERSION=	${PORTNAME}-${PORTVERSION}
+
 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.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 5be71ec527ef..56c776e09b1e 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.0.4.tar.bz2) = 1ea977558c2daf9b7f9916800e933b00
+MD5 (gnome/gtkhtml-1.1.6.tar.bz2) = 4b4e0098653a50e61d3b713ddb7f81d6
diff --git a/www/gtkhtml3/files/gtkhtmlConf.sh b/www/gtkhtml3/files/gtkhtmlConf.sh
new file mode 100644
index 000000000000..3a1ac441de67
--- /dev/null
+++ b/www/gtkhtml3/files/gtkhtmlConf.sh
@@ -0,0 +1,5 @@
+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%%LOCALBASE%%/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-aa b/www/gtkhtml3/files/patch-aa
deleted file mode 100644
index d810dfeba569..000000000000
--- a/www/gtkhtml3/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Tue Dec  4 17:05:01 2001
-+++ Makefile.in	Wed Dec  5 11:05:52 2001
-@@ -151,7 +151,7 @@
- @BONOBO_TRUE@DIR_COMPONENTS = components
- @BONOBO_FALSE@DIR_COMPONENTS = 
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = gtkhtmlConf.sh
- 
- SUBDIRS =  	intl						macros						src						capplet						doc						art						$(DIR_COMPONENTS)				po
diff --git a/www/gtkhtml3/files/patch-ad b/www/gtkhtml3/files/patch-ad
index 5ef7772b0a97..863d79c3bdf9 100644
--- a/www/gtkhtml3/files/patch-ad
+++ b/www/gtkhtml3/files/patch-ad
@@ -1,7 +1,11 @@
---- src/gtkhtml.c.orig	Thu Oct 19 04:04:22 2000
-+++ src/gtkhtml.c	Fri Oct 20 10:40:47 2000
-@@ -2625,3 +2625,3 @@
+--- 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/" : gnome_util_user_home ()),
-+	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml/" : gnome_util_user_home ()),
+-	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
index d0a58d2ba272..f6bf8a431549 100644
--- a/www/gtkhtml3/files/patch-af
+++ b/www/gtkhtml3/files/patch-af
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Sun Jun 16 16:45:03 2002
-+++ configure	Sun Jun 16 16:45:40 2002
-@@ -7012,6 +7012,7 @@
+--- configure.orig	Mon Oct  7 15:12:16 2002
++++ configure	Sat Oct 12 20:42:50 2002
+@@ -7679,6 +7679,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9321,7 +9322,7 @@
+@@ -10215,7 +10216,7 @@
  
  if test "x$enable_xim" = "xyes"; then
  	BACKUP_LDFLAGS=$LDFLAGS
 -	LDFLAGS="$LDFLAGS `gtk-config --libs`"
 +	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo "$as_me:9325: checking for gdk_im_begin" >&5
+ 	echo "$as_me:$LINENO: checking for gdk_im_begin" >&5
  echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
  if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/gtkhtml3/files/patch-capplet::Makefile.in b/www/gtkhtml3/files/patch-capplet::Makefile.in
deleted file mode 100644
index 192479a0fa87..000000000000
--- a/www/gtkhtml3/files/patch-capplet::Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- capplet/Makefile.in	2001/12/12 21:45:18	1.1
-+++ capplet/Makefile.in	2001/12/12 21:49:47
-@@ -193,7 +193,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--DATA =  $(desk_DATA) $(glade_DATA) $(newsys_DATA) $(sys_DATA)
-+DATA =  $(desk_DATA) $(glade_DATA) $(sys_DATA)
- 
- DIST_COMMON =  ChangeLog Makefile.am Makefile.in
- 
-@@ -421,7 +421,7 @@
- install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
- 
--install-data-am: install-deskDATA install-gladeDATA install-newsysDATA \
-+install-data-am: install-deskDATA install-gladeDATA \
- 		install-sysDATA
- install-data: install-data-am
- 
-@@ -438,7 +438,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(deskdir) \
--		$(DESTDIR)$(gladedir) $(DESTDIR)$(newsysdir) \
-+		$(DESTDIR)$(gladedir) \
- 		$(DESTDIR)$(sysdir)
- 
- 
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index d1b7072f5918..e011376209c6 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -1,99 +1,99 @@
 bin/ebrowser
-bin/gnome-gtkhtml-editor
+bin/gnome-gtkhtml-editor-1.1
 bin/gtkhtml-properties-capplet
-etc/CORBA/servers/html-component.gnorba
 etc/gtkhtmlConf.sh
-include/gtkhtml/gtkhtml-compat.h
-include/gtkhtml/gtkhtml-embedded.h
-include/gtkhtml/gtkhtml-enums.h
-include/gtkhtml/gtkhtml-im.h
-include/gtkhtml/gtkhtml-keybinding.h
-include/gtkhtml/gtkhtml-private.h
-include/gtkhtml/gtkhtml-properties.h
-include/gtkhtml/gtkhtml-search.h
-include/gtkhtml/gtkhtml-stream.h
-include/gtkhtml/gtkhtml-types.h
-include/gtkhtml/gtkhtml.h
-include/gtkhtml/gtkhtmldebug.h
-include/gtkhtml/gtkhtmlfontstyle.h
-include/gtkhtml/htmlanchor.h
-include/gtkhtml/htmlbutton.h
-include/gtkhtml/htmlcheckbox.h
-include/gtkhtml/htmlclue.h
-include/gtkhtml/htmlcluealigned.h
-include/gtkhtml/htmlclueflow.h
-include/gtkhtml/htmlclueh.h
-include/gtkhtml/htmlcluev.h
-include/gtkhtml/htmlcolor.h
-include/gtkhtml/htmlcolorset.h
-include/gtkhtml/htmlcursor.h
-include/gtkhtml/htmldrawqueue.h
-include/gtkhtml/htmlembedded.h
-include/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/gtkhtml/htmlengine-edit-cursor.h
-include/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/gtkhtml/htmlengine-edit-fontstyle.h
-include/gtkhtml/htmlengine-edit-images.c
-include/gtkhtml/htmlengine-edit-images.h
-include/gtkhtml/htmlengine-edit-movement.h
-include/gtkhtml/htmlengine-edit-rule.h
-include/gtkhtml/htmlengine-edit-selection-updater.h
-include/gtkhtml/htmlengine-edit-table.h
-include/gtkhtml/htmlengine-edit-tablecell.h
-include/gtkhtml/htmlengine-edit-text.h
-include/gtkhtml/htmlengine-edit.h
-include/gtkhtml/htmlengine-print.h
-include/gtkhtml/htmlengine-save.h
-include/gtkhtml/htmlengine-search.h
-include/gtkhtml/htmlengine.h
-include/gtkhtml/htmlentity.h
-include/gtkhtml/htmlenums.h
-include/gtkhtml/htmlenumutils.h
-include/gtkhtml/htmlfontmanager.h
-include/gtkhtml/htmlform.h
-include/gtkhtml/htmlframe.h
-include/gtkhtml/htmlframeset.h
-include/gtkhtml/htmlgdkpainter.h
-include/gtkhtml/htmlhidden.h
-include/gtkhtml/htmlhspace.h
-include/gtkhtml/htmliframe.h
-include/gtkhtml/htmlimage.h
-include/gtkhtml/htmlimageinput.h
-include/gtkhtml/htmlinterval.h
-include/gtkhtml/htmllinktext.h
-include/gtkhtml/htmllist.h
-include/gtkhtml/htmlmap.h
-include/gtkhtml/htmlobject.h
-include/gtkhtml/htmlpainter.h
-include/gtkhtml/htmlplainpainter.h
-include/gtkhtml/htmlprinter.h
-include/gtkhtml/htmlradio.h
-include/gtkhtml/htmlreplace.h
-include/gtkhtml/htmlrule.h
-include/gtkhtml/htmlsearch.h
-include/gtkhtml/htmlselect.h
-include/gtkhtml/htmlselection.h
-include/gtkhtml/htmlsettings.h
-include/gtkhtml/htmlshape.h
-include/gtkhtml/htmlstack.h
-include/gtkhtml/htmlstringtokenizer.h
-include/gtkhtml/htmltable.h
-include/gtkhtml/htmltablecell.h
-include/gtkhtml/htmltablepriv.h
-include/gtkhtml/htmltext.h
-include/gtkhtml/htmltextarea.h
-include/gtkhtml/htmltextinput.h
-include/gtkhtml/htmltextslave.h
-include/gtkhtml/htmltokenizer.h
-include/gtkhtml/htmltype.h
-include/gtkhtml/htmltypes.h
-include/gtkhtml/htmlundo-action.h
-include/gtkhtml/htmlundo.h
-include/gtkhtml/htmlvspace.h
+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.a
-lib/libgtkhtml.so
-lib/libgtkhtml.so.21
+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
@@ -101,83 +101,101 @@ 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/Editor.idl
-share/gnome/gtkhtml/gtkhtml-capplet.glade
-share/gnome/gtkhtml/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml/icons/16_copy.png
-share/gnome/gtkhtml/icons/16_cut.png
-share/gnome/gtkhtml/icons/16_paste.png
-share/gnome/gtkhtml/icons/24_copy.png
-share/gnome/gtkhtml/icons/24_cut.png
-share/gnome/gtkhtml/icons/24_paste.png
-share/gnome/gtkhtml/icons/bulb.png
-share/gnome/gtkhtml/icons/empty_image.png
-share/gnome/gtkhtml/icons/flowers.png
-share/gnome/gtkhtml/icons/html-viewer.png
-share/gnome/gtkhtml/icons/insert-image-16.png
-share/gnome/gtkhtml/icons/insert-image-24.png
-share/gnome/gtkhtml/icons/insert-link-16.png
-share/gnome/gtkhtml/icons/insert-link-24.png
-share/gnome/gtkhtml/icons/insert-object-16.png
-share/gnome/gtkhtml/icons/insert-object-24.png
-share/gnome/gtkhtml/icons/insert-rule-16.png
-share/gnome/gtkhtml/icons/insert-rule-24.png
-share/gnome/gtkhtml/icons/insert-table-16.png
-share/gnome/gtkhtml/icons/insert-table-24.png
-share/gnome/gtkhtml/icons/properties-16.png
-share/gnome/gtkhtml/icons/redo-16.png
-share/gnome/gtkhtml/icons/redo-24.png
-share/gnome/gtkhtml/icons/rule-blue-center.png
-share/gnome/gtkhtml/icons/rule-blue-left.png
-share/gnome/gtkhtml/icons/rule-blue-right.png
-share/gnome/gtkhtml/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml/icons/search-16.png
-share/gnome/gtkhtml/icons/search-24.png
-share/gnome/gtkhtml/icons/search-and-replace-16.png
-share/gnome/gtkhtml/icons/search-and-replace-24.png
-share/gnome/gtkhtml/icons/transparent.png
-share/gnome/gtkhtml/icons/undo-16.png
-share/gnome/gtkhtml/icons/undo-24.png
-share/gnome/gtkhtml/keybindingsrc.emacs
-share/gnome/gtkhtml/keybindingsrc.ms
-share/gnome/gtkhtml/keybindingsrc.xemacs
+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/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/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/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/zh_CN/LC_MESSAGES/gtkhtml.mo
-share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/gtkhtml/icons
-@dirrm share/gnome/gtkhtml
+share/locale/az/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ca/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/cs/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/da/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/de/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/el/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/es/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/et/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/eu/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/fi/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/fr/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/gl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/hu/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/it/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ja/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ko/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/lt/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/lv/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ms/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/nl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/nn/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/no/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/pl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/pt/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/ru/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/sk/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/sl/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/sv/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/tr/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/uk/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/vi/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml-1.1.mo
+share/locale/zh_TW/LC_MESSAGES/gtkhtml-1.1.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
+@dirrm include/gtkhtml-1.1/gtkhtml
+@dirrm include/gtkhtml-1.1