CVS commit: pkgsrc/www/w3m

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/w3m
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 17 Jan 2026 22:35:59 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 17 22:35:59 UTC 2026

Modified Files:
        pkgsrc/www/w3m: Makefile Makefile.common PLIST distinfo
        pkgsrc/www/w3m/patches: patch-Makefile.in patch-Str.c patch-file.c
            patch-fm.h

Log Message:
w3m: update to 0.5.5.

w3m 0.5.5 - 2025-08-20

* new feature
  - Use gettext everywhere, allow for more localization

* bug fixes
  - Prevent segfault when user aborts session store command
  - Fix cookie sync logic

w3m 0.5.4 - 2025-08-03

* deprecated
  - option -H Users should use -o high-intensity=true instead
  - ChangeLog file, use the git log for all the details

* new features
  - Add command to save the history (SAVE_HISTORY)
  - Add option to set a default download directory (dl_dir)
  - Add command to navigate between image links directly (NEXT_IMAGE,
    PREV_IMAGE)
  - Add command to display user-defined messages (MESSAGE),
    e.g. keymap .  COMMAND "REINIT ; MESSAGE 'Configuration Reloaded!'"
  - Add option display_column_number to include current column number
    in line info
  - Drop undocumented upper limit for -cols
  - Make -cols work without -dump
  - Add option maxcols to permanently set -cols, i.e. limit the text width on
    wide terminals
  - Add command FOLD_PRE and option fold_pre to wrap long lines in <pre>
    elements to workaround missing CSS support on some sites
  - Make https links clickable in w3mman
  - Enable re-ordering of buffers in the stack menu
  - Add option exit_on_last to close the last buffer with BACK(B)
  - Add gophers support
  - Display an error if the users enters an unknown command via COMMAND
  - Prepend https instead of http if the URL has no scheme
  - Add option to change the dictionary prompt (dictprompt)
  - Add command to jump to the line which contains the <main> tag (MAIN)
  - Enable using 'skip to content' links
  - Improved image documentation

* new experimental features
  - Add option for zero based link numbers (zero_based_link_no)
  - Add feature to store and restore sessions (STORE, -R)

* bug fixes
  - Create history file if it does not exist
  - Fix redirection check that broke wikipedia search
  - Add tilde('~') to gopher regex for MARK_URL(':')
  - Fix build error with --disable-color
  - Check for buffer underruns in checkType
  - Fix gopher selector string, use "\r\n" instead of "\n"
  - Prevent a segfault when calling some partial gopher URLs
  - Prevent a buffer overflow when printing mis-positioned images on
    lines shorter than their intended line.
  - Replace deprecated MD% function when building with OpenSSL 3 or greater
  - Enable building with "modern C" build options
  - Prevent segfault when aborting URL prompt in some build configurations
  - Fix slow backward search in long lines
  - Fix handling of key press after ESC
  - Fix selection of nop menu items

* removed
  - Drop wait3 support
  - Drop support for old ss family
  - README.sixel, merged into README.img


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/www/w3m/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/www/w3m/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/w3m/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/w3m/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/w3m/patches/patch-Makefile.in \
    pkgsrc/www/w3m/patches/patch-Str.c pkgsrc/www/w3m/patches/patch-file.c \
    pkgsrc/www/w3m/patches/patch-fm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/w3m/Makefile
diff -u pkgsrc/www/w3m/Makefile:1.103 pkgsrc/www/w3m/Makefile:1.104
--- pkgsrc/www/w3m/Makefile:1.103       Thu Oct 23 20:39:50 2025
+++ pkgsrc/www/w3m/Makefile     Sat Jan 17 22:35:59 2026
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.103 2025/10/23 20:39:50 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2026/01/17 22:35:59 wiz Exp $
 
-PKGNAME=       w3m-${W3M_PKGVERS}
-PKGREVISION=   8
 COMMENT=       Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=    w3m-img-[0-9]*

