Update to 1.1.7, a major update and API change.

This version is NOT compatable with the older 1.0 series but since the one port that uses the 1.0 series will be updated shortly this isn't much of an issue. ok todd@
2003-01-03 21:44:30 +00:00 · 2003-01-03 21:44:30 +00:00 · b479a8a1da
commit b479a8a1da
parent dc1b70af61
8 changed files with 218 additions and 314 deletions
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2002/11/21 02:33:59 margarida Exp $
+# $OpenBSD: Makefile,v 1.5 2003/01/03 21:44:30 marcm Exp $

 COMMENT=		"lightweight HTML rendering/printing/editing engine"

-DISTNAME=		gtkhtml-1.0.4
+DISTNAME=		gtkhtml-1.1.7
 CATEGORIES=    		www
 HOMEPAGE=		http://www.gnome.org/

@ -14,14 +14,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtkhtml/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtkhtml/1.1/}
 EXTRACT_SUFX=		.tar.bz2

 MODULES=		gettext

 LIB_DEPENDS=		bonobo.2,bonobox.2::x11/gnome/bonobo \
 			capplet::x11/gnome/controlcenter \
-			gal.16::devel/gal \
+			gal.22::devel/gal \
 			ghttp.1::www/libghttp \
 			glade.5,glade-gnome.5::devel/libglade,gnome

@ -36,8 +36,4 @@ CONFIGURE_ARGS+= 	--disable-gtk-doc
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

-post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gtkhtml; \
-	cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gtkhtml/
-
 .include <bsd.port.mk>
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@ -1,3 +1,3 @@
-MD5 (gtkhtml-1.0.4.tar.bz2) = 1ea977558c2daf9b7f9916800e933b00
-RMD160 (gtkhtml-1.0.4.tar.bz2) = 995a9759312f5b3f0f51485902bf73596003d541
-SHA1 (gtkhtml-1.0.4.tar.bz2) = 45f02dc212177c9492b350212abf09d275d92614
+MD5 (gtkhtml-1.1.7.tar.bz2) = 83cd60ab9a108d2a0d65b3bf760affa4
+RMD160 (gtkhtml-1.1.7.tar.bz2) = 993fab221b3eaa6c93e7cf04e3d5e806582f8ded
+SHA1 (gtkhtml-1.1.7.tar.bz2) = db57a993a4b0e1021926e9393de701f4f2544d5c
--- a/www/gtkhtml/patches/patch-configure
+++ b/www/gtkhtml/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.2 2002/07/14 20:02:16 nino Exp $
--- configure.orig	Tue Jul  9 08:52:20 2002
-+++ configure	Tue Jul  9 09:05:04 2002
-@@ -2867,7 +2867,7 @@ fi
+$OpenBSD: patch-configure,v 1.3 2003/01/03 21:44:30 marcm Exp $
+--- configure.orig	Mon Oct  7 14:16:40 2002
+++ configure	Tue Oct 15 11:02:41 2002
+@@ -3345,7 +3345,7 @@ fi
   XML_I18N_MERGE_DESKTOP_RULE='%.desktop:   %.desktop.in   $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -d          -p '
 XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -d          -p '
      XML_I18N_MERGE_KEYS_RULE='%.keys:      %.keys.in      $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -k  $(XML_I18N_KEYS_KIND) '
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.2 2002/07/14 20:02:16 nino Exp $
      XML_I18N_MERGE_PONG_RULE='%.pong:      %.pong.in      $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -x          -p '
    XML_I18N_MERGE_SERVER_RULE='%.server:    %.server.in    $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -o -u'
     XML_I18N_MERGE_SHEET_RULE='%.sheet:     %.sheet.in     $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -x -u'
-@@ -5115,8 +5115,8 @@ else
+@@ -5770,8 +5770,8 @@ else
     hardcode_direct=yes
     hardcode_shlibpath_var=no
     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.2 2002/07/14 20:02:16 nino Exp $
       export_dynamic_flag_spec='${wl}-E'
     else
       case "$host_os" in
