SOURCES: lynx-acfix.patch, lynx-autoconf.patch, lynx-config.patch, ...

qboosh qboosh at pld-linux.org
Mon Feb 26 23:06:53 CET 2007


Author: qboosh                       Date: Mon Feb 26 22:06:53 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.8.6rel.4

---- Files affected:
SOURCES:
   lynx-acfix.patch (1.7 -> 1.8) , lynx-autoconf.patch (1.8 -> 1.9) , lynx-config.patch (1.9 -> 1.10) , lynx-etc_dir.patch (1.1 -> 1.2) , lynx-gzip_fallback.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/lynx-acfix.patch
diff -u SOURCES/lynx-acfix.patch:1.7 SOURCES/lynx-acfix.patch:1.8
--- SOURCES/lynx-acfix.patch:1.7	Sat Feb 14 22:33:10 2004
+++ SOURCES/lynx-acfix.patch	Mon Feb 26 23:06:47 2007
@@ -1,27 +1,25 @@
-diff -burN lynx2-8-5.orig/cfg_defs.sh lynx2-8-5/cfg_defs.sh
---- lynx2-8-5.orig/cfg_defs.sh	2004-02-14 22:10:58.372423984 +0100
-+++ lynx2-8-5/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
- };
-diff -burN lynx2-8-5.orig/config.hin lynx2-8-5/config.hin
---- lynx2-8-5.orig/config.hin	2004-02-14 22:10:58.373423832 +0100
-+++ lynx2-8-5/config.hin	2004-02-14 22:22:52.560850840 +0100
-@@ -2,284 +2,284 @@
+#--- 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 @@
  #ifndef LYNX_CFG_H
  #define LYNX_CFG_H 1
  
@@ -38,19 +36,19 @@
 -#undef COPY_PATH		/* CF_PATH_PROG(cp) */
 -#undef CURS_PERFORMANCE		/* CF_CURS_PERFORMANCE */
 -#undef DEBUG			/* configure --enable-debug */
-+#undef ALL_CHARSETS		
-+#undef ALT_CHAR_SET	
++#undef ALL_CHARSETS
++#undef ALT_CHAR_SET
 +#undef ANSI_VARARGS
-+#undef ARCHIVE_ONLY	
++#undef ARCHIVE_ONLY
 +#undef BZIP2_PATH
 +#undef CAN_SET_ERRNO
 +#undef CHMOD_PATH
-+#undef CJK_EX	
++#undef CJK_EX
 +#undef COLOR_CURSES
 +#undef COMPRESS_PATH
 +#undef COPY_PATH
 +#undef CURS_PERFORMANCE
-+#undef DEBUG	
++#undef DEBUG
  #undef DECL_ERRNO
  #undef DECL_GETGRGID
  #undef DECL_GETGRNAM
@@ -73,6 +71,7 @@
 -#undef EXP_ALT_BINDINGS		/* CF_ARG_ENABLE(alt-bindings) */
 -#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) */
@@ -95,19 +94,20 @@
 +#undef DISABLE_NEWS
 +#undef DISP_PARTIAL
 +#undef DONT_TRACK_INTERNAL_LINKS
-+#undef ENABLE_IPV6	
-+#undef ENABLE_NLS	
++#undef ENABLE_IPV6
++#undef ENABLE_NLS
 +#undef ENABLE_OPTS_CHANGE_EXEC
-+#undef EXEC_LINKS	
++#undef EXEC_LINKS
 +#undef EXEC_SCRIPTS
-+#undef EXP_ADDRLIST_PAG
++#undef EXP_ADDRLIST_PAGE
 +#undef EXP_ALT_BINDINGS
 +#undef EXP_CHARSET_CHOICE
-+#undef EXP_CHARTRANS_AUTOSWITCH	
-+#undef EXP_JUSTIFY_ELTS	
++#undef EXP_CHARTRANS_AUTOSWITCH
++#undef EXP_JAPANESEUTF8_SUPPORT
++#undef EXP_JUSTIFY_ELTS
 +#undef EXP_KEYBOARD_LAYOUT
 +#undef EXP_LOCALE_CHARSET
-+#undef EXP_LIBJS	
++#undef EXP_LIBJS
 +#undef EXP_NESTED_TABLES
 +#undef FANCY_CURSES
 +#undef GCC_NORETURN
