Update to 2.4:

=== RELEASE 2.4 ===

Sat Nov 19 01:21:25 MET 2011 mikulas:

	Do not translate '\' to '/' in HTTP requests

Sat Nov 19 01:19:12 MET 2011 mikulas:

	Do not test for existing strings when loading links history file
	=> avoid quadratic-complexity on startup

Sat Nov 19 01:18:59 MET 2011 mikulas:

	Fixed a possible memory leak on Windows

Wed Nov 16 17:59:49 MET 2011 mikulas:

	Fixed a crash on systems that don't have strerror

Fri Nov 11 23:22:25 CEST 2011 mikulas:

	Fixed a crash in Windows console code

Wed Oct 12 22:08:39 MET 2011 mikulas:

	Fixed a possible crash if the user changes socks dns append string
	while socks connection is in progress

Sun Sep 25 18:40:57 MET 2011 mikulas:

	Do not send '#' in the url when downloading

Sun Sep 18 16:57:38 CEST 2011 mikulas:

	Fixed crashes with libpng-1.5

Fri Sep 16 20:16:01 CEST 2011 mikulas:

	Fixed bugs in the directfb driver

Fri Sep 16 18:40:41 CEST 2011 mikulas:

	Workaround for icc optimization bug on framebuffer
	Don't clear the whole framebuffer, clear just an used area
		(fixes problems with Nvidia framebuffer)

Tue Sep 13 23:13:52 CEST 2011 mikulas:

	Make it compile with OpenWatcom for Linux
	Note: because of unimplemented "gethostbyname" function,
	it requires installed "host" command to do name lookups

Tue Sep 13 03:53:06 cet 2011 mikulas:

	Try to free internal caches when out of memory happens

Mon Sep 12 19:57:13 CEST 2011 mikulas:

	Fixed a crash when cache is flushed while auth dialog is displayed

Sun Sep 11 02:02:09 MET 2011 mikulas:

	Reduced memory consumption
	Don't reformat plain text if window size changes

5 files changed, 7 insertions, 99 deletions

diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 8a74180e959..0139da22dbc 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2011/05/11 16:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2011/11/28 15:05:32 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 b6024426694..c1198d83564 100644
--- a/www/links/Makefile.common
+++ b/www/links/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.52 2011/05/02 13:17:47 wiz Exp $
+# $NetBSD: Makefile.common,v 1.53 2011/11/28 15:05:31 wiz Exp $
 # used by www/links/Makefile
 # used by www/links-gui/Makefile
 
-DISTNAME=	links-2.3pre2
+DISTNAME=	links-2.4
 CATEGORIES=	www
 MASTER_SITES=	http://links.twibright.com/download/
 EXTRACT_SUFX=  .tar.bz2
diff --git a/www/links/distinfo b/www/links/distinfo
index 7bab6322638..944f20599d9 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.55 2011/05/11 16:46:15 wiz Exp $
+$NetBSD: distinfo,v 1.56 2011/11/28 15:05:31 wiz Exp $
 
-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 (links-2.4.tar.bz2) = c09fcb03874b1d0586f582f73833bb2f4c9ed7ac
+RMD160 (links-2.4.tar.bz2) = 9ede914cba25925356e3f69a3f40794821326235
+Size (links-2.4.tar.bz2) = 3843247 bytes
 SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837
-SHA1 (patch-dip.c) = 52299aeb395e7e33a359cd8af1d55c0a49b3c186
diff --git a/www/links/patches/patch-aa b/www/links/patches/patch-aa
deleted file mode 100644
index fae1abb2081..00000000000
--- a/www/links/patches/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2011/05/02 13:17:47 wiz Exp $
-
-Fix build with png-1.5.
-
---- png.c.orig	2011-04-19 15:17:49.000000000 +0000
-+++ png.c
-@@ -38,7 +38,11 @@ static void img_my_png_warning(png_struc
- /* Error for from-web PNG images. */
- 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);
-+#else
-+	png_longjmp(png_ptr,1);
-+#endif
- }
- 
- 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 */
--	if (setjmp(png_ptr->jmpbuf)){
-+	if (setjmp(png_jmpbuf(png_ptr))){
- error:
- 		png_destroy_read_struct(&png_ptr, &info_ptr,
- 			(png_infopp)NULL);
-@@ -206,7 +210,7 @@ error:
- 	png_set_progressive_read_fn(png_ptr, NULL,
- 				    png_info_callback, png_row_callback,
- 				    png_end_callback);
--   	if (setjmp(png_ptr->jmpbuf)) goto error;
-+   	if (setjmp(png_jmpbuf(png_ptr))) goto error;
- 	decoder=mem_alloc(sizeof(*decoder));
- 	decoder->png_ptr=png_ptr;
- 	decoder->info_ptr=info_ptr;
-@@ -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;
--	if (setjmp(png_ptr->jmpbuf)){
-+	if (setjmp(png_jmpbuf(png_ptr))){
- 		img_end(cimg);
- 		return;
- 	}
diff --git a/www/links/patches/patch-dip.c b/www/links/patches/patch-dip.c
deleted file mode 100644
index cdcc41054a9..00000000000
--- a/www/links/patches/patch-dip.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-dip.c,v 1.1 2011/05/11 16:46:16 wiz Exp $
-
-From John Bowler <jbowler@acm.org>:
-It's two bugs: one, the obvious one, in the two calls to
-png_set_rgb_to_gray() in dip.c; that should be *DIVIDED* by 256,
-not multiplied!
-                                                                                                                                                                                                                    
-The other is that there is *NO* error handling, no call to setjmp();
-so when png_error is called the call stack ends up destroyed and,
-apparently, the program dies in create_read_struct_2, right after
-the comment that explains why libpng is about to call abort() ;-)
-                                                                                                                                                                                                                    
-The attached patch fixes both problems, but links will still error
-out on a png_error (just with an OOM message, not an abort()).
-
---- dip.c.orig	2011-04-19 15:17:48.000000000 +0000
-+++ dip.c
-@@ -1422,6 +1422,8 @@ unsigned char *png_data, int png_length,
- 	
- 	png_ptr=png_create_read_struct(PNG_LIBPNG_VER_STRING,
- 			NULL, my_png_error, my_png_warning);
-+	if (setjmp(png_jmpbuf(png_ptr)))
-+	    overalloc(); /* some error detected by libpng */
- 	info_ptr=png_create_info_struct(png_ptr);
- 	png_set_read_fn(png_ptr,&work,(png_rw_ptr)&read_stored_data);
- 	png_read_info(png_ptr, info_ptr);
-@@ -1448,7 +1450,7 @@ unsigned char *png_data, int png_length,
- 		if (color_type==PNG_COLOR_TYPE_PALETTE){
- 			png_set_expand(png_ptr);
- #ifdef HAVE_PNG_SET_RGB_TO_GRAY
--			png_set_rgb_to_gray(png_ptr,1,54.0*256,183.0*256);
-+			png_set_rgb_to_gray(png_ptr,1,54.0/256,183.0/256);
- #else
- 			goto end;
- #endif
-@@ -1459,7 +1461,7 @@ unsigned char *png_data, int png_length,
- 		if (color_type==PNG_COLOR_TYPE_RGB ||
- 			color_type==PNG_COLOR_TYPE_RGB_ALPHA){
- #ifdef HAVE_PNG_SET_RGB_TO_GRAY
--			png_set_rgb_to_gray(png_ptr, 1, 54.0*256, 183.0*256);
-+			png_set_rgb_to_gray(png_ptr, 1, 54.0/256, 183.0/256);
- #else
- 			goto end;
- #endif