Sun Feb 11 10:01:46 2024 UTC (105d)
misc/plan9port: update to latest snapshot.

Bring package in sync with most recent upstream commit (20240110).

Noteworthy changes:

* mntgen: import mntgen(4) from Plan 9
* ramfs: fixed bg in erealloc handling
* 9l: refactor the warning-silencing mechanics to match that of 9c
* page: fix viewing of graphics
* acme: have Dump save both low and high DPI fontnames
* libframe: Match the color of tick
* libdraw: fix subfont scaling
* libregexp: allow up to 127 captured subexpressions in one regexp
* plumber: increase NMATCHSUBEXP up to 100
* libregexp: allow up to 128 character classes in one regexp
* plumber: use strtoul to parse subexpression match variable
  substitutions
* plumber: increase NMATCHSUBEXP up to libregexp's NSUBEXP
* plumber: allow multi-digit subexpression match variable substitutions
* plumber: parametrize the number of stored match pattern subexpressions
* devdraw: Fix mouse wheel scrolling in 1-tick increments on macOS


(vins)
diff -r1.6 -r1.7 pkgsrc/misc/plan9port/Makefile
diff -r1.1 -r1.2 pkgsrc/misc/plan9port/PLIST
diff -r1.3 -r1.4 pkgsrc/misc/plan9port/distinfo
diff -r1.1 -r1.2 pkgsrc/misc/plan9port/patches/patch-bin_9c
cvs diff -r1.6 -r1.7 pkgsrc/misc/plan9port/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/plan9port/Makefile 2023/11/12 13:22:52 1.6
+++ pkgsrc/misc/plan9port/Makefile 2024/02/11 10:01:46 1.7
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.6 2023/11/12 13:22:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2024/02/11 10:01:46 vins Exp $
2 2
3DISTNAME= plan9port-20230123 3DISTNAME= plan9port-20240110
4PKGREVISION= 1 
5CATEGORIES= misc plan9 4CATEGORIES= misc plan9
6MASTER_SITES= ${MASTER_SITE_GITHUB:=9fans/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=9fans/}
7GITHUB_TAG= e2a141ae0952c2d28a9f500bb9da6dc72e57be3c 6GITHUB_TAG= be7c68f6954f7dcaa53403e0f600716f65a13d32
8 7
9MAINTAINER= vins@NetBSD.org 8MAINTAINER= vins@NetBSD.org
10HOMEPAGE= https://9fans.github.io/plan9port/ 9HOMEPAGE= https://9fans.github.io/plan9port/
11COMMENT= Plan 9 from User Space 10COMMENT= Plan 9 from User Space
12# mostly MIT (see LICENSE) 11# mostly MIT (see LICENSE)
13# certain fonts may NOT be redistributed separately. 12# certain fonts may NOT be redistributed separately.
14LICENSE= mit AND zlib 13LICENSE= mit AND zlib
15 14
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_TOOLS+= bash:run perl pax 16USE_TOOLS+= bash:run perl pax
18 17
19MKPIE_SUPPORTED= no 18MKPIE_SUPPORTED= no
20RELRO_SUPPORTED= no 19RELRO_SUPPORTED= no
21 20
 21PTHREAD_AUTO_VARS= yes
 22BUILDLINK_TRANSFORM+= rm:-lpthread
 23
