Initial import

9 files changed, 489 insertions, 0 deletions

diff --git a/package/lynx/Config.in b/package/lynx/Config.in
new file mode 100644
index 000000000..0b12bc0bb
--- /dev/null
+++ b/package/lynx/Config.in
@@ -0,0 +1,11 @@
+config ADK_PACKAGE_LYNX
+	prompt "lynx.............................. Standard text browser"
+	tristate
+	default n
+	select ADK_PACKAGE_LIBNCURSES
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_CA_CERTS
+	help
+	  The standard text-based world wide web browser.
+	  
+	  http://lynx.isc.org/current/
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
new file mode 100644
index 000000000..7ac1ab7f6
--- /dev/null
+++ b/package/lynx/Makefile
@@ -0,0 +1,103 @@
+# $Id$
+#-
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME=		lynx
+PKG_VERSION=		2.8.7dev.7
+PKG_RELEASE=		1
+PKG_MD5SUM=		83891107c873421e5ac917cc0ab53fe8
+MASTER_SITES=		http://lynx.isc.org/current/ \
+			${MASTER_SITE_MIRBSD}
+DISTFILES=		${PKG_NAME}${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/lynx2-8-7
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+
+CONFIGURE_STYLE=	gnu
+TCPPFLAGS+=		-DLYNX_VERSION=\"${PKG_VERSION}-OpenADK-${PKG_RELEASE}\"
+# do not hardcode paths; do not scan for ports stuff
+CONFIGURE_ENV+=		ac_cv_path_TELNET=telnet \
+			ac_cv_path_TN3270=tn3270 \
+			ac_cv_path_RLOGIN=rlogin \
+			ac_cv_path_MV=mv \
+			ac_cv_path_GZIP=gzip \
+			ac_cv_path_UNCOMPRESS=gunzip \
+			ac_cv_path_UNZIP=unzip \
+			ac_cv_path_BZIP2=bzip2 \
+			ac_cv_path_TAR=tar \
+			ac_cv_path_COMPRESS=compress \
+			ac_cv_path_RM=rm \
+			ac_cv_path_UUDECODE=uudecode \
+			ac_cv_path_ZCAT=zcat \
+			ac_cv_path_ZIP=zip
+# from MirPorts Framework
+CONFIGURE_ARGS+=	--enable-vertrace \
+			--enable-warnings \
+			--disable-nls \
+			--disable-full-paths \
+			--with-ssl=/usr \
+			--without-gnutls \
+			--without-socks \
+			--without-socks5 \
+			--with-screen=ncursesw \
+			--enable-widec \
+			--enable-addrlist-page \
+			--enable-charset-choice \
+			--enable-cjk \
+			--enable-japanese-utf8 \
+			--enable-color-style \
+			--disable-default-colors \
+			--disable-htmlized-cfg \
+			--enable-ipv6 \
+			--enable-kbd-layout \
+			--enable-locale-charset \
+			--enable-nested-tables \
+			--disable-scrollbar \
+			--enable-justify-elts \
+			--enable-internal-links \
+			--enable-nsl-fork \
+			--enable-underlines \
+			--without-bzlib \
+			--with-zlib \
+			--without-x
+# local stuff
+CONFIGURE_ARGS+=	--with-ssl=${STAGING_DIR}/usr \
+			--disable-full-paths \
+			--with-cfg-file=/etc/lynx.cfg \
+			--with-lss-file=/etc/lynx.lss \
+			--disable-font-switch
+TCPPFLAGS+=		-I${STAGING_DIR}/include/openssl
+TCPPFLAGS+=		-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
+# needs libiconv
+CONFIGURE_ARGS+=	--disable-japanese-utf8
+# shrink size
+CONFIGURE_ARGS+=	--disable-vertrace \
+			--disable-trace \
+			--disable-cjk \
+			--disable-kbd-layout \
+			--disable-prettysrc \
+			--disable-finger \
+			--disable-dired
+ifeq (${ADK_UNICODE},)
+CONFIGURE_ARGS+=	--with-screen=ncurses \
+			--disable-widec \
+			--disable-locale-charset
+endif
+ifneq (${ADK_IPV6},y)
+CONFIGURE_ARGS+=	--disable-ipv6
+endif
+MAKE_FILE=		makefile
+BUILD_STYLE=		auto
+INSTALL_STYLE=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_LYNX}/etc ${IDIR_LYNX}/usr/bin
+	${CP} ${WRKINST}/etc/lynx.{cfg,lss} ${IDIR_LYNX}/etc
+	${CP} ${WRKINST}/usr/bin/lynx ${IDIR_LYNX}/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lynx/ipkg/lynx.control b/package/lynx/ipkg/lynx.control
new file mode 100644
index 000000000..7ee22ce73
--- /dev/null
+++ b/package/lynx/ipkg/lynx.control
@@ -0,0 +1,5 @@
+Package: lynx
+Priority: base
+Section: www
+Description: Standard text browser
+Depends: libncurses, libopenssl
diff --git a/package/lynx/patches/patch-config_hin b/package/lynx/patches/patch-config_hin
new file mode 100644
index 000000000..63312839d
--- /dev/null
+++ b/package/lynx/patches/patch-config_hin
@@ -0,0 +1,17 @@
+$MirOS: ports/www/lynx/patches/patch-config_hin,v 1.1 2007/08/03 16:01:22 tg Exp $
+
+	This will expand to
+	| #define ICONV_CONST <tabs> AM_ICONV */
+	otherwise.
+
+--- lynx2-8-7/config.hin.orig	Thu Aug  2 23:24:04 2007
++++ lynx2-8-7/config.hin	Fri Aug  3 15:58:53 2007
+@@ -176,7 +176,7 @@
+ #undef HAVE___ARGZ_COUNT	/* AM_GNU_GETTEXT */
+ #undef HAVE___ARGZ_NEXT		/* AM_GNU_GETTEXT */
+ #undef HAVE___ARGZ_STRINGIFY	/* AM_GNU_GETTEXT */
+-#undef ICONV_CONST		/* AM_ICONV */
++#undef ICONV_CONST
+ #undef IGNORE_CTRL_C		/* FIXME: make tests? */
+ #undef INCLUDE_PROTOTYPES	/* CF_SOCKS5 */
+ #undef INSTALL_ARGS		/* CF_PATH_PROG(install) */
diff --git a/package/lynx/patches/patch-lynx_cfg b/package/lynx/patches/patch-lynx_cfg
new file mode 100644
index 000000000..ebdfe4e43
--- /dev/null
+++ b/package/lynx/patches/patch-lynx_cfg
@@ -0,0 +1,236 @@
+$Id$
+$MirOS: ports/www/lynx/patches/patch-lynx_cfg,v 1.7 2007/05/20 12:06:19 tg Exp $
+
+	mostly site policy and compatibility, usability
+
+--- lynx2-8-7/lynx.cfg.orig	Thu May 17 22:52:59 2007
++++ lynx2-8-7/lynx.cfg	Sun May 20 11:17:21 2007
+@@ -93,12 +93,12 @@
+ #
+ # 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/
+ #
+ # As an alternative, you may want to use a local URL.  A good choice for this is
+ # the user's home directory:
+ .ex
+-#STARTFILE:file://localhost/~/
++STARTFILE:file://localhost/~/
+ #
+ # Your choice of STARTFILE should reflect your site's needs, and be a URL that
+ # you can connect to reliably.  Otherwise users will become confused and think
+@@ -409,7 +409,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # values and their relationship to the locale value is not.  GNU libiconv
+ # happens to give useful values, but other implementations are not guaranteed
+ # to do this.
+-#LOCALE_CHARSET:FALSE
++LOCALE_CHARSET:TRUE
+ 
+ 
+ .h2 ASSUME_CHARSET
+@@ -424,7 +424,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # ASSUME_CHARSET can also be changed via the 'o'ptions menu but will
+ # not be saved as permanent value in user's .lynxrc file to avoid more chaos.
+ #
+-#ASSUME_CHARSET:iso-8859-1
++ASSUME_CHARSET:utf-8
+ 
+ 
+ .h2 ASSUMED_DOC_CHARSET_CHOICE
+@@ -552,7 +552,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # the 'o'ptions menu and save that preference in their RC file.
+ # This may be a comma-separated list of languages in decreasing preference.
+ #
+-#PREFERRED_LANGUAGE:en
++#PREFERRED_LANGUAGE:
+ 
+ 
+ .h2 PREFERRED_CHARSET
+@@ -571,7 +571,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # the sending of an unacceptable response is also allowed.  See RFC 2068
+ # (http://www.ics.uci.edu/pub/ietf/uri/rfc2068.txt).
+ #
+-#PREFERRED_CHARSET:
++PREFERRED_CHARSET:utf-8
+ 
+ 
+ .h2 CHARSETS_DIRECTORY
+@@ -652,22 +652,22 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # Set the threshold # of lines Lynx must render before it
+ # redraws the screen in PARTIAL mode.  Anything < 0 implies
+ # use of the screen size.
+-#PARTIAL_THRES:-1
++PARTIAL_THRES:3
+ 
+ 
+ .h2 SHOW_KB_RATE
+ # While getting large files, Lynx shows the approximate rate of transfer.
+-# Set this to change the units shown.  "Kilobytes" denotes 1024 bytes:
++# Set this to change the units shown.
+ #	NONE to disable the display of transfer rate altogether.
+-#	TRUE or KB for Kilobytes/second.
++#	TRUE or KB for Kibibytes/second.
+ #	FALSE or BYTES for bytes/second.
+-#	KB,ETA to show Kilobytes/second with estimated completion time.
+-#	BYTES,ETA to show BYTES/second with estimated completion time.
++#	KB,ETA to show Kibibytes/second with estimated completion time.
++#	BYTES,ETA to show bytes/second with estimated completion time.
+ # Note that the "ETA" values are available if USE_READPROGRESS was defined.
+-#SHOW_KB_RATE:TRUE
++SHOW_KB_RATE:BYTES,ETA
+ 
+ .h2 SHOW_KB_NAME
+-# Set the abbreviation for Kilobytes (1024).
++# Set the abbreviation for Kibibytes (1024 Bytes).
+ # Quoting from
+ #	http://www.romulus2.com/articles/guides/misc/bitsbytes.shtml
+ # In December 1998, the International Electrotechnical Commission (IEC)
+@@ -677,9 +677,6 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # metric prefixes and adding the first two letters of the word "binary".  Thus,
+ # for instance, instead of Kilobyte (KB) or Gigabyte (GB), the new terms would
+ # be kibibyte (KiB) or gibibyte (GiB).
+-#
+-# If you prefer using the conventional (and more common) "KB", modify this
+-# setting.
+ #SHOW_KB_NAME:KiB
+ 
+ .h1 Timeouts
+@@ -1076,7 +1073,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # default or that defined here can be toggled via the -force_secure
+ # command line switch.
+ #
+-#FORCE_SSL_COOKIES_SECURE:FALSE
++FORCE_SSL_COOKIES_SECURE:TRUE
+ 
+ 
+ .h1 Internal Behavior
+@@ -1263,7 +1260,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # line break.  Note that the valid way to insert extra blank lines in HTML
+ # is via a PRE block with only newlines in the block.
+ #
+-#COLLAPSE_BR_TAGS:TRUE
++COLLAPSE_BR_TAGS:FALSE
+ 
+ 
+ .h2 TAGSOUP
+@@ -1366,7 +1363,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # The default is FALSE, so that the feature needs to be enabled here
+ # explicitly if you want it.
+ #
+-#PERSISTENT_COOKIES:FALSE
++PERSISTENT_COOKIES:TRUE
+ 
+ 
+ .h2 COOKIE_FILE
+@@ -1920,7 +1917,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/
+ # prefer the more conservative action of requiring an explicit Y or y to
+ # confirm.  The default defined here will override that in userdefs.h.
+ #
+-#QUIT_DEFAULT_YES:TRUE
++QUIT_DEFAULT_YES:FALSE
+ 
+ 
+ .h1 HTML Parsing
+@@ -3208,7 +3205,7 @@ COLOR:6:brightred:black
+ # otherwise. Set this setting to TRUE if you prefer numbered links, but wish
+ # to get valid HTML source when printing or mailing when in psrc view.
+ # Default is FALSE.
+-#PRETTYSRC_VIEW_NO_ANCHOR_NUMBERING:FALSE
++PRETTYSRC_VIEW_NO_ANCHOR_NUMBERING:TRUE
+ 
+ 
+ .h1 HTML Parsing
+@@ -3241,13 +3238,11 @@ COLOR:6:brightred:black
+ 
+ .h2 JUSTIFY
+ # JUSTIFY - Appearance
+-# This option mirrors command-line option with same name.  Default is TRUE.  If
+-# true, most of text (except headers and like this) will be justified.  This
+-# has no influence on CJK text rendering.
++# This option mirrors command-line option with same name.  Default is FALSE.
++# If true, most of text (except headers and like this) will be justified.
++# This has no influence on CJK text rendering.
+ #
+-# This option is only available if Lynx was compiled with EXP_JUSTIFY_ELTS.
+-#
+-#JUSTIFY:FALSE
++JUSTIFY:TRUE
+ 
+ .h2 JUSTIFY_MAX_VOID_PERCENT
+ # JUSTIFY_MAX_VOID_PERCENT - Appearance
+@@ -3275,7 +3270,7 @@ COLOR:6:brightred:black
+ # explicit activation can also be requested with the -tna command line
+ # option.
+ #
+-#TEXTFIELDS_NEED_ACTIVATION:FALSE
++TEXTFIELDS_NEED_ACTIVATION:TRUE
+ 
+ .h2 LEFTARROW_IN_TEXTFIELD_PROMPT
+ # LEFTARROW_IN_TEXTFIELD_PROMPT
+@@ -3285,7 +3280,7 @@ COLOR:6:brightred:black
+ # only if the contents of the fields have been changed since entering it.
+ # If set to TRUE, the confirmation prompt is always issued.
+ #
+-#LEFTARROW_IN_TEXTFIELD_PROMPT:FALSE
++LEFTARROW_IN_TEXTFIELD_PROMPT:TRUE
+ 
+ 
+ .h1 Timeouts
+@@ -3322,7 +3317,7 @@ COLOR:6:brightred:black
+ # one lynx.cfg setting.
+ .nf
+ #ENABLE_LYNXRC:accept_all_cookies:ON
+-#ENABLE_LYNXRC:assume_charset:OFF
++ENABLE_LYNXRC:assume_charset:ON
+ #ENABLE_LYNXRC:bookmark_file:ON
+ #ENABLE_LYNXRC:case_sensitive_searching:ON
+ #ENABLE_LYNXRC:character_set:ON
+@@ -3337,34 +3332,35 @@ COLOR:6:brightred:black
+ #ENABLE_LYNXRC:emacs_keys:ON
+ #ENABLE_LYNXRC:file_editor:ON
+ #ENABLE_LYNXRC:file_sorting_method:ON
+-#ENABLE_LYNXRC:force_cookie_prompt:OFF
+-#ENABLE_LYNXRC:force_ssl_prompt:OFF
+-#ENABLE_LYNXRC:ftp_passive:OFF
++ENABLE_LYNXRC:force_cookie_prompt:ON
++ENABLE_LYNXRC:force_ssl_prompt:ON
++ENABLE_LYNXRC:ftp_passive:ON
+ #ENABLE_LYNXRC:kblayout:ON
+ #ENABLE_LYNXRC:keypad_mode:ON
+ #ENABLE_LYNXRC:lineedit_mode:ON
+ #ENABLE_LYNXRC:locale_charset:ON
+-#ENABLE_LYNXRC:make_links_for_all_images:OFF
+-#ENABLE_LYNXRC:make_pseudo_alts_for_inlines:OFF
++ENABLE_LYNXRC:make_links_for_all_images:ON
++ENABLE_LYNXRC:make_pseudo_alts_for_inlines:ON
+ #ENABLE_LYNXRC:multi_bookmark:ON
+ #ENABLE_LYNXRC:personal_mail_address:ON
+ #ENABLE_LYNXRC:preferred_charset:ON
+-#ENABLE_LYNXRC:preferred_encoding:OFF
++ENABLE_LYNXRC:preferred_encoding:ON
+ #ENABLE_LYNXRC:preferred_language:ON
+-#ENABLE_LYNXRC:preferred_media_types:OFF
+-#ENABLE_LYNXRC:raw_mode:OFF
++ENABLE_LYNXRC:preferred_media_types:ON
++ENABLE_LYNXRC:raw_mode:ON
+ #ENABLE_LYNXRC:run_all_execution_links:ON
+ #ENABLE_LYNXRC:run_execution_links_on_local_files:ON
+-#ENABLE_LYNXRC:scrollbar:OFF
++ENABLE_LYNXRC:scrollbar:ON
+ #ENABLE_LYNXRC:select_popups:ON
+-#ENABLE_LYNXRC:set_cookies:OFF
++ENABLE_LYNXRC:set_cookies:ON
+ #ENABLE_LYNXRC:show_color:ON
+ #ENABLE_LYNXRC:show_cursor:ON
+ #ENABLE_LYNXRC:show_dotfiles:ON
+-#ENABLE_LYNXRC:show_kb_rate:OFF
++ENABLE_LYNXRC:show_kb_name:OFF
++ENABLE_LYNXRC:show_kb_rate:ON
+ #ENABLE_LYNXRC:sub_bookmarks:ON
+ #ENABLE_LYNXRC:tagsoup:OFF
+-#ENABLE_LYNXRC:underline_links:OFF
++ENABLE_LYNXRC:underline_links:ON
+ #ENABLE_LYNXRC:user_mode:ON
+ #ENABLE_LYNXRC:useragent:OFF
+ #ENABLE_LYNXRC:verbose_images:ON
diff --git a/package/lynx/patches/patch-makefile_in b/package/lynx/patches/patch-makefile_in
new file mode 100644
index 000000000..b0a79fe71
--- /dev/null
+++ b/package/lynx/patches/patch-makefile_in
@@ -0,0 +1,22 @@
+$Id$
+$MirOS: ports/www/lynx/patches/patch-makefile_in,v 1.2 2007/05/20 12:06:19 tg Exp $
+--- lynx2-8-7/makefile.in.orig	Thu May 17 22:52:59 2007
++++ lynx2-8-7/makefile.in	Sun May 20 11:17:21 2007
+@@ -161,13 +161,13 @@ SITE_DEFS = # Your defines here
+ # for installation of local execution links, please see the file userdefs.h
+ 
+ WWW_CFLAGS = \
+-	LY_CFLAGS="$(CFLAGS)" \
+-	CPPFLAGS="$(CPPFLAGS)" \
++	LY_CFLAGS='${CFLAGS}' \
++	CPPFLAGS='${CPPFLAGS}' \
+ 	LYFLAGS="$(SITE_LYDEFS)"
+ 
+ SRC_CFLAGS = \
+-	CFLAGS="$(CFLAGS)" \
+-	CPPFLAGS="$(CPPFLAGS)" \
++	CFLAGS='${CFLAGS}' \
++	CPPFLAGS='${CPPFLAGS}' \
+ 	LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \
+ 	SITE_DEFS="$(SITE_DEFS)" \
+ 	WWWINC=$(WWWINC) \
diff --git a/package/lynx/patches/patch-samples_lynx_lss b/package/lynx/patches/patch-samples_lynx_lss
new file mode 100644
index 000000000..332552e9f
--- /dev/null
+++ b/package/lynx/patches/patch-samples_lynx_lss
@@ -0,0 +1,15 @@
+$MirOS: ports/www/lynx/patches/patch-samples_lynx_lss,v 1.2 2007/05/20 12:06:19 tg Exp $
+
+	usability
+
+--- lynx2-8-7/samples/lynx.lss.orig	Tue Sep 19 00:28:05 2006
++++ lynx2-8-7/samples/lynx.lss	Sun May 20 11:17:22 2007
+@@ -6,7 +6,7 @@
+ # If you really want the terminal's default colors, and if lynx is built using
+ # ncurses' default-color support, remove these two lines:
+ normal:		normal:			lightgray:black
+-default:	normal:			white:black
++default:	normal:			lightgray:black
+ 
+ # Normal type styles correspond to HTML tags.
+ #
diff --git a/package/lynx/patches/patch-src_LYUtils_c b/package/lynx/patches/patch-src_LYUtils_c
new file mode 100644
index 000000000..a0b6bd6b8
--- /dev/null
+++ b/package/lynx/patches/patch-src_LYUtils_c
@@ -0,0 +1,15 @@
+$MirOS: ports/www/lynx/patches/patch-src_LYUtils_c,v 1.3 2007/08/03 16:01:22 tg Exp $
+
+	Important for upstream too
+
+--- lynx2-8-7/src/LYUtils.c.orig	Thu Aug  2 23:24:04 2007
++++ lynx2-8-7/src/LYUtils.c	Fri Aug  3 15:59:06 2007
+@@ -5903,7 +5903,7 @@ static BOOL IsOurSymlink(const char *nam
+ 
+ 	    if (cutoff != 0) {
+ 		HTSprintf0(&clone, "%.*s%s%s",
+-			   cutoff - name,
++			   (int)(cutoff - name),
+ 			   name, PATHSEP_STR, buffer);
+ 		FREE(buffer);
+ 		buffer = clone;
diff --git a/package/lynx/patches/patch-userdefs_h b/package/lynx/patches/patch-userdefs_h
new file mode 100644
index 000000000..2f4c3475d
--- /dev/null
+++ b/package/lynx/patches/patch-userdefs_h
@@ -0,0 +1,65 @@
+$Id$
+$MirOS: ports/www/lynx/patches/patch-userdefs_h,v 1.9 2007/08/03 12:14:24 tg Exp $
+--- lynx2-8-7/userdefs.h.orig	Thu Aug  2 23:24:04 2007
++++ lynx2-8-7/userdefs.h	Fri Aug  3 12:01:19 2007
+@@ -461,7 +461,7 @@
+  * Normally we expect you will connect to a remote site, e.g., the Lynx starting
+  * site:
+  */
+-#define STARTFILE "http://lynx.isc.org/"
++/* #define STARTFILE "http://lynx.isc.org/" */
+ /*
+  * As an alternative, you may want to use a local URL.  A good choice for this
+  * is the user's home directory:
+@@ -471,6 +471,7 @@
+  * you can connect to reliably.  Otherwise users will become confused and think
+  * that they cannot run Lynx.
+  */
++#define STARTFILE "file://localhost/~/"
+ 
+ /*****************************
+  * HELPFILE must be defined as a URL and must have a
+@@ -727,7 +728,7 @@
+  * that preference in their RC file.  This may be a comma-separated list
+  * of languages in decreasing preference.
+  */
+-#define PREFERRED_LANGUAGE "en"
++#define PREFERRED_LANGUAGE ""
+ 
+ /*****************************
+  * PREFERRED_CHARSET specifies the character set in MIME notation (e.g.,
+@@ -802,8 +803,8 @@
+  * and use "http://" as the default (e.g., gopher.wfbr.edu or gopher.wfbr.
+  * will be made gopher://gopher.wfbr.edu).
+  */
+-#define URL_DOMAIN_PREFIXES "www."
+-#define URL_DOMAIN_SUFFIXES ".com,.edu,.net,.org"
++#define URL_DOMAIN_PREFIXES ""
++#define URL_DOMAIN_SUFFIXES ""
+ 
+ /********************************
+  * If LIST_NEWS_NUMBERS is set TRUE, Lynx will use an ordered list
+@@ -1371,7 +1372,9 @@
+  * the version definition with the Project Version on checkout.  Just
+  * ignore it. - kw */
+ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
++#ifndef LYNX_VERSION
+ #define LYNX_VERSION "2.8.7dev.7"
++#endif
+ #define LYNX_WWW_HOME "http://lynx.isc.org/"
+ #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
+ /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
+@@ -1559,11 +1562,11 @@
+ 
+ /*****************************
+  * Uncomment the following line to enable the kanji code override routine.
+- * The code can be changed by pressing ^L.  More precisely, this allows
++ * The code can be changed by pressing Shift-J.  More precisely, this allows
+  * the user to override the assumption about the kanji code for the document
+  * which Lynx has made on the basis of a META tag and HTTP response.
+  */
+-/*#define KANJI_CODE_OVERRIDE */
++#define KANJI_CODE_OVERRIDE
+ 
+ 
+ /****************************************************************