Date: Sun, 31 May 2026 20:57:38 +0000 From: Andrey Zakhvatov <andy@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Cc: Alexey Shuvaev <bugsbeastie@gmail.com> Subject: git: 9be1151482 - main - porters-handbook: Fix several copy/paste mistakes Message-ID: <6a1ca0c2.37b91.bfd4255@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by andy: URL: https://cgit.FreeBSD.org/doc/commit/?id=9be11514822b39479d991462dad90aff32d19606 commit 9be11514822b39479d991462dad90aff32d19606 Author: Alexey Shuvaev <bugsbeastie@gmail.com> AuthorDate: 2026-05-31 20:51:26 +0000 Commit: Andrey Zakhvatov <andy@FreeBSD.org> 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= nohome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1ca0c2.37b91.bfd4255>