22REPLACE_BASH+= bin/macedit 24REPLACE_BASH+= bin/macedit
23REPLACE_BASH+= mac/9term.app/Contents/MacOS/9term 25REPLACE_BASH+= mac/9term.app/Contents/MacOS/9term
24REPLACE_BASH+= mac/Plumb.app/Contents/MacOS/plumb 26REPLACE_BASH+= mac/Plumb.app/Contents/MacOS/plumb
25REPLACE_BASH+= src/cmd/rc/checkparse 27REPLACE_BASH+= src/cmd/rc/checkparse
26 28
27REPLACE_PERL+= dist/addsrclinks 29REPLACE_PERL+= dist/addsrclinks
28REPLACE_PERL+= dist/fixurls 30REPLACE_PERL+= dist/fixurls
29REPLACE_PERL+= unix/man/fixurls 31REPLACE_PERL+= unix/man/fixurls
30 32
31REPLACE_INTERPRETER+= rc 33REPLACE_INTERPRETER+= rc
32REPLACE.rc.old= .*/bin/rc 34REPLACE.rc.old= .*/bin/rc
33REPLACE.rc.new= ${PREFIX}/plan9/bin/rc 35REPLACE.rc.new= ${PREFIX}/plan9/bin/rc
34REPLACE_FILES.rc+= bin/wintext 36REPLACE_FILES.rc+= bin/wintext
@@ -106,29 +108,31 @@ do-configure: @@ -106,29 +108,31 @@ do-configure:
106 ${RUN}${ECHO} "FONTSRV=fontsrv" >> ${WRKSRC}/LOCAL.config 108 ${RUN}${ECHO} "FONTSRV=fontsrv" >> ${WRKSRC}/LOCAL.config
107.if ${OPSYS} == "Darwin" 109.if ${OPSYS} == "Darwin"
108 ${RUN}${ECHO} "WSYSTYPE='mac'" >> ${WRKSRC}/LOCAL.config 110 ${RUN}${ECHO} "WSYSTYPE='mac'" >> ${WRKSRC}/LOCAL.config
109.elif !empty(PKG_OPTIONS:Mx11) 111.elif !empty(PKG_OPTIONS:Mx11)
110 ${RUN}${ECHO} "WSYSTYPE='x11'" >> ${WRKSRC}/LOCAL.config 112 ${RUN}${ECHO} "WSYSTYPE='x11'" >> ${WRKSRC}/LOCAL.config
111.else 113.else
112 ${RUN}${ECHO} "WSYSTYPE='nowsys'" >> ${WRKSRC}/LOCAL.config 114 ${RUN}${ECHO} "WSYSTYPE='nowsys'" >> ${WRKSRC}/LOCAL.config
113.endif 115.endif
114 116
115do-build: 117do-build:
116 ${RUN}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ./INSTALL -b 118 ${RUN}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ./INSTALL -b
117 119
118post-build: 120post-build:
 121# Clean versioning and backup files
119.for h in *.orig .gitignore .gitkeep .travis.yml 122.for h in *.orig .gitignore .gitkeep .travis.yml
120 ${RUN}${FIND} ${WRKSRC} -type f -name "${h}" -delete 123 ${RUN}${FIND} ${WRKSRC} -type f -name "${h}" -delete
121.endfor 124.endfor
 125 ${RUN}${RM} -r ${WRKSRC}/.github
