Updated gtkhtml to 1.0.1 (list of changes is unknown, the ChangeLog file

doesn't say anything useful).

7 files changed, 45 insertions, 42 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index f51af11500a..820375f2f5d 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/01/17 11:15:32 martti Exp $
 
-DISTNAME=		gtkhtml-0.14.0
+DISTNAME=		gtkhtml-1.0.1
 CATEGORIES=		www gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gtkhtml/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
-COMMENT=		lightweight HTML rendering/printing/editing engine
+COMMENT=		Lightweight HTML rendering/printing/editing engine
 
 USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
diff --git a/www/gtkhtml/PLIST b/www/gtkhtml/PLIST
index d7b419ad249..340698c73a4 100644
--- a/www/gtkhtml/PLIST
+++ b/www/gtkhtml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/02 16:15:09 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/17 11:15:32 martti Exp $
 bin/ebrowser
 bin/gnome-gtkhtml-editor
 bin/gtkhtml-properties-capplet
@@ -97,10 +97,15 @@ lib/gtkhtmlConf.sh
 lib/libgtkhtml.a
 lib/libgtkhtml.la
 lib/libgtkhtml.so
-lib/libgtkhtml.so.17
-lib/libgtkhtml.so.17.0
+lib/libgtkhtml.so.21
+lib/libgtkhtml.so.21.0
 share/control-center/Documents/gtkhtml-properties.desktop
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
+share/gnome/html/gtkhtml-decl.txt
+share/gnome/html/gtkhtml-sections.txt
+share/gnome/html/gtkhtml.hierarchy
+share/gnome/html/gtkhtml.sgml
+share/gnome/html/gtkhtml.types
 share/gnome/html/gtkhtml/gtkhtml-gtkhtml-enums.html
 share/gnome/html/gtkhtml/gtkhtml-gtkhtml-stream.html
 share/gnome/html/gtkhtml/gtkhtml-gtkhtml-types.html
@@ -109,11 +114,6 @@ share/gnome/html/gtkhtml/gtkhtml.html
 share/gnome/html/gtkhtml/index.html
 share/gnome/html/gtkhtml/license.html
 share/gnome/html/gtkhtml/r27.html
-share/gnome/html/gtkhtml-decl.txt
-share/gnome/html/gtkhtml-sections.txt
-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
@@ -125,21 +125,19 @@ 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/search-24.png
-share/gtkhtml/icons/search-and-replace-24.png
-share/gtkhtml/icons/empty_image.png
-share/gtkhtml/icons/flowers.png
-share/gtkhtml/icons/insert-object-16.png
-share/gtkhtml/icons/insert-object-24.png
 share/gtkhtml/icons/properties-16.png
 share/gtkhtml/icons/redo-16.png
 share/gtkhtml/icons/redo-24.png
@@ -150,7 +148,9 @@ 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
@@ -171,10 +171,12 @@ 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
@@ -182,10 +184,11 @@ 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/oaf/GNOME_GtkHTML_EBrowser.oaf
 share/oaf/GNOME_GtkHTML_Editor.oaf
+@dirrm include/gtkhtml
 @dirrm share/gnome/html/gtkhtml
 @dirrm share/gtkhtml/icons
 @dirrm share/gtkhtml
-@dirrm include/gtkhtml
diff --git a/www/gtkhtml/buildlink.mk b/www/gtkhtml/buildlink.mk
index 29f17ce5912..131aa34783a 100644
--- a/www/gtkhtml/buildlink.mk
+++ b/www/gtkhtml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/06 14:30:51 rh Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/01/17 11:15:32 martti Exp $
 #
 # This Makefile fragment is included by packages that use gtkhtml.
 #
@@ -17,7 +17,7 @@ GTKHTML_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=0.14.0
+BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=1.0.1
 DEPENDS+=	${BUILDLINK_DEPENDS.gtkhtml}:../../www/gtkhtml
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gtkhtml=gtkhtml
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index f822c01915f..55aeb7f3ef6 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2002/01/02 16:15:10 fredb Exp $
+$NetBSD: distinfo,v 1.8 2002/01/17 11:15:32 martti Exp $
 
-SHA1 (gtkhtml-0.14.0.tar.bz2) = 43573722027d749845b3d2545ddc1810e42638ea
-Size (gtkhtml-0.14.0.tar.bz2) = 848138 bytes
-SHA1 (patch-aa) = 912181c9a728714275447e89591d6f01052be75e
-SHA1 (patch-ab) = 4dcb3ca70bad4e7e6e97dfc88e2902a93b11ac14
-SHA1 (patch-ac) = c99434a59d3b5020bb47363ef26a4d0cd10afca4
+SHA1 (gtkhtml-1.0.1.tar.bz2) = 67f9ab77def69365209ec189f0a74d2f05e0359a
+Size (gtkhtml-1.0.1.tar.bz2) = 939965 bytes
+SHA1 (patch-aa) = 0a0c00da0b28a3c8658b5fb486be4dabe14598d4
+SHA1 (patch-ab) = e87b80de2c0a64ca7076264e9d23addb57b709b2
+SHA1 (patch-ac) = ac61550a67e032bc04995137d28293d7b3a714ca
diff --git a/www/gtkhtml/patches/patch-aa b/www/gtkhtml/patches/patch-aa
index a1a3ff9ee51..9d8d90fdb68 100644
--- a/www/gtkhtml/patches/patch-aa
+++ b/www/gtkhtml/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2001/08/11 18:35:45 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/01/17 11:15:33 martti Exp $
 
---- configure.orig	Tue Jul 31 17:04:35 2001
-+++ configure
-@@ -3466,7 +3466,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+--- configure.orig	Mon Dec 17 19:04:07 2001
++++ configure	Wed Jan 16 13:25:59 2002
+@@ -8775,7 +8775,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -		   DATADIRNAME=lib
 +		   DATADIRNAME=share
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  		INSTOBJEXT=.mo
diff --git a/www/gtkhtml/patches/patch-ab b/www/gtkhtml/patches/patch-ab
index c8e06f69eee..57747f94213 100644
--- a/www/gtkhtml/patches/patch-ab
+++ b/www/gtkhtml/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/01/02 16:15:11 fredb Exp $
+$NetBSD: patch-ab,v 1.5 2002/01/17 11:15:33 martti Exp $
 
---- capplet/Makefile.in.orig	Wed Jan  2 08:52:03 2002
-+++ capplet/Makefile.in
-@@ -405,8 +405,8 @@
+--- capplet/Makefile.in.orig	Tue Dec 18 22:30:48 2001
++++ capplet/Makefile.in	Wed Jan 16 13:26:20 2002
+@@ -426,8 +426,8 @@
  install-exec-am: install-binPROGRAMS
  install-exec: install-exec-am
  
diff --git a/www/gtkhtml/patches/patch-ac b/www/gtkhtml/patches/patch-ac
index 8319275ba38..2aefbe8aad2 100644
--- a/www/gtkhtml/patches/patch-ac
+++ b/www/gtkhtml/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2001/08/11 18:35:45 rh Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/17 11:15:33 martti Exp $
 
---- src/gtkhtml.c.orig	Mon Jul 30 22:49:12 2001
-+++ src/gtkhtml.c
-@@ -63,6 +63,8 @@
+--- src/gtkhtml.c.orig	Mon Dec 10 18:10:43 2001
++++ src/gtkhtml.c	Wed Jan 16 13:26:40 2002
+@@ -65,6 +65,8 @@
  #include "math.h"
  #include <libgnome/gnome-util.h>