Changes 0.8.6:

* Designed and implemented a dpi protocol library (libDpip.a in /dpip).
 * Added a couple of new dpip commands.
* Fixed and uniformed the escaping of values inside dpip tags.
* Ported the bookmarks, download, file, https, ftp and hello plugins,
  plus the dpid daemon and the rest of the source tree to use it.
* Improved the dpi buffer reception to handle split buffers (This was
  required for handling arbitrary data streams with dpip).
* Fixed a serious bug with the FTP plugin that led to two downloads of the
  same file when left-clicking a non-viewable file.
* Added MIME/type detection to the FTP plugin, and removed popen().
* Set the dpi daemon (dpid) not to exit when the downloads dpi is running.
* Improved the accuracy of the illegal-character error reporting for URLs.
* Added DOCTYPE parsing (for better bug-meter error messages).
* Added a check for malicious image sizes in IMG tags.
* Made the parser aware of buggy pages with multiple BODY and HTML elements.
* Fixed a bug in MIME content/type detection.
* Moved the cookies management into a dpi server: cookies.dpi.
* Added "./configure --disable-threaded-dns" (for some non reentrant BSDs).

6 files changed, 23 insertions, 38 deletions

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index df4be29d3a7..b1bdeb5b25d 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2006/04/17 13:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/05/10 21:03:41 adam Exp $
 
-DISTNAME=	dillo-0.8.5
-PKGREVISION=	3
+DISTNAME=	dillo-0.8.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.dillo.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,8 +9,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dillo.org/
 COMMENT=	Very small and fast graphical web-browser
 
+USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-
+CONFIGURE_ARGS+=	--disable-dlgui
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=		${PREFIX}/share/examples/dillo
@@ -36,6 +36,7 @@ post-install:
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/www/dillo/PLIST b/www/dillo/PLIST
index 1b78f860005..c2f44eaf61d 100644
--- a/www/dillo/PLIST
+++ b/www/dillo/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.11 2005/06/19 00:13:30 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/05/10 21:03:41 adam Exp $
 bin/dillo
 bin/dpid
 bin/dpidc
 lib/dillo/dpi/bookmarks/bookmarks.dpi
+lib/dillo/dpi/cookies/cookies.dpi
+lib/dillo/dpi/datauri/datauri.filter.dpi
 lib/dillo/dpi/downloads/downloads.dpi
 lib/dillo/dpi/file/file.dpi
 lib/dillo/dpi/ftp/ftp.filter.dpi
@@ -33,6 +35,8 @@ share/examples/dillo/dpidrc
 @dirrm lib/dillo/dpi/ftp
 @dirrm lib/dillo/dpi/file
 @dirrm lib/dillo/dpi/downloads
+@dirrm lib/dillo/dpi/datauri
+@dirrm lib/dillo/dpi/cookies
 @dirrm lib/dillo/dpi/bookmarks
 @dirrm lib/dillo/dpi
 @dirrm lib/dillo
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 27b2bdb67fe..42def5a5d3d 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.25 2006/01/08 06:46:59 garbled Exp $
+$NetBSD: distinfo,v 1.26 2006/05/10 21:03:41 adam Exp $
 
-SHA1 (dillo-0.8.5.tar.bz2) = c0a716f12787649a2f37a222c439c8a9b7f9ec89
-RMD160 (dillo-0.8.5.tar.bz2) = 9d8b99a25b00542aa11afa4652f4766c2f91653f
-Size (dillo-0.8.5.tar.bz2) = 424795 bytes
-SHA1 (patch-aa) = 2c89724fa0846d154292f983db86b3cc1d117343
-SHA1 (patch-ab) = 682f85d285d64f85a9b34d0177a8c6ef5cafd31c
-SHA1 (patch-ac) = b3059bd4fc41c7f80bddd83eda16ac6bf6a0c823
+SHA1 (dillo-0.8.6.tar.bz2) = ee03b11ba6b75d3180ca906d8275bd35e8765995
+RMD160 (dillo-0.8.6.tar.bz2) = 062cff85b330a5b443ddc81a356e81f930677cbb
+Size (dillo-0.8.6.tar.bz2) = 441739 bytes
+SHA1 (patch-aa) = 1307be194c84a6baad25b4272844b804114d5c3b
+SHA1 (patch-ab) = d057a931cea3d368000ee3d24ff49402ba25edfb
diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa
index 9aa1e05b0ad..03a0cd6e35e 100644
--- a/www/dillo/patches/patch-aa
+++ b/www/dillo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2005/01/04 14:09:17 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2006/05/10 21:03:41 adam Exp $
 
---- dpid/Makefile.in.orig	2004-10-25 13:12:18.000000000 +0200
+--- dpid/Makefile.in.orig	2006-04-26 18:07:18.000000000 +0200
 +++ dpid/Makefile.in
-@@ -475,8 +475,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -481,8 +481,8 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  
  install-data-local :
diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab
index b0bfe667795..b0219e9a8bb 100644
--- a/www/dillo/patches/patch-ab
+++ b/www/dillo/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.12 2004/11/08 11:00:24 adam Exp $
+$NetBSD: patch-ab,v 1.13 2006/05/10 21:03:41 adam Exp $
 
---- Makefile.in.orig	2004-10-25 11:12:09.000000000 +0000
+--- Makefile.in.orig	2006-04-26 18:07:27.000000000 +0200
 +++ Makefile.in
-@@ -176,7 +176,7 @@ target_os = @target_os@
+@@ -194,7 +194,7 @@ target_os = @target_os@
  target_vendor = @target_vendor@
- SUBDIRS = doc src dpid dpi
+ SUBDIRS = doc dpip src dpid dpi
  EXTRA_DIST = ChangeLog.old dillorc install-dpi-local
 -sysconf_DATA = dillorc
 +sysconf_DATA =
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
deleted file mode 100644
index f75353cc524..00000000000
--- a/www/dillo/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2006/01/08 06:46:59 garbled Exp $
---- src/dns.c.orig      2006-01-08 00:26:22.000000000 +0000
-+++ src/dns.c   2006-01-08 00:27:16.000000000 +0000
-@@ -38,7 +38,14 @@
- /*
-  * Note: comment the following line for debugging or gprof profiling.
-  */
--#define G_DNS_THREADED
-+#ifdef __NetBSD__
-+#  include <sys/param.h>
-+#  if __NetBSD_Version__ >= 299000900
-+#    define G_DNS_THREADED
-+#  endif
-+#else
-+#  define G_DNS_THREADED
-+#endif
- 
- /*
-  * Uncomment the following line for libc5 optimization