Update to 0.12pre05, provided by Stefano Marinelli in PR 45050.

ELinks 0.12pre5:
----------------

* Debian bug 534835: Check the return values of some SpiderMonkey
  functions, to avoid crashes if out of memory.
* minor bug 1017: To work around HTTP server bugs, disable
  protocol.http.compression by default, until ELinks can report
  decompression errors or automatically retry the connection.
* enhancement: The French translation was updated.

Bugs that should be removed from NEWS before the 0.12.0 release:

* critical bug 1081: To fix crashes caused by different definitions of
  regfree() in TRE and in the system libc, link with TRE before any
  other libraries.  ELinks 0.12pre4 was the first release that had
  this bug.
* Searching for more than one fullwidth (e.g. Japanese) character now
  works.
* bug 1080: Support ``--dump-color-mode'' with ``--dump-charset UTF-8''.
  Neither of those worked before ELinks 0.12pre1.

ELinks 0.12pre4:
----------------

Released on 2009-05-31.  This release also included the changes listed
under ``ELinks 0.11.6'' below.

Incompatibilities:

* Debian build bug 529821: Use ``pkg-config gnutls'' instead of
  ``libgnutls-config'', which is not included in GNUTLS 2.7.x.
  You can no longer specify the location of GNUTLS using
  ``configure --with-gnutls=DIR''.

Other changes:

* critical bug 1077: Fix crash opening a ``javascript:'' link in a new
  tab.
* Debian bug 528661: If using GNUTLS 2.1.7 or later, disable various
  TLS extensions (including CERT and SERVERNAME) to help handshaking
  with the SSLv3-only bugzilla.novell.com.
* Debian build bug 526349: Include asciidoc.py from AsciiDoc 7.1.2,
  to remove all dependencies on the installed version.
* build enhancement: Recognize ``configure --without-tre''.

Bugs that should be removed from NEWS before the 0.12.0 release:

* critical bug 1071: Fix crash in get_dom_node_child.  ELinks 0.12pre1
  was the first release that had this bug.
* bug 765: Opening a new tab no longer asks about the document of the
  previous tab.  ELinks 0.12pre1 was the first release that had this
  bug.

ELinks 0.12pre3:
----------------

Released on 2009-03-29.  This release also included the changes listed
under ``ELinks 0.11.6'' below.

Incompatibilities:

* bug 1060: Regexp searching now requires the TRE library.
* lzma disabled by default. It's rarely used and doesn't build with new xz.

Other changes:

* critical: Fix assertion failure if IMG/@usemap refers to a different
  file.
* Preserve newlines in hidden input fields, and submit them as CRLF.
  Previously, they could turn into spaces or disappear entirely.
* Perl scripts can use modules that dynamically load C libraries, like
  XML::LibXML::SAX does.
* bug 153: Preserve Unicode characters in XBEL bookmark files.
  However, Unicode in URIs (really IRIs) does not work reliably yet;
  this is being tracked as bug 1066.
* bug 885: Convert xterm titles to ISO-8859-1 by default, but add an
  option to disable this.  When removing control characters from a
  title, note the charset.  Don't truncate titles to the width of the
  terminal.
* bug 1061: Correctly truncate UTF-8 titles in the tab bar.
* bug 1068: ELinks used to display a blank or truncated page if an
  HTTP/1.1 server sent a compressed body with incorrect Content-Length.
  That has now been fixed, and a new option (protocol.http.compression)
  has been added.
* Don't crash when the search-toggle-regex action is used and no regular
  expression support is compiled in.
* minor bug 761: When reading bookmarks from an XBEL file, distinguish
  attribute names from attribute values.
* enhancement: Updated ISO 8859-7, ISO 8859-16, KOI8-R, and MacRoman.

Bugs that should be removed from NEWS before the 0.12.0 release:

* critical bug 1067: Fixed a crash in the RSS parser that ``configure
  --enable-html-highlight'' enables.  ELinks 0.12pre1 was the first
  release that had this bug.
* bug 1069: ELinks didn't report ECMAScript errors, even if the
  ecmascript.error_reporting option was turned on.  ELinks 0.12pre2
  was the first release that had this bug.

3 files changed, 12 insertions, 46 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 91cbb2b27ca..7448eb48449 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2011/04/22 13:44:58 obache Exp $
+# $NetBSD: Makefile,v 1.46 2011/06/14 13:36:34 wiz Exp $
 
