Upgrades to 0.97 pre 9.

Add "-force-html" option.

Approved by:	demon

4 files changed, 59 insertions, 3 deletions

diff --git a/www/links/Makefile b/www/links/Makefile
index 0c4cafa55aee..bd68745e11a9 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	links
-PORTVERSION=	0.97.p7
+PORTVERSION=	0.97.p9
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/ \
diff --git a/www/links/files/patch-default.c b/www/links/files/patch-default.c
index f525fdc05692..eb6440ef05d2 100644
--- a/www/links/files/patch-default.c
+++ b/www/links/files/patch-default.c
@@ -1,5 +1,5 @@
---- default.c.orig	Sun Dec 31 14:26:52 2000
-+++ default.c	Tue Mar 20 09:32:18 2001
+--- default.c.orig	Wed Jan 30 06:53:48 2002
++++ default.c	Fri Apr 26 09:12:21 2002
 @@ -265,7 +265,7 @@
  	get_system_name();
  	links_home = get_home(&first_use);
@@ -9,3 +9,41 @@
  		sleep(3);
  		return;
  	}
+@@ -697,6 +697,11 @@
+ 	anonymous = 1;
+ 	return NULL;
+ }
++unsigned char *force_html_cmd(struct option *o, unsigned char ***argv, int *argc)
++{
++	force_html = 1;
++	return NULL;
++}
+ unsigned char *dump_cmd(struct option *o, unsigned char ***argv, int *argc)
+ {
+ 	if (dmp != o->min && dmp) return "Can't use both -dump and -source";
+@@ -769,6 +774,9 @@
+   is allowed, but user can't add or modify entries in\n\
+   association table.\n\
+ \n\
++ -force-html\n\
++  Treat file as if it had an .html extension.\n\
++\n\
+  -dump\n\
+   Write a plain-text version of the given HTML document to\n\
+   stdout.\n\
+@@ -826,6 +834,7 @@
+ int no_connect = 0;
+ int base_session = 0;
+ int dmp = 0;
++int force_html = 0;
+ 
+ int async_lookup = 1;
+ int download_utime = 0;
+@@ -877,6 +886,7 @@
+ 	1, no_connect_cmd, NULL, NULL, 0, 0, NULL, NULL, "no-connect",
+ 	1, anonymous_cmd, NULL, NULL, 0, 0, NULL, NULL, "anonymous",
+ 	1, gen_cmd, num_rd, NULL, 0, MAXINT, &base_session, NULL, "base-session",
++	1, force_html_cmd, NULL, NULL, 0, 0, NULL, NULL, "force-html",
+ 	1, dump_cmd, NULL, NULL, D_DUMP, 0, NULL, NULL, "dump",
+ 	1, dump_cmd, NULL, NULL, D_SOURCE, 0, NULL, NULL, "source",
+ 	1, gen_cmd, num_rd, num_wr, 0, 1, &async_lookup, "async_dns", "async-dns",
diff --git a/www/links/files/patch-links.h b/www/links/files/patch-links.h
new file mode 100644
index 000000000000..ce098ddeb897
--- /dev/null
+++ b/www/links/files/patch-links.h
@@ -0,0 +1,8 @@
+--- links.h.orig	Sat Mar  2 05:35:30 2002
++++ links.h	Fri Apr 26 09:11:47 2002
+@@ -1984,4 +1984,5 @@
+ extern int no_connect;
+ extern int base_session;
++extern int force_html;
+ 
+ #define D_DUMP		1
diff --git a/www/links/files/patch-types.c b/www/links/files/patch-types.c
new file mode 100644
index 000000000000..59ac9b2731a7
--- /dev/null
+++ b/www/links/files/patch-types.c
@@ -0,0 +1,10 @@
+--- types.c.orig	Fri Apr 26 09:11:15 2002
++++ types.c	Fri Apr 26 09:12:27 2002
+@@ -66,5 +66,6 @@
+ 		else if (dir_sep(*ct)) ext = NULL;
+ 	if (ext) while (ext[extl] && !dir_sep(ext[extl]) && !end_of_dir(ext[extl])) extl++;
+-	if ((extl == 3 && !casecmp(ext, "htm", 3)) ||
++	if (force_html ||
++	    (extl == 3 && !casecmp(ext, "htm", 3)) ||
+ 	    (extl == 4 && !casecmp(ext, "html", 4))) return stracpy("text/html");
+ 	foreach(e, extensions) if (is_in_list(e->ext, ext, extl)) return stracpy(e->ct);