git: 6542d237f6b3 - main - devel/plan9port: unbreak, update, and undeprecate the port (+)

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6542d237f6b3aad85a155e54702cb976b957228e

commit 6542d237f6b3aad85a155e54702cb976b957228e
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2024-09-09 19:11:12 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2024-09-09 19:11:12 +0000

    devel/plan9port: unbreak, update, and undeprecate the port (+)
    
    - Fix the conflict with badly named kcmp(2) syscall introduced in
      recent FreeBSD-CURRENT/14.1
    - Update to the latest GitHub commit, shorten the GH_TAGNAME, and
      merge two installation targets into one (which still begs for a
      further pre/post-stage separation and cleanup)
    
    Fixes:  d846b489087a
    PR:     278145
---
 devel/plan9port/Makefile  | 22 ++++++++++------------
 devel/plan9port/distinfo  |  6 +++---
 devel/plan9port/pkg-plist |  3 +++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile
index 6732556c8c05..f3d37bfaaa19 100644
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	plan9port
-PORTVERSION=	20220913
+PORTVERSION=	20240617
 CATEGORIES=	devel plan9
 DIST_SUBDIR=	plan9port
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -11,10 +11,6 @@ WWW=		https://9fans.github.io/plan9port/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		Fails to build, sort.c:111:5: error: conflicting types for 'kcmp'
-DEPRECATED=	Fails to build, unmaintained in tree and outdated
-EXPIRATION_DATE=2024-11-30
-
 BUILD_DEPENDS=	as:devel/binutils
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
@@ -22,7 +18,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 USES=		compiler:c11 localbase:ldflags perl5 shebangfix xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	9fans
-GH_TAGNAME=	ffbdd1aa20c8a20a8e9dcd3cec644b6dfa3c6acb
+GH_TAGNAME=	a2567fc
 USE_PERL5=	build
 USE_XORG=	x11 xext xt
 
@@ -55,10 +51,14 @@ post-extract-DATA-on:
 post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/font/bit|${PREFIX}/plan9/font|' \
 		${WRKSRC}/src/cmd/acme/acme.c
+# XXX: remove after https://github.com/9fans/plan9port/issues/648 fixed
+	@${REINPLACE_CMD} -e 's|kcmp(|${PORTNAME}_&|' \
+		${WRKSRC}/src/cmd/sort.c
 	@${REINPLACE_CMD} -e 's|#!/bin/rc|#!${PREFIX}/plan9/bin/rc|' \
 		${WRKSRC}/src/cmd/upas/ml/mlmgr.c \
 		${WRKSRC}/src/cmd/tcs/font/mkfile
-	@${REINPLACE_CMD} -e 's|ulong|u64int|' ${WRKSRC}/src/libmach/FreeBSD.c
+	@${REINPLACE_CMD} -e 's|ulong|u64int|' \
+		${WRKSRC}/src/libmach/FreeBSD.c
 
 do-configure:
 .if ${CHOSEN_COMPILER_TYPE} == gcc
@@ -72,17 +72,15 @@ do-build:
 	@cd ${WRKSRC} && ${SETENV} CC9=${CC} ./INSTALL -b
 
 do-install:
-.for l in .cvsignore .hg .hgignore .hgtags .gitignore .gitkeep *.bak *.orig \
-	*.beforesubst .travis.yml
-	@${FIND} ${WRKSRC} -name "${l}" -delete
+.for f in .gitkeep actions.yaml
+	@${FIND} ${WRKSRC} -type f -name ${f} -delete
 .endfor
+	@${RMDIR} ${WRKSRC}/.github/workflows ${WRKSRC}/.github
 	@cd ${WRKSRC} && ${SED} -i '' 's#/usr/local#${PREFIX}#' \
 		`${CAT} lib/moveplan9.files`
 	@${MKDIR} ${STAGEDIR}${PREFIX}/plan9
 	@cd ${WRKSRC} && ${PAX} -rw . ${STAGEDIR}${PREFIX}/plan9
 	@${RLN} ${STAGEDIR}${PREFIX}/plan9/bin/9 ${STAGEDIR}${PREFIX}/bin/9
-
-post-install:
 	@cd ${STAGEDIR}${PREFIX}/plan9 && \
 		for f in bin/* bin/disk/* bin/fossil/* bin/fs/* bin/venti/* \
 		src/cmd/devdraw/o.devdraw; do \
diff --git a/devel/plan9port/distinfo b/devel/plan9port/distinfo
index ef33807c3a55..10208fd6f947 100644
--- a/devel/plan9port/distinfo
+++ b/devel/plan9port/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1669791058
+TIMESTAMP = 1718630920
 SHA256 (plan9port/pgw.tar.bz2) = de3af82012b3380612b56fa0c1a2ed8daf619a0215189fc59eab9919ec47ea15
 SIZE (plan9port/pgw.tar.bz2) = 9406367
 SHA256 (plan9port/roget.tar.bz2) = b24f051354dabe58f1d825e29db386091c84aec98125dbe499adeca51a32a836
 SIZE (plan9port/roget.tar.bz2) = 482956
 SHA256 (plan9port/scat.tgz) = a995f52544a712f2bdb87f531638d4c846224fa9212d034e3bd8e809cb99be1e
 SIZE (plan9port/scat.tgz) = 5145346
-SHA256 (plan9port/9fans-plan9port-20220913-ffbdd1aa20c8a20a8e9dcd3cec644b6dfa3c6acb_GH0.tar.gz) = da560c3676022f001778b3a48380fee5d28baf7ed9d7f85b3a6d28ace86e9895
-SIZE (plan9port/9fans-plan9port-20220913-ffbdd1aa20c8a20a8e9dcd3cec644b6dfa3c6acb_GH0.tar.gz) = 23407448
+SHA256 (plan9port/9fans-plan9port-20240617-a2567fc_GH0.tar.gz) = 2bd8655e4c74c2444a53d8d058cf11cc233ddf3bb59a58284f8d26b9612cb9a1
+SIZE (plan9port/9fans-plan9port-20240617-a2567fc_GH0.tar.gz) = 23413366
diff --git a/devel/plan9port/pkg-plist b/devel/plan9port/pkg-plist
index ea8d62be8b10..07974547eb68 100644
--- a/devel/plan9port/pkg-plist
+++ b/devel/plan9port/pkg-plist
@@ -173,6 +173,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
@@ -4496,6 +4497,7 @@ plan9/man/man4/factotum.4
 plan9/man/man4/fontsrv.4
 plan9/man/man4/fossil.4
 plan9/man/man4/import.4
+plan9/man/man4/mntgen.4
 plan9/man/man4/plumber.4
 plan9/man/man4/ramfs.4
 plan9/man/man4/smugfs.4
@@ -5861,6 +5863,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