diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index d0885d41cc1..f6b65e0c12e 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
+# $OpenBSD: Makefile,v 1.2 2002/07/14 20:02:16 nino Exp $
COMMENT= "lightweight HTML rendering/printing/editing engine"
-DISTNAME= gtkhtml-1.0.2
+DISTNAME= gtkhtml-1.0.4
CATEGORIES= www
NEED_VERSION= 1.530
HOMEPAGE= http://www.gnome.org/
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index c312d87c3ce..6b6d473ec77 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkhtml-1.0.2.tar.bz2) = 2220ffd7834c52177708599579531c23
-RMD160 (gtkhtml-1.0.2.tar.bz2) = dc9a204e4423aea63d97f6fd1aac1e58080c624a
-SHA1 (gtkhtml-1.0.2.tar.bz2) = 5d144c3800ef980bf56dc7f8e3aaf9f31929e51d
+MD5 (gtkhtml-1.0.4.tar.bz2) = 1ea977558c2daf9b7f9916800e933b00
+RMD160 (gtkhtml-1.0.4.tar.bz2) = 995a9759312f5b3f0f51485902bf73596003d541
+SHA1 (gtkhtml-1.0.4.tar.bz2) = 45f02dc212177c9492b350212abf09d275d92614
diff --git a/www/gtkhtml/patches/patch-configure b/www/gtkhtml/patches/patch-configure
index d3351ffcc88..e9459274c69 100644
--- a/www/gtkhtml/patches/patch-configure
+++ b/www/gtkhtml/patches/patch-configure
@@ -1,16 +1,16 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
---- configure.orig Tue Mar 19 09:28:29 2002
-+++ configure Mon May 20 14:00:29 2002
-@@ -2865,7 +2865,7 @@ EOF
- fi
-
- XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-- $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< $*.oaf'
-+ sed s/_value/value/ $< > $*.oaf'
-
- XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
- $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< $*.server'
-@@ -5128,8 +5128,8 @@ else
+$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
+ 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) '
+- XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -o -p'
++ XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; sed s/_value/value/ $< > $*.oaf'
+ 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
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.1.1.1 2002/05/30 20:23:13 nino Exp $
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
-@@ -5138,8 +5138,8 @@ else
+@@ -5125,8 +5125,8 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -32,7 +32,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
;;
esac
fi
-@@ -5655,6 +5655,8 @@ openbsd*)
+@@ -5642,6 +5642,8 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -41,14 +41,14 @@ $OpenBSD: patch-configure,v 1.1.1.1 2002/05/30 20:23:13 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].*)
-@@ -8600,6 +8602,10 @@ echo "${ECHO_T}$gt_cv_func_gettext_libin
+@@ -8586,6 +8588,10 @@ echo "$as_me:8585: result: $gt_cv_func_g
+ echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6
fi
- fi
++ fi
+
-+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+ LIBS="$LIBS -lintl";
-+ fi
++ if test "$gt_cv_func_gettext_libintl" = "yes"; then
++ LIBS="$LIBS -lintl";
+ fi
if test "$gt_cv_func_gettext_libc" = "yes" \
- || test "$gt_cv_func_gettext_libintl" = "yes"; then
diff --git a/www/gtkhtml/patches/patch-ltmain_sh b/www/gtkhtml/patches/patch-ltmain_sh
index 87c6dcdaf0b..52dbacef150 100644
--- a/www/gtkhtml/patches/patch-ltmain_sh
+++ b/www/gtkhtml/patches/patch-ltmain_sh
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
---- ltmain.sh.orig Thu May 16 12:39:32 2002
-+++ ltmain.sh Thu May 16 12:38:59 2002
-@@ -1060,6 +1060,17 @@ compiler."
+$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
continue
;;
@@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
-module)
module=yes
continue
-@@ -1500,6 +1511,9 @@ compiler."
+@@ -1840,6 +1851,9 @@ EOF
alldeplibs=yes
continue
;;
@@ -27,11 +27,11 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
+ continue
+ ;;
esac # case $deplib
- if test $found = yes || test -f "$lib"; then :
+ if test "$found" = yes || test -f "$lib"; then :
else
-@@ -4446,40 +4460,6 @@ relink_command=\"$relink_command\""
+@@ -4951,40 +4965,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
- test "$show" = ":" && exit 0
+ test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
diff --git a/www/gtkhtml/pkg/PFRAG.shared b/www/gtkhtml/pkg/PFRAG.shared
index 9632784b158..3725c84accf 100644
--- a/www/gtkhtml/pkg/PFRAG.shared
+++ b/www/gtkhtml/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/05/30 20:23:13 nino Exp $
-lib/libgtkhtml.so.21.1
+@comment $OpenBSD: PFRAG.shared,v 1.2 2002/07/14 20:02:16 nino Exp $
+lib/libgtkhtml.so.21.3
lib/bonobo/plugin/libstorage_http.so
DYNLIBDIR(%D/lib)