Author: lisu Date: Mon Jun 21 12:10:40 2010 GMT Module: packages Tag: HEAD ---- Log message: - up for 2.8.7rel.2
---- Files affected: packages/lynx: lynx-config.patch (1.11 -> 1.12) , lynx.cfg.patch (1.9 -> 1.10) ---- Diffs: ================================================================ Index: packages/lynx/lynx-config.patch diff -u packages/lynx/lynx-config.patch:1.11 packages/lynx/lynx-config.patch:1.12 --- packages/lynx/lynx-config.patch:1.11 Mon Jul 6 15:57:56 2009 +++ packages/lynx/lynx-config.patch Mon Jun 21 14:10:35 2010 @@ -1,5 +1,5 @@ ---- lynx2-8-7/lynx.cfg~ 2009-07-06 14:00:13.000000000 +0200 -+++ lynx2-8-7/lynx.cfg 2009-07-06 14:04:57.000000000 +0200 +--- lynx2-8-7/lynx.cfg~ 2010-06-21 13:58:02.215705722 +0200 ++++ lynx2-8-7/lynx.cfg 2010-06-21 14:00:28.895674991 +0200 @@ -1,6 +1,6 @@ # $LynxId: lynx.cfg,v 1.180 2009/06/07 17:02:21 tom Exp $ # lynx.cfg file. @@ -17,40 +17,17 @@ # the default location of this file in the userdefs.h file and recompile, # or specify its location on the command line with the "-cfg" # command line option. -@@ -48,8 +48,8 @@ +@@ -48,7 +48,7 @@ # # Then in ~/lynx.cfg: # -# INCLUDE:/usr/local/lib/lynx.cfg --# ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system +# INCLUDE:/etc/lynx.cfg -+# ^^^^^^^^^^^^^ or whatever is appropriate on your system + # ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system # and now your own tweaks. # - # Starting with Lynx 2.8.2, the INCLUDE facility is yet more powerful. You can -@@ -94,7 +94,8 @@ - # Normally we expect you will connect to a remote site, e.g., the Lynx starting - # site: - #STARTFILE:http://lynx.isc.org/ --STARTFILE:file://localhost/usr/share/doc/HTML/index.html -+#STARTFILE:file://localhost/usr/share/doc/HTML/index.html -+STARTFILE:file://localhost/~/ - # - # As an alternative, you may want to use a local URL. A good choice for this is - # the user's home directory: -@@ -120,8 +121,8 @@ - # variable has been set. - # - #HELPFILE:http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html --.ex --HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html -+# default in PLD is: -+#HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html.gz - - .h2 DEFAULT_INDEX_FILE - # DEFAULT_INDEX_FILE is the default file retrieved when the ---- lynx2-8-7/makefile.in~ 2008-09-22 00:49:47.000000000 +0200 -+++ lynx2-8-7/makefile.in 2009-07-06 14:09:13.000000000 +0200 +--- lynx2-8-7/makefile.in~ 2010-06-21 11:27:35.000000000 +0200 ++++ lynx2-8-7/makefile.in 2010-06-21 14:04:23.622318548 +0200 @@ -66,7 +66,7 @@ DOCDIR = $(DESTDIR)$(docdir) @@ -69,23 +46,8 @@ test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes @LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg' @LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i -@@ -434,12 +434,12 @@ - - uninstall \ - uninstall-help :: -- -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -rf $(HELPDIR) -+ -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && rm -rf $(HELPDIR) - - uninstall \ - uninstall-doc :: - -test -d $(DOCDIR) && WD=`cd $(DOCDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_doc$$!!'` && test $$WD != $$HEAD && rm -rf $(DOCDIR) -- -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER -+ -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER - - update-po: - rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) ---- lynx2-8-7/userdefs.h~ 2009-07-06 14:00:13.000000000 +0200 -+++ lynx2-8-7/userdefs.h 2009-07-06 14:11:12.000000000 +0200 +--- lynx2-8-7/userdefs.h~ 2010-06-21 14:03:36.879822401 +0200 ++++ lynx2-8-7/userdefs.h 2010-06-21 14:05:52.335642938 +0200 @@ -105,7 +105,7 @@ * mailcap files (see the examples in the samples directory). */ @@ -99,7 +61,7 @@ * The definition here can be overridden at run time by defining a * "LYNX_HELPFILE" environment variable. */ --#define HELPFILE "http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html"; +-#define HELPFILE "http://lynx.isc.org/release/lynx2-8-7/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" */ ================================================================ Index: packages/lynx/lynx.cfg.patch diff -u packages/lynx/lynx.cfg.patch:1.9 packages/lynx/lynx.cfg.patch:1.10 --- packages/lynx/lynx.cfg.patch:1.9 Mon Jul 6 15:57:56 2009 +++ packages/lynx/lynx.cfg.patch Mon Jun 21 14:10:35 2010 @@ -1,29 +1,28 @@ ---- lynx2-8-7/lynx.cfg~ 2009-06-24 01:53:58.000000000 +0200 -+++ lynx2-8-7/lynx.cfg 2009-07-06 13:48:55.000000000 +0200 +--- lynx2-8-7/lynx.cfg~ 2010-06-21 11:27:35.000000000 +0200 ++++ lynx2-8-7/lynx.cfg 2010-06-21 13:35:12.625827117 +0200 @@ -93,7 +93,8 @@ # # Normally we expect you will connect to a remote site, e.g., the Lynx starting # site: -STARTFILE:http://lynx.isc.org/ +#STARTFILE:http://lynx.isc.org/ -+STARTFILE:file://localhost/usr/share/doc/HTML/index.html ++STARTFILE:file://localhost/~/ # # As an alternative, you may want to use a local URL. A good choice for this is # the user's home directory: -@@ -118,10 +119,9 @@ +@@ -118,9 +119,9 @@ # This definition will be overridden if the "LYNX_HELPFILE" environment # variable has been set. # --HELPFILE:http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html -+#HELPFILE:http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html +-HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html ++#HELPFILE:http://lynx.isc.org/release/lynx2-8-7/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 ++HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html.gz + .h2 DEFAULT_INDEX_FILE - # DEFAULT_INDEX_FILE is the default file retrieved when the -@@ -553,7 +553,7 @@ +@@ -553,7 +554,7 @@ # Older browser versions will fail so keep NCR_IN_BOOKMARKS:FALSE if you # plan to use them. # @@ -32,7 +31,7 @@ .h2 FORCE_8BIT_TOUPPER -@@ -2387,7 +2387,8 @@ +@@ -2387,7 +2388,8 @@ #VIEWER:image/tiff:xli %s&:XWINDOWS #VIEWER:image/jpeg:xli %s&:XWINDOWS #VIEWER:video/mpeg:mpeg_play %s &:XWINDOWS @@ -42,7 +41,7 @@ .h2 GLOBAL_MAILCAP .h2 PERSONAL_MAILCAP -@@ -3018,16 +3019,14 @@ +@@ -3018,16 +3020,14 @@ # # Uncomment and change any of the compilation defaults. # ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx-config.patch?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx.cfg.patch?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
