Update to 2.1pre16; new patch-ac from authors, will be

in next release.

Changes since 2.1pre15:

Sat Jan 22 20:27:41 cet 2005 mikulas:

	Fixed empty lines in lists in graphics mode

Sat Jan 22 04:40:28 cet 2005 mikulas:

	On OS/2 use 8.3 temp names, allowing DOS viewers

Sat Jan 22 03:55:08 cet 2005 mikulas:

	Send Accept-Language

Sat Jan 22 02:05:47 MET 2005 user:

	Display is scrolled to see the whole textarea when modifying it

Wed Jan 19 02:57:56 MET 2005 Jakub Bogusz

	Updated Polish translation

Wed Jan 19 01:39:44 MET 2005 mikulas:

	-dump url
	Completed option documentation in links -h

Sun Jan 16 23:57:58 MET 2005 user:

	Fixed bug in svgalib accelerator (tested for different operations)

Mon Jan 10 23:04:22 MET 2005 mikulas:

	Support for border on framebuffer (use -mode left,top,right,bottom)
	to set screen border

Sun Jan  2 20:46:18 MET 2005 Dieter

	Fix warnings on 64-bit machines

Sun Jan  2 20:39:51 MET 2005 Edward Rosten

	Block ad images

Sun Jan  2 18:51:15 cet 2005 mikulas:

	Do not cache redirects if redirect loop is going to happen

Wed Nov 17 15:16:01 MET 2004 user:

	Support for mms:// urls

Tue Nov 16 15:18:55 MET 2004 mikulas:

	Send content-type when uploading files

Tue Nov  9 00:12:05 MET 2004 user:

	^O to go to next form field in braill mode

Sun Oct 31 17:17:53 MET 2004 mikulas:

	Correct jump at tag if it points to position, that moves during loading

Sat Oct 23 22:14:03 MET 2004 user:

	Disallow opening new windows in anonymous mode

Fri Oct 22 22:31:20 MET DST 2004 mikulas:

	Fixed bugs discovered with mangleme:
	http://lcamtuf.coredump.cx/mangleme/mangle2.cgi
	memory leak with nested <select multiple name=n> tags
	integer overflow in frame widths causes an internal error
	internal error with base url only containing //
	internal error with base url containing javascript:
	fixed incorrect generating of title (does not cause crash, but excessive
		memory allocation)
	fixed some quadratic algorithms in title displaying
	internal error with invalid codebase attribute in OBJECT tag
	fixed quadratic algorithm in menu creating

Fri Oct 22 20:12:05 MET DST 2004 mikulas:

	Cleaned up configure script, wrote some more replacements of non-present
	functions

Fri Oct 22 20:11:56 MET DST 2004 mikulas:

	Fixed a lot of cases where overflowed integer arithmetic could cause
	memory allocation corruption

Sat Oct 16 21:38:00 MET 2004 user:

	Allow browsing local and ftp files with '#' in filename

Mon Oct 11 01:26:54 CEST 2004 Karel Karlik

	Fixed framebuffer in 15 and 16-bit modes

Wed Oct  6 00:39:27 MET 2004 user:

	Improved parsing of ftp directories in Windows NT format

Sun Oct  3 17:37:32 MET 2004 user:

	Correct reporting of error on ftp directories

Sat Oct  2 04:29:40 MET 2004 user:

	Ctrl-U cuts into clipboard

Fri Oct  1 15:51:37 MET 2004 user:

	Display the whole page when connection to an image stucks

Thu Sep 23 18:47:11 MET 2004 user:

	Resolving of double '..' in references

Fri Sep 10 04:23:24 cet 2004 mikulas:

	Correctly find file extension if '?' and ';' is in ftp file

Fri Sep  3 03:07:52 MET DST 2004 Wojciech Puchar

	Portability fixes for SunOS

Fri Sep  3 02:47:18 MET DST 2004 mikulas:

	Fixed memory leak in http authentication

Wed Sep  1 19:08:46 MET DST 2004 Strahinya Radich

	Updated Serbian translation

Sun Aug 29 17:43:39 MET DST 2004 mikulas:

	Fix crash when saving options in svgalib due to missing shell

Thu Jul 29 13:03:07 MET 2004 user:

	Allowed dots in extensions (for example "ps.gz")

Sun Jul 25 00:34:04 MET DST 2004 mikulas:

	Allow Ctrl-Z in framebuffer driver

Sat Jul 24 14:56:13 MET DST 2004 mikulas:

	Fixed an error when signal interrupted another syscall

Sat Jul 24 02:15:35 MET 2004 user:

	Fixed bad error codes because of errno modified by signal handler

Fri Jul 23 21:29:22 MET 2004 user:

	Fixed links stuck after Ctrl-Z when one code path lasted more than
	1 second (because of pagefault, too high cpu load or similar)

