Re: update plan9/plan9port

On 2023/01/26 18:12:49 +0100, Omar Polo <op@omarpolo.com> wrote:
> I'm not using exactly this, I have my own build in ~/plan9 (was
> /usr/local/plan9 but had to move it to test the update) with a few
> patches, but I've been using it continuously at least for the last two
> years (rebasing on top of the latest commit every few months) without
> any issue. I'm mostly using Acme, grep (via `g') and the manpages.
>
> I've dropped the substitution for bin/wintext (was rewritten in rc)
> and while here i've simplified do-install: there are no more any
> .cvsignore, .hg, .hgignore or .hgtags file, and adjusted the find
> invocation to delete the other files in one go.
>
> The patch for libthread/daemonize.c was merged upstream and so can be
> dropped.
>
> ok?

Kyle Milz (offlist) noted that patch-src_mkhdr is not needed anymore.
it builds, links, package and works fine without. Thanks!

updated diff

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile 23 Sep 2022 02:28:27 -0000 1.40
+++ Makefile 26 Jan 2023 16:37:16 -0000
@@ -2,11 +2,11 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc powe

COMMENT = Plan 9 from user space

-DISTNAME = plan9port-20210323
+DISTNAME = plan9port-20230123

GH_ACCOUNT = 9fans
GH_PROJECT = plan9port
-GH_COMMIT = 88a87fadae6629932d9c160f53ad5d79775f8f94
+GH_COMMIT = e2a141ae0952c2d28a9f500bb9da6dc72e57be3c

CATEGORIES = plan9

@@ -32,18 +32,17 @@ UPDATE_PLIST_ARGS += -i CC
pre-configure:
${SUBST_CMD} ${WRKSRC}/INSTALL ${WRKSRC}/bin/{9c,9l}
cd ${WRKSRC} && sed -i 's,#!/bin/bash,#!/bin/sh,' \
- bin/{macedit,wintext}
+ bin/macedit

do-build:
cd ${WRKSRC} && env CC9="${CC}" CCFLAGS="${CFLAGS}" ./INSTALL -b

do-install:
-.for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.orig *.beforesubst .travis.yml
- find ${WRKSRC} -name "$l" -delete
-.endfor
+ rm -f ${WRKSRC}/.travis.yml
cd ${WRKSRC} && sed -i 's#/usr/local#${TRUEPREFIX}#' \
`cat lib/moveplan9.files`
-
+ find ${WRKSRC} \( -name .gitignore -o -name .gitkeep -o \
+ -name \*.orig -o -name \*.beforesubst \) -delete
${INSTALL_DATA_DIR} ${PLAN9}
cd ${WRKSRC} && pax -rw . ${PLAN9}
cd ${PREFIX} && ln -s ../plan9/bin/9 bin/9
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/plan9/plan9port/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 25 Mar 2021 21:44:06 -0000 1.17
+++ distinfo 26 Jan 2023 11:12:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (plan9port-20210323-88a87fad.tar.gz) = 1LhzoJQDUCT+VCgqf91lIlW3O1HE/XiudwF0bR4+jzg=
-SIZE (plan9port-20210323-88a87fad.tar.gz) = 23413373
+SHA256 (plan9port-20230123-e2a141ae.tar.gz) = z7Tw88brcf/PDRH055Wbw2srEW/sH+MrXpLXzUSGnFw=
+SIZE (plan9port-20230123-e2a141ae.tar.gz) = 23411241
Index: patches/patch-INSTALL
===================================================================
RCS file: /home/cvs/ports/plan9/plan9port/patches/patch-INSTALL,v
retrieving revision 1.10
diff -u -p -r1.10 patch-INSTALL
--- patches/patch-INSTALL 11 Mar 2022 19:49:08 -0000 1.10
+++ patches/patch-INSTALL 26 Jan 2023 11:22:51 -0000
@@ -1,7 +1,7 @@
Index: INSTALL
--- INSTALL.orig
+++ INSTALL
-@@ -102,7 +102,7 @@ fi
+@@ -113,7 +113,7 @@ fi
if [ `uname` != Darwin ]; then
# Determine whether fontsrv X11 files are available.
rm -f a.out
@@ -10,7 +10,7 @@ Index: INSTALL
-I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
-I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
if [ -f a.out ]; then
-@@ -128,7 +128,7 @@ echo "* Compiler version:"
+@@ -139,7 +139,7 @@ echo "* Compiler version:"
cd src
if $dobuild; then
echo "* Building mk..."
@@ -19,7 +19,7 @@ Index: INSTALL

