diff --git a/www-client/lynx/lynx-2.8.9dev.16.recipe b/www-client/lynx/lynx-2.8.9dev.17.recipe similarity index 52% rename from www-client/lynx/lynx-2.8.9dev.16.recipe rename to www-client/lynx/lynx-2.8.9dev.17.recipe index ab84d9b65..559949fad 100644 --- a/www-client/lynx/lynx-2.8.9dev.16.recipe +++ b/www-client/lynx/lynx-2.8.9dev.17.recipe @@ -1,12 +1,12 @@ SUMMARY="A text-mode web browser" DESCRIPTION="Lynx is a highly configurable console-based web browser with SSL \ support." -HOMEPAGE="http://lynx.invisible-island.net/" -COPYRIGHT="1997-2016 Thomas E. Dickey" +HOMEPAGE="https://lynx.invisible-island.net/" +COPYRIGHT="1997-2018 Thomas E. Dickey" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="http://invisible-mirror.net/archives/lynx/tarballs/lynx$portVersion.tar.bz2" -CHECKSUM_SHA256="04318a100b052d079d0018fa371aa28cfb41ab68db3a959f3b75c2170eea1bc8" +REVISION="1" +SOURCE_URI="https://invisible-mirror.net/archives/lynx/tarballs/lynx$portVersion.tar.bz2" +CHECKSUM_SHA256="a43811b9078c46ccd6d91a3d5ae0a8bc1f247a4dd89c1a6ccdbcd6c2b3d56ed3" SOURCE_DIR="lynx$portVersion" PATCHES="lynx-$portVersion.patchset" @@ -50,10 +50,6 @@ GLOBAL_WRITABLE_FILES=" settings/lynx.lss keep-old settings/lynx.cfg keep-old " -USER_SETTINGS_FILES=" - settings/lynx.lss template data/lynx/lynx.lss.default - settings/lynx.cfg template data/lynx/lynx.cfg.default - " BUILD() { @@ -64,15 +60,4 @@ BUILD() INSTALL() { make install install-help install-doc - - sed -i \ - -e "s,^\(HELPFILE:file://localhost\)$dataDir/,\1/system/data/," \ - -e "s,^STARTFILE:http,#&," \ - -e "/^#STARTFILE:file/ a \ - STARTFILE:file://localhost/system/data/lynx_help/about_lynx.html" \ - $settingsDir/lynx.cfg - - mkdir -p $dataDir/lynx - cp $settingsDir/lynx.lss $dataDir/lynx/lynx.lss.default - cp $settingsDir/lynx.cfg $dataDir/lynx/lynx.cfg.default } diff --git a/www-client/lynx/patches/lynx-2.8.9dev.16.patchset b/www-client/lynx/patches/lynx-2.8.9dev.17.patchset similarity index 88% rename from www-client/lynx/patches/lynx-2.8.9dev.16.patchset rename to www-client/lynx/patches/lynx-2.8.9dev.17.patchset index 9a1cad33f..38ecba497 100644 --- a/www-client/lynx/patches/lynx-2.8.9dev.16.patchset +++ b/www-client/lynx/patches/lynx-2.8.9dev.17.patchset @@ -6,10 +6,10 @@ Subject: Fix SIGWINCH test to include Instead of which is not part of POSIX. diff --git a/aclocal.m4 b/aclocal.m4 -index 192e463..6222d64 100644 +index b28968f..66dafc6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -5009,7 +5009,7 @@ AC_DEFUN([CF_SIGWINCH], +@@ -5021,7 +5021,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 192e463..6222d64 100644 ],[int x = SIGWINCH], [cf_cv_define_sigwinch=yes], [AC_TRY_COMPILE([ -@@ -5017,7 +5017,7 @@ AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ +@@ -5029,7 +5029,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 192e463..6222d64 100644 ],[int x = SIGWINCH], [cf_cv_define_sigwinch=maybe], [cf_cv_define_sigwinch=no]) -@@ -5035,7 +5035,7 @@ do +@@ -5047,7 +5047,7 @@ do #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -37,7 +37,7 @@ index 192e463..6222d64 100644 #if SIGWINCH != $cf_sigwinch make an error -- -2.14.2 +2.16.3 From 2cc3a2c260643cc40a65598f5fdb2718cbf12168 Mon Sep 17 00:00:00 2001 @@ -49,7 +49,7 @@ 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 5927e80..9701af0 100644 +index fb0e4d3..ca7a5f2 100644 --- a/config.hin +++ b/config.hin @@ -122,6 +122,7 @@ @@ -61,7 +61,7 @@ index 5927e80..9701af0 100644 #undef HAVE_SETLOCALE #undef HAVE_SETUID diff --git a/configure.in b/configure.in -index bd80ab9..df3d8bb 100644 +index b4e64db..b240fa0 100644 --- a/configure.in +++ b/configure.in @@ -751,6 +751,7 @@ AC_CHECK_HEADERS( \ @@ -73,7 +73,7 @@ index bd80ab9..df3d8bb 100644 string.h \ sys/fcntl.h \ diff --git a/src/LYUtils.c b/src/LYUtils.c -index 8f7dc7a..50bda3d 100644 +index 6f19675..17c0d9d 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -101,8 +101,11 @@ extern int kbhit(void); /* FIXME: use conio.h */ @@ -90,7 +90,7 @@ index 8f7dc7a..50bda3d 100644 #include #define utmp utmpx -- -2.14.2 +2.16.3 From 87fb129598091b5926f43593d5365fa47b0c905f Mon Sep 17 00:00:00 2001 @@ -103,10 +103,10 @@ with things like AC_DIVERT_HELP. We try to avoid having to patch autoconf just for this. diff --git a/configure b/configure -index 2797cbf..f5e4148 100755 +index 8952b3a..fc5a9e3 100755 --- a/configure +++ b/configure -@@ -10563,7 +10563,7 @@ else +@@ -10566,7 +10566,7 @@ else #include "confdefs.h" #include @@ -115,7 +115,7 @@ index 2797cbf..f5e4148 100755 int main (void) -@@ -10597,7 +10597,7 @@ cat >conftest.$ac_ext <<_ACEOF +@@ -10600,7 +10600,7 @@ cat >conftest.$ac_ext <<_ACEOF #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -124,7 +124,7 @@ index 2797cbf..f5e4148 100755 int main (void) -@@ -10653,7 +10653,7 @@ do +@@ -10656,7 +10656,7 @@ do #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include @@ -133,7 +133,7 @@ index 2797cbf..f5e4148 100755 int main (void) -@@ -27179,6 +27179,7 @@ for ac_header in \ +@@ -27547,6 +27547,7 @@ for ac_header in \ arpa/inet.h \ fcntl.h \ limits.h \ @@ -142,7 +142,7 @@ index 2797cbf..f5e4148 100755 string.h \ sys/fcntl.h \ -- -2.14.2 +2.16.3 From d28767ff56c100201d2d237a9af3b062a35481b2 Mon Sep 17 00:00:00 2001 @@ -152,7 +152,7 @@ Subject: use relative symlinks when installing COPYING and COPYHEADER. diff --git a/configure b/configure -index f5e4148..9050d67 100755 +index fc5a9e3..3d51df5 100755 --- a/configure +++ b/configure @@ -40,14 +40,14 @@ fi @@ -172,7 +172,7 @@ index f5e4148..9050d67 100755 fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln -@@ -45085,14 +45085,14 @@ fi +@@ -45394,14 +45394,14 @@ fi rm -f conf$$ conf$$.exe conf$$.file echo >conf$$.file @@ -190,10 +190,10 @@ index f5e4148..9050d67 100755 elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln diff --git a/makefile.in b/makefile.in -index 0e8f4e2..a2e17b7 100644 +index 785a557..27d25b3 100644 --- a/makefile.in +++ b/makefile.in -@@ -336,7 +336,7 @@ install-doc : $(DOCDIR) $(HELPDIR) +@@ -321,7 +321,7 @@ install-doc : $(DOCDIR) $(HELPDIR) $(SHELL) -c 'for name in COPYING COPYHEADER; do \ cd $(HELPDIR) && rm -f $$name ;\ r= ;\ @@ -203,5 +203,5 @@ index 0e8f4e2..a2e17b7 100644 done' -$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac' -- -2.14.2 +2.16.3