-DISTNAME=		elinks-0.12pre2
+DISTNAME=		elinks-0.12pre5
 PKGNAME=		${DISTNAME:S/pre/rc/}
-PKGREVISION=		4
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/ \
 			http://ftp.icm.edu.pl/packages/elinks/
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index e1096dad65a..075667cdd9f 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2009/07/02 20:04:12 drochner Exp $
+$NetBSD: distinfo,v 1.27 2011/06/14 13:36:34 wiz Exp $
 
-SHA1 (elinks-0.12pre2.tar.bz2) = 7bb30f817cc053b87f80c32359dfccbc49e067eb
-RMD160 (elinks-0.12pre2.tar.bz2) = 94af523e31d24e09c9cb6a41e5d87456f288f234
-Size (elinks-0.12pre2.tar.bz2) = 2770126 bytes
-SHA1 (patch-aa) = b2bef596793e8fb75e89fb95daf399240f28fa0b
+SHA1 (elinks-0.12pre5.tar.bz2) = 15fb38fa938a0eec9d5f22fdd538a6785e2854af
+RMD160 (elinks-0.12pre5.tar.bz2) = 4983083f21928da78f937b4dea09f8937c3a9cb9
+Size (elinks-0.12pre5.tar.bz2) = 2783523 bytes
+SHA1 (patch-aa) = b188ab3975bcfd6a491c2e41a17b1f31703d4667
 SHA1 (patch-ab) = a1d9b4246869c1999043c76dbcb35996a6b294fd
 SHA1 (patch-ac) = a7f4bacbdf4073a5a733fe565b1f51dc755c7e4d
 SHA1 (patch-ad) = 089e2455c64cbfb48907693a653e76cc97961622
diff --git a/www/elinks/patches/patch-aa b/www/elinks/patches/patch-aa
index ead33f79609..02d3ced295d 100644
--- a/www/elinks/patches/patch-aa
+++ b/www/elinks/patches/patch-aa
@@ -1,50 +1,17 @@
-$NetBSD: patch-aa,v 1.10 2008/11/06 08:33:31 bjs Exp $
+$NetBSD: patch-aa,v 1.11 2011/06/14 13:36:34 wiz Exp $
 
---- configure.orig	2008-09-21 07:15:24.000000000 -0400
+--- configure.orig	2009-07-08 09:57:36.000000000 +0000
 +++ configure
-@@ -1453,7 +1453,7 @@ Optional Packages:
-   --without-openssl       disable OpenSSL support
-   --with-openssl=DIR    enable OpenSSL support (default)
-   --with-x                use the X Window System
--  --with-libiconv=DIR     search for libiconv in DIR/include and DIR/lib
-+  --with-libiconv-prefix=DIR     search for libiconv in DIR/include and DIR/lib
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -3525,7 +3525,7 @@ _ACEOF
- 
- 
- 		echo > config.asciidoc-unsafe.txt
--		if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>/dev/null; then
-+		if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>&1 > /dev/null; then
- 			ASCIIDOC_FLAGS=--unsafe
- 		fi
- 		rm config.asciidoc-unsafe.*
-@@ -18899,8 +18899,8 @@ if test -z "$disable_lua"; then
+@@ -18993,7 +18993,7 @@ if test -z "$disable_lua"; then
  		for suffix in "" 50; do
  			if test "$cf_result" = no && ( test -f "$luadir/include/lua.h" || \
  			   test -f "$luadir/include/lua$suffix/lua.h" ) ; then
 -				LUA_LIBS="-L$luadir/lib -llua$suffix -llualib$suffix -lm"
--				LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix"
 +				LUA_LIBS="-L$luadir/lib -llua$suffix -lm"
-+				LUA_CFLAGS="-I$luadir/include"
+ 				LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix"
  
  				LIBS="$LUA_LIBS $LIBS_X"
- 				CFLAGS="$CFLAGS_X $LUA_CFLAGS"
-@@ -21532,9 +21532,9 @@ done
- 
- 
- 
--# Check whether --with-libiconv was given.
--if test "${with_libiconv+set}" = set; then
--  withval=$with_libiconv;
-+# Check whether --with-libiconv-prefix was given.
-+if test "${with_libiconv_prefix+set}" = set; then
-+  withval=$with_libiconv_prefix;
-     for dir in `echo "$withval" | tr : ' '`; do
-       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-@@ -24635,7 +24635,7 @@ _ACEOF
+@@ -25064,7 +25064,7 @@ _ACEOF
  
  
  # Create LIBDIR #define for config.h