122 126
123do-install: 127do-install:
124# Move everything to the PLAN9 target. 128# Move everything to the PLAN9 target.
125 ${RUN}cd ${WRKSRC} && ${PAX} -rw -pm . ${PLAN9_BUILD} 129 ${RUN}cd ${WRKSRC} && ${PAX} -rw -pm . ${PLAN9_BUILD}
126# Rename hard-coded paths and builds mans. 130# Rename hard-coded paths and builds mans.
127 ${RUN}cd ${PLAN9_BUILD} && \ 131 ${RUN}cd ${PLAN9_BUILD} && \
128 ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SH} ./INSTALL -c 132 ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SH} ./INSTALL -c
129# Install docs and sample profile script. 133# Install docs and sample profile script.
130.for f in CHANGES LICENSE README.md 134.for f in CHANGES LICENSE README.md
131 ${RUN}cd ${PLAN9_BUILD} && \ 135 ${RUN}cd ${PLAN9_BUILD} && \
132 ${PAX} -rw -pm ${f} ${DESTDIR}${DOCDIR} 136 ${PAX} -rw -pm ${f} ${DESTDIR}${DOCDIR}
133.endfor 137.endfor
134 ${INSTALL_SCRIPT} ${PLAN9_BUILD}/plan9.sh \ 138 ${INSTALL_SCRIPT} ${PLAN9_BUILD}/plan9.sh \
@@ -158,16 +162,15 @@ do-install: @@ -158,16 +162,15 @@ do-install:
158post-install: 162post-install:
159# Run acme as a standalone application. 163# Run acme as a standalone application.
160 ${INSTALL_SCRIPT} ${WRKSRC}/acme.sh \ 164 ${INSTALL_SCRIPT} ${WRKSRC}/acme.sh \
161 ${DESTDIR}${PREFIX}/bin/acme 165 ${DESTDIR}${PREFIX}/bin/acme
162 ${INSTALL_DATA} ${FILESDIR}/acme.desktop \ 166 ${INSTALL_DATA} ${FILESDIR}/acme.desktop \
163 ${DESTDIR}${PREFIX}/share/applications 167 ${DESTDIR}${PREFIX}/share/applications
164 ${INSTALL_DATA} ${WRKSRC}/dist/glendacircle.png \ 168 ${INSTALL_DATA} ${WRKSRC}/dist/glendacircle.png \
165 ${DESTDIR}${PREFIX}/share/pixmaps/acme.png 169 ${DESTDIR}${PREFIX}/share/pixmaps/acme.png
166 170
167.include "../../sysutils/desktop-file-utils/desktopdb.mk" 171.include "../../sysutils/desktop-file-utils/desktopdb.mk"
168.include "../../fonts/fontconfig/buildlink3.mk" 172.include "../../fonts/fontconfig/buildlink3.mk"
169.include "../../graphics/freetype2/buildlink3.mk" 173.include "../../graphics/freetype2/buildlink3.mk"
170.include "../../devel/zlib/buildlink3.mk" 174.include "../../devel/zlib/buildlink3.mk"
171PTHREAD_AUTO_VARS= yes 
172.include "../../mk/pthread.buildlink3.mk" 175.include "../../mk/pthread.buildlink3.mk"
173.include "../../mk/bsd.pkg.mk" 176.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/misc/plan9port/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/plan9port/PLIST 2022/12/06 14:29:25 1.1
+++ pkgsrc/misc/plan9port/PLIST 2024/02/11 10:01:46 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2022/12/06 14:29:25 vins Exp $ 1@comment $NetBSD: PLIST,v 1.2 2024/02/11 10:01:46 vins Exp $
2bin/acme 2bin/acme
3plan9/acid/386 3plan9/acid/386
4plan9/acid/68020 4plan9/acid/68020
5plan9/acid/acme 5plan9/acid/acme
6plan9/acid/alef 6plan9/acid/alef
7plan9/acid/alpha 7plan9/acid/alpha
8plan9/acid/amd64 8plan9/acid/amd64
9plan9/acid/arm 9plan9/acid/arm
10plan9/acid/coverage 10plan9/acid/coverage
11plan9/acid/kernel 11plan9/acid/kernel
12plan9/acid/leak 12plan9/acid/leak
13plan9/acid/mips 13plan9/acid/mips
14plan9/acid/network 14plan9/acid/network
@@ -156,26 +156,27 @@ plan9/bin/lex @@ -156,26 +156,27 @@ plan9/bin/lex
156plan9/bin/listen1 156plan9/bin/listen1
157plan9/bin/look 157plan9/bin/look
158plan9/bin/lookman 158plan9/bin/lookman
159plan9/bin/ls 159plan9/bin/ls
160plan9/bin/macedit 160plan9/bin/macedit
161plan9/bin/man 161plan9/bin/man
162plan9/bin/mapd 162plan9/bin/mapd
163plan9/bin/mc 163plan9/bin/mc
164plan9/bin/md5sum 164plan9/bin/md5sum
165plan9/bin/mk 165plan9/bin/mk
166plan9/bin/mk9660 166plan9/bin/mk9660
167plan9/bin/mkdir 167plan9/bin/mkdir
168plan9/bin/mklatinkbd 168plan9/bin/mklatinkbd
 169plan9/bin/mntgen
169plan9/bin/mount 170plan9/bin/mount
170plan9/bin/mtime 171plan9/bin/mtime
171plan9/bin/namespace 172plan9/bin/namespace
172plan9/bin/ndbipquery 173plan9/bin/ndbipquery
173plan9/bin/ndbmkdb 174plan9/bin/ndbmkdb
174plan9/bin/ndbmkhash 175plan9/bin/ndbmkhash
175plan9/bin/ndbmkhosts 176plan9/bin/ndbmkhosts
176plan9/bin/ndbquery 177plan9/bin/ndbquery
177plan9/bin/netfileget 178plan9/bin/netfileget
178plan9/bin/netfilelib.rc 179plan9/bin/netfilelib.rc
179plan9/bin/netfileput 180plan9/bin/netfileput
180plan9/bin/netfilestat 181plan9/bin/netfilestat
181plan9/bin/netkey 182plan9/bin/netkey
@@ -4751,26 +4752,28 @@ plan9/man/man4/9pserve.html @@ -4751,26 +4752,28 @@ plan9/man/man4/9pserve.html
4751plan9/man/man4/INDEX 4752plan9/man/man4/INDEX
4752plan9/man/man4/acme.4 4753plan9/man/man4/acme.4
4753plan9/man/man4/acme.html 4754plan9/man/man4/acme.html
4754plan9/man/man4/factotum.4 4755plan9/man/man4/factotum.4
4755plan9/man/man4/factotum.html 4756plan9/man/man4/factotum.html
4756plan9/man/man4/fontsrv.4 4757plan9/man/man4/fontsrv.4
4757plan9/man/man4/fontsrv.html 4758plan9/man/man4/fontsrv.html
4758plan9/man/man4/fossil.4 4759plan9/man/man4/fossil.4
4759plan9/man/man4/fossil.html 4760plan9/man/man4/fossil.html
4760plan9/man/man4/import.4 4761plan9/man/man4/import.4
4761plan9/man/man4/import.html 4762plan9/man/man4/import.html
4762plan9/man/man4/index.html 4763plan9/man/man4/index.html
4763plan9/man/man4/intro.html 4764plan9/man/man4/intro.html
 4765plan9/man/man4/mntgen.4
 4766plan9/man/man4/mntgen.html