Index: pkgsrc/www/w3m/Makefile.common
diff -u pkgsrc/www/w3m/Makefile.common:1.81 pkgsrc/www/w3m/Makefile.common:1.82
--- pkgsrc/www/w3m/Makefile.common:1.81 Mon Nov 17 11:01:40 2025
+++ pkgsrc/www/w3m/Makefile.common      Sat Jan 17 22:35:59 2026
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile.common,v 1.81 2025/11/17 11:01:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.82 2026/01/17 22:35:59 wiz Exp $
 #
 # used by www/w3m/Makefile
 # used by www/w3m-img/Makefile
 
-DISTNAME=      w3m-${W3M_VERS}
+DISTNAME=      w3m-0.5.5
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=tats/}
-GITHUB_TAG=    v${W3M_VERS}
+MASTER_SITES=  -https://git.sr.ht/~rkta/w3m/archive/v${PKGVERSION_NOREV}.tar.gz
 
 MAINTAINER=    uebayasi%NetBSD.org@localhost
-HOMEPAGE=      https://w3m.sourceforge.net/
-# or https://github.com/tats/w3m
-# or https://packages.qa.debian.org/w/w3m.html
-
-WRKSRC=                ${WRKDIR}/w3m-${W3M_VERS:S/+/-/}
+HOMEPAGE=      https://git.sr.ht/~rkta/w3m
+# was https://github.com/tats/w3m
+# but see https://github.com/tats/w3m/issues/304
 
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
@@ -21,13 +18,12 @@ USE_TOOLS+=         gmake   # Needed for some com
 USE_TOOLS+=            msgfmt
 USE_PKGLOCALEDIR=      yes
 
+WRKSRC=                ${WRKDIR}/w3m-v${PKGVERSION_NOREV}
+
 # error: 'for' loop initial declarations are only allowed in C99 mode
 # needs strcasecmp, ISO C unacceptable on illumos
 FORCE_C_STD=   gnu99
 
-W3M_VERS=      0.5.3+git20230121
-W3M_PKGVERS=   ${W3M_VERS:S/+git/.0./}
-
 # For w3mman, xface2xpm, cgi scripts.
 USE_TOOLS+=    perl:run pax pkg-config
 