-@@ -5125,8 +5125,8 @@ else
+@@ -5780,8 +5780,8 @@ else
 	hardcode_libdir_flag_spec='-R$libdir'
         ;;
       *)
@ -32,7 +32,7 @@ $OpenBSD: patch-configure,v 1.2 2002/07/14 20:02:16 nino Exp $
         ;;
       esac
     fi
-@@ -5642,6 +5642,8 @@ openbsd*)
+@@ -6297,6 +6297,8 @@ openbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
@ -41,7 +41,7 @@ $OpenBSD: patch-configure,v 1.2 2002/07/14 20:02:16 nino Exp $
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case "$host_os" in
     openbsd2.[89] | openbsd2.[89].*)
-@@ -8586,6 +8588,10 @@ echo "$as_me:8585: result: $gt_cv_func_g
+@@ -9369,6 +9371,10 @@ echo "$as_me:$LINENO: result: $gt_cv_fun
 echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6
 fi
 
--- a/www/gtkhtml/patches/patch-ltmain_sh
+++ b/www/gtkhtml/patches/patch-ltmain_sh
@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2002/07/14 20:02:16 nino Exp $
--- ltmain.sh.orig	Thu Jun 13 09:30:56 2002
-+++ ltmain.sh	Tue Jul  9 09:05:42 2002
-@@ -1249,6 +1249,17 @@ EOF
+$OpenBSD: patch-ltmain_sh,v 1.3 2003/01/03 21:44:30 marcm Exp $
+--- ltmain.sh.orig	Tue Nov  5 13:00:56 2002
+++ ltmain.sh	Wed Nov  6 22:32:32 2002
+@@ -1060,6 +1060,17 @@ compiler."
 	continue
 	;;
 
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2002/07/14 20:02:16 nino Exp $
       -module)
 	module=yes
 	continue
-@@ -1840,6 +1851,9 @@ EOF
+@@ -1500,6 +1511,9 @@ compiler."
 	  alldeplibs=yes
 	  continue
 	  ;;
@ -29,7 +29,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2002/07/14 20:02:16 nino Exp $
 	esac # case $deplib
 	if test "$found" = yes || test -f "$lib"; then :
 	else
-@@ -4951,40 +4965,6 @@ relink_command=\"$relink_command\""
+@@ -4450,40 +4464,6 @@ relink_command=\"$relink_command\""
     # Exit here if they wanted silent mode.
     test "$show" = : && exit 0
 
