Update to 2.8.2.rel1.

2 files changed, 39 insertions, 25 deletions

diff --git a/japanese/lynx/files/patch-aa b/japanese/lynx/files/patch-aa
index bd0df60043d9..dc95a3ad57f9 100644
--- a/japanese/lynx/files/patch-aa
+++ b/japanese/lynx/files/patch-aa
@@ -1,23 +1,37 @@
---- makefile.in.orig	Sun Sep 13 23:35:55 1998
-+++ makefile.in	Tue Sep 15 08:08:01 1998
-@@ -41,10 +41,10 @@
- libdir= @libdir@
+--- makefile.in.orig	Fri May 28 23:04:01 1999
++++ makefile.in	Sun Jul  4 17:13:39 1999
+@@ -50,11 +50,11 @@
+ LIBDIR= $(DESTDIR)$(libdir)
  
  ## Where you want the doc-files installed
 -docdir= @libdir@/lynx_doc
-+docdir= $(prefix)/share/doc/lynx
++docdir= @datadir@/doc/lynx
+ DOCDIR= $(DESTDIR)$(docdir)
  
  ## Where you want the help-files installed
 -helpdir= @libdir@/lynx_help
-+helpdir= $(prefix)/lib/lynx_help
++helpdir= $(prefix)/share/lynx_help
+ HELPDIR= $(DESTDIR)$(helpdir)
  
  ##set the relative location of the WWW library Implementation directory,
- ##from this directory
-@@ -260,6 +260,7 @@
- 	@echo Copying sample files
- 	(cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \
- 			       ( cd $(docdir) && tar xf - )
-+	cp $(srcdir)/lynx.cfg $(docdir)/samples/lynx.cfg
- 	-rm -f $(libdir)/lynx.tmp
- 
- install-help : $(helpdir)
+@@ -358,10 +358,9 @@
+ 	-rm -f $(HELPDIR)/help_files.sed
+ 	@echo Updating $(libdir)/lynx.cfg
+ 	$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \
+-		mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
+-	else \
+-		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
++		mv -f $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.oldcfg ; \
+ 	fi'
++	cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp
+ 	@echo Updating $(libdir)/lynx.cfg to point to installed help-files
+ 	@ECHO_CC@sed	-e '/^HELPFILE:http/s@^@#@' \
+ 		-e '/^#HELPFILE:file/s@#@@' \
+@@ -371,6 +370,7 @@
+ 		-e '/^HELPFILE:file/s@$(COMPRESS_EXT)$(COMPRESS_EXT)$$@$(COMPRESS_EXT)@' \
+ 		$(LIBDIR)/lynx.tmp >$(LIBDIR)/lynx.cfg
+ 	chmod 644 $(LIBDIR)/lynx.cfg
++	cp -p $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.cfg.sample
+ 	-rm -f $(LIBDIR)/lynx.tmp
+ 	$(INSTALL_DATA) $(srcdir)/COPYHEADER $(DOCDIR)/COPYHEADER
+ 	$(INSTALL_DATA) $(srcdir)/COPYING    $(DOCDIR)/COPYING
diff --git a/japanese/lynx/files/patch-ad b/japanese/lynx/files/patch-ad
index e74262d99eab..16d65f0d2a03 100644
--- a/japanese/lynx/files/patch-ad
+++ b/japanese/lynx/files/patch-ad
@@ -1,6 +1,6 @@
---- src/LYHistory.c.orig	Thu Aug  6 21:28:22 1998
-+++ src/LYHistory.c	Mon Aug 10 01:44:44 1998
-@@ -22,6 +22,10 @@
+--- src/LYHistory.c.orig	Thu Dec 24 20:27:23 1998
++++ src/LYHistory.c	Mon Feb 22 15:01:18 1999
+@@ -23,6 +23,10 @@
  #include <LYexit.h>
  #include <LYLeaks.h>
  
@@ -11,9 +11,9 @@
  PUBLIC HTList * Visited_Links = NULL;	/* List of safe popped docs. */
  
  /*
-@@ -415,6 +419,20 @@
+@@ -401,6 +405,20 @@
  	} else {
- 	    StrAllocCopy(Title, "(no title)");
+ 	    StrAllocCopy(Title, NO_TITLE);
  	}
 +	if (HTCJK == JAPANESE) {
 +	    char *tmp;
@@ -32,16 +32,16 @@
  	fprintf(fp0,
  		"%s<em>%d</em>. <tab id=t%d><a href=\"LYNXHIST:%d\">%s</a>\n",
  		(x > 99 ? "" : x < 10 ? "  " : " "),
-@@ -568,6 +586,20 @@
- 	    LYEntify(&Title, TRUE);
+@@ -552,6 +570,20 @@
+ 		StrAllocCopy(Title , NO_TITLE);
  	} else {
- 	    StrAllocCopy(Title , "(no title)");
+ 	    StrAllocCopy(Title , NO_TITLE);
 +	}
 +	if (HTCJK == JAPANESE) {
 +	    char *tmp;
 +
 +	    if ((tmp = (char *)calloc(strlen(Title)*2, sizeof(char *))) == NULL)
-+    		outofmem(__FILE__, "LYShowVisitedLinks");
++		outofmem(__FILE__, "LYShowVisitedLinks");
 +	    *tmp = '\0';
 +	    if (kanji_code == EUC) {
 +		TO_EUC(Title, tmp);
@@ -49,7 +49,7 @@
 +		TO_SJIS(Title, tmp);
 +	    }
 +	    if (*tmp) StrAllocCopy(Title, tmp);
-+	    FREE(tmp);
++		FREE(tmp);
  	}
  	if (vl->address != NULL && *vl->address != '\0') {
  	    StrAllocCopy(Address, vl->address);