Pullup ticket #4366 - requested by obache

www/dillo: security update

Revisions pulled up:
- www/dillo/Makefile                                            1.65
- www/dillo/PLIST                                               1.19
- www/dillo/distinfo                                            1.36
- www/dillo/patches/patch-aa                                    deleted
- www/dillo/patches/patch-ab                                    deleted
- www/dillo/patches/patch-ac                                    deleted
- www/dillo/patches/patch-ad                                    deleted
- www/dillo/patches/patch-dillorc                               deleted

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Sat Apr 12 02:24:19 UTC 2014

   Modified Files:
   	pkgsrc/www/dillo: Makefile PLIST distinfo
   Removed Files:
   	pkgsrc/www/dillo/patches: patch-aa patch-ab patch-ac patch-ad
   	    patch-dillorc

   Log Message:
   Update dillo to 3.0.4.

   While here,
   * move dependency on wget to TOOLS,
   * simplify configuration file handling

   dillo-3.0.4 [April 09, 2014]

   +- OPTGROUP and INS elements.
    - Some HTML5 elements, etc.
    - Added show_ui_tooltip preference (BUG#1140).
      Patches: corvid
   +- Make embedding into other applications more reliable (BUG#1127).
    - Add search from address bar.
    - Share CSS user agent stylesheet between pages.
      Patches: Johannes Hofmann
   +- Better scaling (down) of images, even with consideration of gamma
      correction.
    - Fixed (possibly security) problem of FltkImgBuf caused by integer
   overflow    (BUG#1129).
    - Some linebreaking fixes, and optimization for non-justified text,
   including    new preference stretchability_factor.
    - Added white_bg_replacement preference.
    - Implemented background images (except 'background-attachment'), added
      load_background_images preference, as well as a new entry in the tools
   menu.    Patches: Sebastian Geerken
   +- Fix a set of bugs reported by Oulu Univ. Secure Programming Group
      (HTML parsing, URL resolution, GIF processing, etc.)
    - Improved/fixed handling of HEAD, TITLE, TEXTAREA and form inputs.
    - Made show_url dillorc option work again (BUG#1128)
      Patches: Jorge Arellano Cid
   +- Fix compiling on Hurd.
      Patch: Pino Toscano
   +- Avoid Dpid children becoming zombies.
      Patch: Jorge Arellano, J. Gaffney
   +- HTML5 WBR element.
    - Fix compiling on IRIX with MIPSpro compiler.
      Patches: corvid, Sebastian Geerken

8 files changed, 12 insertions, 96 deletions

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 84ad7179205..966fc92461f 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2014/02/12 23:18:44 tron Exp $
+# $NetBSD: Makefile,v 1.64.2.1 2014/04/12 17:24:57 tron Exp $
 
-DISTNAME=	dillo-3.0.3
-PKGREVISION=	2
+DISTNAME=	dillo-3.0.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.dillo.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,12 +12,10 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
 REPLACE_PERL+=	dpid/dpidc dillo-install-hyphenation
-USE_TOOLS+=	perl:run
-
-DEPENDS+=	wget-[0-9]*:../../net/wget
+USE_TOOLS+=	perl:run wget:run
 
 PKG_SYSCONFSUBDIR=	dillo
 EGDIR=		${PREFIX}/share/examples/dillo
@@ -29,6 +26,8 @@ CONF_FILES+=	${EGDIR}/domainrc ${PKG_SYSCONFDIR}/domainrc
 
 INSTALLATION_DIRS=	share/doc/dillo ${EGDIR}
 
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+
 LIBS.SunOS+=	-liconv
 
 .include "options.mk"
@@ -36,9 +35,6 @@ LIBS.SunOS+=	-liconv
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/dillo
 	${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 711385b5008..d8462fe286c 100644
--- a/www/dillo/PLIST
+++ b/www/dillo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/06/09 16:29:33 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.18.8.1 2014/04/12 17:24:57 tron Exp $
 bin/dillo
 bin/dillo-install-hyphenation
 bin/dpid
@@ -13,6 +13,7 @@ lib/dillo/dpi/hello/hello.filter.dpi
 lib/dillo/dpi/https/https.filter.dpi
 lib/dillo/dpi/vsource/vsource.filter.dpi
 man/man1/dillo.1
+share/doc/dillo/CCCwork.txt
 share/doc/dillo/Cache.txt
 share/doc/dillo/Cookies.txt
 share/doc/dillo/Dillo.txt
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 853dbe54ddf..3b67a6619a1 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.35 2013/06/09 16:29:33 ryoon Exp $
+$NetBSD: distinfo,v 1.35.8.1 2014/04/12 17:24:57 tron Exp $
 
-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
+SHA1 (dillo-3.0.4.tar.bz2) = 69be51126c9f65a86eb1da76bb2042b421b866a0
+RMD160 (dillo-3.0.4.tar.bz2) = 816e07b985a801d1b096562dd8d78651e538dc78
+Size (dillo-3.0.4.tar.bz2) = 738826 bytes
diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa
deleted file mode 100644
index 892f8214ccc..00000000000
--- a/www/dillo/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2013/06/09 16:29:33 ryoon Exp $
-
---- 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)
-+	$(MKDIR_P) "$(DESTDIR)$(datadir)/examples/$(PACKAGE)"
- 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- 	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 $$?; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/$(PACKAGE)" || exit $$?; \
- 	done
- 
- uninstall-sysconfDATA:
diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab
deleted file mode 100644
index 05606b12f2d..00000000000
--- a/www/dillo/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.18 2013/06/09 16:29:33 ryoon Exp $
-
---- Makefile.in.orig	2013-03-14 15:03:54.000000000 +0000
-+++ Makefile.in
-@@ -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 =
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
deleted file mode 100644
index e419ac0075c..00000000000
--- a/www/dillo/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.13 2013/06/09 16:29:33 ryoon Exp $
-
---- 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
- 
--dist_sysconf_DATA = domainrc keysrc
-+dist_sysconf_DATA = 
- EXTRA_DIST = chg srch
- all: all-recursive
- 
diff --git a/www/dillo/patches/patch-ad b/www/dillo/patches/patch-ad
deleted file mode 100644
index 1d1da9c4fb3..00000000000
--- a/www/dillo/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2011/12/02 13:06:31 is Exp $
-
---- configure.orig	2011-09-21 17:30:13.000000000 +0000
-+++ configure
-@@ -3143,7 +3143,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
- ac_config_headers="$ac_config_headers config.h"
- 
- 
--sysconfdir=${sysconfdir}/${PACKAGE}
-+sysconfdir=${sysconfdir}
- 
- 
- 
diff --git a/www/dillo/patches/patch-dillorc b/www/dillo/patches/patch-dillorc
deleted file mode 100644
index 531c3182a1d..00000000000
--- a/www/dillo/patches/patch-dillorc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dillorc,v 1.1 2013/06/09 16:30:05 ryoon Exp $
-
-* Fix runtime error. prefs: Color 'bfdabf' not recognized.
-
---- dillorc.orig	2013-04-04 17:20:10.000000000 +0000
-+++ dillorc
-@@ -264,7 +264,7 @@ search_url="Google http://www.google.com
- #
- ui_fg_color=black
- ui_main_bg_color=#c6c6c6
--ui_text_bg_color=bfdabf
-+ui_text_bg_color=#bfdabf
- ui_selection_color=#191970
- ui_button_highlight_color=#a9a9a9
- ui_tab_active_bg_color=#87aca7