Update to 2.1pre11:

        Correct parse_http_date (sponsored by Awite Bioenergie)
        Non-aggressive cache (sponsored by Awite Bioenergie)
        Refresh (sponsored by Awite Bioenergie)
        Support for 16-bit 565 RGB big endian (from dillo via pkgsrc)
        Fix for 24-bit RGB big endian (from dillo via pkgsrc)

5 files changed, 26 insertions, 284 deletions

diff --git a/www/links/Makefile b/www/links/Makefile
index 838c32adcba..0713d906a8a 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2003/05/21 10:10:19 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2003/05/24 19:19:34 wiz Exp $
 #
 
-PKGNAME=	links-2.1.0.10
+PKGNAME=	links-2.1.0.11
 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 682b316663e..e8e098c20ba 100644
--- a/www/links/Makefile.common
+++ b/www/links/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.14 2003/05/21 10:10:19 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2003/05/24 19:19:34 wiz Exp $
 
-DISTNAME=	links-2.1pre10
+DISTNAME=	links-2.1pre11
 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 9034a084a0b..d0663d601e1 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.22 2003/05/21 10:10:19 wiz Exp $
+$NetBSD: distinfo,v 1.23 2003/05/24 19:19:34 wiz Exp $
 
-SHA1 (links-2.1pre10.tar.bz2) = 415e939be55be8fe5fd8738cd9c97b7570a0b75c
-Size (links-2.1pre10.tar.bz2) = 3747153 bytes
+SHA1 (links-2.1pre11.tar.bz2) = e106dc011169191c1e8c0648ff6317402e38aaac
+Size (links-2.1pre11.tar.bz2) = 3737197 bytes
 SHA1 (patch-aa) = 47fab20748fc660517ebc2d2ef8a6b9c7c0dd1e4
-SHA1 (patch-ab) = 159c06569c42ea2d3eb4ec1a25a958621f11f793
-SHA1 (patch-ac) = 0d0bb5000ef8511aa6783cfb97ea03c2b2b32803
+SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837
diff --git a/www/links/patches/patch-ab b/www/links/patches/patch-ab
index ad693139002..d2c98a68084 100644
--- a/www/links/patches/patch-ab
+++ b/www/links/patches/patch-ab
@@ -1,43 +1,19 @@
-$NetBSD: patch-ab,v 1.5 2002/10/18 23:00:25 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2003/05/24 19:19:35 wiz Exp $
 