@@ -117,16 +117,19 @@
 +#undef GZIP_PATH
 +#undef HAVE_ALLOCA
 +#undef HAVE_ALLOCA_H
-+#undef HAVE_ARGZ_H	
++#undef HAVE_ARGZ_H
  #undef HAVE_ARPA_INET_H
 -#undef HAVE_ASSUME_DEFAULT_COLORS /* ncurses extension */
 -#undef HAVE_BSD_TOUCHLINE	/* CF_CURS_TOUCHLINE */
 -#undef HAVE_CATGETS		/* defined if you want to use non-GNU catgets */
 +#undef HAVE_ASSUME_DEFAULT_COLORS
-+#undef HAVE_BSD_TOUCHLINE	
-+#undef HAVE_CATGETS	
++#undef HAVE_BSD_TOUCHLINE
++#undef HAVE_CATGETS
  #undef HAVE_CBREAK
+ #undef HAVE_CTERMID
  #undef HAVE_CURSESX_H
+-#undef HAVE_CURSES_VERSION	/* CF_FUNC_CURSES_VERSION */
++#undef HAVE_CURSES_VERSION
  #undef HAVE_CUSERID
 -#undef HAVE_DCGETTEXT		/* AM_GNU_GETTEXT */
 +#undef HAVE_DCGETTEXT
@@ -136,7 +139,7 @@
 -#undef HAVE_FCNTL_H		/* have <fcntl.h> */
 +#undef HAVE_DELSCREEN
 +#undef HAVE_DIRENT_H
-+#undef HAVE_FCNTL_H	
++#undef HAVE_FCNTL_H
  #undef HAVE_FTIME
 -#undef HAVE_GAI_STRERROR	/* CF_CHECK_IPV6 */
 -#undef HAVE_GETADDRINFO		/* CF_CHECK_IPV6 */
@@ -166,7 +169,7 @@
 -#undef HAVE_LIBINTL_H		/* AM_GNU_GETTEXT, or cleanup from that */
 -#undef HAVE_LIBUTF8_H		/* may be needed for libncursesw */
 +#undef HAVE_LANGINFO_CODESET
-+#undef HAVE_LC_MESSAGES	
++#undef HAVE_LC_MESSAGES
 +#undef HAVE_LIBDBMALLOC
 +#undef HAVE_LIBDMALLOC
 +#undef HAVE_LIBGETTEXT_H
@@ -194,13 +197,13 @@
 -#undef HAVE_NCURSES_TERM_H	/* have <ncurses/term.h> */
 +#undef HAVE_NCURSESW_NCURSES_H
 +#undef HAVE_NCURSESW_TERM_H
-+#undef HAVE_NCURSES_H	
++#undef HAVE_NCURSES_H
 +#undef HAVE_NCURSES_NCURSES_H
 +#undef HAVE_NCURSES_TERM_H
  #undef HAVE_NEWPAD
  #undef HAVE_NEWTERM
 -#undef HAVE_NL_TYPES_H		/* AM_GNU_GETTEXT */
-+#undef HAVE_NL_TYPES_H	
++#undef HAVE_NL_TYPES_H
  #undef HAVE_PNOUTREFRESH
  #undef HAVE_POPEN
  #undef HAVE_PUTENV
@@ -214,7 +217,7 @@
 -#undef HAVE_SIGACTION		/* CF_FUNC_SIGACTION */
 -#undef HAVE_SIZECHANGE		/* CF_SIZECHANGE */
 -#undef HAVE_STDARG_H		/* CF_VARARGS */
-+#undef HAVE_SIGACTION	
++#undef HAVE_SIGACTION
 +#undef HAVE_SIZECHANGE
 +#undef HAVE_STDARG_H
  #undef HAVE_STDLIB_H
@@ -240,7 +243,7 @@
 -#undef HAVE_TERMIO_H		/* have <termio.h> */
 -#undef HAVE_TERM_H		/* have <term.h> */
 +#undef HAVE_SYSV_TOUCHLINE
-+#undef HAVE_SYS_DIR_H	
++#undef HAVE_SYS_DIR_H
 +#undef HAVE_SYS_FCNTL_H
 +#undef HAVE_SYS_FILIO_H
 +#undef HAVE_SYS_IOCTL_H