--- a/www/gtkhtml/pkg/DEINSTALL
+++ b/www/gtkhtml/pkg/DEINSTALL
@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
-#
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-FILES='
-CORBA/servers/html-component.gnorba
-'
-
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${SYSCONFDIR} directory."
-echo "| If you are planning on installing $1 again in the future"
-echo "| you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belongs to this package:"
-echo "|"
-for f in ${FILES}; do
-  echo "| ${SYSCONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
-
-exit 0
--- a/www/gtkhtml/pkg/INSTALL
+++ b/www/gtkhtml/pkg/INSTALL
@ -1,86 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: INSTALL,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-P_NAME=gtkhtml
-DEST_PFX=${SYSCONFDIR}
-SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
-
-FILES='
-CORBA/servers/html-component.gnorba
-'
-
-do_post() {
-
-    echo 
-    echo "+--------------- ${P_NAME}"
-
-    # install dirs if neccesary
-    install -d ${DEST_PFX}/gnome/panel-config/panel.d/default
-            
-    # install or take note of existing config files
-    for f in ${FILES}; do
-	if [ -f "${DEST_PFX}/$f" ]; then
-	    OLD_CONFS="${OLD_CONFS} $f"
-	else
-	    if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then
-		echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
-		exit 1
-	    fi
-	    NEW_CONFS="${NEW_CONFS} $f"
-	fi
-    done
-    
-    # print status report
-    if [ -n "${NEW_CONFS}" ]; then
-	echo "| The following NEW configuration files have been installed:"
-	echo "|"
-	for f in ${NEW_CONFS}; do
-	    echo "| ${DEST_PFX}/$f"
-	done 
-    fi
-    
-    if [ -n "${OLD_CONFS}" ]; then
-	if [ -n "${NEW_CONFS}" ]; then
-	    echo "|"
-	fi
-	echo "| The following OLD configuration files was found and have NOT been overwritten:"
-	echo "| You should however manually compare them to their equivalents in "
-        echo "|"
-        echo "| ${SOURCE_PFX}"
-        echo "|"
-	echo "| and update your configuration if needed." 
-	echo "|"
-	for f in ${OLD_CONFS}; do
-	    echo "| ${DEST_PFX}/$f"
-	done 
-    fi
-    echo "+--------------- ${P_NAME}"
-    echo 
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-        ;;
-    POST-INSTALL)
-        do_post
-        ;;
-    *)
-        echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
--- a/www/gtkhtml/pkg/PFRAG.shared
+++ b/www/gtkhtml/pkg/PFRAG.shared
@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2002/07/14 20:02:16 nino Exp $
-lib/libgtkhtml.so.21.3
+@comment $OpenBSD: PFRAG.shared,v 1.3 2003/01/03 21:44:30 marcm Exp $
 lib/bonobo/plugin/libstorage_http.so
+lib/libgtkhtml-1.1.so.3.2
 DYNLIBDIR(%D/lib)
--- a/www/gtkhtml/pkg/PLIST
+++ b/www/gtkhtml/pkg/PLIST
@ -1,102 +1,100 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/01/03 21:44:30 marcm Exp $
 bin/ebrowser
-bin/gnome-gtkhtml-editor
+bin/gnome-gtkhtml-editor-1.1
 bin/gtkhtml-properties-capplet
-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.a
 lib/bonobo/plugin/libstorage_http.la
-lib/gtkhtmlConf.sh
-lib/libgtkhtml.a
-lib/libgtkhtml.la
+lib/libgtkhtml-1.1.a
+lib/libgtkhtml-1.1.la
+lib/pkgconfig/gtkhtml-1.1.pc
 share/control-center/Documents/gtkhtml-properties.desktop
-@comment share/control-center/capplets/gtkhtml-properties.desktop
-share/examples/gtkhtml/CORBA/servers/html-component.gnorba
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
 share/gnome/html/gtkhtml-decl.txt
 share/gnome/html/gtkhtml-sections.txt
@ -104,78 +102,95 @@ share/gnome/html/gtkhtml.hierarchy
 share/gnome/html/gtkhtml.sgml
 share/gnome/html/gtkhtml.types
 share/gnome/ui/GNOME_GtkHTML_Editor.xml
