- updated to 2.8.5dev.15

Changed files:
    lynx-acfix.patch -> 1.3
    lynx-config.patch -> 1.8
    lynx.cfg.patch -> 1.7

diff --git a/lynx-acfix.patch b/lynx-acfix.patch
index ce1acf7baa14894d968b4aeae90a9daec64b863b..48cdcf3b6f39fa2db932a18e0ba60df5b4fbbca6 100644 (file)
--- a/lynx-acfix.patch
+++ b/lynx-acfix.patch
@@ -30,7 +30,7 @@
  };
 --- lynx2-8-5/config.hin.orig  Mon Oct  1 22:45:02 2001
 +++ lynx2-8-5/config.hin       Mon Oct  1 23:02:02 2001
-@@ -2,272 +2,272 @@
+@@ -2,274 +2,274 @@
  #ifndef LYNX_CFG_H
  #define LYNX_CFG_H 1
  
@@ -202,10 +202,12 @@
 -#undef HAVE_NCURSES_H         /* defined if we include <ncurses.h> */
 -#undef HAVE_NCURSES_NCURSES_H /* defined if we include <ncurses/ncurses.h> */
 -#undef HAVE_NCURSES_TERM_H    /* have <ncurses/term.h> */
+-#undef HAVE_NCURSESW_TERM_H   /* have <ncursesw/term.h> */
 +#undef HAVE_NCURSESW_NCURSES_H
 +#undef HAVE_NCURSES_H
 +#undef HAVE_NCURSES_NCURSES_H
 +#undef HAVE_NCURSES_TERM_H
++#undef HAVE_NCURSESW_TERM_H
  #undef HAVE_NEWPAD
  #undef HAVE_NEWTERM
 -#undef HAVE_NL_TYPES_H                /* AM_GNU_GETTEXT */
@@ -406,6 +408,7 @@
 -#undef USE_EXECVP             /* CF_ARG_DISABLE(full-paths) */
 -#undef USE_EXTERNALS          /* CF_ARG_ENABLE(externs) */
 -#undef USE_FCNTL              /* CF_FIONBIO */
+-#undef USE_GNUTLS_INCL                /* CF_GNUTLS */
 -#undef USE_OPENSSL_INCL               /* CF_SSL */
 -#undef USE_PRETTYSRC          /* CF_ARG_ENABLE(prettysrc) */
 -#undef USE_SCROLLBAR          /* CF_ARG_ENABLE(scrollbar) */
@@ -440,6 +443,7 @@
 +#undef USE_EXECVP
 +#undef USE_EXTERNALS
 +#undef USE_FCNTL
++#undef USE_GNUTLS_INCL
 +#undef USE_OPENSSL_INCL
 +#undef USE_PRETTYSRC
 +#undef USE_SCROLLBAR

diff --git a/lynx-config.patch b/lynx-config.patch
index f9c92150a68c627748e19bd54252785f0dd87b78..cc3fee3bd1921f693c46b3251dd641d751df0619 100644 (file)
--- a/lynx-config.patch
+++ b/lynx-config.patch
@@ -62,7 +62,7 @@ diff -Nur lynx2-8-5.orig/lynx.cfg lynx2-8-5/lynx.cfg
 @@ -112,9 +113,8 @@
  #   This should be changed to the local path.
  #
- #HELPFILE:http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+ #HELPFILE:http://www.subir.com/lynx/lynx_help/lynx_help_main.html
 -.ex
 -HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html
 -
@@ -74,7 +74,7 @@ diff -Nur lynx2-8-5.orig/lynx.cfg lynx2-8-5/lynx.cfg
 diff -Nur lynx2-8-5.orig/makefile.in lynx2-8-5/makefile.in
 --- lynx2-8-5.orig/makefile.in Mon Apr  2 02:51:46 2001
 +++ lynx2-8-5/makefile.in      Sun Jun 10 16:29:52 2001
-@@ -48,16 +48,16 @@
+@@ -48,15 +48,15 @@
  MANDIR= $(DESTDIR)$(mandir)
  
  ## Where you want the lynx.cfg file installed
@@ -86,23 +86,22 @@ diff -Nur lynx2-8-5.orig/makefile.in lynx2-8-5/makefile.in
 -docdir= @libdir@/lynx_doc
 +docdir= @datadir@/lynx_doc
  DOCDIR= $(DESTDIR)$(docdir)
- docdir1= $(shell echo "$(docdir)"|sed -e 's!^/!!')
  
  ## Where you want the help-files installed
 -helpdir= @libdir@/lynx_help
 +helpdir= @datadir@/lynx/help
  HELPDIR= $(DESTDIR)$(helpdir)
- helpdir1= $(shell echo "$(helpdir)"|sed -e 's!^/!!')
  
-@@ -328,7 +328,7 @@
+ ##set the relative location of the WWW library Implementation directory,
+@@ -326,7 +326,7 @@
        @-rm -f help_files.tmp
  
- install-help : help_files.sed $(HELPDIR) $(HELPDIR)/keystrokes
--      - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -f * keystrokes/*)
-+      - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && rm -f * keystrokes/*)
+ install-help : help_files.sed $(HELPDIR)
+-      - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -fr *)
++      - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && rm -fr *)
+       test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes
  @LYNXCFG_MAKE@        @echo 'Making htmlized lynx.cfg'
  @LYNXCFG_MAKE@        cd src && make LYReadCFG.i
- @LYNXCFG_MAKE@        @-rm -f alphatoc.html body.html cattoc.html
 @@ -438,12 +438,12 @@
  
  uninstall \
@@ -140,10 +139,10 @@ diff -Nur lynx2-8-4.orig/userdefs.h lynx2-8-4/userdefs.h
  #endif /* LYNX_CFG_FILE */
  #endif /* HAVE_CONFIG_H */
 @@ -478,7 +478,7 @@
-  * http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+  * http://www.subir.com/lynx/lynx_help/lynx_help_main.html
   *   This should be changed here or in lynx.cfg to the local path.
   */
--#define HELPFILE "http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html"
+-#define HELPFILE "http://www.subir.com/lynx/lynx_help/lynx_help_main.html"
 +#define HELPFILE "file://localhost/usr/share/lynx/help/lynx_help_main.html.gz"
  /* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
  

diff --git a/lynx.cfg.patch b/lynx.cfg.patch
index 92c80c7822923ec9b2e088efd20e8b5c573fc8ac..fcc5714844cd820bf86d17703acf9dca18bbf367 100644 (file)
--- a/lynx.cfg.patch
+++ b/lynx.cfg.patch
@@ -15,8 +15,8 @@ diff -ru lynx2-8-2.old/lynx.cfg lynx2-8-2/lynx.cfg
  # http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
  #   This should be changed to the local path.
  #
--HELPFILE:http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
-+#HELPFILE:http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+-HELPFILE:http://www.subir.com/lynx/lynx_help/lynx_help_main.html
++#HELPFILE:http://www.subir.com/lynx/lynx_help/lynx_help_main.html
  .ex
 -#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
 +HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html