Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 57 insertions, 19 deletions

diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_www_tcp_h b/package/lynx/patches/patch-WWW_Library_Implementation_www_tcp_h
new file mode 100644
index 000000000..67bc96b3b
--- /dev/null
+++ b/package/lynx/patches/patch-WWW_Library_Implementation_www_tcp_h
@@ -0,0 +1,17 @@
+--- lynx2-8-7.orig/WWW/Library/Implementation/www_tcp.h	2007-08-03 01:24:27.000000000 +0200
++++ lynx2-8-7/WWW/Library/Implementation/www_tcp.h	2009-06-13 12:34:28.000000000 +0200
+@@ -777,12 +777,14 @@ Defaults
+ #ifndef NO_IOCTL
+ #include <sys/ioctl.h>		/* EJB */
+ #endif /* !NO_IOCTL */
++#ifndef HOSTBUILD
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #ifdef HAVE_ARPA_INET_H
+ #include <arpa/inet.h>		/* Must be after netinet/in.h */
+ #endif
+ #include <netdb.h>
++#endif
+ #endif /* TCP includes */
+ 
+ typedef unsigned short PortNumber;
diff --git a/package/lynx/patches/patch-config_hin b/package/lynx/patches/patch-config_hin
index 63312839d..3728e5f7a 100644
--- a/package/lynx/patches/patch-config_hin
+++ b/package/lynx/patches/patch-config_hin
@@ -1,11 +1,9 @@
-$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.
 
-	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
+--- lynx2-8-7.orig/config.hin	2007-08-03 01:24:27.000000000 +0200
++++ lynx2-8-7/config.hin	2009-06-13 11:46:29.000000000 +0200
 @@ -176,7 +176,7 @@
  #undef HAVE___ARGZ_COUNT	/* AM_GNU_GETTEXT */
  #undef HAVE___ARGZ_NEXT		/* AM_GNU_GETTEXT */
diff --git a/package/lynx/patches/patch-lynx_cfg b/package/lynx/patches/patch-lynx_cfg
index ebdfe4e43..f28c4aa1f 100644
--- a/package/lynx/patches/patch-lynx_cfg
+++ b/package/lynx/patches/patch-lynx_cfg
@@ -3,8 +3,8 @@ $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
+--- lynx2-8-7.orig/lynx.cfg	2007-05-18 00:53:22.000000000 +0200
++++ lynx2-8-7/lynx.cfg	2009-06-13 11:46:29.000000000 +0200
 @@ -93,12 +93,12 @@
  #
  # Normally we expect you will connect to a remote site, e.g., the Lynx starting
@@ -148,12 +148,12 @@ $MirOS: ports/www/lynx/patches/patch-lynx_cfg,v 1.7 2007/05/20 12:06:19 tg Exp $
 -# 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 is only available if Lynx was compiled with EXP_JUSTIFY_ELTS.
 +# 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
  
diff --git a/package/lynx/patches/patch-makefile_in b/package/lynx/patches/patch-makefile_in
index b0a79fe71..db687c433 100644
--- a/package/lynx/patches/patch-makefile_in
+++ b/package/lynx/patches/patch-makefile_in
@@ -1,7 +1,7 @@
 $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
+--- lynx2-8-7.orig/makefile.in	2007-05-18 00:53:22.000000000 +0200
++++ lynx2-8-7/makefile.in	2009-06-13 11:46:29.000000000 +0200
 @@ -161,13 +161,13 @@ SITE_DEFS = # Your defines here
  # for installation of local execution links, please see the file userdefs.h
  
diff --git a/package/lynx/patches/patch-samples_lynx_lss b/package/lynx/patches/patch-samples_lynx_lss
index 332552e9f..eef0800eb 100644
--- a/package/lynx/patches/patch-samples_lynx_lss
+++ b/package/lynx/patches/patch-samples_lynx_lss
@@ -2,8 +2,8 @@ $MirOS: ports/www/lynx/patches/patch-samples_lynx_lss,v 1.2 2007/05/20 12:06:19
 
 	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
