From nobody Sun May 31 20:57:38 2026 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 4gT8Yg66fDz6glf0 for ; Sun, 31 May 2026 20:57:43 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gT8Yg4Z25z43Gr for ; Sun, 31 May 2026 20:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780261063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VFSA20mytTaSiSDeSpyNj4LANP0Og4zFhW9kxNuMVZE=; b=qxdiOdxWzvgbeJLpUYkGeBW8r0mzYjtrUkLSaqa54Fmacl0KUAtSRePo1ovx3ROoRSScSB NrntaSoRaoepzUq/kERWyo+TK7inp9TXcJvvIUZwouHy2/Ib/xyZeL1YH6RQexcrd6smU+ 9OeP4SceE+Oyzz7qNHO+YI6i8yiNJMkG+x3kvza6kwR+cSEbfUJTrd2hXFS7e7L9xQi0Ei MrkML2FhKzbdQ8qHPSyolL0NR6IJf5acinsO0IxLep1WH+yw3FqMzUK2z1/6ose+QkC5oL BjT3VErk/t4FOAfrj9XaQayvnOPdEU3ozE50XmWBv/s1ZO1U2+r+nuzQWI1FWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780261063; a=rsa-sha256; cv=none; b=yaikvx5Kpc8XfFw55Xv2R6kI/n7cx6zzkdlBipS5Lu6u7TTelD/QQq7XefLpZTQZffSyED MgvsG248+B9hxXai2Ol4LbRE3ke2v+TrvytxBITR3fh89iTyOpi3+qTfIQg7BHj5XQLtun Y8M8Gvx3Wbs2k/TbVpyRmPVRRZSbGtNgnAp3dwpBoWRfLCcVDEb7vEBrCprVHaNip47il+ /lDcNMgw9GpiywWA/ll+YtwMWS3d8LDyaSFnRojRPgfRdnyu71Gtf4ZqNiJHMIaLiMgC9y Gnmzgj+8k+ZnIaJnEYrANizoVYlbyTdCnh1XbDZZ+mIDfQGJo1KKSLjQ4nSxkQ== 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=1780261063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VFSA20mytTaSiSDeSpyNj4LANP0Og4zFhW9kxNuMVZE=; b=GZWslceQwfykJPwd+6vTDzzjHNvgK9ZCI1TBYIYGZVTj3HOqhhobFwJD7jEWOz39LOznck 15i/IN4CgBBs3AbDmv9YzyZykLIGICuEpqL7vwaEB7nuBxOqjLSK0XOU6uC/I1SgzoTInJ 63D18lOcCBq8ZMhzbzbjDfX+8t8M61n3tKyQ4NY4zoZSy/jTTCNz3He8nOzB6+uIlgVgzf O0ynG5d6QBX1CUA7yuebTEVcIHB8zz6/AaDUKjqAddKNxjPth8nvNXSi65zxvQdbHedSvc moCqgvm/rEr7/s+hF+pq/4v2Sk/nTPKXSAkXoMvVjGj2bRm+DQYP04PwPf0O5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gT8Yg407qz16RS for ; Sun, 31 May 2026 20:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37b91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 31 May 2026 20:57:38 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Alexey Shuvaev From: Andrey Zakhvatov Subject: git: 9be1151482 - main - porters-handbook: Fix several copy/paste mistakes 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: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andy X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9be11514822b39479d991462dad90aff32d19606 Auto-Submitted: auto-generated Date: Sun, 31 May 2026 20:57:38 +0000 Message-Id: <6a1ca0c2.37b91.bfd4255@gitrepo.freebsd.org> The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=9be11514822b39479d991462dad90aff32d19606 commit 9be11514822b39479d991462dad90aff32d19606 Author: Alexey Shuvaev AuthorDate: 2026-05-31 20:51:26 +0000 Commit: Andrey Zakhvatov CommitDate: 2026-05-31 20:51:26 +0000 porters-handbook: Fix several copy/paste mistakes Fix underscore usage and improve the consistency. PR: 295716 --- .../books/porters-handbook/makefiles/_index.adoc | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index a0e4c2c89e..1c857aeed0 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -1973,7 +1973,7 @@ It will have `MASTER_SITES` set to `"https://gitlab.example.com"` and `WRKSRC` t The `USE_GITLAB` framework also supports fetching multiple distribution files from different places from GitLab and GitLab hosted sites. It works in a way very similar to crossref:makefiles[porting-master-sites-n, Multiple Distribution or Patches Files from Multiple Locations] and -crossref:makefiles[makefile-master_sites-gitlab-multiple, Fetching Multiple Files from GitLab]. +crossref:makefiles[makefile-master_sites-github-multiple, Fetching Multiple Files from GitHub]. Multiple values are added to `GL_SITE`, `GL_ACCOUNT`, `GL_PROJECT` and `GL_COMMIT`. Each different value is assigned a group. @@ -2258,7 +2258,7 @@ DISTFILES= source1.tar.gz:source1 \ ==== Multiple distribution files can have the same group. -Continuing the previous example, suppose that there was a third distfile, [.filename]#source3.tar.gz#, that is downloaded from `ftp.example2.com`. +Continuing the previous example, suppose that there was a third distfile, [.filename]#source3.tar.gz#, that is downloaded from `www.example.com`. The [.filename]#Makefile# would then be written like crossref:makefiles[ports-master-sites-n-example-simple-use-more-than-one-file-per-site,Simplified Use of `MASTER_SITES:n` with More Than One File Per Site]. @@ -4339,7 +4339,7 @@ CONFIGURE_ARGS+= --disable-test2 [[options-configure_with]] ===== `OPT_CONFIGURE_WITH` -When option _OPT_ is selected, for each _entry_ in `_OPT_CONFIGURE_WITH` then `--with-_entry_` is appended to `CONFIGURE_ARGS`. +When option _OPT_ is selected, for each _entry_ in `OPT_CONFIGURE_WITH` then `--with-_entry_` is appended to `CONFIGURE_ARGS`. When option _OPT_ is _not_ selected, `--without-_entry_` is appended to `CONFIGURE_ARGS`. An optional argument can be specified with an `=` symbol. This argument is only appended to the `--with-_entry_` configure option. @@ -4448,9 +4448,9 @@ See crossref:makefiles[options-cmake_bool, `OPT_CMAKE_BOOL` and `OPT_CMAKE_BOOL_ [[options-cmake_bool]] ===== `OPT_CMAKE_BOOL` and `OPT_CMAKE_BOOL_OFF` -When option _OPT_ is selected, for each _entry_ in `OPT_CMAKE_BOOL` then `-D_entry_:BOOL=true` is appended to `CMAKE_ARGS`. -When option _OPT_ is _not_ selected, `-D_entry_:BOOL=false` is appended to `CONFIGURE_ARGS`. -`OPT_CMAKE_BOOL_OFF` is the opposite, `-D_entry_:BOOL=false` is appended to `CMAKE_ARGS` when the option is selected, and `-D_entry_:BOOL=true` when the option is _not_ selected. +When option _OPT_ is selected, for each _entry_ in `OPT_CMAKE_BOOL` then `-D__entry__:BOOL=true` is appended to `CMAKE_ARGS`. +When option _OPT_ is _not_ selected, `-D__entry__:BOOL=false` is appended to `CMAKE_ARGS`. +`OPT_CMAKE_BOOL_OFF` is the opposite, `-D__entry__:BOOL=false` is appended to `CMAKE_ARGS` when the option is selected, and `-D__entry__:BOOL=true` when the option is _not_ selected. For example: [.programlisting] @@ -4512,9 +4512,9 @@ MESON_ARGS+= -Dopt=2 [[options-meson_true]] ===== `OPT_MESON_TRUE` and `OPT_MESON_FALSE` -When option _OPT_ is selected, for each _entry_ in `OPT_MESON_TRUE` then `-D_entry_=true` is appended to `MESON_ARGS`. -When option _OPT_ is _not_ selected, `-D_entry_=false` is appended to `MESON_ARGS`. -`OPT_MESON_FALSE` is the opposite, `-D_entry_=false` is appended to `MESON_ARGS` when the option is selected, and `-D_entry_=true` when the option is _not_ selected. +When option _OPT_ is selected, for each _entry_ in `OPT_MESON_TRUE` then `-D__entry__=true` is appended to `MESON_ARGS`. +When option _OPT_ is _not_ selected, `-D__entry__=false` is appended to `MESON_ARGS`. +`OPT_MESON_FALSE` is the opposite, `-D__entry__=false` is appended to `MESON_ARGS` when the option is selected, and `-D__entry__=true` when the option is _not_ selected. For example: [.programlisting] @@ -4544,9 +4544,9 @@ MESON_ARGS+= -Dtest=false -Ddebug=false \ [[options-meson_yes]] ===== `OPT_MESON_YES` and `OPT_MESON_NO` -When option _OPT_ is selected, for each _entry_ in `OPT_MESON_YES` then `-D_entry_=yes` is appended to `MESON_ARGS`. -When option _OPT_ is _not_ selected, `-D_entry_=no` is appended to `MESON_ARGS`. -`OPT_MESON_NO` is the opposite, `-D_entry_=no` is appended to `MESON_ARGS` when the option is selected, and `-D_entry_=yes` when the option is _not_ selected. +When option _OPT_ is selected, for each _entry_ in `OPT_MESON_YES` then `-D__entry__=yes` is appended to `MESON_ARGS`. +When option _OPT_ is _not_ selected, `-D__entry__=no` is appended to `MESON_ARGS`. +`OPT_MESON_NO` is the opposite, `-D__entry__=no` is appended to `MESON_ARGS` when the option is selected, and `-D__entry__=yes` when the option is _not_ selected. For example: [.programlisting] @@ -4576,9 +4576,9 @@ MESON_ARGS+= -Dtest=no -Ddebug=no \ [[options-meson_enabled]] ===== `OPT_MESON_ENABLED` and `OPT_MESON_DISABLED` -When option _OPT_ is selected, for each _entry_ in `OPT_MESON_ENABLED` then `-D_entry_=enabled` is appended to `MESON_ARGS`. -When option _OPT_ is _not_ selected, `-D_entry_=disabled` is appended to `MESON_ARGS`. -`OPT_MESON_DISABLED` is the opposite, `-D_entry_=disabled` is appended to `MESON_ARGS` when the option is selected, and `-D_entry_=enabled` when the option is _not_ selected. +When option _OPT_ is selected, for each _entry_ in `OPT_MESON_ENABLED` then `-D__entry__=enabled` is appended to `MESON_ARGS`. +When option _OPT_ is _not_ selected, `-D__entry__=disabled` is appended to `MESON_ARGS`. +`OPT_MESON_DISABLED` is the opposite, `-D__entry__=disabled` is appended to `MESON_ARGS` when the option is selected, and `-D__entry__=enabled` when the option is _not_ selected. For example: [.programlisting] @@ -4774,7 +4774,7 @@ is equivalent to: [.programlisting] .... -OPTIONS_DEFINE= OPT1 OPT2 +OPTIONS_DEFINE= OPT1 OPT2 OPT3 MAKE_ARGS= ALSO_BUILD="${ALSO_BUILD}" BIN3_BUILD="${BIN3_BUILD}" @@ -4788,7 +4788,7 @@ ALSO_BUILD+= bin1 ALSO_BUILD+= bin2 .endif -.if ${PORT_OPTIONS:MOPT2} +.if ${PORT_OPTIONS:MOPT3} BIN3_BUILD= yes .else BIN3_BUILD= no