diff --git a/www-client/lynx/lynx-2.8.9dev.11.recipe b/www-client/lynx/lynx-2.8.9dev.16.recipe similarity index 94% rename from www-client/lynx/lynx-2.8.9dev.11.recipe rename to www-client/lynx/lynx-2.8.9dev.16.recipe index 994740698..766459097 100644 --- a/www-client/lynx/lynx-2.8.9dev.11.recipe +++ b/www-client/lynx/lynx-2.8.9dev.16.recipe @@ -4,9 +4,9 @@ support." HOMEPAGE="http://lynx.invisible-island.net/" COPYRIGHT="1997-2016 Thomas E. Dickey" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="http://invisible-mirror.net/archives/lynx/tarballs/lynx$portVersion.tar.bz2" -CHECKSUM_SHA256="2a1092f2cde76f109e4f1df1760c1d2a8792ba7018ab7ff3cc2b01d14e0c15b3" +CHECKSUM_SHA256="04318a100b052d079d0018fa371aa28cfb41ab68db3a959f3b75c2170eea1bc8" SOURCE_DIR="lynx$portVersion" PATCHES="lynx-$portVersion.patchset" diff --git a/www-client/lynx/patches/lynx-2.8.9dev.11.patchset b/www-client/lynx/patches/lynx-2.8.9dev.16.patchset similarity index 81% rename from www-client/lynx/patches/lynx-2.8.9dev.11.patchset rename to www-client/lynx/patches/lynx-2.8.9dev.16.patchset index fcb826a8a..9a1cad33f 100644 --- a/www-client/lynx/patches/lynx-2.8.9dev.11.patchset +++ b/www-client/lynx/patches/lynx-2.8.9dev.16.patchset @@ -1,15 +1,15 @@ -From 2e6fb7b833c90ddd940683ca1a5ab5c22f20923f Mon Sep 17 00:00:00 2001 +From 4874499dc665a09b8eb9729334c256e1698bd372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 22 Jul 2014 23:57:16 +0200 -Subject: [PATCH 1/3] Fix SIGWINCH test to include +Subject: Fix SIGWINCH test to include Instead of which is not part of POSIX. diff --git a/aclocal.m4 b/aclocal.m4 -index e9e4a81..1d30cb8 100644 +index 192e463..6222d64 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -4911,7 +4911,7 @@ AC_DEFUN([CF_SIGWINCH], +@@ -5009,7 +5009,7 @@ AC_DEFUN([CF_SIGWINCH], AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ AC_TRY_COMPILE([ #include @@ -18,7 +18,7 @@ index e9e4a81..1d30cb8 100644 ],[int x = SIGWINCH], [cf_cv_define_sigwinch=yes], [AC_TRY_COMPILE([ -@@ -4919,7 +4919,7 @@ AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ +@@ -5017,7 +5017,7 @@ AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -27,7 +27,7 @@ index e9e4a81..1d30cb8 100644 ],[int x = SIGWINCH], [cf_cv_define_sigwinch=maybe], [cf_cv_define_sigwinch=no]) -@@ -4937,7 +4937,7 @@ do +@@ -5035,7 +5035,7 @@ do #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -37,22 +37,22 @@ index e9e4a81..1d30cb8 100644 #if SIGWINCH != $cf_sigwinch make an error -- -2.2.2 +2.14.2 -From 728ce504b6deb51caa3ef36ea384f5803c7c350a Mon Sep 17 00:00:00 2001 +From 2cc3a2c260643cc40a65598f5fdb2718cbf12168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 23 Jul 2014 00:15:05 +0200 -Subject: [PATCH 2/3] Fix calling getpwdnam without including the header +Subject: Fix calling getpwdnam without including the header pwd.h is only included on HAVE_UTMP, but Haiku has pwd.h but no utmp. diff --git a/config.hin b/config.hin -index bc2123f..fea934c 100644 +index 5927e80..9701af0 100644 --- a/config.hin +++ b/config.hin -@@ -120,6 +120,7 @@ +@@ -122,6 +122,7 @@ #undef HAVE_READDIR #undef HAVE_RESIZETERM #undef HAVE_RESOLV_H @@ -61,7 +61,7 @@ index bc2123f..fea934c 100644 #undef HAVE_SETLOCALE #undef HAVE_SETUID diff --git a/configure.in b/configure.in -index 610fa14..8fd6ed8 100644 +index bd80ab9..df3d8bb 100644 --- a/configure.in +++ b/configure.in @@ -751,6 +751,7 @@ AC_CHECK_HEADERS( \ @@ -73,7 +73,7 @@ index 610fa14..8fd6ed8 100644 string.h \ sys/fcntl.h \ diff --git a/src/LYUtils.c b/src/LYUtils.c -index b47779e..7fecbc3 100644 +index 8f7dc7a..50bda3d 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -101,8 +101,11 @@ extern int kbhit(void); /* FIXME: use conio.h */ @@ -90,23 +90,23 @@ index b47779e..7fecbc3 100644 #include #define utmp utmpx -- -2.2.2 +2.14.2 -From 7325373c7c9bd8bf88bd6dbe3b59d87e72b3dd72 Mon Sep 17 00:00:00 2001 +From 87fb129598091b5926f43593d5365fa47b0c905f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 23 Jul 2014 00:18:13 +0200 -Subject: [PATCH 3/3] Force patching configure itself +Subject: Force patching configure itself It seems lynx requires its own flavor of autoconf, with things like AC_DIVERT_HELP. We try to avoid having to patch autoconf just for this. diff --git a/configure b/configure -index d8468ba..678f92a 100755 +index 2797cbf..f5e4148 100755 --- a/configure +++ b/configure -@@ -10183,7 +10183,7 @@ else +@@ -10563,7 +10563,7 @@ else #include "confdefs.h" #include @@ -114,8 +114,8 @@ index d8468ba..678f92a 100755 +#include int - main () -@@ -10217,7 +10217,7 @@ cat >conftest.$ac_ext <<_ACEOF + main (void) +@@ -10597,7 +10597,7 @@ cat >conftest.$ac_ext <<_ACEOF #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -123,8 +123,8 @@ index d8468ba..678f92a 100755 +#include int - main () -@@ -10273,7 +10273,7 @@ do + main (void) +@@ -10653,7 +10653,7 @@ do #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -132,8 +132,8 @@ index d8468ba..678f92a 100755 +#include int - main () -@@ -26699,6 +26699,7 @@ for ac_header in \ + main (void) +@@ -27179,6 +27179,7 @@ for ac_header in \ arpa/inet.h \ fcntl.h \ limits.h \ @@ -142,17 +142,17 @@ index d8468ba..678f92a 100755 string.h \ sys/fcntl.h \ -- -2.2.2 +2.14.2 -From b698f2218b2e8faf0aa7c2c230df634aa3a3176a Mon Sep 17 00:00:00 2001 +From d28767ff56c100201d2d237a9af3b062a35481b2 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Mon, 6 Jun 2016 00:19:19 +0000 Subject: use relative symlinks when installing COPYING and COPYHEADER. diff --git a/configure b/configure -index 678f92a..87df4dd 100755 +index f5e4148..9050d67 100755 --- a/configure +++ b/configure @@ -40,14 +40,14 @@ fi @@ -172,7 +172,7 @@ index 678f92a..87df4dd 100755 fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln -@@ -44338,14 +44338,14 @@ fi +@@ -45085,14 +45085,14 @@ fi rm -f conf$$ conf$$.exe conf$$.file echo >conf$$.file @@ -190,7 +190,7 @@ index 678f92a..87df4dd 100755 elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln diff --git a/makefile.in b/makefile.in -index c434b62..9b5d17d 100644 +index 0e8f4e2..a2e17b7 100644 --- a/makefile.in +++ b/makefile.in @@ -336,7 +336,7 @@ install-doc : $(DOCDIR) $(HELPDIR) @@ -203,5 +203,5 @@ index c434b62..9b5d17d 100644 done' -$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac' -- -2.7.0 +2.14.2