-share/gtkhtml/Editor.idl
-share/gtkhtml/gtkhtml-capplet.glade
-share/gtkhtml/gtkhtml-editor-properties.glade
-share/gtkhtml/icons/16_copy.png
-share/gtkhtml/icons/16_cut.png
-share/gtkhtml/icons/16_paste.png
-share/gtkhtml/icons/24_copy.png
-share/gtkhtml/icons/24_cut.png
-share/gtkhtml/icons/24_paste.png
-share/gtkhtml/icons/bulb.png
-share/gtkhtml/icons/empty_image.png
-share/gtkhtml/icons/flowers.png
-share/gtkhtml/icons/html-viewer.png
-share/gtkhtml/icons/insert-image-16.png
-share/gtkhtml/icons/insert-image-24.png
-share/gtkhtml/icons/insert-link-16.png
-share/gtkhtml/icons/insert-link-24.png
-share/gtkhtml/icons/insert-object-16.png
-share/gtkhtml/icons/insert-object-24.png
-share/gtkhtml/icons/insert-rule-16.png
-share/gtkhtml/icons/insert-rule-24.png
-share/gtkhtml/icons/insert-table-16.png
-share/gtkhtml/icons/insert-table-24.png
-share/gtkhtml/icons/properties-16.png
-share/gtkhtml/icons/redo-16.png
-share/gtkhtml/icons/redo-24.png
-share/gtkhtml/icons/rule-blue-center.png
-share/gtkhtml/icons/rule-blue-left.png
-share/gtkhtml/icons/rule-blue-right.png
-share/gtkhtml/icons/rule-yellow-flowers-center.png
-share/gtkhtml/icons/rule-yellow-flowers-left.png
-share/gtkhtml/icons/rule-yellow-flowers-right.png
-share/gtkhtml/icons/search-16.png
-share/gtkhtml/icons/search-24.png
-share/gtkhtml/icons/search-and-replace-16.png
-share/gtkhtml/icons/search-and-replace-24.png
-share/gtkhtml/icons/transparent.png
-share/gtkhtml/icons/undo-16.png
-share/gtkhtml/icons/undo-24.png
-share/gtkhtml/keybindingsrc.emacs
-share/gtkhtml/keybindingsrc.ms
-share/gtkhtml/keybindingsrc.xemacs
-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
+share/gtkhtml-1.1/Editor.idl
+share/gtkhtml-1.1/gtkhtml-capplet.glade
+share/gtkhtml-1.1/gtkhtml-editor-properties.glade
+share/gtkhtml-1.1/icons/16_copy.png
+share/gtkhtml-1.1/icons/16_cut.png
+share/gtkhtml-1.1/icons/16_paste.png
+share/gtkhtml-1.1/icons/24_copy.png
+share/gtkhtml-1.1/icons/24_cut.png
+share/gtkhtml-1.1/icons/24_paste.png
+share/gtkhtml-1.1/icons/bulb.png
+share/gtkhtml-1.1/icons/empty_image.png
+share/gtkhtml-1.1/icons/flowers.png
+share/gtkhtml-1.1/icons/html-viewer.png
+share/gtkhtml-1.1/icons/insert-image-16.png
+share/gtkhtml-1.1/icons/insert-image-24.png
+share/gtkhtml-1.1/icons/insert-link-16.png
+share/gtkhtml-1.1/icons/insert-link-24.png
+share/gtkhtml-1.1/icons/insert-object-16.png
+share/gtkhtml-1.1/icons/insert-object-24.png
+share/gtkhtml-1.1/icons/insert-rule-16.png
+share/gtkhtml-1.1/icons/insert-rule-24.png
+share/gtkhtml-1.1/icons/insert-table-16.png
+share/gtkhtml-1.1/icons/insert-table-24.png
+share/gtkhtml-1.1/icons/paper.png
+share/gtkhtml-1.1/icons/properties-16.png
+share/gtkhtml-1.1/icons/rect.png
+share/gtkhtml-1.1/icons/redo-16.png
+share/gtkhtml-1.1/icons/redo-24.png
+share/gtkhtml-1.1/icons/rule-blue-center.png
+share/gtkhtml-1.1/icons/rule-blue-left.png
+share/gtkhtml-1.1/icons/rule-blue-right.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
+share/gtkhtml-1.1/icons/search-16.png
+share/gtkhtml-1.1/icons/search-24.png
+share/gtkhtml-1.1/icons/search-and-replace-16.png
+share/gtkhtml-1.1/icons/search-and-replace-24.png
+share/gtkhtml-1.1/icons/smiley-1.png
+share/gtkhtml-1.1/icons/smiley-10.png
+share/gtkhtml-1.1/icons/smiley-11.png
+share/gtkhtml-1.1/icons/smiley-2.png
+share/gtkhtml-1.1/icons/smiley-3.png
+share/gtkhtml-1.1/icons/smiley-4.png
+share/gtkhtml-1.1/icons/smiley-5.png
+share/gtkhtml-1.1/icons/smiley-6.png
+share/gtkhtml-1.1/icons/smiley-8.png
+share/gtkhtml-1.1/icons/smiley-9.png
+share/gtkhtml-1.1/icons/texture.png
+share/gtkhtml-1.1/icons/transparent.png
+share/gtkhtml-1.1/icons/undo-16.png
+share/gtkhtml-1.1/icons/undo-24.png
+share/gtkhtml-1.1/keybindingsrc.emacs
+share/gtkhtml-1.1/keybindingsrc.ms
+share/gtkhtml-1.1/keybindingsrc.xemacs
+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
 share/oaf/GNOME_GtkHTML_EBrowser.oaf
 share/oaf/GNOME_GtkHTML_Editor.oaf
 %%SHARED%%