4764plan9/man/man4/plumber.4 4767plan9/man/man4/plumber.4
4765plan9/man/man4/plumber.html 4768plan9/man/man4/plumber.html
4766plan9/man/man4/ramfs.4 4769plan9/man/man4/ramfs.4
4767plan9/man/man4/ramfs.html 4770plan9/man/man4/ramfs.html
4768plan9/man/man4/smugfs.4 4771plan9/man/man4/smugfs.4
4769plan9/man/man4/smugfs.html 4772plan9/man/man4/smugfs.html
4770plan9/man/man4/srv.4 4773plan9/man/man4/srv.4
4771plan9/man/man4/srv.html 4774plan9/man/man4/srv.html
4772plan9/man/man4/tapefs.4 4775plan9/man/man4/tapefs.4
4773plan9/man/man4/tapefs.html 4776plan9/man/man4/tapefs.html
4774plan9/man/man4/vacfs.4 4777plan9/man/man4/vacfs.4
4775plan9/man/man4/vacfs.html 4778plan9/man/man4/vacfs.html
4776plan9/man/man7/0intro.7 4779plan9/man/man7/0intro.7
@@ -6153,26 +6156,27 @@ plan9/src/cmd/mk/shprint.c @@ -6153,26 +6156,27 @@ plan9/src/cmd/mk/shprint.c
6153plan9/src/cmd/mk/symtab.c 6156plan9/src/cmd/mk/symtab.c
6154plan9/src/cmd/mk/sys.h 6157plan9/src/cmd/mk/sys.h
6155plan9/src/cmd/mk/sys.std.h 6158plan9/src/cmd/mk/sys.std.h
6156plan9/src/cmd/mk/unix.c 6159plan9/src/cmd/mk/unix.c
6157plan9/src/cmd/mk/var.c 6160plan9/src/cmd/mk/var.c
6158plan9/src/cmd/mk/varsub.c 6161plan9/src/cmd/mk/varsub.c
6159plan9/src/cmd/mk/word.c 6162plan9/src/cmd/mk/word.c
6160plan9/src/cmd/mkdir.c 6163plan9/src/cmd/mkdir.c
6161plan9/src/cmd/mkfile 6164plan9/src/cmd/mkfile
6162plan9/src/cmd/mnihongo/README 6165plan9/src/cmd/mnihongo/README
6163plan9/src/cmd/mnihongo/mkfile 6166plan9/src/cmd/mnihongo/mkfile
6164plan9/src/cmd/mnihongo/mnihongo.c 6167plan9/src/cmd/mnihongo/mnihongo.c
6165plan9/src/cmd/mnihongo/tmac.nihongo 6168plan9/src/cmd/mnihongo/tmac.nihongo
 6169plan9/src/cmd/mntgen.c