if [ ! -x ../bin/mk ]; then
echo "* Error: mk failed to build."
-@@ -136,7 +136,6 @@ if $dobuild; then
+@@ -147,7 +147,6 @@ if $dobuild; then
fi

echo "* Building everything (be patient)..."
@@ -27,7 +27,7 @@ Index: INSTALL
mk libs-nuke
mk all || exit 1
if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then
-@@ -195,5 +194,5 @@ if $doinstall; then
+@@ -206,5 +205,5 @@ if $doinstall; then
echo " PLAN9=$PLAN9 export PLAN9"
echo ' PATH=$PATH:$PLAN9/bin export PATH'
fi
Index: patches/patch-bin_9l
===================================================================
RCS file: /home/cvs/ports/plan9/plan9port/patches/patch-bin_9l,v
retrieving revision 1.4
diff -u -p -r1.4 patch-bin_9l
--- patches/patch-bin_9l 11 Mar 2022 19:49:08 -0000 1.4
+++ patches/patch-bin_9l 26 Jan 2023 11:22:51 -0000
@@ -1,7 +1,7 @@
Index: bin/9l
--- bin/9l.orig
+++ bin/9l
-@@ -12,7 +12,7 @@ extralibs="-lm"
+@@ -14,7 +14,7 @@ extralibs="-lm"
tag="${SYSNAME:-`uname`}"
case "$tag" in
*DragonFly*|*BSD*)
Index: patches/patch-src_libthread_daemonize_c
===================================================================
RCS file: patches/patch-src_libthread_daemonize_c
diff -N patches/patch-src_libthread_daemonize_c
--- patches/patch-src_libthread_daemonize_c 11 Mar 2022 19:49:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/libthread/daemonize.c
---- src/libthread/daemonize.c.orig
-+++ src/libthread/daemonize.c
-@@ -106,7 +106,7 @@ _threadsetupdaemonize(void)
- * Put it in its own process group so that we don't get a SIGHUP
- * when the parent exits.
- */
-- setpgrp();
-+ setpgid(0, 0);
-
- if(pipe(p) < 0)
- sysfatal("passer pipe: %r");
Index: patches/patch-src_mkhdr
===================================================================
RCS file: patches/patch-src_mkhdr
diff -N patches/patch-src_mkhdr
--- patches/patch-src_mkhdr 11 Mar 2022 19:49:08 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: src/mkhdr
---- src/mkhdr.orig
-+++ src/mkhdr
-@@ -11,8 +11,8 @@ CC=9c
- LD=9l
- AS=no-9a
- AR=9ar
--CFLAGS=
--LDFLAGS=
-+CFLAGS=${CCFLAGS} -pthread
-+LDFLAGS=-pthread
- AFLAGS=
- CLEANFILES=
- NUKEFILES=
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/plan9/plan9port/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 11 Mar 2022 19:49:08 -0000 1.17
+++ pkg/PLIST 26 Jan 2023 16:48:15 -0000
@@ -5084,6 +5084,7 @@ plan9/postscript/troff/H
plan9/postscript/troff/HB
plan9/postscript/troff/HI
plan9/postscript/troff/HL
+plan9/postscript/troff/HX
plan9/postscript/troff/Helvetica-Narrow-BoldOblique
plan9/postscript/troff/I
plan9/postscript/troff/Jp
@@ -7038,7 +7039,6 @@ plan9/src/lib9/write.c
plan9/src/lib9/zoneinfo.c
plan9/src/lib9/zoneinfo.h
plan9/src/lib9p/
-plan9/src/lib9p/_post.c
plan9/src/lib9p/dirread.c
plan9/src/lib9p/fid.c
plan9/src/lib9p/file.c
@@ -7048,8 +7048,6 @@ plan9/src/lib9p/mem.c
plan9/src/lib9p/mkfile
plan9/src/lib9p/parse.c
plan9/src/lib9p/portdate
-plan9/src/lib9p/post.c
-plan9/src/lib9p/post.h
plan9/src/lib9p/ramfs.c
plan9/src/lib9p/req.c
plan9/src/lib9p/srv.c