pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/misc/pinfo
Module Name: pkgsrc
Committed By: ktnb
Date: Fri Nov 20 15:57:11 UTC 2026
Modified Files:
pkgsrc/misc/pinfo: Makefile PLIST distinfo
pkgsrc/misc/pinfo/patches: patch-ab
Added Files:
pkgsrc/misc/pinfo/patches: patch-src_filehandling__functions.c
patch-src_initializelinks.c patch-src_mainfunction.c
patch-src_manual.c patch-src_parse__config.c patch-src_utils.c
patch-src_video.c
Removed Files:
pkgsrc/misc/pinfo/patches: patch-aa patch-ad
Log Message:
pinfo: update to 0.6.13
Packaging changes:
- upstream ownership changed hands and locations
- many updates to the build system requiring changes
Upstream changes:
0.6.13:
- Fix crash on 32-bit architectures
0.6.12:
- minor release to fix the use of defualt colors (COLOR_DEFAULT) on
ncurses installs; COLOR_DEFAULT values in pinforc were silently
ignored, causing pinfo to use black-on-balc or white-on-white
text
- remove AM_MAINTAINER_MODE from autoconf scripts to make sure all
necessary files are always rebuilt on ./configure && make
- fix possibel buffer overflow (and compiler error with gcc 8.2)
0.6.11:
- Gracefully handle missing indirect info nodes
- Fix infinite loop when regexp-matching an empty string
- Fix loading of bare info pages (i.e., without .info extension)
- Properly load info pages whose name starts with "dir"
- Changes and tweaks to the auto* build tools
- Get rid of inlined functions, which break building with gcc7
- Fix segfautl when closing unopened file
- Fix typos in docs
- Fix compiler warnings
- Fix a number of out-of-buffer write, buffer overflows, string truncations
- Clean up documentation
- Correctly handle redirected stdin and/or stdout (https://bugs.debian.org/671306)
- Fix crash after failed global search
- Make curses mouse behaviour configurable
Note: this changes the default behaviour to not capture the mouse. To
restore the old behaviour, set GRAB-MOUSE=true in pinforc.
- Avoid an infinite loop for malformed info pages
- Add readline tab completion for nodes (https://bugs.debian.org/431708)
- Correct parse node links that span multiple (indented) lines.
- If a direct info page hit isn't found, try to look up a node in the dir
- Improve lookup of info pages
- Fix linking to man pages in a different section
- Fix the -n/--node command line option
0.6.10:
- Fix issue with handling of suspend/resume and character input
(thanks to Scott Mcdermott for the patch)
- Move variable declarations to the start of a block, to accomodate non-gcc
compilers. Thanks to Anonymous for the patches submitted to Alioth.
0.6.9
- New maintainer: Bas Zoetekouw <bas%debian.org@localhost>
- License is now GPL version 2 only
- Updated German, Dutch, English, Polish, Russian, Czech translations and
added Basque, Swedish, Viernamese and Brazilian translations. Thanks to
Jens Seidel, Rene van Bevern, Piarres Beobide, Krzysztof Krzyzaniak, Yuri
Kozlov, Eddy Petrişor, Katarína Machálková, Clytie Siddall and Felipe
Augusto van de Wiel.
- Nodes containing a "." are now correctly found
- Non-ASCII man pages are displayed correctly
- Improved the history behavior of the search input line
- Broken tag tables are now automatically fixed
- Don't segfault when a broken regexp is entered
- Fixed a number of segfaults caused by using uninitialized pointers and
off-by-1 errors
- Fixed heap corruption caused by non-ascii chars in info pages
- Fixed a lot of patch searching issues
- Fixed text display on narrow terminals
- Fixed highlighting of searches
- The default pinforc now uses the terminal's default foreground and
background colors. Thanks to Rob Funk for a patch.
- Use libreadline by default; readline version 4 is now required.
- Better cooperation between ncurses and readline
- Fixed some memory leaks
- Got rid of tempnam() calls
- Fixed -Wall and -Wshadow compiler warnings
- Use utf8 in documentation files and fixed typoes
0.6.8
Patches from Witold Filipczyk for node detection algorithms in man
and info.
Added default item on search prompt.
Bugfix in info link freeing procedure, which failed on exim pages.
Bugfix for dir page lookup when several matches are found--there was
a double close() problem.
0.6.7
Added scrolling in left/right direction (!!!new config file keys).
Fixed handling of info entries like `emacs21/emacs'--modified
function matchfile().
Added autmatical detection of rawfilename for filenames beginning
with `../', `./', `/' in main().
Added support for '(gcc)Introduction' like specification of nodes.
0.6.6
bugfixes for userdefined rcfile and configuration inconsistences
added sorting of matches for the info file to display
0.6.5
Fixed bug in sorting of tag table links (major effect to the engine)
Changed the file search engine to scan the directory for a matching
pattern (instead of trying various propositions).
Fixed minor sigsegv bug in page loader (link initializer).
!Added switching between sections in manualviewer mode
Highlighting code does not highlight leading spaces in splitted
notes anymore.
Added information when the search is not successful
Added support for command line selected rc files
0.6.4
New apropos handler. It works now interactively. New option -p here.
Doesn't highlight anymore links to itself in man viewer.
Fixed bug with link following.
Fixed readline emulation: it now deletes old line content,
and handles end key
Fixed SIGWINCH handler/curses blocking getch emulation
Fixed searchpath routines. First of all, there is introduced a
'context' for currently viewed file. Pinfo will search files for
one set of infopages only in one directory--in the context directory.
The context can be changed only when changing the set of infopages.
0.6.3
NLS and documentation bugfixes
Small bugfix in keyhandler
0.6.2
Fixed bug with searchpath for raw filename specification (temporary
hack).
Fixed stupid bug with info parser, which didn't accept an
`INFOTAG.+\n' separator for info nodes (eg. gnuplot's infopage).
Fixd detection of first info page.
Fixed buggy use of bkgdset()
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/misc/pinfo/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/pinfo/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/pinfo/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/pinfo/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/pinfo/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/misc/pinfo/patches/patch-ad
cvs rdiff -u -r0 -r1.1 \
pkgsrc/misc/pinfo/patches/patch-src_filehandling__functions.c \
pkgsrc/misc/pinfo/patches/patch-src_initializelinks.c \
pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c \
pkgsrc/misc/pinfo/patches/patch-src_manual.c \
pkgsrc/misc/pinfo/patches/patch-src_parse__config.c \
pkgsrc/misc/pinfo/patches/patch-src_utils.c \
pkgsrc/misc/pinfo/patches/patch-src_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/misc/pinfo/Makefile
diff -u pkgsrc/misc/pinfo/Makefile:1.41 pkgsrc/misc/pinfo/Makefile:1.42
--- pkgsrc/misc/pinfo/Makefile:1.41 Thu Jan 22 08:39:56 2026
+++ pkgsrc/misc/pinfo/Makefile Fri Nov 20 15:57:10 2026
@@ -1,33 +1,34 @@
-# $NetBSD: Makefile,v 1.41 2026/01/22 08:39:56 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2026/11/20 15:57:10 ktnb Exp $
-DISTNAME= pinfo-0.6.1
-PKGREVISION= 8
-CATEGORIES= misc
-MASTER_SITES= # http://alioth.debian.org/download.php/1502/
+DISTNAME= pinfo-0.6.13
+CATEGORIES= misc
+MASTER_SITES= ${MASTER_SITE_GITHUB:=baszoetekouw/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE= http://pinfo.alioth.debian.org/
+HOMEPAGE= https://github.com/baszoetekouw/pinfo/
COMMENT= Przemek's Info Viewer
+LICENSE= gnu-gpl-v2
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt
+USE_TOOLS+= msgfmt autoconf automake autopoint gettext makeinfo
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-CPPFLAGS+= -DDFLT_INFOPATH="\"/usr/share/info:${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}:/usr/local/info\""
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/pinfo
CONF_FILES= ${EGDIR}/pinforc ${PKG_SYSCONFDIR}/pinforc
INFO_FILES= yes
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
-.include "../../devel/gettext-lib/buildlink3.mk"
+SUBST_CLASSES+= infopath
+SUBST_STAGE.infopath= pre-configure
+SUBST_FILES.infopath= src/datatypes.c
+SUBST_SED.infopath= -e 's,= "\.:/usr/share/info,= ".:/usr/share/info:${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}:/usr/local/info,'
-.include "../../mk/curses.buildlink3.mk"
-.if ${CURSES_TYPE} == "curses"
-CONFIGURE_ARGS+= --with-vcurses
-.elif ${CURSES_TYPE} == "ncurses"
-CONFIGURE_ARGS+= --with-ncurses=${BUILDLINK_PREFIX.curses}
-.endif
+pre-configure:
+ cd ${WRKSRC} && autoreconf -fi -I macros
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/pinfo/PLIST
diff -u pkgsrc/misc/pinfo/PLIST:1.9 pkgsrc/misc/pinfo/PLIST:1.10
--- pkgsrc/misc/pinfo/PLIST:1.9 Sun Jun 14 18:07:28 2009
+++ pkgsrc/misc/pinfo/PLIST Fri Nov 20 15:57:10 2026
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:07:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2026/11/20 15:57:10 ktnb Exp $
bin/pinfo
info/pinfo.info
man/man1/pinfo.1
share/examples/pinfo/pinforc
share/locale/cs/LC_MESSAGES/pinfo.mo
share/locale/de/LC_MESSAGES/pinfo.mo
+share/locale/eu/LC_MESSAGES/pinfo.mo
+share/locale/ja/LC_MESSAGES/pinfo.mo
+share/locale/nl/LC_MESSAGES/pinfo.mo
share/locale/pl/LC_MESSAGES/pinfo.mo
+share/locale/pt_BR/LC_MESSAGES/pinfo.mo
+share/locale/ro/LC_MESSAGES/pinfo.mo
share/locale/ru/LC_MESSAGES/pinfo.mo
share/locale/sv/LC_MESSAGES/pinfo.mo
+share/locale/vi/LC_MESSAGES/pinfo.mo
Index: pkgsrc/misc/pinfo/distinfo
diff -u pkgsrc/misc/pinfo/distinfo:1.10 pkgsrc/misc/pinfo/distinfo:1.11
--- pkgsrc/misc/pinfo/distinfo:1.10 Tue Oct 26 10:59:21 2021
+++ pkgsrc/misc/pinfo/distinfo Fri Nov 20 15:57:10 2026
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:59:21 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/11/20 15:57:10 ktnb Exp $
-BLAKE2s (pinfo-0.6.1.tar.gz) = d96f0659c0f3a3dc7b8a061c10d2ea7c61b665f458079f0d7c33f2d217b444ac
-SHA512 (pinfo-0.6.1.tar.gz) = ee3dc36bbef0903405886787489bcb70d456dfcaea342b15a5a1e4d300456a2e9bf2eece2bdc10f4216cca351c76018cbe4629d911c6eb02fe0ce4634b6654ba
-Size (pinfo-0.6.1.tar.gz) = 271015 bytes
-SHA1 (patch-aa) = e2d7d0e8ccbe5db276fb736d22682bb8f719eb98
-SHA1 (patch-ab) = f089af56a969af630e2cb886aa8fb40be055eca7
+BLAKE2s (pinfo-0.6.13.tar.gz) = fb352de5e504deb4bb3baca1252c60941e292805c8f8ec37b171918c57a5a3b0
+SHA512 (pinfo-0.6.13.tar.gz) = 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
+Size (pinfo-0.6.13.tar.gz) = 157103 bytes
+SHA1 (patch-ab) = eae999f697e5802309a105d2068804cbb0841efc
SHA1 (patch-ac) = 7dbddcf81e9ad6ff00dadd8a93cf2c160992ce75
-SHA1 (patch-ad) = 29a395521ab7e08960fb7200f1dd4e0721d1895d
+SHA1 (patch-src_filehandling__functions.c) = 510ea7560884effb5484d5674aa68bb548ca76be
+SHA1 (patch-src_initializelinks.c) = 6f5abacd6913cdfc4f482bb0d37b218498574565
+SHA1 (patch-src_mainfunction.c) = f032a3b2e63dc57de73d5b129aeefd09ae5b97b5
+SHA1 (patch-src_manual.c) = 27b57e13a39256e3efd5c4edef02c68785dea0b8
+SHA1 (patch-src_parse__config.c) = 5803791d0690da22b4685f13ee8813c92cb24949
+SHA1 (patch-src_utils.c) = 07c9810dff44e3590aaf5059e086887d36d6ca9f
+SHA1 (patch-src_video.c) = 82904d5258d9fae1d94f297b6e247f2d255eb384
Index: pkgsrc/misc/pinfo/patches/patch-ab
diff -u pkgsrc/misc/pinfo/patches/patch-ab:1.1 pkgsrc/misc/pinfo/patches/patch-ab:1.2
--- pkgsrc/misc/pinfo/patches/patch-ab:1.1 Mon Mar 26 00:28:12 2001
+++ pkgsrc/misc/pinfo/patches/patch-ab Fri Nov 20 15:57:10 2026
@@ -1,18 +1,19 @@
-$NetBSD: patch-ab,v 1.1 2001/03/26 00:28:12 fredb Exp $
+$NetBSD: patch-ab,v 1.2 2026/11/20 15:57:10 ktnb Exp $
---- doc/pinfo.1.in.orig Sun Oct 31 07:27:41 1999
+Remove potentially invalid info locations
+
+--- doc/pinfo.1.in.orig 2019-02-16 20:23:32.000000000 +0000
+++ doc/pinfo.1.in
-@@ -11,11 +11,8 @@
- read by passing it an
+@@ -12,12 +12,6 @@ The program will then (by default) search for it in th
.I infopage
argument. This argument contains the name of an info page (i.e. 'bash').
--The program will then search for it in
--.IR "./",
+ The program will then (by default) search for it in the current directory,
+-.IR "/usr/share/info",
-.IR "/usr/info",
--and
+-.IR "/usr/local/share/info",
-.IR "/usr/local/info".
-+The program will then search for it in the current directory and in any
-+paths specified by the $INFOPATH environment variable.
- It will also automaticaly add the suffix '-info', '-info.Z', '-info.gz',
- or '-info.bz2'.
- At present other suffixes are not recognized, but you can easily add them to
+-and
+-.IR "/opt/info".
+ The search path can be adjusted by INFOPATH environment variable or in the configuration
+ file. Pinfo will also automatically add the suffix '-info', '-info.Z', '-info.gz', or '-info.bz2'.
+ .P
Added files:
Index: pkgsrc/misc/pinfo/patches/patch-src_filehandling__functions.c
diff -u /dev/null pkgsrc/misc/pinfo/patches/patch-src_filehandling__functions.c:1.1
--- /dev/null Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_filehandling__functions.c Fri Nov 20 15:57:11 2026
@@ -0,0 +1,47 @@
+$NetBSD: patch-src_filehandling__functions.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+
+ctype fix for NetBSD 11; fixed bug with GNU basename(3)
+
+--- src/filehandling_functions.c.orig 2019-02-16 20:23:32.000000000 +0000
++++ src/filehandling_functions.c
+@@ -65,10 +65,12 @@ matchfile(char **buf, char *name)
+ {
+ #define Buf (*buf)
+ DIR *dir;
+- char *bname = basename(name);
++ char *bname = strrchr(name, '/');
+ struct dirent *dp;
+ int matched = 0;
+
++ bname = bname ? bname + 1 : name;
++
+ /* remove a possible ".info" from the end of the file name
+ * we're looking for */
+ strip_info_suffix(bname);
+@@ -181,7 +183,7 @@ dirpage_lookup(char **type, char ***message, unsigned
+ file[fileend - filestart - 1] = 0;
+ strncpy(name, fileend + 1, dot - fileend - 1);
+ name[dot - fileend - 1] = 0;
+- while (isspace(*tmp)) tmp++;
++ while (isspace((unsigned char)*tmp)) tmp++;
+
+ if (strlen(name))
+ {
+@@ -391,7 +393,7 @@ load_tag_table(char **message, unsigned long lines)
+ char *check;
+ wsk = message[i + is_indirect];
+ check = wsk + strlen(wsk);
+- while (!isspace(*(++wsk)))
++ while (!isspace((unsigned char)*(++wsk)))
+ {
+ if (wsk >= check)
+ {
+@@ -757,7 +759,7 @@ openinfo(char *filename, int number)
+ int i, j;
+ char *tmpfilename;
+
+- if ((strncmp(filename, "dir", 3)==0) && !isalnum(filename[3]))
++ if ((strncmp(filename, "dir", 3)==0) && !isalnum((unsigned char)filename[3]))
+ {
+ xfree(buf);
+ return opendirfile(number);
Index: pkgsrc/misc/pinfo/patches/patch-src_initializelinks.c
diff -u /dev/null pkgsrc/misc/pinfo/patches/patch-src_initializelinks.c:1.1
--- /dev/null Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_initializelinks.c Fri Nov 20 15:57:11 2026
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_initializelinks.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+
+ctype fix for NetBSD 11
+
+--- src/initializelinks.c.orig 2026-11-20 14:30:16.042759124 +0000
++++ src/initializelinks.c
+@@ -49,10 +49,10 @@ compare_tag_table_string(char *base, char *compared)
+ {
+ if (base[i] != compared[j])
+ {
+- if ((isspace(compared[j])) &&(isspace(base[i]))); /* OK--two blanks */
+- else if (isspace(compared[j]))
++ if ((isspace((unsigned char)compared[j])) &&(isspace((unsigned char)base[i]))); /* OK--two blanks */
++ else if (isspace((unsigned char)compared[j]))
+ i--; /* index of `base' should be unchanged after for's i++ */
+- else if (isspace(base[i]))
++ else if (isspace((unsigned char)base[i]))
+ j--; /* index of `compared' stands in place
+ and waits for base to skip blanks */
+ else
+@@ -62,7 +62,7 @@ compare_tag_table_string(char *base, char *compared)
+ }
+ while (compared[j]) /* handle trailing whitespaces of variable `compared' */
+ {
+- if (!isspace(compared[j]))
++ if (!isspace((unsigned char)compared[j]))
+ return (int) base[i] -(int) compared[j];
+ j++;
+ }
+@@ -127,7 +127,7 @@ finddot(char *str, int mynote)
+ };
+ char *closest = 0;
+ int i;
+- while (isspace(*ptr)) /* if there are only spaces and newline... */
++ while (isspace((unsigned char)*ptr)) /* if there are only spaces and newline... */
+ {
+ if (*ptr == '\n') /* then it's a `Menu: \n' entry--skip it */
+ return 0;
+@@ -449,7 +449,7 @@ handle_no_file_menu_label:
+ }
+
+ start = tmp + 1; /* move after the padding spaces */
+- while (isspace(*start))
++ while (isspace((unsigned char)*start))
+ start++;
+ NodenameLen =(long)(dot - start);
+ strcpy(hyperobjects[hyperobjectcount].file, "");
+@@ -703,7 +703,7 @@ handle_no_file_note_label:
+ }
+
+ start = tmp + 1; /* move after the padding spaces */
+- while (isspace(*start))
++ while (isspace((unsigned char)*start))
+ start++;
+ NodenameLen =(long)(dot - start);
+ strcpy(hyperobjects[hyperobjectcount].file, "");
Index: pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c
diff -u /dev/null pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c:1.1
--- /dev/null Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c Fri Nov 20 15:57:11 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mainfunction.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+
+ctype fix for NetBSD 11
+
+--- src/mainfunction.c.orig 2026-11-20 14:20:46.610621143 +0000
++++ src/mainfunction.c
+@@ -233,7 +233,7 @@ work(char ***message, char **type, unsigned long *line
+ int digit_val = 1;
+ for (unsigned i = 0; token[i] != 0; i++)
+ {
+- if (!isdigit(token[i]))
++ if (!isdigit((unsigned char)token[i]))
+ digit_val = 0;
+ }
+ if (digit_val) /* go to specified line */
Index: pkgsrc/misc/pinfo/patches/patch-src_manual.c
diff -u /dev/null pkgsrc/misc/pinfo/patches/patch-src_manual.c:1.1
--- /dev/null Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_manual.c Fri Nov 20 15:57:11 2026
@@ -0,0 +1,140 @@
+$NetBSD: patch-src_manual.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+
+ctype fix for NetBSD 11
+
+--- src/manual.c.orig 2026-11-20 14:21:55.644146177 +0000
++++ src/manual.c
+@@ -158,14 +158,14 @@ set_initial_history(char *name)
+ /* one object of array */
+ manualhistory = xmalloc(sizeof(manhistory));
+ /* filter trailing spaces */
+- while ((len > 1) &&(isspace(name1[len - 1])))
++ while ((len > 1) &&(isspace((unsigned char)name1[len - 1])))
+ {
+ name1[len - 1] = 0;
+ len--;
+ }
+ i = len;
+ /* find the beginning of the last token */
+- for (i = len - 1;(i > 0) &&(!isspace(name1[i])); i--);
++ for (i = len - 1;(i > 0) &&(!isspace((unsigned char)name1[i])); i--);
+
+ /* if we've found space, then we move to the first nonspace character */
+ if (i > 0)
+@@ -234,7 +234,7 @@ construct_manualname(char *buf, int which)
+ strncpy(base, manual[manuallinks[which].line - 1],1023);
+ strip_manual(base);
+ ptr = base + strlen(base) - 3;
+- while (((isalpha(*ptr)) ||(*ptr == '.') ||(*ptr == '_')) &&(ptr > base))
++ while (((isalpha((unsigned char)*ptr)) ||(*ptr == '.') ||(*ptr == '_')) &&(ptr > base))
+ ptr--;
+ /* workaround for man pages with leading '(' see svgalib man pages */
+ if (*ptr == '(')
+@@ -256,7 +256,7 @@ construct_manualname(char *buf, int which)
+ strip_manual(base);
+ ptr = base;
+ /* skip whitespace */
+- while (isspace(*ptr))
++ while (isspace((unsigned char)*ptr))
+ ptr++;
+ eptr = findurlend(ptr);
+ *eptr = 0;
+@@ -700,7 +700,7 @@ loadmanual(FILE * id)
+ man_initializelinks(tmp, carryflag);
+ carryflag = 0;
+ if (manlinelen > 1)
+- if (ishyphen(manual[ManualLines][manlinelen - 2]))
++ if (ishyphen((unsigned char)manual[ManualLines][manlinelen - 2]))
+ carryflag = 1;
+ /* free temporary buffer */
+ xfree(tmp);
+@@ -757,7 +757,7 @@ man_initializelinks(char *tmp, int carry)
+ manuallinks[ManualLinks].name = xmalloc(urlend - urlstart + 10);
+ strncpy(manuallinks[ManualLinks].name, urlstart, urlend - urlstart);
+ manuallinks[ManualLinks].name[urlend - urlstart] = 0;
+- if (ishyphen(manuallinks[ManualLinks].name[urlend - urlstart - 1]))
++ if (ishyphen((unsigned char)manuallinks[ManualLinks].name[urlend - urlstart - 1]))
+ manuallinks[ManualLinks].carry = 1;
+ else
+ manuallinks[ManualLinks].carry = 0;
+@@ -776,7 +776,7 @@ man_initializelinks(char *tmp, int carry)
+ manuallinks[ManualLinks].name = xmalloc(urlend - urlstart + 10);
+ strncpy(manuallinks[ManualLinks].name, urlstart, urlend - urlstart);
+ manuallinks[ManualLinks].name[urlend - urlstart] = 0;
+- if (ishyphen(manuallinks[ManualLinks].name[urlend - urlstart - 1]))
++ if (ishyphen((unsigned char)manuallinks[ManualLinks].name[urlend - urlstart - 1]))
+ manuallinks[ManualLinks].carry = 1;
+ else
+ manuallinks[ManualLinks].carry = 0;
+@@ -795,7 +795,7 @@ man_initializelinks(char *tmp, int carry)
+ manuallinks[ManualLinks].name = xmalloc(urlend - urlstart + 10);
+ strncpy(manuallinks[ManualLinks].name, urlstart, urlend - urlstart);
+ manuallinks[ManualLinks].name[urlend - urlstart] = 0;
+- if (ishyphen(manuallinks[ManualLinks].name[urlend - urlstart - 1]))
++ if (ishyphen((unsigned char)manuallinks[ManualLinks].name[urlend - urlstart - 1]))
+ manuallinks[ManualLinks].carry = 1;
+ else
+ manuallinks[ManualLinks].carry = 0;
+@@ -833,7 +833,7 @@ man_initializelinks(char *tmp, int carry)
+ i++;
+ for (; i > 0; --i)
+ {
+- if (!isspace(tmp[i]))
++ if (!isspace((unsigned char)tmp[i]))
+ /* ignore spaces between linkname and '(x)' */
+ break;
+ }
+@@ -848,7 +848,7 @@ man_initializelinks(char *tmp, int carry)
+ */
+ for (i = breakpos; i > 0; --i)
+ {
+- if (isspace(tmp[i]))
++ if (isspace((unsigned char)tmp[i]))
+ {
+ i++;
+ break;
+@@ -884,7 +884,7 @@ man_initializelinks(char *tmp, int carry)
+ if (LongManualLinks)
+ {
+ for (b = 1; mylink[b] != ')'; b++)
+- manuallinks[ManualLinks].section[b - 1] = tolower(mylink[b]);
++ manuallinks[ManualLinks].section[b - 1] = tolower((unsigned char)mylink[b]);
+ manuallinks[ManualLinks].section[b - 1] = 0;
+ }
+ else
+@@ -903,7 +903,7 @@ man_initializelinks(char *tmp, int carry)
+ for (b = i - 1; b >= 0; b--)
+ {
+ if (b > 0)
+- if (!isspace(tmp[b]))
++ if (!isspace((unsigned char)tmp[b]))
+ break;
+ }
+ if (b >= 0)
+@@ -1065,7 +1065,7 @@ manualwork()
+ int digit_val = 1;
+ for (unsigned i = 0; token[i] != 0; i++)
+ {
+- if (!isdigit(token[i]))
++ if (!isdigit((unsigned char)token[i]))
+ digit_val = 0;
+ }
+ /* move cursor position */
+@@ -1812,7 +1812,7 @@ add_highlights()
+ * positon ltlinelen to the beginning of the link to be
+ * highlighted
+ */
+- while ((isalpha(TestCh)) ||(TestCh == '.') ||(TestCh == '_'))
++ while ((isalpha((unsigned char)TestCh)) ||(TestCh == '.') ||(TestCh == '_'))
+ ltlinelen--;
+
+ *newlinemark = 0;
+@@ -1853,7 +1853,7 @@ add_highlights()
+ char *wskend;
+ strip_manual(tmpstr);
+ /* skip spaces */
+- while (isspace(tmpstr[k]))
++ while (isspace((unsigned char)tmpstr[k]))
+ k++;
+ /* find the end of url */
+ wskend = findurlend(tmpstr+k);
Index: pkgsrc/misc/pinfo/patches/patch-src_parse__config.c
diff -u /dev/null pkgsrc/misc/pinfo/patches/patch-src_parse__config.c:1.1
--- /dev/null Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_parse__config.c Fri Nov 20 15:57:11 2026
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_parse__config.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+
+ctype fix for NetBSD 11
+
+--- src/parse_config.c.orig 2026-11-20 14:27:58.428941106 +0000
++++ src/parse_config.c
+@@ -895,7 +895,7 @@ parse_line(char *line)
+ {
+ if (temp[1] == '\'')
+ *key = KEY_CTRL(temp[2]);
+- else if (isdigit(temp[1]))
++ else if (isdigit((unsigned char)temp[1]))
+ {
+ char *tail = temp +(strlen(temp));
+ *key = KEY_CTRL((int) strtol(temp + 1, &tail, 10));
+@@ -913,8 +913,8 @@ parse_line(char *line)
+ if (temp[0] == '(')
+ {
+ if (temp[1] == '\'')
+- *key = KEY_ALT(tolower(temp[2]));
+- else if (isdigit(temp[1]))
++ *key = KEY_ALT(tolower((unsigned char)temp[2]));
++ else if (isdigit((unsigned char)temp[1]))
+ {
+ char *tail = temp +(strlen(temp));
+ *key = KEY_ALT((int) strtol(temp + 1, &tail, 10));
+@@ -948,7 +948,7 @@ parse_line(char *line)
+ *key = temp[1];
+ }
+ }
+- else if (isdigit(temp[0]))
++ else if (isdigit((unsigned char)temp[0]))
+ {
+ char *tail = temp +(strlen(temp));
+ *key =(int) strtol(temp, &tail, 10);
+@@ -963,8 +963,8 @@ str_toupper(char *str)
+ {
+ unsigned int i;
+ for (i = 0; i < strlen(str); ++i)
+- if (islower(str[i]))
+- str[i] = toupper(str[i]);
++ if (islower((unsigned char)str[i]))
++ str[i] = toupper((unsigned char)str[i]);
+
+ return str;
+ }
Index: pkgsrc/misc/pinfo/patches/patch-src_utils.c
diff -u /dev/null pkgsrc/misc/pinfo/patches/patch-src_utils.c:1.1
--- /dev/null Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_utils.c Fri Nov 20 15:57:11 2026
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_utils.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+
+ctype fix for NetBSD 11 and sys/wait.h is required
+
+--- src/utils.c.orig 2026-11-20 14:25:26.785618991 +0000
++++ src/utils.c
+@@ -24,6 +24,7 @@
+ #include <regex.h>
+ #include <ctype.h>
+ #include <sys/select.h>
++#include <sys/wait.h>
+
+ #ifdef USE_WCHAR
+ #include <wchar.h>
+@@ -353,7 +354,7 @@ char ** completions_from_tag_table(TagTable * table, s
+ const char ** completions = calloc(num+1, sizeof(*completions));
+ for (size_t i=0, j=0; i<num; i++)
+ {
+- if (isalnum(table[i].nodename[0]))
++ if (isalnum((unsigned char)table[i].nodename[0]))
+ {
+ completions[j++] = table[i].nodename;
+ }
+@@ -604,14 +605,14 @@ yesno(char *prompt, int def)
+ break;
+ else
+ {
+- if (tolower(key) == tolower(*yes))
++ if (tolower((unsigned char)key) == tolower((unsigned char)*yes))
+ {
+ def = 1;
+ break;
+ }
+ else
+ {
+- if (tolower(key) == tolower(*no))
++ if (tolower((unsigned char)key) == tolower((unsigned char)*no))
+ {
+ def = 0;
+ break;
Index: pkgsrc/misc/pinfo/patches/patch-src_video.c
diff -u /dev/null pkgsrc/misc/pinfo/patches/patch-src_video.c:1.1
--- /dev/null Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_video.c Fri Nov 20 15:57:11 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_video.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+
+unsigned long is being printed
+
+--- src/video.c.orig 2026-11-20 14:27:35.687596322 +0000
++++ src/video.c
+@@ -109,9 +109,9 @@ showscreen(char **message, unsigned long lines, unsign
+ mymvhline(maxy - 1, 0, ' ', maxx);
+ move(maxy - 1, 0);
+ if ((pos < lines - 1) &&(lines > pos + maxy - 2))
+- printw(_("Viewing line %d/%d, %d%%"), pos + maxy - 2, lines,((pos + maxy - 2) * 100) / lines);
++ printw(_("Viewing line %ld/%ld, %ld%%"), pos + maxy - 2, lines,((pos + maxy - 2) * 100) / lines);
+ else
+- printw(_("Viewing line %d/%d, 100%%"), lines, lines);
++ printw(_("Viewing line %ld/%ld, 100%%"), lines, lines);
+ info_add_highlights(pos, cursor, lines, column, message);
+ attrset(normal);
+ move(0, 0);
Home |
Main Index |
Thread Index |
Old Index