+--- lynx2-8-7.orig/samples/lynx.lss	2006-09-19 02:28:28.000000000 +0200
++++ lynx2-8-7/samples/lynx.lss	2009-06-13 11:46:29.000000000 +0200
 @@ -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:
diff --git a/package/lynx/patches/patch-src_LYUtils_c b/package/lynx/patches/patch-src_LYUtils_c
index a0b6bd6b8..d8c02cb03 100644
--- a/package/lynx/patches/patch-src_LYUtils_c
+++ b/package/lynx/patches/patch-src_LYUtils_c
@@ -2,8 +2,8 @@ $MirOS: ports/www/lynx/patches/patch-src_LYUtils_c,v 1.3 2007/08/03 16:01:22 tg
 
 	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
+--- lynx2-8-7.orig/src/LYUtils.c	2007-08-03 01:24:27.000000000 +0200
++++ lynx2-8-7/src/LYUtils.c	2009-06-13 11:46:29.000000000 +0200
 @@ -5903,7 +5903,7 @@ static BOOL IsOurSymlink(const char *nam
  
  	    if (cutoff != 0) {
diff --git a/package/lynx/patches/patch-src_chrtrans_makefile_in b/package/lynx/patches/patch-src_chrtrans_makefile_in
new file mode 100644
index 000000000..038b5b7ad
--- /dev/null
+++ b/package/lynx/patches/patch-src_chrtrans_makefile_in
@@ -0,0 +1,11 @@
+--- lynx2-8-7.orig/src/chrtrans/makefile.in	2007-08-03 01:24:27.000000000 +0200
++++ lynx2-8-7/src/chrtrans/makefile.in	2009-06-13 12:29:28.000000000 +0200
+@@ -50,7 +50,7 @@ CPP_OPTS	= \
+ 		-I$(top_srcdir)/$(WWWINC) \
+ 		-I$(top_srcdir)/ \
+ 		$(INTLDIR_CPPFLAGS) $(SITE_DEFS) $(BUILD_CPPFLAGS)
+-CC_OPTS		= $(CPP_OPTS) $(BUILD_CFLAGS)
++CC_OPTS		= $(CPP_OPTS) $(BUILD_CFLAGS) -DHOSTBUILD
+ 
+ #
+ # This file contains the font map for the default (hardware) font
diff --git a/package/lynx/patches/patch-src_chrtrans_makeuctb_c b/package/lynx/patches/patch-src_chrtrans_makeuctb_c
new file mode 100644
index 000000000..9dcfdc73e
--- /dev/null
+++ b/package/lynx/patches/patch-src_chrtrans_makeuctb_c
@@ -0,0 +1,12 @@
+--- lynx2-8-7.orig/src/chrtrans/makeuctb.c	2007-08-03 01:24:27.000000000 +0200
++++ lynx2-8-7/src/chrtrans/makeuctb.c	2009-06-13 11:54:42.000000000 +0200
+@@ -31,6 +31,9 @@
+ #include <UCDefs.h>
+ #include <UCkd.h>
+ 
++#include <stdlib.h>
++#include <unistd.h>
++
+ /*
+  *  Don't try to use LYexit() since this is a standalone file.
+  */
diff --git a/package/lynx/patches/patch-userdefs_h b/package/lynx/patches/patch-userdefs_h
index 2f4c3475d..d39bc4c60 100644
--- a/package/lynx/patches/patch-userdefs_h
+++ b/package/lynx/patches/patch-userdefs_h
@@ -1,7 +1,7 @@
 $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
+--- lynx2-8-7.orig/userdefs.h	2007-08-03 01:24:27.000000000 +0200
++++ lynx2-8-7/userdefs.h	2009-06-13 11:46:29.000000000 +0200
 @@ -461,7 +461,7 @@
   * Normally we expect you will connect to a remote site, e.g., the Lynx starting
   * site: