Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
lynx update
To:
ports <ports@openbsd.org>
Date:
Wed, 17 Jan 2024 10:00:55 +0000

Download raw body.

Thread
  • Stuart Henderson:

    lynx update

Here's an update to lynx, I've only very lightly tested it so far.
Since it can be used in quite a lot of different environments and
there are a number of patches relating to pledge, it definitely
wants more testing before it can be committed.

Currently the port has no dependencies but the new version uses
libiconv by default if available to provide Japanese UTF-8 support.
The configure script doesn't provide a way to disable finding it,
but that could be patched away if there's strong opposition to
adding a dep.

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/lynx/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile	27 Sep 2023 19:13:03 -0000	1.47
+++ Makefile	17 Jan 2024 09:54:33 -0000
@@ -1,9 +1,8 @@
-V =		2.8.9
-R =		1
+V =		2.9.0
+#R =		rel1
 COMMENT =	text web browser
-DISTNAME =	lynx${V}rel.${R}
-PKGNAME =	lynx-${V}rel${R}
-REVISION =	1
+DISTNAME =	lynx${V}${R:S/rel/rel./}
+PKGNAME =	lynx-${V}${R}
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	www net
 
@@ -13,11 +12,13 @@ HOMEPAGE =	https://lynx.invisible-island
 PERMIT_PACKAGE =	Yes
 
 # uses pledge()
-WANTLIB +=	c crypto curses ssl z
+WANTLIB +=	c crypto curses iconv ssl z
 
 SITES =		https://invisible-mirror.net/archives/lynx/tarballs/ \
 		ftp://ftp.invisible-island.net/lynx/tarballs/
 
+LIB_DEPENDS =	converters/libiconv
+
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	--datarootdir="${PREFIX}/share/doc/lynx" \
 			--disable-idna \
@@ -30,6 +31,7 @@ CONFIGURE_ARGS =	--datarootdir="${PREFIX
 			--enable-widec \
 			--with-ssl=/usr \
 			--with-zlib \
+			--without-brotli \
 			--without-bzlib
 
 # This disables most calls to getpw*(3) so we can avoid pledge "getpw".
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/lynx/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo	12 Aug 2018 08:28:49 -0000	1.17
+++ distinfo	17 Jan 2024 09:54:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (lynx2.8.9rel.1.tar.bz2) = OH8ZPXeS+c+toUxgsOXAv/GPIn2SV6OUg+FPoar3lZU=
-SIZE (lynx2.8.9rel.1.tar.bz2) = 2689171
+SHA256 (lynx2.9.0.tar.bz2) = W8rl4uYEPKeyIJY6l3Y8ScEyGNhJ/9pr53Ob/VotNv8=
+SIZE (lynx2.9.0.tar.bz2) = 2781819
Index: patches/patch-lynx_cfg
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-lynx_cfg,v
retrieving revision 1.6
diff -u -p -r1.6 patch-lynx_cfg
--- patches/patch-lynx_cfg	11 Mar 2022 20:10:05 -0000	1.6
+++ patches/patch-lynx_cfg	17 Jan 2024 09:54:33 -0000
@@ -1,7 +1,7 @@
 Index: lynx.cfg
 --- lynx.cfg.orig
 +++ lynx.cfg
-@@ -108,7 +108,7 @@
+@@ -105,7 +105,7 @@
  #
  # Normally we expect you will connect to a remote site, e.g., the Lynx starting
  # site:
Index: patches/patch-lynx_man
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-lynx_man,v
retrieving revision 1.9
diff -u -p -r1.9 patch-lynx_man
--- patches/patch-lynx_man	11 Mar 2022 20:10:05 -0000	1.9
+++ patches/patch-lynx_man	17 Jan 2024 09:54:33 -0000
@@ -1,7 +1,7 @@
 Index: lynx.man
 --- lynx.man.orig
 +++ lynx.man
-@@ -618,6 +618,22 @@ flushes the cache on a proxy server
+@@ -642,6 +642,22 @@ flushes the cache on a proxy server
  allows a list of services to be disabled selectively.
  Dashes and underscores in option names can be intermixed.
  The following list is printed if no options are specified.
Index: patches/patch-src_LYMainLoop_c
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-src_LYMainLoop_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_LYMainLoop_c
--- patches/patch-src_LYMainLoop_c	30 May 2023 16:15:54 -0000	1.1
+++ patches/patch-src_LYMainLoop_c	17 Jan 2024 09:54:33 -0000
@@ -1,6 +1,7 @@
---- src/LYMainLoop.c.orig	Tue May 30 14:29:30 2023
-+++ src/LYMainLoop.c	Tue May 30 14:30:30 2023
-@@ -7212,7 +7212,8 @@
+Index: src/LYMainLoop.c
+--- src/LYMainLoop.c.orig
++++ src/LYMainLoop.c
+@@ -7225,7 +7225,8 @@ int mainloop(void)
  	    handle_LYK_DOWN_HALF(&old_c, real_c);
  	    break;
  
Index: patches/patch-src_LYMain_c
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-src_LYMain_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_LYMain_c
--- patches/patch-src_LYMain_c	11 Mar 2022 20:10:05 -0000	1.6
+++ patches/patch-src_LYMain_c	17 Jan 2024 09:54:33 -0000
@@ -1,7 +1,7 @@
 Index: src/LYMain.c
 --- src/LYMain.c.orig
 +++ src/LYMain.c