6166plan9/src/cmd/mpm/README 6170plan9/src/cmd/mpm/README
6167plan9/src/cmd/mpm/misc.cc 6171plan9/src/cmd/mpm/misc.cc
6168plan9/src/cmd/mpm/misc.h 6172plan9/src/cmd/mpm/misc.h
6169plan9/src/cmd/mpm/mkfile 6173plan9/src/cmd/mpm/mkfile
6170plan9/src/cmd/mpm/page.cc 6174plan9/src/cmd/mpm/page.cc
6171plan9/src/cmd/mpm/page.h 6175plan9/src/cmd/mpm/page.h
6172plan9/src/cmd/mpm/queue.cc 6176plan9/src/cmd/mpm/queue.cc
6173plan9/src/cmd/mpm/range.cc 6177plan9/src/cmd/mpm/range.cc
6174plan9/src/cmd/mpm/range.h 6178plan9/src/cmd/mpm/range.h
6175plan9/src/cmd/mpm/slug.cc 6179plan9/src/cmd/mpm/slug.cc
6176plan9/src/cmd/mpm/slug.h 6180plan9/src/cmd/mpm/slug.h
6177plan9/src/cmd/mpm/tmac.pm 6181plan9/src/cmd/mpm/tmac.pm
6178plan9/src/cmd/mtime.c 6182plan9/src/cmd/mtime.c
cvs diff -r1.3 -r1.4 pkgsrc/misc/plan9port/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/plan9port/distinfo 2023/03/08 22:30:52 1.3
+++ pkgsrc/misc/plan9port/distinfo 2024/02/11 10:01:46 1.4
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.3 2023/03/08 22:30:52 vins Exp $ 1$NetBSD: distinfo,v 1.4 2024/02/11 10:01:46 vins Exp $
2 2
3BLAKE2s (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 99010aa1dc24bbd7a6a2f24fef9f3e2cd525261d1628fcc9405cbfa7ac2acd2f 3BLAKE2s (plan9port-20240110-be7c68f6954f7dcaa53403e0f600716f65a13d32.tar.gz) = 6bb41110e7b485e95b6c10444c576e9a01a4860620df5c55180f279210b126cc
4SHA512 (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = c2c730e478ed3d876dead7cf3ff3d6d24ac37436f18ad478fd61e943248b0e37435520ea6c57fcb398ee7424d7609af3bfb9704f5ac3ddb1a23553cebf906ccd 4SHA512 (plan9port-20240110-be7c68f6954f7dcaa53403e0f600716f65a13d32.tar.gz) = c8749d55a8e1253c4ed566406e6ba56b6818b652935dd086cd169ee59816cedaf6ead4c3cfa90781357b339fedc422406ce55a2f08c2b65d0e8f06280ba9ce4f
5Size (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 23411241 bytes 5Size (plan9port-20240110-be7c68f6954f7dcaa53403e0f600716f65a13d32.tar.gz) = 23413541 bytes
6SHA1 (patch-INSTALL) = a20664c816a3c242bb6ca3484bccb84350843122 6SHA1 (patch-INSTALL) = a20664c816a3c242bb6ca3484bccb84350843122
7SHA1 (patch-bin_9c) = f82600788e2643d9b93941a47774be1b3c79c03b 7SHA1 (patch-bin_9c) = 65184d75f4ff87718093f9e85e43adf8018ea366
8SHA1 (patch-bin_9l) = e6daeac87657ed3e25e0f0db403d973f60d544d2 8SHA1 (patch-bin_9l) = e6daeac87657ed3e25e0f0db403d973f60d544d2
9SHA1 (patch-src_cmd_devdraw_mkwsysrules.sh) = b81252ff054868622e07e743e436ddaad540b9e0 9SHA1 (patch-src_cmd_devdraw_mkwsysrules.sh) = b81252ff054868622e07e743e436ddaad540b9e0
10SHA1 (patch-src_cmd_rio_mkfile) = b2584bf14a71efb7af4bebba763035d21b38a194 10SHA1 (patch-src_cmd_rio_mkfile) = b2584bf14a71efb7af4bebba763035d21b38a194
cvs diff -r1.1 -r1.2 pkgsrc/misc/plan9port/patches/patch-bin_9c (expand / switch to unified diff)

--- pkgsrc/misc/plan9port/patches/patch-bin_9c 2022/12/06 14:29:25 1.1
+++ pkgsrc/misc/plan9port/patches/patch-bin_9c 2024/02/11 10:01:46 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-bin_9c,v 1.1 2022/12/06 14:29:25 vins Exp $ 1$NetBSD: patch-bin_9c,v 1.2 2024/02/11 10:01:46 vins Exp $
2 2
3Let pkgsrc define its own compiler. 3Let pkgsrc define its own compiler.
4 4
5--- bin/9c.orig 2022-09-12 14:35:36.000000000 +0000 5--- bin/9c.orig 2022-09-12 14:35:36.000000000 +0000
6+++ bin/9c 6+++ bin/9c
7@@ -3,7 +3,7 @@ 7@@ -3,7 +3,7 @@
8 test -f $PLAN9/config && . $PLAN9/config 8 test -f "$PLAN9/config" && . "$PLAN9/config"
9 usegcc() 9 usegcc()
10 { 10 {
11- cc=${CC9:-gcc} 11- cc=${CC9:-gcc}
12+ cc=${CC9:-@CC@} 12+ cc=${CC9:-@CC@}
13 cflags=" \ 13 cflags=" \
14 -O2 \ 14 -O2 \
15 -c \ 15 -c \
16@@ -60,7 +60,7 @@ quiet() 16@@ -60,7 +60,7 @@ quiet()
17  17
18 useclang() 18 useclang()
19 { 19 {
20- cc=${CC9:-clang} 20- cc=${CC9:-clang}
21+ cc=${CC9:-@CC@} 21+ cc=${CC9:-@CC@}