CVS commit: pkgsrc/misc/plan9port

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Feb 11 10:01:46 UTC 2024

Modified Files:
        pkgsrc/misc/plan9port: Makefile PLIST distinfo
        pkgsrc/misc/plan9port/patches: patch-bin_9c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/plan9port/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/plan9port/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/plan9port/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/plan9port/patches/patch-bin_9c

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

Modified files:

Index: pkgsrc/misc/plan9port/Makefile
diff -u pkgsrc/misc/plan9port/Makefile:1.6 pkgsrc/misc/plan9port/Makefile:1.7
--- pkgsrc/misc/plan9port/Makefile:1.6  Sun Nov 12 13:22:52 2023
+++ pkgsrc/misc/plan9port/Makefile      Sun Feb 11 10:01:46 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2023/11/12 13:22:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/02/11 10:01:46 vins Exp $
 
-DISTNAME=      plan9port-20230123
-PKGREVISION=   1
+DISTNAME=      plan9port-20240110
 CATEGORIES=    misc plan9
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=9fans/}
-GITHUB_TAG=    e2a141ae0952c2d28a9f500bb9da6dc72e57be3c
+GITHUB_TAG=    be7c68f6954f7dcaa53403e0f600716f65a13d32
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://9fans.github.io/plan9port/
@@ -19,6 +18,9 @@ USE_TOOLS+=   bash:run perl pax
 MKPIE_SUPPORTED=       no
 RELRO_SUPPORTED=       no
 
+PTHREAD_AUTO_VARS=             yes
+BUILDLINK_TRANSFORM+=          rm:-lpthread
+
 REPLACE_BASH+= bin/macedit
 REPLACE_BASH+= mac/9term.app/Contents/MacOS/9term
 REPLACE_BASH+= mac/Plumb.app/Contents/MacOS/plumb
@@ -116,9 +118,11 @@ do-build:
        ${RUN}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ./INSTALL -b
 
 post-build:
+# Clean versioning and backup files
 .for h in *.orig .gitignore .gitkeep .travis.yml
        ${RUN}${FIND} ${WRKSRC} -type f -name "${h}" -delete
 .endfor
+       ${RUN}${RM} -r ${WRKSRC}/.github
 
 do-install:
 # Move everything to the PLAN9 target.
@@ -168,6 +172,5 @@ post-install:
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-PTHREAD_AUTO_VARS=     yes
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/plan9port/PLIST
diff -u pkgsrc/misc/plan9port/PLIST:1.1 pkgsrc/misc/plan9port/PLIST:1.2
--- pkgsrc/misc/plan9port/PLIST:1.1     Tue Dec  6 14:29:25 2022
+++ pkgsrc/misc/plan9port/PLIST Sun Feb 11 10:01:46 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/12/06 14:29:25 vins Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/02/11 10:01:46 vins Exp $
 bin/acme
 plan9/acid/386
 plan9/acid/68020
@@ -166,6 +166,7 @@ plan9/bin/mk
 plan9/bin/mk9660
 plan9/bin/mkdir
 plan9/bin/mklatinkbd
+plan9/bin/mntgen
 plan9/bin/mount
 plan9/bin/mtime
 plan9/bin/namespace
@@ -4761,6 +4762,8 @@ plan9/man/man4/import.4
 plan9/man/man4/import.html
 plan9/man/man4/index.html
 plan9/man/man4/intro.html
+plan9/man/man4/mntgen.4
+plan9/man/man4/mntgen.html
 plan9/man/man4/plumber.4
 plan9/man/man4/plumber.html
 plan9/man/man4/ramfs.4
@@ -6163,6 +6166,7 @@ plan9/src/cmd/mnihongo/README
 plan9/src/cmd/mnihongo/mkfile
 plan9/src/cmd/mnihongo/mnihongo.c
 plan9/src/cmd/mnihongo/tmac.nihongo
+plan9/src/cmd/mntgen.c
 plan9/src/cmd/mpm/README
 plan9/src/cmd/mpm/misc.cc
 plan9/src/cmd/mpm/misc.h

Index: pkgsrc/misc/plan9port/distinfo
diff -u pkgsrc/misc/plan9port/distinfo:1.3 pkgsrc/misc/plan9port/distinfo:1.4
--- pkgsrc/misc/plan9port/distinfo:1.3  Wed Mar  8 22:30:52 2023
+++ pkgsrc/misc/plan9port/distinfo      Sun Feb 11 10:01:46 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2023/03/08 22:30:52 vins Exp $
+$NetBSD: distinfo,v 1.4 2024/02/11 10:01:46 vins Exp $
 
-BLAKE2s (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 99010aa1dc24bbd7a6a2f24fef9f3e2cd525261d1628fcc9405cbfa7ac2acd2f
-SHA512 (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 
c2c730e478ed3d876dead7cf3ff3d6d24ac37436f18ad478fd61e943248b0e37435520ea6c57fcb398ee7424d7609af3bfb9704f5ac3ddb1a23553cebf906ccd
-Size (plan9port-20230123-e2a141ae0952c2d28a9f500bb9da6dc72e57be3c.tar.gz) = 23411241 bytes
+BLAKE2s (plan9port-20240110-be7c68f6954f7dcaa53403e0f600716f65a13d32.tar.gz) = 6bb41110e7b485e95b6c10444c576e9a01a4860620df5c55180f279210b126cc
+SHA512 (plan9port-20240110-be7c68f6954f7dcaa53403e0f600716f65a13d32.tar.gz) = 
c8749d55a8e1253c4ed566406e6ba56b6818b652935dd086cd169ee59816cedaf6ead4c3cfa90781357b339fedc422406ce55a2f08c2b65d0e8f06280ba9ce4f
+Size (plan9port-20240110-be7c68f6954f7dcaa53403e0f600716f65a13d32.tar.gz) = 23413541 bytes
 SHA1 (patch-INSTALL) = a20664c816a3c242bb6ca3484bccb84350843122
-SHA1 (patch-bin_9c) = f82600788e2643d9b93941a47774be1b3c79c03b
+SHA1 (patch-bin_9c) = 65184d75f4ff87718093f9e85e43adf8018ea366
 SHA1 (patch-bin_9l) = e6daeac87657ed3e25e0f0db403d973f60d544d2
 SHA1 (patch-src_cmd_devdraw_mkwsysrules.sh) = b81252ff054868622e07e743e436ddaad540b9e0
 SHA1 (patch-src_cmd_rio_mkfile) = b2584bf14a71efb7af4bebba763035d21b38a194

Index: pkgsrc/misc/plan9port/patches/patch-bin_9c
diff -u pkgsrc/misc/plan9port/patches/patch-bin_9c:1.1 pkgsrc/misc/plan9port/patches/patch-bin_9c:1.2
--- pkgsrc/misc/plan9port/patches/patch-bin_9c:1.1      Tue Dec  6 14:29:25 2022
+++ pkgsrc/misc/plan9port/patches/patch-bin_9c  Sun Feb 11 10:01:46 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-bin_9c,v 1.1 2022/12/06 14:29:25 vins Exp $
+$NetBSD: patch-bin_9c,v 1.2 2024/02/11 10:01:46 vins Exp $
 
 Let pkgsrc define its own compiler.
 
 --- bin/9c.orig        2022-09-12 14:35:36.000000000 +0000
 +++ bin/9c
 @@ -3,7 +3,7 @@
- test -f $PLAN9/config && . $PLAN9/config
+ test -f "$PLAN9/config" && . "$PLAN9/config"
  usegcc()
  {
 -      cc=${CC9:-gcc}