From nobody Mon Sep 09 19:12:31 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X2c0c1G47z5Tm5K; Mon, 09 Sep 2024 19:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X2c0b5rRSz4TqM; Mon, 9 Sep 2024 19:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725909151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zI/dJ/IZjdCBV9A6+RD4oub0dG9EHGB0av+p6LJ8UuE=; b=EdTx2F1MtnGTVzTF+DMsuHObQTYZMIgWVoYnReFSv2WE5nc5kBV8m9WDGePmVnOWbL4TZK x1dLl6e/TgcbVDJsy5h6L3Vr+ZXgX5CKXR2/bY2KFbVBDe5SxJLpPSo0hKPPo5FLUs3b2v QtVJFxNgF8HfCgq5wt5e5e07/aT6CoELu3ucMZw1LtfVxoWIhcU6vMdq+uvFqLHFOHERXf zXL5BeZhcS0n03Z6qa/KVoHzCAEUOgjrIgPup6DcI5sFCLsbSzLBXW3A6OkQzC8asBaAft VRI07WYaMzToEDaYQwZq7KuFli2C8CFKJ1zl9muvlr5FNJEX4ycEqn0sBI9EbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725909151; a=rsa-sha256; cv=none; b=reH0GZhHuDkxdh7YQGAe7mIvDWQhKgKqQfH4+mwelOJ2D7T0QqmGl8D1kklyC2nlcr7yQa tzBIibyN+1q0fezTTMN1t4DRIKeaZsbwnQ4M+s+6zhCWAbtW3AAZhzs6a/QyVYNywUxF16 m1mMwPfrP0ECGmFn5ZPTZhiUllRdauz2B1qQwztqOf9xOpkEWuvNhwTKZPxixPMtMTZLpc vMqzJwiEJw0y4df8kVyyvqAg16Zi3YT92VGYZEgdPWa7ervsIzHrsYXJBM0QFnldssNF4a z10x6HVsTUWak83M2aT8mg/ZsAi9S/3GSjhfZqBgPv07+1lW2PVSgSGSEm7DlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725909151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zI/dJ/IZjdCBV9A6+RD4oub0dG9EHGB0av+p6LJ8UuE=; b=LRxIe1M+vprwpGtgpWuwKZtF4T9nbrRFtuVAD8IZpZfnss5iLmM+UAEoPOyl0xhyCXU+EL ZzK/T0kFUeZoNgvkAwhQ/YG7KfbRAmDnVGVACIOwf2laXMypQEHvT5FZeUE3Hejd4ohdOO e4Szg2xbrF2dykU3EVzQ6UZovrk3JDIRd+PKvE674qMen6DuT6cyp8VXVnxPtTeqXrJkeL SFJcrL9uYPlrjW96jEvbXOBuZ4TSwIgf5clUxut7d8OKkgHRyAOH1juNgCIAMbMnxTwXbk V15ecweBTbg3NHgUktoHHa/eEn7DpMqtNMIVznJYbm4Z7Xpi/oe/b9NXUzt9og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X2c0b5S8BzG5r; Mon, 9 Sep 2024 19:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 489JCViI065370; Mon, 9 Sep 2024 19:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 489JCVWe065367; Mon, 9 Sep 2024 19:12:31 GMT (envelope-from git) Date: Mon, 9 Sep 2024 19:12:31 GMT Message-Id: <202409091912.489JCVWe065367@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 6542d237f6b3 - main - devel/plan9port: unbreak, update, and undeprecate the port (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6542d237f6b3aad85a155e54702cb976b957228e Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=6542d237f6b3aad85a155e54702cb976b957228e commit 6542d237f6b3aad85a155e54702cb976b957228e Author: Alexey Dokuchaev AuthorDate: 2024-09-09 19:11:12 +0000 Commit: Alexey Dokuchaev 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