-@@ -2155,6 +2155,22 @@ int main(int argc,
+@@ -2176,6 +2176,22 @@ int main(int argc,
      }
  
      /*
Index: patches/patch-src_LYReadCFG_c
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-src_LYReadCFG_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_LYReadCFG_c
--- patches/patch-src_LYReadCFG_c	11 Mar 2022 20:10:05 -0000	1.8
+++ patches/patch-src_LYReadCFG_c	17 Jan 2024 09:54:33 -0000
@@ -1,7 +1,7 @@
 Index: src/LYReadCFG.c
 --- src/LYReadCFG.c.orig
 +++ src/LYReadCFG.c
-@@ -1508,7 +1508,6 @@ static Config_Type Config_Table [] =
+@@ -1518,7 +1518,6 @@ static Config_Type Config_Table [] =
       PARSE_FUN(RC_DISPLAY_CHARSET_CHOICE, parse_display_charset_choice),
  #endif
       PARSE_SET(RC_DONT_WRAP_PRE,        dont_wrap_pre),
@@ -9,7 +9,7 @@ Index: src/LYReadCFG.c
       PARSE_SET(RC_EMACS_KEYS_ALWAYS_ON, emacs_keys),
       PARSE_FUN(RC_ENABLE_LYNXRC,        enable_lynxrc),
       PARSE_SET(RC_ENABLE_SCROLLBACK,    enable_scrollback),
-@@ -1537,7 +1536,6 @@ static Config_Type Config_Table [] =
+@@ -1547,7 +1546,6 @@ static Config_Type Config_Table [] =
  #endif
       PARSE_Env(RC_FTP_PROXY,            0),
       PARSE_STR(RC_GLOBAL_EXTENSION_MAP, global_extension_map),
@@ -17,7 +17,7 @@ Index: src/LYReadCFG.c
       PARSE_Env(RC_GOPHER_PROXY,         0),
       PARSE_SET(RC_GOTOBUFFER,           goto_buffer),
       PARSE_PRG(RC_GZIP_PATH,            ppGZIP),
-@@ -1656,7 +1654,6 @@ static Config_Type Config_Table [] =
+@@ -1668,7 +1666,6 @@ static Config_Type Config_Table [] =
       PARSE_SET(RC_PERSISTENT_COOKIES,   persistent_cookies),
  #endif /* USE_PERSISTENT_COOKIES */
       PARSE_STR(RC_PERSONAL_EXTENSION_MAP, personal_extension_map),
@@ -25,15 +25,15 @@ Index: src/LYReadCFG.c
       PARSE_LST(RC_POSITIONABLE_EDITOR,  positionable_editor),
       PARSE_STR(RC_PREFERRED_CHARSET,    pref_charset),
       PARSE_ENU(RC_PREFERRED_CONTENT_TYPE, LYContentType, tbl_preferred_content),
-@@ -1670,7 +1667,6 @@ static Config_Type Config_Table [] =
+@@ -1682,7 +1679,6 @@ static Config_Type Config_Table [] =
       PARSE_FUN(RC_PRETTYSRC_SPEC,       psrcspec_fun),
       PARSE_SET(RC_PRETTYSRC_VIEW_NO_ANCHOR_NUM, psrcview_no_anchor_numbering),
  #endif
 -     PARSE_ADD(RC_PRINTER,              printers),
       PARSE_SET(RC_QUIT_DEFAULT_YES,     LYQuitDefaultYes),
       PARSE_INT(RC_READ_TIMEOUT,         reading_timeout),
-      PARSE_FUN(RC_REFERER_WITH_QUERY,   referer_with_query_fun),
-@@ -1769,11 +1765,9 @@ static Config_Type Config_Table [] =
+      PARSE_INT(RC_REDIRECTION_LIMIT,    redirection_limit),
+@@ -1782,11 +1778,9 @@ static Config_Type Config_Table [] =
       PARSE_PRG(RC_UUDECODE_PATH,        ppUUDECODE),
       PARSE_SET(RC_VERBOSE_IMAGES,       verbose_img),
       PARSE_SET(RC_VI_KEYS_ALWAYS_ON,    vi_keys),
Index: patches/patch-src_LYUtils_c
===================================================================
RCS file: /cvs/ports/www/lynx/patches/patch-src_LYUtils_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_LYUtils_c
--- patches/patch-src_LYUtils_c	11 Mar 2022 20:10:05 -0000	1.6
+++ patches/patch-src_LYUtils_c	17 Jan 2024 09:54:33 -0000
@@ -6,7 +6,7 @@ no breakage is to be expected from this.
 Index: src/LYUtils.c
 --- src/LYUtils.c.orig
 +++ src/LYUtils.c
-@@ -5175,10 +5175,11 @@ const char *Home_Dir(void)
+@@ -5177,10 +5177,11 @@ const char *Home_Dir(void)
  	    /*
  	     * One could use getlogin() and getpwnam() here instead.
  	     */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/lynx/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST	11 Mar 2022 20:10:05 -0000	1.8
+++ pkg/PLIST	17 Jan 2024 09:54:33 -0000
@@ -75,6 +75,7 @@ share/doc/lynx/lynx_doc/test/c1.html
 share/doc/lynx/lynx_doc/test/circle.html
 share/doc/lynx/lynx_doc/test/cp-1252.html
 share/doc/lynx/lynx_doc/test/cp-1252a.html
+share/doc/lynx/lynx_doc/test/idna-tr46.html
 share/doc/lynx/lynx_doc/test/image.jpg
 share/doc/lynx/lynx_doc/test/iso-8859-1.html
 share/doc/lynx/lynx_doc/test/iso-8859-1a.html