@@ -259,9 +262,13 @@
 -#undef HAVE_TYPE_UNIONWAIT	/* CF_UNION_WAIT */
 -#undef HAVE_UNISTD_H		/* have <unistd.h> */
 +#undef HAVE_TYPE_UNIONWAIT
-+#undef HAVE_UNISTD_H	
++#undef HAVE_UNISTD_H
  #undef HAVE_UNSETENV
 -#undef HAVE_USE_DEFAULT_COLORS	/* ncurses extension */
+-#undef HAVE_USE_LEGACY_CODING	/* ncurses extension */
++#undef HAVE_USE_DEFAULT_COLORS
++#undef HAVE_USE_LEGACY_CODING
+ #undef HAVE_USLEEP
 -#undef HAVE_UTMP		/* CF_UTMP */
 -#undef HAVE_UTMP_UT_HOST	/* CF_UTMP_UT_HOST */
 -#undef HAVE_UTMP_UT_SESSION	/* CF_UTMP_UT_SESSION */
@@ -269,13 +276,12 @@
 -#undef HAVE_UTMP_UT_XTIME	/* CF_UTMP_UT_XTIME */
 -#undef HAVE_VALUES_H		/* AM_GNU_GETTEXT */
 -#undef HAVE_VARARGS_H		/* CF_VARARGS */
-+#undef HAVE_USE_DEFAULT_COLORS
-+#undef HAVE_UTMP	
++#undef HAVE_UTMP
 +#undef HAVE_UTMP_UT_HOST
 +#undef HAVE_UTMP_UT_SESSION
 +#undef HAVE_UTMP_UT_XSTATUS
 +#undef HAVE_UTMP_UT_XTIME
-+#undef HAVE_VALUES_H	
++#undef HAVE_VALUES_H
 +#undef HAVE_VARARGS_H
  #undef HAVE_VASPRINTF
 -#undef HAVE_VFORK_H		/* have <vfork.h> */
@@ -286,6 +292,8 @@
  #undef HAVE_WREDRAWLN
  #undef HAVE_WRESIZE
 -#undef HAVE_XCURSES		/* CF_PDCURSES_X11 */
++#undef HAVE_XCURSES
+ #undef HAVE_ZERROR
 -#undef HAVE___ARGZ_COUNT	/* AM_GNU_GETTEXT */
 -#undef HAVE___ARGZ_NEXT		/* AM_GNU_GETTEXT */
 -#undef HAVE___ARGZ_STRINGIFY	/* AM_GNU_GETTEXT */
@@ -297,8 +305,8 @@
 -#undef LOCALE			/* for locale support */
 -#undef LONG_LIST		/* CF_ARG_DISABLE(long-list) */
 -#undef LYNXCGI_LINKS		/* CF_ARG_ENABLE(cgi-links) */
--#undef LYNX_CFG_FILE		/* $libdir/lynx.cfg */
--#undef LYNX_LSS_FILE		/* $libdir/lynx.lss */
+-#undef LYNX_CFG_FILE		/* $sysconfdir/lynx.cfg */
+-#undef LYNX_LSS_FILE		/* $sysconfdir/lynx.lss */
 -#undef LYNX_RAND_MAX		/* CF_SRAND */
 -#undef LY_FIND_LEAKS		/* CF_ARG_ENABLE(find-leaks) */
 -#undef LY_TRACELINE		/* CF_ARG_ENABLE(vertrace) */
@@ -318,17 +326,16 @@
 -#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_XCURSES
 +#undef HAVE___ARGZ_COUNT
-+#undef HAVE___ARGZ_NEXT	
-+#undef HAVE___ARGZ_STRINGIFY	
-+#undef IGNORE_CTRL_C	
++#undef HAVE___ARGZ_NEXT
++#undef HAVE___ARGZ_STRINGIFY
++#undef IGNORE_CTRL_C
 +#undef INCLUDE_PROTOTYPES
-+#undef INSTALL_ARGS	
++#undef INSTALL_ARGS
 +#undef INSTALL_PATH
-+#undef LINUX	
++#undef LINUX
 +#undef LOCALE
-+#undef LONG_LIST	
++#undef LONG_LIST
 +#undef LYNXCGI_LINKS
 +#undef LYNX_CFG_FILE
 +#undef LYNX_LSS_FILE
@@ -336,33 +343,35 @@
 +#undef LY_FIND_LEAKS
 +#undef LY_TRACELINE
 +#undef MKDIR_PATH