---- x.c.orig	Sun Sep 22 02:05:29 2002
-+++ x.c
-@@ -964,6 +963,11 @@ bytes_per_pixel_found:
- 						case 15:
- 						case 16:
- 						if (x_bitmap_bpp!=2)break;
-+						if (x_bitmap_bit_order==MSBFirst&&vinfo.red_mask>vinfo.green_mask&&vinfo.green_mask>vinfo.blue_mask)
-+						{
-+							misordered=256;
-+							goto visual_found;
-+						}
- 						if (x_bitmap_bit_order==MSBFirst)break;
- 						if (vinfo.red_mask>vinfo.green_mask&&vinfo.green_mask>vinfo.blue_mask)
- 						{
-@@ -979,14 +983,14 @@ bytes_per_pixel_found:
- 							misordered=256;
- 							goto visual_found;
- 						}
--						if (vinfo.red_mask>vinfo.green_mask&&vinfo.green_mask>vinfo.blue_mask)
-+						if (x_bitmap_bit_order==MSBFirst&&vinfo.red_mask>vinfo.green_mask&&vinfo.green_mask>vinfo.blue_mask)
- 						{
--							misordered=0;
-+							misordered=512;
- 							goto visual_found;
- 						}
--						if (x_bitmap_bit_order==MSBFirst&&vinfo.red_mask>vinfo.green_mask&&vinfo.green_mask>vinfo.blue_mask)
-+						if (vinfo.red_mask>vinfo.green_mask&&vinfo.green_mask>vinfo.blue_mask)
- 						{
--							misordered=512;
-+							misordered=0;
- 							goto visual_found;
- 						}
- 						break;
-@@ -1015,6 +1019,7 @@ visual_found:;
- 		case 451:
- 		case 195:
- 		case 196:
-+		case 386:
- 		case 452:
- 		case 708:
- /* 			printf("depth=%d visualid=%x\n",x_driver.depth, vinfo.visualid); */
+--- configure.orig	Sat May 24 21:02:30 2003
++++ configure
+@@ -801,10 +801,10 @@ fi
+ 
+ 
+ 
+-ACLOCAL="./missing aclocal"
+-AUTOCONF="./missing autoconf"
+-AUTOMAKE="./missing automake"
+-AUTOHEADER="./missing autoheader"
++ACLOCAL="aclocal"
++AUTOCONF="autoconf"
++AUTOMAKE="automake"
++AUTOHEADER="autoheader"
+ image_formats="GIF PNG XBM"
+ 
+ 
diff --git a/www/links/patches/patch-ac b/www/links/patches/patch-ac
deleted file mode 100644
index 80276a9ad3b..00000000000
--- a/www/links/patches/patch-ac
+++ /dev/null
@@ -1,233 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/09/05 01:41:24 dillo Exp $
-
---- dither.c.orig	Tue Jun  4 14:38:37 2002
-+++ dither.c
-@@ -500,6 +500,29 @@ long color_555(int rgb)
- 
- }
- 
-+long color_565be(int rgb)
-+{
-+	int r,g,b;
-+	long ret;
-+	int i, i2;
-+
-+	r=(rgb>>16)&255;
-+	g=(rgb>>8)&255;
-+	/* Long live the PIN photodiode */
-+	b=rgb&255;
-+
-+	r=(r*31+127)/255;
-+	g=(g*63+127)/255;
-+	b=(b*31+127)/255;
-+	i = (r<<11)|(g<<5)|b;
-+#ifdef AC_LITTLE_ENDIAN
-+	ret = (((i&0xff)<<8) | ((i>>8)&0xff)) << 16;
-+#else
-+	ret = i;
-+#endif
-+	return ret;
-+}
-+
- long color_565(int rgb)
- {
- 	int r,g,b;
-@@ -557,6 +580,10 @@ long (*get_color_fn(int depth))(int rgb)
- 			return color_565;
- 			break;
- 
-+		case 386:
-+			return color_565be;
-+			break;
-+
- 		case 451:
- 			return color_pass_rgb;
- 			break;
-@@ -605,7 +632,8 @@ void make_8_table(int *table, double gam
- /* dump_t2c means memory organization defined in comment for
-  * red_table on the top of dither.c */
- /* dump_t2c is taken into account only if t2c is defined. */
--void make_16_table(int *table, int bits, int pos,double gamma, int dump_t2c)
-+void make_16_table(int *table, int bits, int pos,double gamma, int dump_t2c,
-+	int bigendian)
- {
- 	int j,light_val,grades=(1<<bits)-1,grade;
- 	double voltage;
-@@ -649,13 +677,24 @@ void make_16_table(int *table, int bits,
- 			t2c sh;
- 			int val=grade<<pos;
- 
--			((unsigned char *)&sh)[0]=val;
--			((unsigned char *)&sh)[1]=val>>8;
-+			if (bigendian) {
-+				((unsigned char *)&sh)[0]=val & 0xff;
-+				((unsigned char *)&sh)[1]=val>>8;
-+			}else{
-+				((unsigned char *)&sh)[1]=val;
-+				((unsigned char *)&sh)[0]=val>>8;
-+			}
- 			last_content=light_val|(sh<<16U);	
--
- 		}else{
- #endif /* #ifdef t2c */
--			last_content=light_val|(grade<<(pos+16U));
-+			if (bigendian) {
-+				int val, val2;
-+				val = grade<<pos;
-+				val2 = (val>>8) | ((val&0xff)<<8);
-+				last_content=light_val|(val2<<16U);
-+			}else{
-+				last_content=light_val|(grade<<(pos+16U));
-+			}
- #ifdef t2c
- 		}
- #endif /* #ifdef t2c */
-@@ -664,19 +703,19 @@ void make_16_table(int *table, int bits,
- 	}
- }
- 
--void make_red_table(int bits, int pos, int dump_t2c)
-+void make_red_table(int bits, int pos, int dump_t2c, int be)
- {
--	make_16_table(red_table,bits,pos,display_red_gamma,dump_t2c);
-+	make_16_table(red_table,bits,pos,display_red_gamma,dump_t2c, be);
- }
- 
--void make_green_table(int bits, int pos, int dump_t2c)
-+void make_green_table(int bits, int pos, int dump_t2c, int be)
- {
--	make_16_table(green_table,bits,pos,display_green_gamma,dump_t2c);
-+	make_16_table(green_table,bits,pos,display_green_gamma,dump_t2c, be);
- }
- 
--void make_blue_table(int bits, int pos,int dump_t2c)
-+void make_blue_table(int bits, int pos,int dump_t2c, int be)
- {
--	make_16_table(blue_table,bits,pos,display_blue_gamma, dump_t2c);
-+	make_16_table(blue_table,bits,pos,display_blue_gamma, dump_t2c, be);
- }
- 
- void dither(unsigned short *in, struct bitmap *out)
-@@ -727,36 +766,45 @@ void init_dither(int depth)
- 	switch(depth){
- 		case 33:
- 		/* 4bpp, 1Bpp */
--		make_red_table(1,3,0);
--		make_green_table(2,1,0);
--		make_blue_table(1,0,0);
-+		make_red_table(1,3,0,0);
-+		make_green_table(2,1,0,0);
-+		make_blue_table(1,0,0,0);
- 		dither_fn_internal=dither_1byte;
- 		round_fn=round_1byte;
- 		break;
- 
- 		case 65:
- 		/* 8 bpp, 1 Bpp */
--		make_red_table(3,5,0);
--		make_green_table(3,2,0);
--		make_blue_table(2,0,0);
-+		make_red_table(3,5,0,0);
-+		make_green_table(3,2,0,0);
-+		make_blue_table(2,0,0,0);
- 		dither_fn_internal=dither_1byte;
- 		round_fn=round_1byte;
- 		break;
- 
- 		case 122:
- 		/* 15bpp, 2Bpp */
--		make_red_table(5,10,1);
--		make_green_table(5,5,1);
--		make_blue_table(5,0,1);
-+		make_red_table(5,10,1,0);
-+		make_green_table(5,5,1,0);
-+		make_blue_table(5,0,1,0);
- 		dither_fn_internal=dither_2byte;
- 		round_fn=round_2byte;
- 		break;
- 
- 		case 130:
- 		/* 16bpp, 2Bpp */
--		make_red_table(5,11,1);
--		make_green_table(6,5,1);
--		make_blue_table(5,0,1);
-+		make_red_table(5,11,1,0);
-+		make_green_table(6,5,1,0);
-+		make_blue_table(5,0,1,0);
-+		dither_fn_internal=dither_2byte;
-+		round_fn=round_2byte;
-+		break;
-+
-+		case 386:
-+		/* 16bpp, 2Bpp, disordered */
-+		make_red_table(5,11,1,1);
-+		make_green_table(6,5,1,1);
-+		make_blue_table(5,0,1,1);
- 		dither_fn_internal=dither_2byte;
- 		round_fn=round_2byte;
- 		break;
-@@ -766,9 +814,9 @@ void init_dither(int depth)
- 		 * Even this is dithered!
- 		 * R G B
- 		 */
--		make_red_table(8,0,0);
--		make_green_table(8,0,0);
--		make_blue_table(8,0,0);
-+		make_red_table(8,0,0,0);
-+		make_green_table(8,0,0,0);
-+		make_blue_table(8,0,0,0);
- 		dither_fn_internal=dither_451;
- 		round_fn=round_451;
- 		break;
-@@ -778,9 +826,9 @@ void init_dither(int depth)
- 		 * Even this is dithered!
- 		 * B G R
- 		 */
--		make_red_table(8,0,0);
--		make_green_table(8,0,0);
--		make_blue_table(8,0,0);
-+		make_red_table(8,0,0,0);
-+		make_green_table(8,0,0,0);
-+		make_blue_table(8,0,0,0);
- 		dither_fn_internal=dither_195;
- 		round_fn=round_195;
- 		break;
-@@ -790,9 +838,9 @@ void init_dither(int depth)
- 		 * Even this is dithered!
- 		 * 0 B G R
- 		 */
--		make_red_table(8,0,0);
--		make_green_table(8,0,0);
--		make_blue_table(8,0,0);
-+		make_red_table(8,0,0,0);
-+		make_green_table(8,0,0,0);
-+		make_blue_table(8,0,0,0);
- 		dither_fn_internal=dither_452;
- 		round_fn=round_452;
- 		break;
-@@ -802,9 +850,9 @@ void init_dither(int depth)
- 		 * Even this is dithered!
- 		 * B G R 0
- 		 */
--		make_red_table(8,0,0);
--		make_green_table(8,0,0);
--		make_blue_table(8,0,0);
-+		make_red_table(8,0,0,0);
-+		make_green_table(8,0,0,0);
-+		make_blue_table(8,0,0,0);
- 		dither_fn_internal=dither_196;
- 		round_fn=round_196;
- 		break;
-@@ -814,9 +862,9 @@ void init_dither(int depth)
- 		 * Even this is dithered!
- 		 * 0 R G B
- 		 */
--		make_red_table(8,0,0);
--		make_green_table(8,0,0);
--		make_blue_table(8,0,0);
-+		make_red_table(8,0,0,0);
-+		make_green_table(8,0,0,0);
-+		make_blue_table(8,0,0,0);
- 		dither_fn_internal=dither_708;
- 		round_fn=round_708;
- 		break;