Update to 2.3pre2:

=== RELEASE 2.3pre2 ===

So dub 16 20:19:07 CEST 2011 mikulas:

	Utf-8 text terminal support

Sat Mar 12 23:55:56 MET 2011 mikulas:

	Fixed a bug with gpm, if gpm closed a handle on its own,
	links would occasionaly close it again

Mon Aug  9 01:35:29 UTC 2010 mikulas:

	Don't report terminal size in User-Agent

Thu Aug  5 23:31:59 MET 2010 mikulas:

	Scan for header tags even in document body

Sat Jul 31 22:35:04 MET 2010 mikulas:

	link rel=prefetch

Sat Jul 31 22:24:06 MET 2010 mikulas:

	Interpret style="display:none"

Fri Jun 18 20:39:46 MET 2010 mikulas:

	Fixed crash when unknown Content-Enconding is returned by the server

Sat Apr 24 04:11:58 CEST 2010 mikulas:

	Fix an occasional lockup with Ctrl-Z, fg and framebuffer

4 files changed, 16 insertions, 17 deletions

diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index a5acc7a2d60..efb91e82806 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2011/01/13 13:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2011/05/02 13:17:47 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/links/&-gui/}
-PKGREVISION=	1
 COMMENT=	Lynx-like text and graphics WWW browser
 
 CONFLICTS+=	links-[0-9]* elinks-0.3*
diff --git a/www/links/Makefile.common b/www/links/Makefile.common
index d5f4ffed8c3..b6024426694 100644
--- a/www/links/Makefile.common
+++ b/www/links/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.51 2011/01/14 10:37:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.52 2011/05/02 13:17:47 wiz Exp $
 # used by www/links/Makefile
 # used by www/links-gui/Makefile
 
-DISTNAME=	links-2.3pre1
+DISTNAME=	links-2.3pre2
 CATEGORIES=	www
 MASTER_SITES=	http://links.twibright.com/download/
 EXTRACT_SUFX=  .tar.bz2
diff --git a/www/links/distinfo b/www/links/distinfo
index 6089dd0a1aa..2e3e36d7c4b 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.53 2011/01/14 10:37:21 wiz Exp $
+$NetBSD: distinfo,v 1.54 2011/05/02 13:17:47 wiz Exp $
 
-SHA1 (links-2.3pre1.tar.bz2) = 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d
-RMD160 (links-2.3pre1.tar.bz2) = f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de
-Size (links-2.3pre1.tar.bz2) = 3832651 bytes
-SHA1 (patch-aa) = b2a6d47767e7d132c6903a044e9aeeb4b35f0eb6
+SHA1 (links-2.3pre2.tar.bz2) = 5bc210f746559725565bec1d4748b5c56b263ee5
+RMD160 (links-2.3pre2.tar.bz2) = 800032cf852382b70aa29e6f9a0c2b86bde5b74f
+Size (links-2.3pre2.tar.bz2) = 3832710 bytes
+SHA1 (patch-aa) = 45b6a12bcef9a229cf1b7f2b777c14786b3c5b81
 SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837
diff --git a/www/links/patches/patch-aa b/www/links/patches/patch-aa
index 124a705b893..fae1abb2081 100644
--- a/www/links/patches/patch-aa
+++ b/www/links/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.6 2011/01/14 10:37:22 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2011/05/02 13:17:47 wiz Exp $
 
 Fix build with png-1.5.
 
---- png.c.orig	2008-08-18 01:14:38.000000000 +0000
+--- png.c.orig	2011-04-19 15:17:49.000000000 +0000
 +++ png.c
-@@ -48,7 +48,11 @@ void img_my_png_warning(png_structp a, p
+@@ -38,7 +38,11 @@ static void img_my_png_warning(png_struc
  /* Error for from-web PNG images. */
- void img_my_png_error(png_structp png_ptr, png_const_charp error_string)
+ static void img_my_png_error(png_structp png_ptr, png_const_charp error_string)
  {
 +#if (PNG_LIBPNG_VER < 10500)
  	longjmp(png_ptr->jmpbuf,1);
@@ -15,8 +15,8 @@ Fix build with png-1.5.
 +#endif
  }
  
- void png_info_callback(png_structp png_ptr, png_infop info_ptr)
-@@ -204,7 +208,7 @@ void png_start(struct cached_image *cimg
+ static void png_info_callback(png_structp png_ptr, png_infop info_ptr)
+@@ -196,7 +200,7 @@ void png_start(struct cached_image *cimg
  #ifdef DEBUG
  	if (!info_ptr) internal ("png_create_info_struct failed\n");
  #endif /* #ifdef DEBUG */
@@ -25,7 +25,7 @@ Fix build with png-1.5.
  error:
  		png_destroy_read_struct(&png_ptr, &info_ptr,
  			(png_infopp)NULL);
-@@ -214,7 +218,7 @@ error:
+@@ -206,7 +210,7 @@ error:
  	png_set_progressive_read_fn(png_ptr, NULL,
  				    png_info_callback, png_row_callback,
  				    png_end_callback);
@@ -34,7 +34,7 @@ Fix build with png-1.5.
  	decoder=mem_alloc(sizeof(*decoder));
  	decoder->png_ptr=png_ptr;
  	decoder->info_ptr=info_ptr;
-@@ -233,7 +237,7 @@ void png_restart(struct cached_image *ci
+@@ -225,7 +229,7 @@ void png_restart(struct cached_image *ci
  	png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr;
  	info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr;
  	end_callback_hit=0;