-+#undef MV_PATH	
++#undef MV_PATH
 +#undef NCURSES
 +#undef NCURSES_BROKEN
 +#undef NEED_PTEM_H
 +#undef NEED_REMOVE
 +#undef NEED_WCHAR_H
-+#undef NGROUPS	
++#undef NGROUPS
 +#undef NO_CHANGE_EXECUTE_PERMS
-+#undef NO_CONFIG_INFO	
++#undef NO_CONFIG_INFO
 +#undef NO_EXTENDED_HTMLDTD
-+#undef NO_LYNX_TRACE	
++#undef NO_LYNX_TRACE
 +#undef NO_OPTION_FORMS
 +#undef NO_OPTION_MENU
 +#undef NO_PARENT_DIR_REFERENCE
-+#undef NSL_FORK		
++#undef NSL_FORK
  #undef OK_INSTALL
 -#undef OK_OVERRIDE		/* CF_ARG_DISABLE(dired-override) */
 -#undef OK_PERMIT		/* CF_ARG_DISABLE(dired-permit) */
 -#undef REAL_UNIX_SYSTEM		/* CF_SLANG_UNIX_DEFS */
 -#undef RLOGIN_PATH		/* CF_PATH_PROG(rlogin) */
 -#undef RM_PATH			/* CF_PATH_PROG(rm) */
+-#undef SETFONT_PATH		/* CF_PATH_PROG(setfont) */
 -#undef SOCKS			/* CF_SOCKS, CF_SOCKS5 */
 +#undef OK_OVERRIDE
 +#undef OK_PERMIT
 +#undef REAL_UNIX_SYSTEM
 +#undef RLOGIN_PATH
-+#undef RM_PATH	
++#undef RM_PATH
++#undef SETFONT_PATH
 +#undef SOCKS
  #undef STDC_HEADERS
 -#undef SYSTEM_MAIL		/* CF_DEFINE_PROG */
@@ -381,20 +390,20 @@
 -#undef ULTRIX			/* config.sub */
 -#undef UNCOMPRESS_PATH		/* CF_PATH_PROG(gunzip) */
 -#undef UNDERLINE_LINKS		/* CF_ARG_ENABLE(underlines) */
-+#undef SYSTEM_MAIL	
++#undef SYSTEM_MAIL
 +#undef SYSTEM_MAIL_FLAGS
 +#undef SYSTEM_NAME
-+#undef TAR_DOWN_OPTIONS	
++#undef TAR_DOWN_OPTIONS
 +#undef TAR_FILE_OPTIONS
-+#undef TAR_PATH	
-+#undef TAR_PIPE_OPTIONS	
++#undef TAR_PATH
++#undef TAR_PIPE_OPTIONS
 +#undef TAR_UP_OPTIONS
 +#undef TELNET_PATH
 +#undef TERMIO_AND_CURSES
 +#undef TERMIO_AND_TERMIOS
-+#undef TN3270_PATH	
++#undef TN3270_PATH
 +#undef TOUCH_PATH
-+#undef ULTRIX	
++#undef ULTRIX
 +#undef UNCOMPRESS_PATH
 +#undef UNDERLINE_LINKS
  #undef UNIX
@@ -436,6 +445,7 @@
 -#undef mode_t			/* AC_TYPE_MODE_T */
 -#undef off_t			/* AC_TYPE_OFF_T */
 -#undef pid_t			/* AC_TYPE_PID_T */
+-#undef socklen_t		/* CF_CHECK_TYPE(socklen_t,...) */
 -#undef uid_t			/* AC_TYPE_UID_T */
 -#undef ut_name			/* CF_UTMP */
 -#undef ut_xstatus		/* CF_UTMP_UT_XSTATUS */
@@ -444,44 +454,45 @@
 +#undef USE_BZLIB
 +#undef USE_COLOR_STYLE
 +#undef USE_DEFAULT_COLORS
-+#undef USE_EXECVP	
++#undef USE_EXECVP
 +#undef USE_EXTERNALS
 +#undef USE_FCNTL
-+#undef USE_FILE_UPLOAD	
++#undef USE_FILE_UPLOAD
 +#undef USE_GNUTLS_INCL
 +#undef USE_OPENSSL_INCL
