Update to 0.12pre6. Remove javascript option since

a) lang/see support was removed (see below)
b) lang/spidermonkey and wip/spidermonkey185 aren't recognized

ELinks 0.12pre6
---------------

Security fix:

* bug 1124, CVE-2012-4545: Do not delegate GSSAPI credentials in HTTP
  Negotiate or GSS-Negotiate authentication.  Reported by Marko Myllynen.
  (ELinks 0.12pre1 was the first release that supported GSSAPI; earlier
  releases are not vulnerable.)

Fixed crashes and hangs:

* critical bug 943: Don't let user JavaScripts call any methods of
  ``elinks.action'' in tabs that do not have the focus.  If a tab was
  closed with ``elinks.action.tab_close'' while it had pop-up windows,
  ELinks could crash; as a precaution, don't allow other actions
  either.  (ELinks 0.12pre1 was the first release that supported
  ``elinks.action''.)
* critical bug 1083: Avoid an infinite loop when trying to decompress
  malformed data.  Caused by the bug 1068 fix in ELinks 0.12pre3.
* Fix a possible crash or information disclosure on big-endian 64-bit
  systems using HTTP Negotiate or GSS-Negotiate authentication.

Incompatibilities:

* Dropped support for SEE.  (ELinks 0.12pre1 was the first release
  that supported SEE.)
* Guile 2.0.0 (released on 2011-02-16) changed its license to
  LGPLv3-or-later, which is not compatible with the GPLv2 that covers
  ELinks.  Also, Guile has deprecated many of the functions that
  ELinks calls.

Other changes:

* major bug 764: Correctly initialize options on big-endian 64-bit
  systems.
* bug 983: Give preference to the Content-Type specified in the HTTP
  header over that specified via the HTML meta tag.
* bug 1084: Allow option names containing '+' and '*' in the option
  manager.
* bug 1112: Map most numeric character references € ... Ÿ
  to graphical characters also when the output charset is UTF-8.
  (ELinks 0.12pre1 was the first release that supported UTF-8 as the
  terminal charset, and ELinks 0.12pre5 was the first release that
  supported UTF-8 as the dump charset.)
* minor bug 1113: Fix a small memory leak if a mailcap file is malformed.
* minor bug 1114: Decode SGML entities and NCRs only once in link/@title
  and other attributes.
* build: Fix several warnings reported by GCC 4.7.1.  Harmless at
  runtime but could break the build if configured --enable-debug.
  (This version does not fix all such warnings.)

3 files changed, 16 insertions, 22 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 64f5a6904cb..b9e44eac018 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2012/10/28 06:30:14 asau Exp $
+# $NetBSD: Makefile,v 1.50 2012/11/03 14:43:25 wiz Exp $
 
-DISTNAME=		elinks-0.12pre5
+DISTNAME=		elinks-0.12pre6
 PKGNAME=		${DISTNAME:S/pre/rc/}
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/ \
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index 075667cdd9f..ecf0e1133e6 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2011/06/14 13:36:34 wiz Exp $
+$NetBSD: distinfo,v 1.28 2012/11/03 14:43:25 wiz Exp $
 
-SHA1 (elinks-0.12pre5.tar.bz2) = 15fb38fa938a0eec9d5f22fdd538a6785e2854af
-RMD160 (elinks-0.12pre5.tar.bz2) = 4983083f21928da78f937b4dea09f8937c3a9cb9
-Size (elinks-0.12pre5.tar.bz2) = 2783523 bytes
+SHA1 (elinks-0.12pre6.tar.bz2) = 3517795e8a390cb36ca249a5be6514b9784520a5
+RMD160 (elinks-0.12pre6.tar.bz2) = 99d92dde61ed9c626f10d3d431ed4d325b2e33f6
+Size (elinks-0.12pre6.tar.bz2) = 2854500 bytes
 SHA1 (patch-aa) = b188ab3975bcfd6a491c2e41a17b1f31703d4667
 SHA1 (patch-ab) = a1d9b4246869c1999043c76dbcb35996a6b294fd
 SHA1 (patch-ac) = a7f4bacbdf4073a5a733fe565b1f51dc755c7e4d
diff --git a/www/elinks/options.mk b/www/elinks/options.mk
index 408901dbcaf..318a2c558cb 100644
--- a/www/elinks/options.mk
+++ b/www/elinks/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2012/06/12 15:46:04 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2012/11/03 14:43:25 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.elinks
 PKG_SUPPORTED_OPTIONS+=	bittorrent nntp javascript finger gopher
@@ -10,11 +10,9 @@ PKG_OPTIONS_GROUP.tls=	gnutls ssl
 PKG_OPTIONS_GROUP.malloc=	boehm-gc elinks-fastmem
 PKG_OPTIONS_REQUIRED_GROUPS=	tls
 PKG_OPTIONS_OPTIONAL_GROUPS=	malloc
-PKG_SUGGESTED_OPTIONS=	ssl javascript elinks-html-highlight elinks-exmode
+PKG_SUGGESTED_OPTIONS=	ssl elinks-html-highlight elinks-exmode
 PKG_SUGGESTED_OPTIONS+=	expat boehm-gc inet6
 
-PKG_OPTIONS_LEGACY_OPTS+= spidermonkey:javascript
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
@@ -46,18 +44,14 @@ CONFIGURE_ARGS+=	--enable-nntp
 CONFIGURE_ARGS+=	--disable-nntp
 .endif
 
-.if !empty(PKG_OPTIONS:Mjavascript)
-
-.include "../../lang/see/buildlink3.mk"
-
-CONFIGURE_ARGS+=	--with-see=${BUILDLINK_PREFIX.see:Q}
-CONFIGURE_ARGS+=	--without-spidermonkey
-CONFIGURE_ARGS+=	--enable-sm-scripting
-.else
-CONFIGURE_ARGS+=	--without-spidermonkey
-CONFIGURE_ARGS+=	--without-see
-CONFIGURE_ARGS+=	--disable-sm-scripting
-.endif
+#.if !empty(PKG_OPTIONS:Mjavascript)
+#.include "../../lang/spidermonkey/buildlink3.mk"
+#CONFIGURE_ARGS+=	--with-spidermonkey
+#CONFIGURE_ARGS+=	--enable-sm-scripting
+#.else
+#CONFIGURE_ARGS+=	--without-spidermonkey
+#CONFIGURE_ARGS+=	--disable-sm-scripting
+#.endif
 
 .if !empty(PKG_OPTIONS:Mssl)