diff --git a/www-client/lynx/lynx-2.8.9dev.1.recipe b/www-client/lynx/lynx-2.8.9dev.8.recipe similarity index 71% rename from www-client/lynx/lynx-2.8.9dev.1.recipe rename to www-client/lynx/lynx-2.8.9dev.8.recipe index 1d43a39c0..d10d7e3fc 100644 --- a/www-client/lynx/lynx-2.8.9dev.1.recipe +++ b/www-client/lynx/lynx-2.8.9dev.8.recipe @@ -1,14 +1,15 @@ SUMMARY="A text-mode web browser" -DESCRIPTION="An excellent console-based web browser with SSL support." -HOMEPAGE="http://lynx.isc.org/" -COPYRIGHT="1997-2013, 2014 Thomas E. Dickey" +DESCRIPTION="Lynx is a highly configurable console-based web browser with SSL \ +support." +HOMEPAGE="http://lynx.invisible-island.net/" +COPYRIGHT="1997-2014, 2015 Thomas E. Dickey" #XXX:Also check COPYHEADER? LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="http://lynx.isc.org/current/lynx2.8.9dev.1.tar.bz2" -CHECKSUM_SHA256="e9278002e34175240e986db92a60f6214f35999f51287056149cdc08578c2bff" -SOURCE_DIR="lynx2-8-9" -PATCHES="lynx-2.8.9dev.1.patchset" +SOURCE_URI="http://invisible-mirror.net/archives/lynx/tarballs/lynx$portVersion.tar.bz2" +CHECKSUM_SHA256="c6223b885378d77cbc7cf7137273f1e9c142ec846d4d78477d319d10c4316d31" +SOURCE_DIR="lynx$portVersion" +PATCHES="lynx-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/www-client/lynx/patches/lynx-2.8.9dev.1.patchset b/www-client/lynx/patches/lynx-2.8.9dev.8.patchset similarity index 71% rename from www-client/lynx/patches/lynx-2.8.9dev.1.patchset rename to www-client/lynx/patches/lynx-2.8.9dev.8.patchset index aa8772d3d..dbcb2e532 100644 --- a/www-client/lynx/patches/lynx-2.8.9dev.1.patchset +++ b/www-client/lynx/patches/lynx-2.8.9dev.8.patchset @@ -1,18 +1,13 @@ -From 2e6fb7b833c90ddd940683ca1a5ab5c22f20923f 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 Instead of which is not part of POSIX. ---- - aclocal.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 6d9d274..909cacb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -4826,7 +4826,7 @@ AC_DEFUN([CF_SIGWINCH], +@@ -4910,7 +4910,7 @@ AC_DEFUN([CF_SIGWINCH], AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ AC_TRY_COMPILE([ #include @@ -21,7 +16,7 @@ index 6d9d274..909cacb 100644 ],[int x = SIGWINCH], [cf_cv_define_sigwinch=yes], [AC_TRY_COMPILE([ -@@ -4834,7 +4834,7 @@ AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ +@@ -4918,7 +4918,7 @@ AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -30,7 +25,7 @@ index 6d9d274..909cacb 100644 ],[int x = SIGWINCH], [cf_cv_define_sigwinch=maybe], [cf_cv_define_sigwinch=no]) -@@ -4852,7 +4852,7 @@ do +@@ -4936,7 +4936,7 @@ do #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -40,24 +35,17 @@ index 6d9d274..909cacb 100644 #if SIGWINCH != $cf_sigwinch make an error -- -1.8.3.4 +2.2.2 -From 728ce504b6deb51caa3ef36ea384f5803c7c350a 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 pwd.h is only included on HAVE_UTMP, but Haiku has pwd.h but no utmp. ---- - config.hin | 1 + - configure.in | 1 + - src/LYUtils.c | 5 ++++- - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config.hin b/config.hin -index 2644f5b..96930d7 100644 --- a/config.hin +++ b/config.hin @@ -119,6 +119,7 @@ @@ -69,10 +57,9 @@ index 2644f5b..96930d7 100644 #undef HAVE_SETLOCALE #undef HAVE_SETUID diff --git a/configure.in b/configure.in -index 6eee4d1..d2bb819 100644 --- a/configure.in +++ b/configure.in -@@ -752,6 +752,7 @@ AC_CHECK_HEADERS( \ +@@ -751,6 +751,7 @@ AC_CHECK_HEADERS( \ arpa/inet.h \ fcntl.h \ limits.h \ @@ -81,10 +68,9 @@ index 6eee4d1..d2bb819 100644 string.h \ sys/fcntl.h \ diff --git a/src/LYUtils.c b/src/LYUtils.c -index f4f97b7..e7ddc7c 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c -@@ -99,8 +99,11 @@ extern int kbhit(void); /* FIXME: use conio.h */ +@@ -101,8 +101,11 @@ extern int kbhit(void); /* FIXME: use conio.h */ #include #endif /* VMS */ @@ -98,27 +84,21 @@ index f4f97b7..e7ddc7c 100644 #include #define utmp utmpx -- -1.8.3.4 +2.2.2 -From 7325373c7c9bd8bf88bd6dbe3b59d87e72b3dd72 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 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. ---- - configure | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 3efcee3..aba5f06 100755 --- a/configure +++ b/configure -@@ -10226,7 +10226,7 @@ else +@@ -10183,7 +10183,7 @@ else #include "confdefs.h" #include @@ -127,7 +107,7 @@ index 3efcee3..aba5f06 100755 int main () -@@ -10260,7 +10260,7 @@ cat >conftest.$ac_ext <<_ACEOF +@@ -10217,7 +10217,7 @@ cat >conftest.$ac_ext <<_ACEOF #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -136,7 +116,7 @@ index 3efcee3..aba5f06 100755 int main () -@@ -10316,7 +10316,7 @@ do +@@ -10273,7 +10273,7 @@ do #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -145,7 +125,7 @@ index 3efcee3..aba5f06 100755 int main () -@@ -26246,6 +26246,7 @@ for ac_header in \ +@@ -26561,6 +26561,7 @@ for ac_header in \ arpa/inet.h \ fcntl.h \ limits.h \ @@ -154,5 +134,5 @@ index 3efcee3..aba5f06 100755 string.h \ sys/fcntl.h \ -- -1.8.3.4 +2.2.2