Fri Jul 23 20:15:29 MET 2004 user:

	Fixed incorrectly displayed character entities (&) in attributes (img
	alt, etc.)

Tue Jun 29 03:35:32 MET 2004 user:

	Fixed overflow when accessing local files >= 2G

Mon Jun 28 01:34:45 MET 2004 user:

	Ctrl-K cuts current line

Sat Jun 26 13:54:53 MET DST 2004 mikulas:

	Send Content-Type when uploading files

Sat Jun 26 02:24:32 MET 2004 user:

	y and t move word forward and backward in braille terminal

Sat Jun 26 00:35:17 MET 2004 user:

	Resolve dot-number IP address on systems when gethostbyname and
	gethostbyaddr can't resolve it

Mon Jun 21 15:02:25 MDT 2004 mpat7421:

	Fixed compilation problems on Irix

Sun Jun 20 18:49:53 MET DST 2004 mikulas:

	Posting of <option> fields in correct charset

Sun Jun 20 15:58:08 MET DST 2004 Sam

	SDL graphics driver

Sat Jun 19 18:10:05 MET 2004 user:

	Fixed case when '&' entities or special characters were in ftp or disk
	filenames

Sat Jun 19 18:09:50 MET 2004 user:

	Fixed compilation problem on AIX

Thu Jun 17 20:32:59 MET DST 2004 mikulas:

	Correct handling of Ctrl-Z when executing user viewer

Fri Jun 11 03:17:20 MET 2004 user:

	Fixed incorrect error handling in smb

Sun Jun  6 03:12:00 MET 2004 user:

	Allow '@' in ftp password in url

Thu Jun  3 22:39:24 MET 2004 user:

	Allow characters >= 128 in ftp filenames

Fri May 28 15:40:35 CEST 2004 mikulas

	Handling URLs in form http://host?params

Mon May 17 17:10:22 MET DST 2004 Serge Winitzki

	Updated German and Russian localization

5 files changed, 102 insertions, 10 deletions

diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 5cf07858086..7e69de0ca73 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: Makefile,v 1.32 2005/02/22 00:19:55 wiz Exp $
 #
 
-PKGNAME=	links-gui-2.1.0.15
-PKGREVISION=	2
+PKGNAME=	links-gui-2.1.0.16
 
 COMMENT=	Lynx-like text and graphics WWW browser
 
@@ -11,6 +10,7 @@ CONFLICTS+=	links-[0-9]* elinks-0.3*
 USE_X11=	YES
 
 CONFIGURE_ARGS+=	--enable-graphics
+CONFIGURE_ARGS+=	--without-sdl
 
 .include "../../www/links/Makefile.common"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/www/links/Makefile b/www/links/Makefile
index 20bb65fd52f..d54aefd963a 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/04/29 09:28:21 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/02/22 00:19:55 wiz Exp $
 #
 
-PKGNAME=	links-2.1.0.15
+PKGNAME=	links-2.1.0.16
 COMMENT=	Lynx-like text WWW browser
 
 CONFLICTS+=	links-gui-[0-9]* elinks-0.3*
diff --git a/www/links/Makefile.common b/www/links/Makefile.common
index cd0f2f595fa..1dbf2677608 100644
--- a/www/links/Makefile.common
+++ b/www/links/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.20 2004/04/29 09:28:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/02/22 00:19:55 wiz Exp $
 
-DISTNAME=	links-2.1pre15
+DISTNAME=	links-2.1pre16
 CATEGORIES=	www
 MASTER_SITES= \
 	http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/ \
diff --git a/www/links/distinfo b/www/links/distinfo
index d2e9861d2c6..f51af7e1116 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2004/04/29 09:28:21 wiz Exp $
+$NetBSD: distinfo,v 1.27 2005/02/22 00:19:55 wiz Exp $
 
-SHA1 (links-2.1pre15.tar.bz2) = 207ec64c2732c51552a93f702a239bf2c970167f
-Size (links-2.1pre15.tar.bz2) = 3789080 bytes
+SHA1 (links-2.1pre16.tar.bz2) = bd28dba3431269323b8e2fbf5f958bce43312524
+Size (links-2.1pre16.tar.bz2) = 3825255 bytes
 SHA1 (patch-aa) = 47fab20748fc660517ebc2d2ef8a6b9c7c0dd1e4
 SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837