@@ -65,15 +61,9 @@ CONFIGURE_ARGS+=     --sysconfdir=${PKG_SYSC
 SUBST_CLASSES+=                man-ja
 SUBST_MESSAGE.man-ja=  Fixing the path to Japanese manual pages.
 SUBST_STAGE.man-ja=    pre-configure
-SUBST_FILES.man-ja=    Makefile.in config.h.dist
+SUBST_FILES.man-ja=    Makefile.in
 SUBST_SED.man-ja=      -e 's|/ja/|/ja_JP.eucJP/|g'
 
-SUBST_CLASSES+=                fh
-SUBST_MESSAGE.fh=      Rename file_handle.
-SUBST_STAGE.fh=                pre-configure
-SUBST_FILES.fh=                istream.*
-SUBST_SED.fh=          -e 's/file_handle/file_handle_rofl/g'
-
 .if ${OPSYS} == SunOS && ${OS_VARIANT} == Solaris
 LDFLAGS+=              -lm
 .endif

Index: pkgsrc/www/w3m/PLIST
diff -u pkgsrc/www/w3m/PLIST:1.20 pkgsrc/www/w3m/PLIST:1.21
--- pkgsrc/www/w3m/PLIST:1.20   Thu Apr 27 13:26:19 2023
+++ pkgsrc/www/w3m/PLIST        Sat Jan 17 22:35:59 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2023/04/27 13:26:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2026/01/17 22:35:59 wiz Exp $
 bin/w3m
 bin/w3mman
 libexec/w3m/cgi-bin/dirlist.cgi
@@ -59,7 +59,6 @@ share/doc/w3m/doc/README.mouse
 share/doc/w3m/doc/README.passwd
 share/doc/w3m/doc/README.pre_form
 share/doc/w3m/doc/README.siteconf
-share/doc/w3m/doc/README.sixel
 share/doc/w3m/doc/README.tab
 share/doc/w3m/doc/STORY.html
 share/doc/w3m/doc/keymap.default

Index: pkgsrc/www/w3m/distinfo
diff -u pkgsrc/www/w3m/distinfo:1.42 pkgsrc/www/w3m/distinfo:1.43
--- pkgsrc/www/w3m/distinfo:1.42        Mon Jul  7 00:54:38 2025
+++ pkgsrc/www/w3m/distinfo     Sat Jan 17 22:35:59 2026
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.42 2025/07/07 00:54:38 schmonz Exp $
+$NetBSD: distinfo,v 1.43 2026/01/17 22:35:59 wiz Exp $
 
-BLAKE2s (w3m-0.5.3+git20230121.tar.gz) = 8dd724d95a676c9831ea20599767c6fec0a27e02b6487af970f749768b41967f
-SHA512 (w3m-0.5.3+git20230121.tar.gz) = f220aabf69cf11ca7560c1519a971bdb1cc0baa443b1b46cd8fca2a4defb614653dd9ba637afbf9315f3b63a349f972436348c2f93d06665573057e4232eab1c
-Size (w3m-0.5.3+git20230121.tar.gz) = 2322709 bytes
-SHA1 (patch-Makefile.in) = 42b98e9c1a57f10411a87fbdc370d3e2650749c3
-SHA1 (patch-Str.c) = 29fd80f6e80a6503967a14cb6255e261ff724dd5
-SHA1 (patch-etc.c) = af69b43ceba1e2ffd8c602dacd9272a3fb2ec5b0
-SHA1 (patch-file.c) = a93d207e25dc055d7f3fd931581790bf90e6edfa
-SHA1 (patch-fm.h) = 0338d7ac97f31325f59d056096f8789ef90a0f1d
+BLAKE2s (w3m-0.5.5.tar.gz) = b23cbaf114fc839f497d4262194767616f3e5500d87fa60a9db91e373ab750b7
+SHA512 (w3m-0.5.5.tar.gz) = ba373483355b46b2a6025e3f3241cd20ac814bd2e47199aa886e55eece7972389d3508cd0d326e89e9630c8b884ba0e3b3462f869eadcf7278115be4247d9fd6
+Size (w3m-0.5.5.tar.gz) = 2307438 bytes
+SHA1 (patch-Makefile.in) = 5cb650ec7900cb298335d1d821cb4be00ee1e38e
+SHA1 (patch-Str.c) = a756cf258622d0d41f9d90950719ce497dd8861b
+SHA1 (patch-file.c) = 033c6e0315087571a21b4c633089d46d9943182b
+SHA1 (patch-fm.h) = d01ca9c36500b8cd83055b3327eebdc2d63403c3

Index: pkgsrc/www/w3m/patches/patch-Makefile.in
diff -u pkgsrc/www/w3m/patches/patch-Makefile.in:1.1 pkgsrc/www/w3m/patches/patch-Makefile.in:1.2
--- pkgsrc/www/w3m/patches/patch-Makefile.in:1.1        Mon Jul  7 00:54:38 2025
+++ pkgsrc/www/w3m/patches/patch-Makefile.in    Sat Jan 17 22:35:59 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1 2025/07/07 00:54:38 schmonz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2026/01/17 22:35:59 wiz Exp $
 
 Fix parallel builds.
 
---- Makefile.in.orig   2023-01-21 02:01:52.000000000 +0000
+--- Makefile.in.orig   2025-08-20 09:32:27.000000000 +0000
 +++ Makefile.in
-@@ -136,6 +136,7 @@ $(ALIB): $(ALIBOBJS)
+@@ -141,6 +141,7 @@ $(OBJS) $(LOBJS): fm.h funcname1.h
        $(RANLIB) $(ALIB)
  
  $(OBJS) $(LOBJS): fm.h funcname1.h
@@ -12,7 +12,7 @@ Fix parallel builds.
  
  tagtable.c: tagtable.tab mktable$(EXT) html.h 
        ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@
-@@ -194,7 +195,7 @@ inflate.o: inflate.c
+@@ -199,7 +200,7 @@ libwc/libwc.a: libwc
        $(CC) $(CFLAGS) -o $@ -c $(srcdir)/inflate.c
  
  libwc/libwc.a: libwc
@@ -21,7 +21,7 @@ Fix parallel builds.
        (cd libwc && $(MAKE) CC='$(CC0)' OPTS='$(OPTS)')
   
  dummy.o: entity.c
-@@ -207,7 +208,7 @@ w3mimgdisplay.o: w3mimgdisplay.c w3mimg/
+@@ -212,7 +213,7 @@ w3mimg/w3mimg.a: w3mimg
        $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
  
  w3mimg/w3mimg.a: w3mimg
Index: pkgsrc/www/w3m/patches/patch-Str.c
diff -u pkgsrc/www/w3m/patches/patch-Str.c:1.1 pkgsrc/www/w3m/patches/patch-Str.c:1.2
--- pkgsrc/www/w3m/patches/patch-Str.c:1.1      Thu Jul  3 10:50:37 2025
+++ pkgsrc/www/w3m/patches/patch-Str.c  Sat Jan 17 22:35:59 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-Str.c,v 1.1 2025/07/03 10:50:37 jperkin Exp $
+$NetBSD: patch-Str.c,v 1.2 2026/01/17 22:35:59 wiz Exp $
 
 Include strings.h for bcopy().
 
---- Str.c.orig 2025-07-03 10:48:29.508854520 +0000
+--- Str.c.orig 2025-08-20 09:32:27.000000000 +0000
 +++ Str.c
 @@ -18,9 +18,7 @@
- #include <gc.h>
+ #include <gc/gc.h>
  #include <stdarg.h>
  #include <string.h>
 -#ifdef __EMX__                        /* or include "fm.h" for HAVE_BCOPY? */
Index: pkgsrc/www/w3m/patches/patch-file.c
diff -u pkgsrc/www/w3m/patches/patch-file.c:1.1 pkgsrc/www/w3m/patches/patch-file.c:1.2
--- pkgsrc/www/w3m/patches/patch-file.c:1.1     Tue Dec 17 13:35:10 2024
+++ pkgsrc/www/w3m/patches/patch-file.c Sat Jan 17 22:35:59 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-file.c,v 1.1 2024/12/17 13:35:10 ryoon Exp $
+$NetBSD: patch-file.c,v 1.2 2026/01/17 22:35:59 wiz Exp $
 
 * Revert DL/DT/DD related change. It is broken and cannot display
   doc-jp/FAQ.html and http://www.cpm.z80.de/ correctly, for example.
   The old behavior may not be perfect however it works.
 
---- file.c.orig        2023-01-21 02:01:52.000000000 +0000
+--- file.c.orig        2025-08-20 09:32:27.000000000 +0000
 +++ file.c
-@@ -4410,14 +4410,6 @@ process_idattr(struct readbuffer *obuf, 
+@@ -4299,14 +4299,6 @@ process_idattr(struct readbuffer *obuf, int cmd, struc
          envs[h_env->envc].indent = envs[h_env->envc - 1].indent; \
      }
  
@@ -21,16 +21,16 @@ $NetBSD: patch-file.c,v 1.1 2024/12/17 1
  #define POP_ENV \
      if (h_env->envc_real-- < h_env->nenv) \
        h_env->envc--;
-@@ -4660,7 +4652,6 @@ HTMLtagproc1(struct parsed_tag *tag, str
+@@ -4554,7 +4546,6 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_
      case HTML_N_OL:
      case HTML_N_DL:
      case HTML_N_BLQ:
 -    case HTML_N_DD:
        CLOSE_DT;
-       CLOSE_A;
-       if (h_env->envc > 0) {
-@@ -4687,7 +4678,7 @@ HTMLtagproc1(struct parsed_tag *tag, str
-               do_blankline(h_env, obuf, envs[h_env->envc].indent, 0,
+       if (cmd == HTML_N_DL)
+           CLOSE_DD;
+@@ -4582,7 +4573,7 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_
+               do_blankline(h_env, obuf, envs[h_env->envc].indent,
                             h_env->limit);
        }
 -      PUSH_ENV_NOINDENT(cmd);
@@ -38,7 +38,7 @@ $NetBSD: patch-file.c,v 1.1 2024/12/17 1
        if (parsedtag_exists(tag, ATTR_COMPACT))
            envs[h_env->envc].env = HTML_DL_COMPACT;
        obuf->flag |= RB_IGNORE_P;
-@@ -4783,7 +4774,7 @@ HTMLtagproc1(struct parsed_tag *tag, str
+@@ -4679,7 +4670,7 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_
            (h_env->envc_real < h_env->nenv &&
             envs[h_env->envc].env != HTML_DL &&
             envs[h_env->envc].env != HTML_DL_COMPACT)) {
@@ -47,22 +47,21 @@ $NetBSD: patch-file.c,v 1.1 2024/12/17 1
        }
        if (h_env->envc > 0) {
            flushline(h_env, obuf,
-@@ -4808,12 +4799,14 @@ HTMLtagproc1(struct parsed_tag *tag, str
+@@ -4704,12 +4695,14 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_
      case HTML_DD:
        CLOSE_A;
        CLOSE_DT;
 -      if (envs[h_env->envc].env == HTML_DL ||
 -              envs[h_env->envc].env == HTML_DL_COMPACT) {
--          PUSH_ENV(HTML_DD);
 +      if (h_env->envc == 0 ||
 +          (h_env->envc_real < h_env->nenv &&
 +           envs[h_env->envc].env != HTML_DL &&
 +           envs[h_env->envc].env != HTML_DL_COMPACT)) {
-+          PUSH_ENV(HTML_DL);
+           PUSH_ENV(HTML_DD);
        }
  
--      if (h_env->envc > 0 && envs[h_env->envc - 1].env == HTML_DL_COMPACT) {
-+      if (envs[h_env->envc].env == HTML_DL_COMPACT) {
-           if (obuf->pos > envs[h_env->envc].indent)
-               flushline(h_env, obuf, envs[h_env->envc].indent, 0,
-                         h_env->limit);
+-      if (h_env->envc > 0 && envs[h_env->envc - 1].env == HTML_DL_COMPACT
++      if (envs[h_env->envc - 1].env == HTML_DL_COMPACT
+           && obuf->pos <= envs[h_env->envc].indent) {
+           push_spaces(obuf, 1, envs[h_env->envc].indent - obuf->pos);
+       }
Index: pkgsrc/www/w3m/patches/patch-fm.h
diff -u pkgsrc/www/w3m/patches/patch-fm.h:1.1 pkgsrc/www/w3m/patches/patch-fm.h:1.2
--- pkgsrc/www/w3m/patches/patch-fm.h:1.1       Thu Jul  3 10:50:37 2025
+++ pkgsrc/www/w3m/patches/patch-fm.h   Sat Jan 17 22:35:59 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-fm.h,v 1.1 2025/07/03 10:50:37 jperkin Exp $
+$NetBSD: patch-fm.h,v 1.2 2026/01/17 22:35:59 wiz Exp $
 
 Include strings.h for bcopy().
 
---- fm.h.orig  2025-07-03 10:47:28.078773140 +0000
+--- fm.h.orig  2025-08-20 09:32:27.000000000 +0000
 +++ fm.h
-@@ -83,9 +83,7 @@ typedef int wc_ces;  /* XXX: not used */
- void bcopy(const void *, void *, int);
- void bzero(void *, int);
- #endif                                /* HAVE_BCOPY */
+@@ -77,9 +77,7 @@
+ #include "terms.h"
+ #include "istream.h"
+ 
 -#ifdef __EMX__
  #include <strings.h>          /* for bzero() and bcopy() */
 -#endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index