Update to 3.0.3

* Add LICENSE.

Changelog:

dillo-3.0.3 [April 17, 2013]

+- Support for CSS display property
 - Replace polling in DNS with a pipe.
 - Packed trie to optimize hyphenator memory consumption.
 - Fix crash in datauri dpi.
 - Speed up DNS requests when ipv6 isn't enabled.
   Patches: Johannes Hofmann
+- Fix image input coordinates (BUG#1070)
 - When location bar is given focus, temporarily show panels if hidden
   (BUG#1093).
 - Fix bug where data URI has charset but no media type.
 - Bug meter line number fix for bare carriage returns.
 - Add some more info to various bug meter messages.
 - For text selection, fix releasing mouse button outside of boundary.
 - While selecting text, moving cursor outside viewport will scroll it.
 - Make form resetting work for <select>.
 - Never leave location bar empty when requesting page (BUG#1113).
 - Some improvements to tab navigation of form widgets (includes BUG#1111).
 - Don't let form input widget insert literal control chars (BUG#1110).
 - Assorted improvements to browser usability from the keyboard.
 - Added user interface color preferences (ui_*).
 - Removed show_url preference.
   Patches: corvid
+- Automatic hyphenation (includes penalty_* preferences that control
   line-breaking).
   Patch: Sebastian Geerken
+- Added the "view-source" keybinding (default: Ctrl-U).
   Patch: Alexander Voigt
+- Introduced the domainrc mechanism for finer-grained control than
   filter_auto_requests had provided.
   Patch: p37sitdu, corvid
+- After focusing option menu, keypress will seek to next one beginning with
   that character.
 - When active tab is closed, focus the last one visited or opened.
 - Fixed a bug in dpip when dillo aborts a running dpi connection.
   Patches: Jorge Arellano Cid
+- Better window titles.
 - Show dialog if saved file would overwrite an existing one.
   Patches: Jeremy Henty
+- Remove hardcoded UI colors.
   Patch: Benjamin Johnson, corvid
+- Fix fd leak in dpi write failure case.
   Patch: p37sitdu, Jorge Arellano Cid

6 files changed, 36 insertions, 32 deletions

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 08f290e7721..aa539e5cb40 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2013/05/31 12:42:32 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2013/06/09 16:29:33 ryoon Exp $
 
-DISTNAME=	dillo-3.0.2
-PKGREVISION=	5
+DISTNAME=	dillo-3.0.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.dillo.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -9,12 +8,13 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dillo.org/
 COMMENT=	Very small and fast graphical web-browser
+LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
-REPLACE_PERL+=	dpid/dpidc
+REPLACE_PERL+=	dpid/dpidc dillo-install-hyphenation
 USE_TOOLS+=	perl:run
 
 DEPENDS+=	wget-[0-9]*:../../net/wget
@@ -24,6 +24,7 @@ EGDIR=		${PREFIX}/share/examples/dillo
 CONF_FILES=	${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
 CONF_FILES+=	${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
 CONF_FILES+=	${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc
+CONF_FILES+=	${EGDIR}/domainrc ${PKG_SYSCONFDIR}/domainrc
 
 INSTALLATION_DIRS=	share/doc/dillo ${EGDIR}
 
@@ -36,6 +37,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${PREFIX}/share/doc/dillo
 	${INSTALL_DATA} ${WRKSRC}/dillorc ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/keysrc ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/domainrc ${DESTDIR}${EGDIR}
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/www/dillo/PLIST b/www/dillo/PLIST
index b32400c2010..711385b5008 100644
--- a/www/dillo/PLIST
+++ b/www/dillo/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.17 2011/12/02 13:06:31 is Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/06/09 16:29:33 ryoon Exp $
 bin/dillo
+bin/dillo-install-hyphenation
 bin/dpid
 bin/dpidc
 lib/dillo/dpi/bookmarks/bookmarks.dpi
@@ -26,5 +27,6 @@ share/doc/dillo/README
 share/doc/dillo/Selection.txt
 share/doc/dillo/user_help.html
 share/examples/dillo/dillorc
+share/examples/dillo/domainrc
 share/examples/dillo/dpidrc
 share/examples/dillo/keysrc
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 5d6d923ec9c..853dbe54ddf 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.34 2012/01/22 11:23:35 obache Exp $
+$NetBSD: distinfo,v 1.35 2013/06/09 16:29:33 ryoon Exp $
 
-SHA1 (dillo-3.0.2.tar.bz2) = 1d1258ee7d18c8ca0eabaf100f2f611c6be03f87
-RMD160 (dillo-3.0.2.tar.bz2) = 418fa4926a86290dbbbc36942ceb1bac1d3bd407
-Size (dillo-3.0.2.tar.bz2) = 640894 bytes
-SHA1 (patch-aa) = df4222ae9a0bd58af4c5481f920b60893145dbc1
-SHA1 (patch-ab) = 2cb89a6fd5bcb19b83de94fed6a67605f83b4764
-SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158
+SHA1 (dillo-3.0.3.tar.bz2) = c47286ca0dfcf9e471b8062310ae1cd5dd719441
+RMD160 (dillo-3.0.3.tar.bz2) = ade7a3333b8206eafc01c3b10b7cdf8e9e36af6c
+Size (dillo-3.0.3.tar.bz2) = 685824 bytes
+SHA1 (patch-aa) = c2aa2246657de4c0ee526b2edb6fbe8841bf94e7
+SHA1 (patch-ab) = 1ac5ebd14f5b6e89a3dc02d86fe0062b2448d33b
+SHA1 (patch-ac) = c8627276e633731c8aeef06b59a77cb039f55bff
 SHA1 (patch-ad) = dbae6a09285673771ff95ff3b40fe113f4b09726
+SHA1 (patch-dillorc) = 41650b232a354de6d1a68738f27f6ec445410610
diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa
index b36339e6ceb..892f8214ccc 100644
--- a/www/dillo/patches/patch-aa
+++ b/www/dillo/patches/patch-aa
@@ -1,22 +1,21 @@
-$NetBSD: patch-aa,v 1.9 2010/02/14 20:19:25 snj Exp $
+$NetBSD: patch-aa,v 1.10 2013/06/09 16:29:33 ryoon Exp $
 
---- dpid/Makefile.in.orig	2010-02-11 02:20:00.000000000 -0800
-+++ dpid/Makefile.in	2010-02-14 09:55:43.000000000 -0800
-@@ -335,15 +335,15 @@ distclean-compile:
+--- dpid/Makefile.in.orig	2013-03-14 15:03:53.000000000 +0000
++++ dpid/Makefile.in
+@@ -377,6 +377,7 @@ distclean-compile:
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
 +	$(MKDIR_P) "$(DESTDIR)$(datadir)/examples/$(PACKAGE)"
  	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	if test -n "$$list"; then \
+ 	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+@@ -387,8 +388,7 @@ install-sysconfDATA: $(sysconf_DATA)
  	  echo "$$d$$p"; \
  	done | $(am__base_list) | \
  	while read files; do \
 -	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
 -	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples/$(PACKAGE)'"; \
 +	  $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/$(PACKAGE)" || exit $$?; \
  	done
  
diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab
index d33f3fd316a..05606b12f2d 100644
--- a/www/dillo/patches/patch-ab
+++ b/www/dillo/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.17 2011/12/02 13:06:31 is Exp $
+$NetBSD: patch-ab,v 1.18 2013/06/09 16:29:33 ryoon Exp $
 
---- Makefile.in.orig	2011-09-21 17:30:15.000000000 +0000
+--- Makefile.in.orig	2013-03-14 15:03:54.000000000 +0000
 +++ Makefile.in
-@@ -244,7 +244,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = lout dw dlib dpip src doc dpid dpi test
+ dist_bin_SCRIPTS = dillo-install-hyphenation
  EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h
 -sysconf_DATA = dillorc
 +sysconf_DATA =
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
index 61568087695..e419ac0075c 100644
--- a/www/dillo/patches/patch-ac
+++ b/www/dillo/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.12 2009/07/09 05:04:03 snj Exp $
+$NetBSD: patch-ac,v 1.13 2013/06/09 16:29:33 ryoon Exp $
 
---- src/Makefile.in.orig	2009-07-08 20:27:51.000000000 -0700
-+++ src/Makefile.in	2009-07-08 20:28:37.000000000 -0700
-@@ -321,7 +321,7 @@ dillo_SOURCES = \
+--- src/Makefile.in.orig	2013-03-14 15:03:54.000000000 +0000
++++ src/Makefile.in
+@@ -416,7 +416,7 @@ dillo_SOURCES = \
+ 	xembed.cc \
  	xembed.hh
  
- EXTRA_DIST = chg srch keysrc
--sysconf_DATA = keysrc
-+sysconf_DATA =
+-dist_sysconf_DATA = domainrc keysrc
++dist_sysconf_DATA = 
+ EXTRA_DIST = chg srch
  all: all-recursive
  
- .SUFFIXES: