Updated to version 0.7.2.

Changes:

- use tar.bz2 distfile
- add USE_INET6 to BUILD_DEFS only if it's really used
- DESCR has 80 columns
- style nits

0.7.2:
======
- * Implemented text selection! (aka: Copy&Paste) (BUG#59)
  Patch: Sebastian Geerken, Eric Gaudet
- * Fixed IPv6 support when the unthreaded server is used.
  Patch: Damien Couderc, Jorge Arellano
- * Fixed the IPv6 socket connection code for *BSD.
  Patch: Daniel Hartmeier, Jorge Arellano
- * Made the URL_SpamSafe flag be inherited by the BASE element.
  Patch: Melvin Hadasht
- * Switched configure.in to use AC_CANONICAL_SYSTEM instead of 'uname'.
  Patch: Patrice Mandin
- * Added "image/x-png" to MIME types (obsolete, but should be recognized).
  Patch: Paolo P.
- * Fixed the code that handled the installation of "dillorc".
  Patches: Andreas Schweitzer, Paolo P.
- * Fixed a lot of glitches in configure.in: notably libpng and libjpeg
  detection, enabling and disabling. (BUG#: 386, 407, 392, 349)!
  Patches: Andreas Schweitzer
- * Fixed two leaks in Dw(Ext)Iterator.
  Patches: Jörgen Viksell
- * Repaired some minor misbehaviours in the cookie-strings parser.
  Patches: Jörgen Viksell, Jorge Arellano
- * Enabled entities parsing in HTML-given hidden and password values.
  Patch: Jorge Arellano, Francis Daly
- * Implemented character stuffing in dpi (Fix bookmarks with quotes) BUG#434.
  * Added a HTML warning message for META outside HEAD.
  * Removed a segfault source when the server doesn't send content/type info.
  * Added file type detection for filenames without extension.
  * Removed the warnings detected with gcc 3.2.2.
  * Fixed the VERBATIM parsing mode and replaced the SCRIPT mode with it.
  * Fixed the problem with CR handling in TEXTAREA (BUG#318).
  * Fixed initial value parsing within TEXTAREA tags (BUG#400).
  * Fixed loading files with spaces in the name (command line) BUG#437.
  Patches: Jorge Arellano

7 files changed, 33 insertions, 129 deletions

diff --git a/www/dillo/DESCR b/www/dillo/DESCR
index 71f20ccd0ab..b5fd7dbae26 100644
--- a/www/dillo/DESCR
+++ b/www/dillo/DESCR
@@ -1,5 +1,5 @@
 A very small and fast graphical web browser using GTK+.
 
-It is still in early development, so many features are still missing:
-most notably ftp, https, and frames. Table support is incomplete.
-Cookies are supported.
+It is still in early development, so many features are still missing: most
+notably ftp, https, and frames. Table support is incomplete.  Cookies are
+supported.
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index de925601512..4068020c727 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,36 +1,37 @@
-# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:40 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/06 16:10:15 salo Exp $
 #
 
-DISTNAME=	dillo-0.7.1.2
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/dillo-0.7.1
+DISTNAME=	dillo-0.7.2
 CATEGORIES=	www
 MASTER_SITES=	http://dillo.auriga.wearlab.de/download/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	Benjamin.Wong@cc.gatech.edu
 HOMEPAGE=	http://dillo.auriga.wearlab.de/
 COMMENT=	Very small and fast graphical web-browser
 
-USE_BUILDLINK2=	yes
-USE_PKGINSTALL=	yes
-USE_X11=	yes
-GNU_CONFIGURE=	yes
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
-EGDIR=		${PREFIX}/share/examples/dillo
-CONF_FILES=	${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
+CONFIGURE_ARGS=	--sysconfdir=${PKG_SYSCONFDIR}
 
-CFLAGS+=	-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
+EGDIR=		${PREFIX}/share/examples/dillo
+CONF_FILES=	${EGDIR}/dillorc.default ${PKG_SYSCONFDIR}/dillorc
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=            USE_INET6
 .if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=        --enable-ipv6
+BUILD_DEFS+=		USE_INET6
+CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/dillo
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/dillorc ${EGDIR}/dillorc.default
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/www/dillo/PLIST b/www/dillo/PLIST
index dc63d5b431a..55aeb3a3de6 100644
--- a/www/dillo/PLIST
+++ b/www/dillo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/03/21 18:15:29 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/05/06 16:10:15 salo Exp $
 bin/bm_srv12
 bin/dillo
 share/doc/dillo/Cache.txt
@@ -18,6 +18,6 @@ share/doc/dillo/Makefile.am
 share/doc/dillo/Makefile.in
 share/doc/dillo/NC_design.txt
 share/doc/dillo/README
-share/examples/dillo/dillorc
+share/examples/dillo/dillorc.default
 @dirrm share/examples/dillo
 @dirrm share/doc/dillo
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index d4e4430f185..5619d5946b5 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.13 2003/04/11 20:26:30 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2003/05/06 16:10:15 salo Exp $
 
-SHA1 (dillo-0.7.1.2.tar.gz) = eb6ed7af0cb0f0d68f0f3411cbba0606d1dec242
-Size (dillo-0.7.1.2.tar.gz) = 365171 bytes
-SHA1 (patch-aa) = a03f8d4af8f789be6dce6227213100af75e90807
-SHA1 (patch-ab) = ce94918707e3639edfdc0ee1e2d1cd00eed6e3fb
-SHA1 (patch-ac) = e432430a1ab0b12d0824fa00c34548eb4e26976b
+SHA1 (dillo-0.7.2.tar.bz2) = 1e5cc1bc79ca34b7cf1084133493640f485c4f1e
+Size (dillo-0.7.2.tar.bz2) = 329088 bytes
+SHA1 (patch-ab) = 0428bb40dc0f12b4c46cc7062712bd69532ea4a1
diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa
deleted file mode 100644
index 91f182fd03f..00000000000
--- a/www/dillo/patches/patch-aa
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/04/11 20:26:31 jmmv Exp $
-
---- src/IO/http.c.orig	2003-03-04 20:34:59.000000000 +0100
-+++ src/IO/http.c
-@@ -246,10 +246,11 @@ static int Http_connect_socket(ChainLink
- {
-    gint status;
- #ifdef ENABLE_IPV6
--   struct sockaddr_storage name;
--#else
--   struct sockaddr_in name;
-+   struct sockaddr_in6 name6;
- #endif
-+   struct sockaddr_in name4;
-+   struct sockaddr *sa = NULL;
-+   socklen_t sa_len = 0;
-    SocketData_t *S;
-    DilloHost *dh;
- 
-@@ -268,31 +269,35 @@ static int Http_connect_socket(ChainLink
-    fcntl(S->SockFD, F_SETFD,
-          FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
- 
--   /* Some OSes require this...  */
--   memset(&name, 0, sizeof(name));
-    /* Set remaining parms. */
-    switch (dh->af) {
-    case AF_INET:
-    {
--      struct sockaddr_in *sin = (struct sockaddr_in *)&name;
-+      struct sockaddr_in *sin = (struct sockaddr_in *)&name4;
-+      memset(&name4, 0, sizeof(name4));
-       sin->sin_family = dh->af;
-       sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
-       memcpy(&sin->sin_addr, dh->data, dh->alen);
-       if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-          DEBUG_MSG(5, "Connecting to %s\n", inet_ntoa(sin->sin_addr));
-+      sa = (struct sockaddr *)sin;
-+      sa_len = sizeof(struct sockaddr_in);
-       break;
-    }
- #ifdef ENABLE_IPV6
-    case AF_INET6:
-    {
-       char buf[128];
--      struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
-+      struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name6;
-+      memset(&name6, 0, sizeof(name6));
-       sin6->sin6_family = dh->af;
-       sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
-       memcpy(&sin6->sin6_addr, dh->data, dh->alen);
-       inet_ntop(dh->af, dh->data, buf, sizeof(buf));
-       if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-          DEBUG_MSG(5, "Connecting to %s\n", buf);
-+      sa = (struct sockaddr *)sin6;
-+      sa_len = sizeof(struct sockaddr_in6);
-       break;
-    }
- #endif
-@@ -302,7 +307,7 @@ static int Http_connect_socket(ChainLink
-       S->GioCh = g_io_channel_unix_new(S->SockFD);
-    g_io_add_watch(S->GioCh, G_IO_ERR | G_IO_HUP | G_IO_OUT,
-                   Http_use_socket, Info->LocalKey);
--   status = connect(S->SockFD, (struct sockaddr *)&name, sizeof(name));
-+   status = connect(S->SockFD, sa, sa_len);
-    if ( status == -1 && errno != EINPROGRESS ) {
-       S->Err = errno;
-       return -1;
diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab
index 6da0a01c2b3..aa6ff9e7de6 100644
--- a/www/dillo/patches/patch-ab
+++ b/www/dillo/patches/patch-ab
@@ -1,26 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2003/03/21 18:15:29 jmmv Exp $
+$NetBSD: patch-ab,v 1.8 2003/05/06 16:10:16 salo Exp $
 
---- Makefile.in.orig	2003-03-10 13:44:49.000000000 +0100
-+++ Makefile.in
-@@ -25,7 +25,7 @@ bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples/@PACKAGE@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -397,10 +397,9 @@ uninstall-info: uninstall-info-recursive
+--- Makefile.in.orig	2003-04-29 18:24:33.000000000 +0200
++++ Makefile.in	2003-05-06 17:43:28.000000000 +0200
+@@ -128,7 +128,7 @@
  
+ EXTRA_DIST = ChangeLog.old dillorc
  
- install-data-local: dillorc
-+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- 	-if [ -d $(DESTDIR)$(sysconfdir) ]; then \
--		$(INSTALL_DATA) -b $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \
--	elif [ -d /etc/ ]; then \
--		$(INSTALL_DATA) -b $(srcdir)/dillorc /etc/; \
-+		$(INSTALL_DATA) $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \
- 	fi
- 
- uninstall-local:
+-sysconf_DATA = dillorc
++sysconf_DATA =
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
deleted file mode 100644
index 4d0b0625cf4..00000000000
--- a/www/dillo/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/03/21 18:15:29 jmmv Exp $
-
---- src/prefs.c.orig	2003-03-04 20:34:59.000000000 +0100
-+++ src/prefs.c
-@@ -250,8 +250,7 @@ static gint Prefs_load(void)
-    file = a_Misc_prepend_user_home(".dillo/dillorc");
-    fd = open(file, O_RDONLY);
-    g_free(file);
--   if (fd < 0 && (fd = open("/etc/dillorc", O_RDONLY)) < 0)
--      if ((fd = open("/usr/local/etc/dillorc", O_RDONLY)) < 0)
-+   if (fd < 0 && (fd = open(PKG_SYSCONFDIR "/dillorc", O_RDONLY)) < 0)
-          return FILE_NOT_FOUND;
- 
-    fcntl(fd, F_SETFD, FD_CLOEXEC | fcntl(fd, F_GETFD));