@ -183,6 +198,8 @@ share/oaf/GNOME_GtkHTML_Editor.oaf
@comment @dirrm share/locale/zh_TW
@comment @dirrm share/locale/zh_CN/LC_MESSAGES
@comment @dirrm share/locale/zh_CN
+@comment @dirrm share/locale/vi/LC_MESSAGES
+@comment @dirrm share/locale/vi
@comment @dirrm share/locale/uk/LC_MESSAGES
@comment @dirrm share/locale/uk
@comment @dirrm share/locale/tr/LC_MESSAGES
@ -207,6 +224,8 @@ share/oaf/GNOME_GtkHTML_Editor.oaf
@comment @dirrm share/locale/nn
@comment @dirrm share/locale/nl/LC_MESSAGES
@comment @dirrm share/locale/nl
+@comment @dirrm share/locale/ms/LC_MESSAGES
+@comment @dirrm share/locale/ms
@comment @dirrm share/locale/lv/LC_MESSAGES
@comment @dirrm share/locale/lv
@comment @dirrm share/locale/lt/LC_MESSAGES
@ -227,6 +246,8 @@ share/oaf/GNOME_GtkHTML_Editor.oaf
@comment @dirrm share/locale/fi
@comment @dirrm share/locale/eu/LC_MESSAGES
@comment @dirrm share/locale/eu
+@comment @dirrm share/locale/et/LC_MESSAGES
+@comment @dirrm share/locale/et
@comment @dirrm share/locale/es/LC_MESSAGES
@comment @dirrm share/locale/es
@comment @dirrm share/locale/el/LC_MESSAGES
@ -237,11 +258,13 @@ share/oaf/GNOME_GtkHTML_Editor.oaf
@comment @dirrm share/locale/da
@comment @dirrm share/locale/cs/LC_MESSAGES
@comment @dirrm share/locale/cs
+@comment @dirrm share/locale/ca/LC_MESSAGES
+@comment @dirrm share/locale/ca
@comment @dirrm share/locale/az/LC_MESSAGES
@comment @dirrm share/locale/az
@comment @dirrm share/locale
-@dirrm share/gtkhtml/icons
-@dirrm share/gtkhtml
+@dirrm share/gtkhtml-1.1/icons
+@dirrm share/gtkhtml-1.1
@comment @dirrm share/gnome/ui
@comment @exec mkdir -p %D/share/gnome/html/gtkhtml
@comment @dirrm share/gnome/html/gtkhtml
@ -250,8 +273,7 @@ share/oaf/GNOME_GtkHTML_Editor.oaf
@comment @dirrm share/gnome/apps/Settings
@comment @dirrm share/gnome/apps
@comment @dirrm share/gnome
-@dirrm share/examples/gtkhtml/CORBA/servers
-@dirrm share/examples/gtkhtml/CORBA
-@dirrm share/examples/gtkhtml
-@comment @dirrm share/control-center/capplets
-@dirrm include/gtkhtml
+@comment @dirrm lib/pkgconfig
+@comment @dirrm lib/bonobo
+@dirrm include/gtkhtml-1.1/gtkhtml
+@dirrm include/gtkhtml-1.1