packages: lynx/lynx-acfix.patch, lynx/lynx-autoconf.patch, lynx/lynx.cfg.pa...
lisu
lisu at pld-linux.org
Mon Jul 6 15:58:02 CEST 2009
Author: lisu Date: Mon Jul 6 13:58:02 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for version 2.8.7rel.1
---- Files affected:
packages/lynx:
lynx-acfix.patch (1.8 -> 1.9) , lynx-autoconf.patch (1.9 -> 1.10) , lynx.cfg.patch (1.8 -> 1.9) , lynx-config.patch (1.10 -> 1.11) , lynx-pld.patch (1.4 -> 1.5) , lynx-po_DESTDIR.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/lynx/lynx-acfix.patch
diff -u packages/lynx/lynx-acfix.patch:1.8 packages/lynx/lynx-acfix.patch:1.9
--- packages/lynx/lynx-acfix.patch:1.8 Mon Feb 26 23:06:47 2007
+++ packages/lynx/lynx-acfix.patch Mon Jul 6 15:57:56 2009
@@ -1,31 +1,11 @@
-#--- lynx2-8-5.orig/scripts/cfg_defs.sh 2004-02-14 22:10:58.372423984 +0100
-#+++ lynx2-8-5/scripts/cfg_defs.sh 2004-02-14 22:16:58.206720856 +0100
-#@@ -19,11 +19,14 @@
-# EOF
-#
-# sed \
-#- -e '/^#/d' \
-#+ -e '/^$/d' \
-#+ -e '/^[^acgn]/d' \
-#+ -e '/^.[^cfmst]/d' \
-#+ -e '/^..[^s_]/d' \
-# -e 's/^.[^=]*_cv_//' \
-# -e 's/=\${.*=/=/' \
-# -e 's/}$//' \
-#- config.cache | $SHELL $TOP/cfg_edit.sh >>$OUT
-#+ config.log | $SHELL $TOP/cfg_edit.sh >>$OUT
-#
-# cat >>$OUT <<EOF
-# };
---- lynx2-8-6/config.hin.orig 2006-10-02 21:56:53.000000000 +0200
-+++ lynx2-8-6/config.hin 2007-02-25 21:54:42.490389596 +0100
-@@ -2,292 +2,292 @@
+--- lynx2-8-7/config.hin~ 2009-07-06 14:12:59.000000000 +0200
++++ lynx2-8-7/config.hin 2009-07-06 14:42:22.000000000 +0200
+@@ -7,314 +7,313 @@
#ifndef LYNX_CFG_H
#define LYNX_CFG_H 1
-#undef ALL_CHARSETS /* AC_ARG_WITH(charsets) */
-#undef ALT_CHAR_SET /* CF_ALT_CHAR_SET */
--#undef ANSI_VARARGS /* CF_VARARGS */
-#undef ARCHIVE_ONLY /* CF_ARG_DISABLE(dired-archive) */
-#undef BZIP2_PATH /* CF_PATH_PROG(bzip2) */
-#undef CAN_SET_ERRNO /* CF_SET_ERRNO */
@@ -61,6 +41,7 @@
-#undef DISABLE_GOPHER /* CF_ARG_DISABLE(gopher) */
-#undef DISABLE_NEWS /* CF_ARG_DISABLE(news) */
-#undef DISP_PARTIAL /* CF_ARG_ENABLE(partial) */
+-#undef DONT_HAVE_TM_GMTOFF /* CF_TM_GMTOFF */
-#undef DONT_TRACK_INTERNAL_LINKS /* CF_ARG_DISABLE(internal-links) */
-#undef ENABLE_IPV6 /* CF_CHECK_IPV6 */
-#undef ENABLE_NLS /* defined if NLS is requested */
@@ -69,12 +50,12 @@
-#undef EXEC_SCRIPTS /* CF_ARG_ENABLE(exec-scripts) */
-#undef EXP_ADDRLIST_PAGE /* CF_ARG_ENABLE(addrlist-page) */
-#undef EXP_ALT_BINDINGS /* CF_ARG_ENABLE(alt-bindings) */
+-#undef EXP_ASCII_CTYPES /* CF_ARG_ENABLE(ascii-ctypes) */
-#undef EXP_CHARSET_CHOICE /* CF_ARG_ENABLE(charset-choice) */
-#undef EXP_CHARTRANS_AUTOSWITCH /* CF_ARG_ENABLE(font-switch) */
-#undef EXP_JAPANESEUTF8_SUPPORT /* CF_ARG_ENABLE(japanese-utf8) */
-#undef EXP_JUSTIFY_ELTS /* CF_ARG_ENABLE(justify-elts) */
-#undef EXP_KEYBOARD_LAYOUT /* CF_ARG_ENABLE(kbd-layout) */
--#undef EXP_LOCALE_CHARSET /* CF_ARG_ENABLE(locale-charset) */
-#undef EXP_LIBJS /* CF_ARG_ENABLE(libjs) */
-#undef EXP_NESTED_TABLES /* CF_ARG_ENABLE(nested-tables) */
-#undef FANCY_CURSES /* CF_FANCY_CURSES */
@@ -153,12 +134,14 @@
#undef HAVE_GETCWD
#undef HAVE_GETGROUPS
-#undef HAVE_GETTEXT /* defined if you want to use non-GNU gettext */
-+#undef HAVE_GETTEXT
#undef HAVE_GETTIMEOFDAY
#undef HAVE_GETUID
#undef HAVE_H_ERRNO
+-#undef HAVE_ICONV /* AM_ICONV */
-#undef HAVE_INET_ATON /* CF_INET_ADDR */
++#undef HAVE_ICONV
+#undef HAVE_INET_ATON
+ #undef HAVE_INTTYPES_H
#undef HAVE_JCURSES_H
#undef HAVE_KEYPAD
-#undef HAVE_LANGINFO_CODESET /* AM_LANGINFO_CODESET */
@@ -229,6 +212,8 @@
+#undef HAVE_STRCHR
#undef HAVE_STRERROR
#undef HAVE_STRING_H
+-#undef HAVE_STRUCT_DIRENT64 /* CF_LARGEFILE */
++#undef HAVE_STRUCT_DIRENT64
#undef HAVE_SYSLOG_H
-#undef HAVE_SYSV_TOUCHLINE /* CF_CURS_TOUCHLINE */
-#undef HAVE_SYS_DIR_H /* AC_HEADER_DIRENT */
@@ -237,6 +222,7 @@
-#undef HAVE_SYS_IOCTL_H /* have <sys/ioctl.h> */
-#undef HAVE_SYS_NDIR_H /* AC_HEADER_DIRENT */
-#undef HAVE_SYS_PARAM_H /* AM_GNU_GETTEXT */
+-#undef HAVE_SYS_TIME_H /* have <sys/time.h> */
-#undef HAVE_SYS_TIMEB_H /* have <sys/timeb.h> */
-#undef HAVE_SYS_WAIT_H /* have <sys/wait.h> */
-#undef HAVE_TERMIOS_H /* have <termios.h> */
@@ -249,6 +235,7 @@
+#undef HAVE_SYS_IOCTL_H
+#undef HAVE_SYS_NDIR_H
+#undef HAVE_SYS_PARAM_H
++#undef HAVE_SYS_TIME_H
+#undef HAVE_SYS_TIMEB_H
+#undef HAVE_SYS_WAIT_H
+#undef HAVE_TERMIOS_H
@@ -259,8 +246,10 @@
#undef HAVE_TRUNCATE
#undef HAVE_TTYNAME
#undef HAVE_TTYTYPE
+-#undef HAVE_TYPE_CHTYPE /* CF_CURSES_CHTYPE */
-#undef HAVE_TYPE_UNIONWAIT /* CF_UNION_WAIT */
-#undef HAVE_UNISTD_H /* have <unistd.h> */
++#undef HAVE_TYPE_CHTYPE
+#undef HAVE_TYPE_UNIONWAIT
+#undef HAVE_UNISTD_H
#undef HAVE_UNSETENV
@@ -289,14 +278,28 @@
#undef HAVE_WAITPID
#undef HAVE_WATTR_GET
#undef HAVE_WBORDER
+-#undef HAVE_WINDOWS_H /* CF_NETLIBS */
+-#undef HAVE_WINSOCK2_H /* CF_NETLIBS */
+-#undef HAVE_WINSOCK_H /* CF_NETLIBS */
++#undef HAVE_WINDOWS_H
++#undef HAVE_WINSOCK2_H
++#undef HAVE_WINSOCK_H
#undef HAVE_WREDRAWLN
#undef HAVE_WRESIZE
-#undef HAVE_XCURSES /* CF_PDCURSES_X11 */
+#undef HAVE_XCURSES
#undef HAVE_ZERROR
+-#undef HAVE__NC_FREEALL /* ncurses debugging extension */
+-#undef HAVE__NC_FREE_AND_EXIT /* ncurses debugging extension */
-#undef HAVE___ARGZ_COUNT /* AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_NEXT /* AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_STRINGIFY /* AM_GNU_GETTEXT */
++#undef HAVE__NC_FREEALL
++#undef HAVE__NC_FREE_AND_EXIT
++#undef HAVE___ARGZ_COUNT
++#undef HAVE___ARGZ_NEXT
++#undef HAVE___ARGZ_STRINGIFY
+ #undef ICONV_CONST
-#undef IGNORE_CTRL_C /* FIXME: make tests? */
-#undef INCLUDE_PROTOTYPES /* CF_SOCKS5 */
-#undef INSTALL_ARGS /* CF_PATH_PROG(install) */
@@ -310,6 +313,7 @@
-#undef LYNX_RAND_MAX /* CF_SRAND */
-#undef LY_FIND_LEAKS /* CF_ARG_ENABLE(find-leaks) */
-#undef LY_TRACELINE /* CF_ARG_ENABLE(vertrace) */
+-#undef MIME_LIBDIR /* CF_WITH_PATH(mime-libdir */
-#undef MKDIR_PATH /* CF_PATH_PROG(mkdir) */
-#undef MV_PATH /* CF_PATH_PROG(mv) */
-#undef NCURSES /* defined for ncurses support */
@@ -326,9 +330,6 @@
-#undef NO_OPTION_MENU /* CF_ARG_DISABLE(option-menu) */
-#undef NO_PARENT_DIR_REFERENCE /* CF_ARG_DISABLE(parent-dir-refs) */
-#undef NSL_FORK /* CF_ARG_ENABLE(nsl-fork) */
-+#undef HAVE___ARGZ_COUNT
-+#undef HAVE___ARGZ_NEXT
-+#undef HAVE___ARGZ_STRINGIFY
+#undef IGNORE_CTRL_C
+#undef INCLUDE_PROTOTYPES
+#undef INSTALL_ARGS
@@ -342,6 +343,7 @@
+#undef LYNX_RAND_MAX
+#undef LY_FIND_LEAKS
+#undef LY_TRACELINE
++#undef MIME_LIBDIR
+#undef MKDIR_PATH
+#undef MV_PATH
+#undef NCURSES
@@ -365,6 +367,10 @@
-#undef RLOGIN_PATH /* CF_PATH_PROG(rlogin) */
-#undef RM_PATH /* CF_PATH_PROG(rm) */
-#undef SETFONT_PATH /* CF_PATH_PROG(setfont) */
+-#undef SIZEOF_INT /* AC_CHECK_SIZEOF(int) */
+-#undef SIZEOF_LONG /* AC_CHECK_SIZEOF(long) */
+-#undef SIZEOF_OFF_T /* AC_CHECK_SIZEOF(off_t) */
+-#undef SIZEOF_TIME_T /* AC_CHECK_SIZEOF(time_t) */
-#undef SOCKS /* CF_SOCKS, CF_SOCKS5 */
+#undef OK_OVERRIDE
+#undef OK_PERMIT
@@ -372,6 +378,10 @@
+#undef RLOGIN_PATH
+#undef RM_PATH
+#undef SETFONT_PATH
++#undef SIZEOF_INT
++#undef SIZEOF_LONG
++#undef SIZEOF_OFF_T
++#undef SIZEOF_TIME_T
+#undef SOCKS
#undef STDC_HEADERS
-#undef SYSTEM_MAIL /* CF_DEFINE_PROG */
@@ -385,6 +395,7 @@
-#undef TELNET_PATH /* CF_PATH_PROG(telnet) */
-#undef TERMIO_AND_CURSES /* CF_TERMIO_AND_CURSES workaround */
-#undef TERMIO_AND_TERMIOS /* CF_TERMIO_AND_TERMIOS workaround */
+-#undef TIME_WITH_SYS_TIME /* AC_HEADER_TIME */
-#undef TN3270_PATH /* CF_PATH_PROG(tn3270) */
-#undef TOUCH_PATH /* CF_PATH_PROG(touch) */
-#undef ULTRIX /* config.sub */
@@ -401,6 +412,7 @@
+#undef TELNET_PATH
+#undef TERMIO_AND_CURSES
+#undef TERMIO_AND_TERMIOS
++#undef TIME_WITH_SYS_TIME
+#undef TN3270_PATH
+#undef TOUCH_PATH
+#undef ULTRIX
@@ -409,18 +421,23 @@
#undef UNIX
-#undef UNZIP_PATH /* CF_PATH_PROG(unzip) */
-#undef USE_BZLIB /* AC_ARG_WITH(bzlib) */
+-#undef USE_CACHEJAR /* CF_ARG_ENABLE(session-cache) */
-#undef USE_COLOR_STYLE /* CF_ARG_ENABLE(color-style) */
-#undef USE_DEFAULT_COLORS /* CF_ARG_ENABLE(default-colors) */
-#undef USE_EXECVP /* CF_ARG_DISABLE(full-paths) */
-#undef USE_EXTERNALS /* CF_ARG_ENABLE(externs) */
-#undef USE_FCNTL /* CF_FIONBIO */
-#undef USE_FILE_UPLOAD /* CF_ARG_ENABLE(file-upload) */
+-#undef USE_GNUTLS_FUNCS /* CF_GNUTLS */
-#undef USE_GNUTLS_INCL /* CF_GNUTLS */
+-#undef USE_LOCALE_CHARSET /* CF_ARG_ENABLE(locale-charset) */
-#undef USE_OPENSSL_INCL /* CF_SSL */
-#undef USE_PERSISTENT_COOKIES /* CF_ARG_ENABLE(persistent-cookies) */
-#undef USE_PRETTYSRC /* CF_ARG_ENABLE(prettysrc) */
+-#undef USE_PROGRESSBAR /* CF_ARG_ENABLE(progressbar) */
-#undef USE_READPROGRESS /* CF_ARG_ENABLE(read-eta) */
-#undef USE_SCROLLBAR /* CF_ARG_ENABLE(scrollbar) */
+-#undef USE_SESSIONS /* CF_ARG_ENABLE(sessions) */
-#undef USE_SLANG /* AC_ARG_WITH(screen=slang) */
-#undef USE_SOCKS4_PREFIX /* CF_SOCKS5 */
-#undef USE_SOCKS5 /* CF_SOCKS5 */
@@ -438,7 +455,7 @@
-#undef XCURSES /* CF_PDCURSES_X11 */
-#undef ZCAT_PATH /* CF_PATH_PROG(zcat) */
-#undef ZIP_PATH /* CF_PATH_PROG(zip) */
--#undef _ALL_SOURCE /* AC_AIX */
+-#undef _WINDOWS_NSL /* CF_ARG_ENABLE(nsl-fork) */
-#undef inline /* AC_C_INLINE */
-#undef lynx_rand /* CF_SRAND */
-#undef lynx_srand /* CF_SRAND */
@@ -452,18 +469,23 @@
-#undef ut_xtime /* CF_UTMP_UT_XTIME */
+#undef UNZIP_PATH
+#undef USE_BZLIB
++#undef USE_CACHEJAR
+#undef USE_COLOR_STYLE
+#undef USE_DEFAULT_COLORS
+#undef USE_EXECVP
+#undef USE_EXTERNALS
+#undef USE_FCNTL
+#undef USE_FILE_UPLOAD
++#undef USE_GNUTLS_FUNCS
+#undef USE_GNUTLS_INCL
++#undef USE_LOCALE_CHARSET
+#undef USE_OPENSSL_INCL
+#undef USE_PERSISTENT_COOKIES
+#undef USE_PRETTYSRC
++#undef USE_PROGRESSBAR
+#undef USE_READPROGRESS
+#undef USE_SCROLLBAR
++#undef USE_SESSIONS
+#undef USE_SLANG
+#undef USE_SOCKS4_PREFIX
+#undef USE_SOCKS5
@@ -481,7 +503,7 @@
+#undef XCURSES
+#undef ZCAT_PATH
+#undef ZIP_PATH
-+#undef _ALL_SOURCE
++#undef _WINDOWS_NSL
+#undef inline
+#undef lynx_rand
+#undef lynx_srand
@@ -523,7 +545,7 @@
#endif
/* 'const' may be defined externally by the compiler-wrapper, as in 'unproto'
-@@ -324,7 +324,7 @@
+@@ -351,7 +350,7 @@
#endif
#ifdef HAVE_SYSLOG_H
@@ -532,15 +554,3 @@
#endif
#ifndef HAVE_LSTAT
-#diff -burN lynx2-8-5.orig/makefile.in lynx2-8-5/makefile.in
-#--- lynx2-8-5.orig/makefile.in 2004-02-14 22:10:58.401419576 +0100
-#+++ lynx2-8-5/makefile.in 2004-02-14 22:15:36.124199296 +0100
-#@@ -394,7 +394,7 @@
-# @echo
-# @echo '**********************************************'
-#
-#-cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.cache lynx_cfg.h
-#+cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.log lynx_cfg.h
-# @rm -f $@
-# $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(srcdir)/cfg_defs.sh $(srcdir)'
-#
================================================================
Index: packages/lynx/lynx-autoconf.patch
diff -u packages/lynx/lynx-autoconf.patch:1.9 packages/lynx/lynx-autoconf.patch:1.10
--- packages/lynx/lynx-autoconf.patch:1.9 Mon Feb 26 23:06:48 2007
+++ packages/lynx/lynx-autoconf.patch Mon Jul 6 15:57:56 2009
@@ -1,7 +1,6 @@
-diff -burN lynx2-8-5.orig/aclocal.m4 lynx2-8-5/aclocal.m4
---- lynx2-8-5.orig/aclocal.m4 2004-02-14 22:10:58.336429456 +0100
-+++ lynx2-8-5/aclocal.m4 2004-02-14 22:14:16.154356560 +0100
-@@ -24,7 +24,6 @@
+--- lynx2-8-7/aclocal.m4~ 2009-02-02 02:41:02.000000000 +0100
++++ lynx2-8-7/aclocal.m4 2009-07-06 13:56:14.000000000 +0200
+@@ -50,7 +50,6 @@
AC_REQUIRE([AC_HEADER_STDC])dnl
AC_REQUIRE([AC_C_CONST])dnl
AC_REQUIRE([AC_C_INLINE])dnl
@@ -9,7 +8,7 @@
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl
-@@ -2226,9 +2226,7 @@
+@@ -2884,9 +2883,7 @@
dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
dnl ---------------
dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
@@ -20,9 +19,9 @@
dnl ---------------------------------------------------------------------------
dnl CF_INET_ADDR version: 4 updated: 1999/03/30 12:24:31
dnl ------------
---- lynx2-8-6/configure.in.orig 2006-10-11 01:39:50.000000000 +0200
-+++ lynx2-8-6/configure.in 2007-02-25 20:19:36.781239762 +0100
-@@ -36,7 +36,6 @@
+--- lynx2-8-7/configure.in~ 2009-04-26 18:24:31.000000000 +0200
++++ lynx2-8-7/configure.in 2009-07-06 13:59:02.000000000 +0200
+@@ -40,7 +40,6 @@
# run to the next, as well as with tests that are order-dependent.
rm -f config.cache
@@ -30,7 +29,7 @@
AC_INIT(userdefs.h)
# autoconf 2.5x defaults to no cache file; we need the cache file's information
-@@ -101,9 +100,6 @@
+@@ -118,9 +117,6 @@
dnl Debug/development/test
dnl --------------------------------------------------------------------------
@@ -40,7 +39,7 @@
CF_DISABLE_ECHO
# special case for WWW/*
-@@ -335,9 +331,6 @@
+@@ -357,9 +353,6 @@
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -49,8 +48,8 @@
-
CF_LARGEFILE
- dnl internationalization macros
-@@ -658,9 +651,6 @@
+ dnl --------------------------------------------------------------------------
+@@ -822,9 +815,6 @@
dnl Experimental options that don't need to test system features
dnl --------------------------------------------------------------------------
@@ -60,17 +59,27 @@
AC_MSG_CHECKING(if bibp: URLs should be supported)
CF_ARG_DISABLE(bibp-urls,
[ --disable-bibp-urls disable support for bibp: URLs],
-@@ -849,9 +839,6 @@
+@@ -982,9 +972,6 @@
dnl Miscellaneous options that don't need to test system features
dnl --------------------------------------------------------------------------
-CF_HELP_MESSAGE(
-Miscellaneous Options:)
-
+ dnl --------------------------------------------------------------------------
AC_MSG_CHECKING(if alternative line-edit bindings should be used)
CF_ARG_ENABLE(alt-bindings,
- [ --disable-alt-bindings disable alternative line-edit bindings],
-@@ -1095,9 +1082,6 @@
+@@ -1223,9 +1210,6 @@
+ fi
+
+ dnl --------------------------------------------------------------------------
+-CF_HELP_MESSAGE(
+-Other Network Services:)
+-
+ dnl --------------------------------------------------------------------------
+ AC_MSG_CHECKING(if you want to exclude FINGER code)
+ CF_ARG_DISABLE(finger,
+@@ -1266,9 +1250,6 @@
dnl DirEd (directory-editor) options
dnl --------------------------------------------------------------------------
@@ -80,7 +89,7 @@
# All DirEd functions that were enabled on compilation can be disabled
# or modified at run time via DIRED_MENU symbols in lynx.cfg.
AC_MSG_CHECKING(if directory-editor code should be used)
-@@ -1218,7 +1202,6 @@
+@@ -1392,7 +1373,6 @@
AC_SUBST(COMPRESS_EXT)
if test $cf_cv_screen = pdcurses ; then
================================================================
Index: packages/lynx/lynx.cfg.patch
diff -u packages/lynx/lynx.cfg.patch:1.8 packages/lynx/lynx.cfg.patch:1.9
--- packages/lynx/lynx.cfg.patch:1.8 Sun Jan 18 21:58:27 2004
+++ packages/lynx/lynx.cfg.patch Mon Jul 6 15:57:56 2009
@@ -1,7 +1,6 @@
-diff -ru lynx2-8-2.old/lynx.cfg lynx2-8-2/lynx.cfg
---- lynx2-8-2.old/lynx.cfg Tue May 11 15:02:06 1999
-+++ lynx2-8-2/lynx.cfg Tue May 11 15:11:22 1999
-@@ -43,7 +43,8 @@
+--- 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
+@@ -93,7 +93,8 @@
#
# Normally we expect you will connect to a remote site, e.g., the Lynx starting
# site:
@@ -11,37 +10,39 @@
#
# As an alternative, you may want to use a local URL. A good choice for this is
# the user's home directory:
-@@ -109,9 +109,9 @@
- # http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
- # This should be changed to the local path.
+@@ -118,10 +119,9 @@
+ # This definition will be overridden if the "LYNX_HELPFILE" environment
+ # variable has been set.
#
--HELPFILE:http://www.subir.com/lynx/lynx_help/lynx_help_main.html
-+#HELPFILE:http://www.subir.com/lynx/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-6/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
.h2 DEFAULT_INDEX_FILE
# DEFAULT_INDEX_FILE is the default file retrieved when the
-@@ -326,7 +327,7 @@
+@@ -553,7 +553,7 @@
# Older browser versions will fail so keep NCR_IN_BOOKMARKS:FALSE if you
# plan to use them.
#
-#NCR_IN_BOOKMARKS:FALSE
+NCR_IN_BOOKMARKS:TRUE
- # FORCE_8BIT_TOUPPER overrides locale settings and uses internal 8-bit
- # case-conversion mechanism for case-insensitive searches in non-ASCII display
-@@ -1535,6 +1536,8 @@
- #VIEWER:image/x-tiff:xli %s&:XWINDOWS
+
+ .h2 FORCE_8BIT_TOUPPER
+@@ -2387,7 +2387,8 @@
+ #VIEWER:image/tiff:xli %s&:XWINDOWS
#VIEWER:image/jpeg:xli %s&:XWINDOWS
#VIEWER:video/mpeg:mpeg_play %s &:XWINDOWS
+-
+VIEWER:image/gif:zgv %s:NON_XWINDOWS
+VIEWER:image/jpeg:zgv %s:NON_XWINDOWS
- # The global and personal MAILCAP files allow you to specify external
- # viewers to be spawned when Lynx encounters different MIME types, which
-@@ -1903,15 +1906,14 @@
+ .h2 GLOBAL_MAILCAP
+ .h2 PERSONAL_MAILCAP
+@@ -3018,16 +3019,14 @@
#
# Uncomment and change any of the compilation defaults.
#
@@ -54,6 +55,7 @@
-#COLOR:6:red:white
-COLOR:6:brightred:black
-#COLOR:7:magenta:cyan
+-
+COLOR:0:black:lightgray
+COLOR:1:blue:lightgray
+COLOR:2:yellow:blue
@@ -63,5 +65,5 @@
+COLOR:6:white:blue
+COLOR:7:lightgray:black
- # External application support. This feature allows Lynx to pass a given
- # URL to an external program. It was written for three reasons.
+ .h2 COLOR_STYLE
+ # Also known as "lss" (lynx style-sheet), the color-style file assigns color
================================================================
Index: packages/lynx/lynx-config.patch
diff -u packages/lynx/lynx-config.patch:1.10 packages/lynx/lynx-config.patch:1.11
--- packages/lynx/lynx-config.patch:1.10 Mon Feb 26 23:06:48 2007
+++ packages/lynx/lynx-config.patch Mon Jul 6 15:57:56 2009
@@ -1,14 +1,14 @@
-diff -Nur lynx2-8-5.orig/lynx.cfg lynx2-8-5/lynx.cfg
---- lynx2-8-5.orig/lynx.cfg Sun Jun 10 16:24:29 2001
-+++ lynx2-8-5/lynx.cfg Sun Jun 10 16:16:44 2001
-@@ -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
+@@ -1,6 +1,6 @@
+ # $LynxId: lynx.cfg,v 1.180 2009/06/07 17:02:21 tom Exp $
# lynx.cfg file.
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
+# The default placement for this file is /etc/lynx.cfg (Unix)
# or Lynx_Dir:lynx.cfg (VMS)
#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-@@ -11,7 +11,7 @@
+@@ -12,7 +12,7 @@
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
#
@@ -17,7 +17,7 @@
# 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.
-@@ -42,8 +42,8 @@
+@@ -48,8 +48,8 @@
#
# Then in ~/lynx.cfg:
#
@@ -28,7 +28,7 @@
# and now your own tweaks.
#
# Starting with Lynx 2.8.2, the INCLUDE facility is yet more powerful. You can
-@@ -88,7 +88,8 @@
+@@ -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/
@@ -38,30 +38,29 @@
#
# As an alternative, you may want to use a local URL. A good choice for this is
# the user's home directory:
-@@ -112,9 +113,8 @@
- # This should be changed to the local path.
+@@ -120,8 +121,8 @@
+ # variable has been set.
#
- #HELPFILE:http://www.subir.com/lynx/lynx_help/lynx_help_main.html
+ #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-6/makefile.in.orig 2006-09-04 01:25:39.000000000 +0200
-+++ lynx2-8-6/makefile.in 2007-02-25 20:32:56.534815121 +0100
-@@ -64,7 +64,7 @@
- DOCDIR= $(DESTDIR)$(docdir)
+--- 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
+@@ -66,7 +66,7 @@
+ DOCDIR = $(DESTDIR)$(docdir)
## Where you want the help-files installed
--helpdir= @datadir@/lynx_help
-+helpdir= @datadir@/lynx/help
- HELPDIR= $(DESTDIR)$(helpdir)
+-helpdir = @datadir@/lynx_help
++helpdir = @datadir@/lynx/help
+ HELPDIR = $(DESTDIR)$(helpdir)
##set the relative location of the WWW library Implementation directory,
-@@ -337,7 +337,7 @@
+@@ -358,7 +358,7 @@
@-rm -f help_files.tmp
install-help : help_files.sed $(HELPDIR)
@@ -69,8 +68,8 @@
+ - (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
-@@ -413,12 +413,12 @@
+ @LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
+@@ -434,12 +434,12 @@
uninstall \
uninstall-help ::
@@ -83,12 +82,11 @@
- -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
- $(BINDIR) \
- $(MANDIR) \
-diff -Nur lynx2-8-4.orig/userdefs.h lynx2-8-4/userdefs.h
---- lynx2-8-4.orig/userdefs.h Sun Jun 10 16:24:29 2001
-+++ lynx2-8-4/userdefs.h Sun Jun 10 16:16:44 2001
-@@ -93,7 +93,7 @@
+ update-po:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx-acfix.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx-autoconf.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx.cfg.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx-config.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx-pld.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lynx/lynx-po_DESTDIR.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list