-+#undef USE_PERSISTENT_COOKIES	
-+#undef USE_PRETTYSRC	
++#undef USE_PERSISTENT_COOKIES
++#undef USE_PRETTYSRC
 +#undef USE_READPROGRESS
 +#undef USE_SCROLLBAR
 +#undef USE_SLANG
 +#undef USE_SOCKS4_PREFIX
 +#undef USE_SOCKS5
 +#undef USE_SOURCE_CACHE
-+#undef USE_SSL	
-+#undef USE_SYSV_UTMP	
++#undef USE_SSL
++#undef USE_SYSV_UTMP
 +#undef USE_X509_SUPPORT
-+#undef USE_ZLIB	
++#undef USE_ZLIB
 +#undef UTF8
 +#undef UTMPX_FOR_UTMP
 +#undef UUDECODE_PATH
 +#undef WAITPID_USES_UNION
-+#undef WAIT_USES_UNION	
++#undef WAIT_USES_UNION
 +#undef WIDEC_CURSES
-+#undef XCURSES	
++#undef XCURSES
 +#undef ZCAT_PATH
-+#undef ZIP_PATH	
-+#undef _ALL_SOURCE		
-+#undef inline		
++#undef ZIP_PATH
++#undef _ALL_SOURCE
++#undef inline
 +#undef lynx_rand
 +#undef lynx_srand
-+#undef mode_t	
++#undef mode_t
 +#undef off_t
 +#undef pid_t
++#undef socklen_t
 +#undef uid_t
-+#undef ut_name	
++#undef ut_name
 +#undef ut_xstatus
-+#undef ut_xtime	
++#undef ut_xtime
  
  #ifdef GZIP_PATH
 -#undef OK_GZIP			/* CF_ARG_DISABLE(dired-gzip) */
@@ -500,7 +511,7 @@
  
  #ifdef ZIP_PATH
 -#undef OK_ZIP			/* CF_ARG_DISABLE(dired-zip) */