+SHA1 (patch-ac) = ffd6255980ccc6a887806ac1af140750f2c6aebb
diff --git a/www/links/patches/patch-ac b/www/links/patches/patch-ac
new file mode 100644
index 00000000000..5280b94a39c
--- /dev/null
+++ b/www/links/patches/patch-ac
@@ -0,0 +1,91 @@
+$NetBSD: patch-ac,v 1.3 2005/02/22 00:19:55 wiz Exp $
+
+--- html_tbl.c.orig	2005-01-02 21:17:25.000000000 +0100
++++ html_tbl.c
+@@ -41,42 +41,6 @@
+ #define R_ALL		3
+ #define R_GROUPS	4
+ 
+-/* prototype */
+-void get_align(char *, int *);
+-void get_valign(char *, int *);
+-void get_c_width(char *, int *, int);
+-void free_table(struct table *);
+-void expand_cells(struct table *, int, int);
+-struct table_cell *new_cell(struct table *, int, int);
+-void new_columns(struct table *, int, int, int, int, int);
+-void set_td_width(struct table *, int, int, int);
+-unsigned char *skip_element(unsigned char *, unsigned char *, unsigned char *, int);
+-void get_cell_widths(struct table *);
+-void dst_width(int *, int, int, int *);
+-int get_vline_width(struct table *, int);
+-int get_hline_width(struct table *, int);
+-int g_get_vline_pad(struct table *, int, int *, int *);
+-int g_get_hline_pad(struct table *, int, int *, int *);
+-int get_column_widths(struct table *);
+-void get_table_width(struct table *);
+-void distribute_widths(struct table *, int);
+-void check_table_widths(struct table *);
+-void get_table_heights(struct table *);
+-void display_complicated_table(struct table *, int, int, int *);
+-void get_table_frame(struct table *, signed char *, signed char *);
+-void display_table_frames(struct table *, int, int);
+-void add_to_rect_sets(struct rect_set ***, int *, struct rect *);
+-void add_to_cell_sets(struct table_cell ****, int **, int *, struct rect *, struct table_cell *);
+-void table_mouse_event(struct f_data_c *, struct g_object_table *, int, int, int);
+-void draw_rect_set(struct graphics_device *, struct background *, struct rect_set *, int, int);
+-void draw_rect_sets(struct graphics_device *, struct background *, struct rect_set **, int, int, int);
+-void table_draw(struct f_data_c *, struct g_object_table *, int, int);
+-void table_destruct(struct g_object_table *);
+-void table_get_list(struct g_object_table *, void (*)(struct g_object *, struct g_object *));
+-struct table *new_table(void);
+-
+-void get_cell_width(char *, char *, int, int, int, int *, int *, int, int *, unsigned char *);
+-
+ 
+ void get_align(char *attr, int *a)
+ {
+@@ -197,6 +161,43 @@ struct table {
+ #endif
+ };
+ 
++/* prototype */
++void get_align(char *, int *);
++void get_valign(char *, int *);
++void get_c_width(char *, int *, int);
++void free_table(struct table *);
++void expand_cells(struct table *, int, int);
++struct table_cell *new_cell(struct table *, int, int);
++void new_columns(struct table *, int, int, int, int, int);
++void set_td_width(struct table *, int, int, int);
++unsigned char *skip_element(unsigned char *, unsigned char *, unsigned char *, int);
++void get_cell_widths(struct table *);
++void dst_width(int *, int, int, int *);
++int get_vline_width(struct table *, int);
++int get_hline_width(struct table *, int);
++int g_get_vline_pad(struct table *, int, int *, int *);
++int g_get_hline_pad(struct table *, int, int *, int *);
++int get_column_widths(struct table *);
++void get_table_width(struct table *);
++void distribute_widths(struct table *, int);
++void check_table_widths(struct table *);
++void get_table_heights(struct table *);
++void display_complicated_table(struct table *, int, int, int *);
++void get_table_frame(struct table *, signed char *, signed char *);
++void display_table_frames(struct table *, int, int);
++void add_to_rect_sets(struct rect_set ***, int *, struct rect *);
++void add_to_cell_sets(struct table_cell ****, int **, int *, struct rect *, struct table_cell *);
++void table_mouse_event(struct f_data_c *, struct g_object_table *, int, int, int);
++void draw_rect_set(struct graphics_device *, struct background *, struct rect_set *, int, int);
++void draw_rect_sets(struct graphics_device *, struct background *, struct rect_set **, int, int, int);
++void table_draw(struct f_data_c *, struct g_object_table *, int, int);
++void table_destruct(struct g_object_table *);
++void table_get_list(struct g_object_table *, void (*)(struct g_object *, struct g_object *));
++struct table *new_table(void);
++
++void get_cell_width(char *, char *, int, int, int, int *, int *, int, int *, unsigned char *);
++
++
+ #ifdef DEBUG
+ #define CELL(t, x, y) (((x) < 0 || (x) >= (t)->rx || (y) < 0 || (y) >= (t)->ry) ? (internal("accessing cell out of table (%d,%d) - limit (%d,%d)", (x), (y), (t)->rx, (t)->ry), (t)->cells) : &(t)->cells[(y) * (t)->rx + (x)])
+ #else