From nobody Sun Mar 19 16:12:30 2023 X-Original-To: dev-commits-doc-all@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 4PfjZ64Lhfz40MyD for ; Sun, 19 Mar 2023 16:12:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PfjZ638c7z4SFK; Sun, 19 Mar 2023 16:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679242350; 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=5M8JrZ2L4AWh3KXbYLOo7fDO4MVVut3PAzbIuu96eEs=; b=sRSx4WOGHo6m5p8SjB4ykL4zWQ+XvUH4Gu3VRy1KFMUUnUye1vmJyUlPOaNL8eqpYKMKC9 5hEJRkwtES2BR0mIB3j9mOcpMT6OB/c6QcgcO2qp0FHG9Q4wV13IP5Qq6lhzKnTgs6Bq8E wu7zXvvELrUdx/D3q4dmell7Ur+ayVWv99SZ2YRK1bWtd2hNONRfk0FaK838AfUUnw34mR r3OrFs3hfjl4H5PRUQRBDHHLw1aKgmEXdDeiE6m1F29OpCX1IE8z9frRNtzp3OmZLcK0XY xUlya7BBldDHSMadkSpGw9V2/8XkOS2Ffe0qqSuHs0URGg7at1XfxKSP2zaYiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679242350; 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=5M8JrZ2L4AWh3KXbYLOo7fDO4MVVut3PAzbIuu96eEs=; b=AO0xhBfLIgFG4uVgMv5az6kvVzfiNG9vy3Iy6z+0l6pek7ap5+UXpTzkXDqC+1WLsQBanE wNQEw2p7g/x06u363Nkl7KmKNPLyVBFBe3hsHczKEYgGteqI6uUMAhRdcWl4VgKpJtOZji e1hAyF7xeUXUo/Etah8SJ6IiwNpdGoRmlIljYt3EwkGaNZi2kVIpOZfCTpgzE2tz4PsKNl YFI/lox4yo3CWoRgmX0JshA7dxMgHZA5XU7F8BcL+7MDICEclPQZAzKiroDnLA0kIq4wUf Z40gbGuPlFJwyRr743xwN469rYW8BAAlHLHPDMqSJRmuPeXvcxqJXsy4n8T2qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679242350; a=rsa-sha256; cv=none; b=FG2Edx0fpDj5wQOUvMz9tUTmobnEfJPrzcl0vTovIwtWaPDU83ZwNB1JoW9JvqRILqGsXK ukpUxN/Ot5MysULZIctE3SFp4J3EerXaIBy7YQ5XLMWjJ/HTCqlFbc6SA0ef7m4POmHVl7 E6+4HGUi87mQeBKpJzMlJ/DggWWVGAQuvXBX05K/oDpqQ5VuueeUKxdLMNHNMYNRHwFxwa /Vl5zYj95WoBKgEnNd6eubCp0QGIlQk8Q3EgJlpsyhpUyC4Or/wZw5QXAAN1u28odaIjpZ 8lpVye8dEBAAFG3QgvPJ0ggdmVtbeoUI/WHPJteOMfz7ue+rd3D4u47vVExpeA== 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 4PfjZ617dtzvsT; Sun, 19 Mar 2023 16:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32JGCUVK070922; Sun, 19 Mar 2023 16:12:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32JGCUQm070921; Sun, 19 Mar 2023 16:12:30 GMT (envelope-from git) Date: Sun, 19 Mar 2023 16:12:30 GMT Message-Id: <202303191612.32JGCUQm070921@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: 1d899c1c6f - main - PackagesMacro: Extend the syntax to category/name@flavor[pkgname] List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d899c1c6fc6b000411cc45fc2823caefc5af7e2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/doc/commit/?id=1d899c1c6fc6b000411cc45fc2823caefc5af7e2 commit 1d899c1c6fc6b000411cc45fc2823caefc5af7e2 Author: Li-Wen Hsu AuthorDate: 2023-03-19 16:09:25 +0000 Commit: Li-Wen Hsu CommitDate: 2023-03-19 16:09:25 +0000 PackagesMacro: Extend the syntax to category/name@flavor[pkgname] The package macro creates a link to the web interface of the port's origin directory in the ports repository. Extend its usage to cover the case when we want to refer to a speicifed flavor of a port. For example, if we want to refer the aarch64-gcc12 pacakge, in the past we can only specify its origin port, like `pacakge:devel/freebsd-gcc12`, and unable to add the `@aarch64` flavor suffix because it creates a broken link. This change makes it strip the suffix after `@` and accept a parameter of package name as link text. If not provided, use the origin as the original behavior. Thus we can have this kind of notation: package:devel/freebsd-gcc12@aarch64[aarch64-gcc12] which creates linkt to: https://cgit.freebsd.org/ports/tree/devel/freebsd-gcc12/ with link text: aarch64-gcc12 Reviewed by: carlavilla, dbaio Differential Revision: https://reviews.freebsd.org/D39067 --- shared/lib/PackagesMacro/extension.rb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/shared/lib/PackagesMacro/extension.rb b/shared/lib/PackagesMacro/extension.rb index 20969ca3c0..5476995c49 100644 --- a/shared/lib/PackagesMacro/extension.rb +++ b/shared/lib/PackagesMacro/extension.rb @@ -6,14 +6,23 @@ class PackagesMacro < Asciidoctor::Extensions::InlineMacroProcessor use_dsl named :package + name_positional_attributes 'pkgname' def process parent, target, attrs - packagename = target + pkgorigin = target - target = %(https://cgit.freebsd.org/ports/tree/#{target}/pkg-descr) - parent.document.register :links, target + if pkgorigin.include?("@") + pkgorigin = pkgorigin[0..pkgorigin.index("@")-1] + end - %(#{packagename}) + pkgname = if (pkgname = attrs['pkgname']) + "#{pkgname}" + else + "#{target}" + end + + url = %(https://cgit.freebsd.org/ports/tree/#{pkgorigin}/) + + %(#{pkgname}) end end -