Update to 2.0, which is a major overhaul. Change dillo-ssl option to

ssl, as there is no reason for it to be package-specific.

Most visible changes:
- Switch from GTK1 to FLTK2
- Tabbed browsing
- Downloads and FTP now work (at the expense of a wget dependency)

3 files changed, 27 insertions, 17 deletions

diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa
index 03a0cd6e35e..c1308620059 100644
--- a/www/dillo/patches/patch-aa
+++ b/www/dillo/patches/patch-aa
@@ -1,15 +1,25 @@
-$NetBSD: patch-aa,v 1.6 2006/05/10 21:03:41 adam Exp $
+$NetBSD: patch-aa,v 1.7 2008/10/31 02:02:44 snj Exp $
 
---- dpid/Makefile.in.orig	2006-04-26 18:07:18.000000000 +0200
-+++ dpid/Makefile.in
-@@ -481,8 +481,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+--- ./dpid/Makefile.in.orig	2008-10-30 07:40:38.000000000 -0700
++++ dpid/Makefile.in	2008-10-30 07:46:09.000000000 -0700
+@@ -485,13 +485,13 @@
  
  
  install-data-local :
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 -	echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.file=file/file.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
+-	echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
 +	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/$(PACKAGE)
 +	echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
++	echo >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
++	echo "proto.file=file/file.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
++	echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
++	echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
++	echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab
index b0219e9a8bb..8d0ed022f2f 100644
--- a/www/dillo/patches/patch-ab
+++ b/www/dillo/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.13 2006/05/10 21:03:41 adam Exp $
+$NetBSD: patch-ab,v 1.14 2008/10/31 02:02:44 snj Exp $
 
---- Makefile.in.orig	2006-04-26 18:07:27.000000000 +0200
-+++ Makefile.in
-@@ -194,7 +194,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
- SUBDIRS = doc dpip src dpid dpi
- EXTRA_DIST = ChangeLog.old dillorc install-dpi-local
+--- ./Makefile.in.orig	2008-10-30 07:47:58.000000000 -0700
++++ ./Makefile.in	2008-10-30 07:48:05.000000000 -0700
+@@ -197,7 +197,7 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = lout dw dlib dpip src doc dpid dpi test
+ EXTRA_DIST = Doxyfile dillorc install-dpi-local
 -sysconf_DATA = dillorc
 +sysconf_DATA =
  all: config.h
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
index 531e16f5d4b..6aefb87fa59 100644
--- a/www/dillo/patches/patch-ac
+++ b/www/dillo/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.10 2006/05/27 03:22:32 reed Exp $
+$NetBSD: patch-ac,v 1.11 2008/10/31 02:02:44 snj Exp $
 
---- dpi/https.c.orig	2006-03-24 07:52:23.000000000 -0800
-+++ dpi/https.c	2006-05-26 18:18:34.000000000 -0700
-@@ -61,8 +61,6 @@
- #include "../dpip/dpip.h"
- #include "dpiutil.h"
+--- dpi/https.c.orig	2008-10-13 07:49:46.000000000 -0700
++++ dpi/https.c	2008-10-30 07:52:45.000000000 -0700
+@@ -68,8 +68,6 @@
+ #define MSG(...)  printf("[https dpi]: " __VA_ARGS__)
+ 
  
 -#define ENABLE_SSL
 -#undef ENABLE_SSL