14 files changed, 1 insertions, 370 deletions
diff --git a/www/Makefile b/www/Makefile
index a7ec8fccc0a..432fbdb2108 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.506 2007/05/04 21:46:29 heinz Exp $
+# $NetBSD: Makefile,v 1.507 2007/05/13 14:39:16 wiz Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -115,10 +115,8 @@ SUBDIR+=	galway
 SUBDIR+=	ganglia-webfrontend
 SUBDIR+=	geeklog
 SUBDIR+=	gitweb
-SUBDIR+=	glibwww
 SUBDIR+=	grail
 SUBDIR+=	gtkasp2php
-SUBDIR+=	gtkhtml
 SUBDIR+=	gtkhtml314
 SUBDIR+=	gtkhtml38
 SUBDIR+=	haskell-cgi
diff --git a/www/glibwww/DESCR b/www/glibwww/DESCR
deleted file mode 100644
index c9cfababfa1..00000000000
--- a/www/glibwww/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-  Glibwww comprises event register/unregister functions that use the glib
-event loop.  This makes lib www fit nicely into just about any gnome or
-gtk+ program.
-
-  This code may be useful for other people wanting to use libwww with gtk.
-
-  This code includes a nice bonobo control.
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
deleted file mode 100644
index 5b09c0587c2..00000000000
--- a/www/glibwww/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2007/01/09 15:06:23 joerg Exp $
-#
-
-DISTNAME=		glibwww-0.2
-PKGREVISION=		9
-CATEGORIES=		www gnome devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glibwww/0.2/}
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Event register functions that use the glib event loop
-
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-
-.include "../../www/libwww/buildlink3.mk"
-.include "../../x11/gnome-libs/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/glibwww/PLIST b/www/glibwww/PLIST
deleted file mode 100644
index 748176c49cd..00000000000
--- a/www/glibwww/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:56 jlam Exp $
-include/glibwww/glibwww.h
-lib/glibwwwConf.sh
-lib/libglibwww.la
-@dirrm include/glibwww
diff --git a/www/glibwww/buildlink3.mk b/www/glibwww/buildlink3.mk
deleted file mode 100644
index 1f6a9b72b9a..00000000000
--- a/www/glibwww/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/01/09 15:06:23 joerg Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GLIBWWW_BUILDLINK3_MK:=	${GLIBWWW_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	glibwww
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglibwww}
-BUILDLINK_PACKAGES+=	glibwww
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glibwww
-
-.if !empty(GLIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.glibwww?=	glibwww>=0.2nb5
-BUILDLINK_ABI_DEPENDS.glibwww+=	glibwww>=0.2nb9
-BUILDLINK_PKGSRCDIR.glibwww?=	../../www/glibwww
-.endif	# GLIBWWW_BUILDLINK3_MK
-
-.include "../../www/libwww/buildlink3.mk"
-.include "../../x11/gnome-libs/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/glibwww/distinfo b/www/glibwww/distinfo
deleted file mode 100644
index 951e194ff62..00000000000
--- a/www/glibwww/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:08:31 wiz Exp $
-
-SHA1 (glibwww-0.2.tar.gz) = ce1d8d3bd8720ace668058114e5192d3d4fd4571
-RMD160 (glibwww-0.2.tar.gz) = 477240d4b6fb21d4d17187f7eb640badeda87e8a
-Size (glibwww-0.2.tar.gz) = 162157 bytes
diff --git a/www/gtkhtml/DESCR b/www/gtkhtml/DESCR
deleted file mode 100644
index 7bfa6f7519b..00000000000
--- a/www/gtkhtml/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-  GtkHTML is a lightweight HTML rendering/printing/editing engine.  It was
-originally based on KHTMLW, part of the KDE project, but is now being
-developed independently.
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
deleted file mode 100644
index 65ec576e0de..00000000000
--- a/www/gtkhtml/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2006/04/17 13:46:01 wiz Exp $
-
-DISTNAME=		gtkhtml-1.1.10
-PKGREVISION=		8
-CATEGORIES=		www gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtkhtml/1.1/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Lightweight HTML rendering/printing/editing engine
-
-USE_X11BASE=		YES
-USE_TOOLS+=		gmake msgfmt
-USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-BROKEN_GETTEXT_DETECTION=	yes
-
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
-
-.include "../../devel/bonobo/buildlink3.mk"
-.include "../../devel/gal/buildlink3.mk"
-.include "../../net/soup/buildlink3.mk"
-.include "../../print/gnome-print/buildlink3.mk"
-.include "../../www/glibwww/buildlink3.mk"
-.include "../../www/libghttp/buildlink3.mk"
-.include "../../x11/control-center/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml/PLIST b/www/gtkhtml/PLIST
deleted file mode 100644
index 803f8e051ad..00000000000
--- a/www/gtkhtml/PLIST
+++ /dev/null
@@ -1,199 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:37 jlam Exp $
-bin/ebrowser
-bin/gnome-gtkhtml-editor-1.1
-bin/gtkhtml-properties-capplet
-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.la
-lib/libgtkhtml-1.1.la
-lib/pkgconfig/gtkhtml-1.1.pc
-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/ui/GNOME_GtkHTML_Editor.xml
-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.mo
-share/locale/ca/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/et/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/ms/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/vi/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 share/gtkhtml-1.1/icons
-@dirrm share/gtkhtml-1.1
-@exec ${MKDIR} %D/share/gnome/html/gtkhtml
-@dirrm share/gnome/html/gtkhtml
-@dirrm include/gtkhtml-1.1/gtkhtml
-@dirrm include/gtkhtml-1.1
diff --git a/www/gtkhtml/buildlink3.mk b/www/gtkhtml/buildlink3.mk
deleted file mode 100644
index 370a7a12343..00000000000
--- a/www/gtkhtml/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:12 jlam Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GTKHTML_BUILDLINK3_MK:=	${GTKHTML_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtkhtml
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkhtml}
-BUILDLINK_PACKAGES+=	gtkhtml
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkhtml
-
-.if !empty(GTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb5
-BUILDLINK_ABI_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb8
-BUILDLINK_PKGSRCDIR.gtkhtml?=	../../www/gtkhtml
-.endif	# GTKHTML_BUILDLINK3_MK
-
-.include "../../devel/bonobo/buildlink3.mk"
-.include "../../devel/gal/buildlink3.mk"
-.include "../../print/gnome-print/buildlink3.mk"
-.include "../../www/glibwww/buildlink3.mk"
-.include "../../www/libghttp/buildlink3.mk"
-.include "../../x11/control-center/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
deleted file mode 100644
index 177dd5d0ef5..00000000000
--- a/www/gtkhtml/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.15 2006/06/13 07:28:56 dbj Exp $
-
-SHA1 (gtkhtml-1.1.10.tar.bz2) = 45f0256e48f5b1b898c35864533179ce47a3ce59
-RMD160 (gtkhtml-1.1.10.tar.bz2) = 0bfb80ff1ee729a870fe133b26ef408642501050
-Size (gtkhtml-1.1.10.tar.bz2) = 1029542 bytes
-SHA1 (patch-aa) = 3cab2fd75b8f7e68879203e9a5f74fa295ad7fd7
-SHA1 (patch-ac) = 4b01bcab28a1bd6ba609bf6987af9d2eb9bccdc9
-SHA1 (patch-ad) = 457a8f5122ad53f10aeed4b02f0f90a1ca607415
diff --git a/www/gtkhtml/patches/patch-aa b/www/gtkhtml/patches/patch-aa
deleted file mode 100644
index 1832e900502..00000000000
--- a/www/gtkhtml/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/10/07 15:42:36 joerg Exp $
-
---- components/html-editor/popup.c.orig	2005-07-10 16:36:36.000000000 +0000
-+++ components/html-editor/popup.c
-@@ -496,6 +496,7 @@ prepare_properties_and_menu (GtkHTMLCont
- 			ADD_PROP (PARAGRAPH);
- 			break;
- 		default:
-+			break;
- 		}
- 		if (obj->parent && obj->parent->parent && HTML_IS_TABLE_CELL (obj->parent->parent)) {
- 			if (cd->format_html) {
diff --git a/www/gtkhtml/patches/patch-ac b/www/gtkhtml/patches/patch-ac
deleted file mode 100644
index 43451109a0d..00000000000
--- a/www/gtkhtml/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/01/09 10:51:04 rh Exp $
-
---- src/gtkhtml.c.orig	Wed Nov  6 06:56:58 2002
-+++ src/gtkhtml.c
-@@ -71,6 +71,8 @@
- #include "math.h"
- #include <libgnome/gnome-util.h>
- 
-+int allow_severity, deny_severity;
-+
- enum DndTargetType {
- 	DND_TARGET_TYPE_TEXT_URI_LIST,
- 	DND_TARGET_TYPE__NETSCAPE_URL,
diff --git a/www/gtkhtml/patches/patch-ad b/www/gtkhtml/patches/patch-ad
deleted file mode 100644
index 7f35f98e6fd..00000000000
--- a/www/gtkhtml/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/06/13 07:28:56 dbj Exp $
-
---- src/htmlcluealigned.h.orig	2001-05-21 08:47:11.000000000 -0400
-+++ src/htmlcluealigned.h
-@@ -38,9 +38,6 @@ struct _HTMLClueAlignedClass {
- };
- 
- 
--extern HTMLClueAlignedClass html_cluealigned_class;
--
--
- void        html_cluealigned_type_init   (void);
- void        html_cluealigned_class_init  (HTMLClueAlignedClass *klass,
- 					  HTMLType              type,