-+#undef OK_ZIP	
++#undef OK_ZIP
  #endif
  
  /*
@@ -512,7 +523,7 @@
  #endif
  
  /* 'const' may be defined externally by the compiler-wrapper, as in 'unproto'
-@@ -316,7 +316,7 @@
+@@ -324,7 +324,7 @@
  #endif
  
  #ifdef HAVE_SYSLOG_H
@@ -521,15 +532,15 @@
  #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)'
- 
+#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: SOURCES/lynx-autoconf.patch
diff -u SOURCES/lynx-autoconf.patch:1.8 SOURCES/lynx-autoconf.patch:1.9
--- SOURCES/lynx-autoconf.patch:1.8	Sun Jun 12 13:52:37 2005
+++ SOURCES/lynx-autoconf.patch	Mon Feb 26 23:06:48 2007
@@ -20,10 +20,9 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_INET_ADDR version: 4 updated: 1999/03/30 12:24:31
  dnl ------------
-diff -burN lynx2-8-5.orig/configure.in lynx2-8-5/configure.in
---- lynx2-8-5.orig/configure.in	2004-02-14 22:10:58.364425200 +0100
-+++ lynx2-8-5/configure.in	2004-02-14 22:13:35.179585672 +0100
-@@ -16,7 +16,6 @@
+--- 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 @@
  # run to the next, as well as with tests that are order-dependent.
  rm -f config.cache
  
@@ -31,7 +30,7 @@
  AC_INIT(userdefs.h)
  
  # autoconf 2.5x defaults to no cache file; we need the cache file's information
-@@ -75,9 +74,6 @@
+@@ -101,9 +100,6 @@
  dnl Debug/development/test
  dnl --------------------------------------------------------------------------
  
@@ -41,17 +40,17 @@
  CF_DISABLE_ECHO
  
  # special case for WWW/*
-@@ -308,9 +304,6 @@
+@@ -335,9 +331,6 @@
  dnl --------------------------------------------------------------------------
  dnl --------------------------------------------------------------------------
  
 -CF_HELP_MESSAGE(
 -Basic Configuration Options:)
 -
- dnl internationalization macros
- CF_BUNDLED_INTL(makefile,disable)
+ CF_LARGEFILE
  
-@@ -609,9 +602,6 @@
+ dnl internationalization macros
+@@ -658,9 +651,6 @@
  dnl Experimental options that don't need to test system features
  dnl --------------------------------------------------------------------------
  
@@ -61,7 +60,7 @@
  AC_MSG_CHECKING(if bibp: URLs should be supported)
  CF_ARG_DISABLE(bibp-urls,
  [  --disable-bibp-urls     disable support for bibp: URLs],
-@@ -787,9 +777,6 @@
+@@ -849,9 +839,6 @@
  dnl Miscellaneous options that don't need to test system features
  dnl --------------------------------------------------------------------------
  
@@ -71,16 +70,7 @@
  AC_MSG_CHECKING(if alternative line-edit bindings should be used)
  CF_ARG_ENABLE(alt-bindings,
  [  --disable-alt-bindings  disable alternative line-edit bindings],
-@@ -862,7 +849,7 @@
- AC_MSG_RESULT($use_externs)
- if test $use_externs != "no" ; then
- 	AC_DEFINE(USE_EXTERNALS)
--	LIBOBJS="$LIBOBJS LYExtern\$o"
-+	AC_LIBOBJ([LYExtern])
- fi
- 
- AC_MSG_CHECKING(if you want to use setfont support)
-@@ -1008,9 +995,6 @@
+@@ -1095,9 +1082,6 @@
  dnl DirEd (directory-editor) options
  dnl --------------------------------------------------------------------------
  
@@ -90,16 +80,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)
-@@ -1021,7 +1005,7 @@
- AC_MSG_RESULT($use_dired)
- 
- if test ".$use_dired" != ".no" ; then
--	LIBOBJS="$LIBOBJS LYLocal\$o"
-+	AC_LIBOBJ([LYLocal])
- 	AC_DEFINE(DIRED_SUPPORT)
- 
- 	AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd)
-@@ -1131,7 +1115,6 @@
+@@ -1218,7 +1202,6 @@
  AC_SUBST(COMPRESS_EXT)
  
  if test $cf_cv_screen = pdcurses ; then

================================================================
Index: SOURCES/lynx-config.patch
diff -u SOURCES/lynx-config.patch:1.9 SOURCES/lynx-config.patch:1.10
--- SOURCES/lynx-config.patch:1.9	Sun Jan 18 21:58:27 2004
+++ SOURCES/lynx-config.patch	Mon Feb 26 23:06:48 2007
@@ -1,24 +1,3 @@
-diff -Nur lynx2-8-4.orig/configure.in lynx2-8-4/configure.in
---- lynx2-8-4.orig/configure.in	Sun Jun 10 16:24:29 2001
-+++ lynx2-8-4/configure.in	Sun Jun 10 16:16:44 2001
-@@ -434,7 +434,7 @@
- cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
- 
- AC_MSG_CHECKING(for location of config-file)
--LYNX_CFG_FILE=$cf_libdir/lynx.cfg
-+LYNX_CFG_FILE=$sysconfdir/lynx.cfg
- AC_DEFINE_UNQUOTED(LYNX_CFG_FILE,"$LYNX_CFG_FILE")
- AC_MSG_RESULT($LYNX_CFG_FILE)
- 
-@@ -696,7 +696,7 @@
- 	AC_MSG_RESULT(yes)
- 
- 	AC_MSG_CHECKING(for location of style-sheet file)
--	LYNX_LSS_FILE=$cf_libdir/lynx.lss
-+	LYNX_LSS_FILE=$datadir/lynx/lynx.lss
- 	AC_DEFINE_UNQUOTED(LYNX_LSS_FILE,"$LYNX_LSS_FILE")
- 	AC_MSG_RESULT($LYNX_LSS_FILE)
- 	INSTALL_LSS=install-lss
 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
@@ -71,29 +50,18 @@
  
  .h2 DEFAULT_INDEX_FILE
  # DEFAULT_INDEX_FILE is the default file retrieved when the
-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,15 +48,15 @@
- MANDIR= $(DESTDIR)$(mandir)
- 
- ## Where you want the lynx.cfg file installed
--libdir= @libdir@
-+libdir= @sysconfdir@
- LIBDIR= $(DESTDIR)$(libdir)
- 
- ## Where you want the doc-files installed
--docdir= @libdir@/lynx_doc
-+docdir= @datadir@/lynx_doc
+--- 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)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lynx-acfix.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/lynx-autoconf.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/lynx-config.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SOURCES/lynx-etc_dir.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/lynx-gzip_fallback.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list