D20171.diff
No OneTemporary
Actions

Size

71 KB

Referenced Files

None

Subscribers

None

D20171.diff
View Options

	Index: en_US.ISO8859-1/books/porters-handbook/flavors/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/flavors/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/flavors/chapter.xml
	@@ -61,11 +61,11 @@
	lite_PKGNAMESUFFIX= -lite
	[...]
	.if ${FLAVOR:U} != lite
	-[enable non lite features]
	+[enable non-lite features]
	.endif</programlisting>

	<note>
	- <para>The first flavor is the default one, and is called,
	+ <para>The first flavor is the default one and is called,
	here, <literal>default</literal>. It is not an obligation,
	and if possible, use a more specific flavor name, like in
	<xref linkend="flavors-using-ex2"/>.</para>
	@@ -283,7 +283,7 @@
	<example xml:id="flavors-auto-php-ex1">
	<title>Simple <literal>USES=php</literal> Extension</title>

	- <para>This will generate package for all the supported
	+ <para>This will generate a packages for all the supported
	versions:</para>

	<programlisting>PORTNAME= some-ext
	@@ -292,7 +292,7 @@

	USES= php:ext</programlisting>

	- <para>This will generate package for all the supported
	+ <para>This will generate a packages for all the supported
	versions but 7.2:</para>

	<programlisting>PORTNAME= some-ext
	@@ -306,14 +306,14 @@
	<sect2 xml:id="flavors-auto-php-app">
	<title>PHP Flavors with PHP Applications</title>

	- <para>PHP applications can also be flavorized.</para>
	+ <para>PHP applications can also be flavored.</para>

	- <para>This allows generating packages for all PHP versions, so
	+ <para>This allows generating packages for all PHP versions so
	that users can use them with whatever version they need on
	their servers.</para>

	<important>
	- <para>PHP applications that are flavorized
	+ <para>PHP applications that are flavored
	<emphasis>must</emphasis> append
	<varname>PHP_PKGNAMESUFFIX</varname> to their package
	names.</para>
	@@ -368,7 +368,7 @@
	USE_PYTHON= distutils allflavors</programlisting>

	<para>Will get these flavors: <literal>py27</literal>,
	- <literal>py34</literal>, <literal>py35</literal> and
	+ <literal>py34</literal>, <literal>py35</literal>, and
	<literal>py36</literal>.</para>
	</example>

	@@ -408,7 +408,7 @@
	on the correct version of <application>Python</application>
	modules. All dependencies on flavored Python ports should
	use <varname>PY_FLAVOR</varname>, and not
	- <varname>FLAVOR</varname> directly..</para>
	+ <varname>FLAVOR</varname> directly.</para>

	<example xml:id="flavors-auto-python-ex3">
	<title>For a Port Not Using
	Index: en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/keeping-up/chapter.xml
	@@ -20,15 +20,15 @@
	already been committed is by subscribing to <link
	xlink:href="http://www.FreshPorts.org/">FreshPorts</link>.
	Multiple ports can be monitored. Maintainers are
	- strongly encouraged to subscribe, because they will receive
	- notification of not only their own changes, but also any changes
	+ strongly encouraged to subscribe because they will receive
	+ notification of not only their own changes but also any changes
	that any other &os; committer has made. (These are often
	necessary to keep up with changes in the underlying ports
	framework—although it would be most polite to receive an
	advance heads-up from those committing such changes, sometimes
	this is overlooked or impractical. Also, in some
	cases, the changes are very minor in nature. We expect everyone
	- to use their best judgement in these cases.)</para>
	+ to use their best judgment in these cases.)</para>

	<para>To use FreshPorts, an account is required. Those with
	registered email addresses at <literal>@FreeBSD.org</literal>
	Index: en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
	@@ -1058,7 +1058,7 @@

	<row>
	<entry><filename>cad</filename></entry>
	- <entry>Computer aided design tools.</entry>
	+ <entry>Computer-aided design tools.</entry>
	<entry/>
	</row>

	@@ -1121,7 +1121,7 @@
	<entry>General editors.</entry>
	<entry>Specialized editors go in the section for those
	tools. For example, a mathematical-formula editor
	- will go in <filename>math</filename>, and have
	+ will go in <filename>math</filename> and have
	<filename>editors</filename> as a second
	category.</entry>
	</row>
	@@ -1489,7 +1489,7 @@
	<entry><filename>science</filename></entry>
	<entry>Scientific ports that do not fit into other
	categories such as <filename>astro</filename>,
	- <filename>biology</filename> and
	+ <filename>biology</filename>, and
	<filename>math</filename>.</entry>
	<entry/>
	</row>
	@@ -1666,7 +1666,7 @@
	</listitem>

	<listitem>
	- <para>Language specific categories always come first. For
	+ <para>Language-specific categories always come first. For
	example, if the port installs Japanese X11 fonts, then
	the <varname>CATEGORIES</varname> line would read
	<filename>japanese x11-fonts</filename>.</para>
	@@ -1744,7 +1744,7 @@
	not have a corresponding subdirectory in the ports tree—
	or <emphasis>physical</emphasis> categories—those that
	do. This section discusses the issues involved in creating a
	- new physical category. Read it thouroughly before proposing a
	+ new physical category. Read it thoroughly before proposing a
	new one.</para>

	<para>Our existing practice has been to avoid creating a new
	@@ -1835,7 +1835,7 @@
	</procedure>

	<para>Proposing a new virtual category is similar to the
	- above but much less involved, since no ports will actually
	+ above but much less involved since no ports will actually
	have to move. In this case, the only patches to include in
	the PR would be those to add the new category to
	<varname>CATEGORIES</varname> of the affected ports.</para>
	@@ -1845,7 +1845,7 @@
	<title>Proposing Reorganizing All the Categories</title>

	<para>Occasionally someone proposes reorganizing the
	- categories with either a 2-level structure, or some other kind
	+ categories with either a 2-level structure or some other kind
	of keyword structure. To date, nothing has come of any of
	these proposals because, while they are very easy to make, the
	effort involved to retrofit the entire existing ports
	@@ -1905,7 +1905,7 @@
	<varname>DISTVERSION</varname> as the variable name. Set
	<varname>PORTVERSION</varname> to the computed version based
	on the variable you
	- created, and set <varname>DISTNAME</varname>
	+ created and set <varname>DISTNAME</varname>
	accordingly.</para>

	<para>If the upstream version scheme cannot easily be coerced
	@@ -1921,11 +1921,11 @@
	<para><application>BIND9</application> uses a version scheme
	that is not compatible with the ports versions (it has
	<literal>-</literal> in its versions) and cannot be derived
	- using <varname>DISTVERSION</varname> because after the 9.9.9
	+ using <varname>DISTVERSION</varname>, because after the 9.9.9
	release, it will release a <quote>patchlevels</quote> in the
	form of <literal>9.9.9-P1</literal>. DISTVERSION would
	translate that into <literal>9.9.9.p1</literal>, which, in
	- the ports versioning scheme means 9.9.9 pre-release 1, which
	+ the ports versioning scheme, means 9.9.9 pre-release 1, which
	is before 9.9.9 and not after. So
	<varname>PORTVERSION</varname> is manually derived from an
	<varname>ISCVERSION</varname> variable to output
	@@ -2469,7 +2469,7 @@

	<para>While trying to make a port for version
	<literal>1.2.7</literal> of <application>pkg</application>
	- from the &os; user on github, at <link
	+ from the &os; user on GitHub, at <link
	xlink:href="https://github.com/freebsd/pkg"/>, The
	<filename>Makefile</filename> would end up looking like
	this (slightly stripped for the example):</para>
	@@ -2492,7 +2492,7 @@

	<para>While trying to make a port for the bleeding edge
	version of <application>pkg</application> from the &os;
	- user on github, at <link
	+ user on GitHub, at <link
	xlink:href="https://github.com/freebsd/pkg"/>, the
	<filename>Makefile</filename> ends up looking like
	this (slightly stripped for the example):</para>
	@@ -2668,7 +2668,7 @@
	<varname>GH_ACCOUNT</varname>,
	<varname>GH_PROJECT</varname>, and
	<varname>GH_TAGNAME</varname>. Each different value is
	- assigned a group. The main value can either have no group,
	+ assigned to a group. The main value can either have no group,
	or the <literal>:DEFAULT</literal> group. A value can be
	omitted if it is the same as the default as listed in
	<xref
	@@ -2745,7 +2745,7 @@
	CONFIGURE_ARGS= --with-contrib=${WRKSRC_contrib}</programlisting>

	<para>This will fetch three distribution files from
	- github. The default one comes from
	+ GitHub. The default one comes from
	<filename>foo/foo</filename> and is version
	<literal>1.0.2</literal>. The second one, with the
	<literal>icons</literal> group, comes from
	@@ -2827,7 +2827,7 @@
	It has a <link
	xlink:href="https://github.com/moneymanagerex/moneymanagerex/blob/master/.gitmodules"><filename>.gitmodules</filename></link>
	file at the root. This file describes all the submodules
	- used in this repository, and lists additional repositories
	+ used in this repository and lists additional repositories
	needed. This file will tell what additional repositories
	are needed:</para>

	@@ -2984,7 +2984,7 @@
	<replaceable>site</replaceable><literal>:</literal><replaceable>account</replaceable><literal>:</literal><replaceable>project</replaceable><literal>:</literal><replaceable>commit</replaceable><literal>:</literal><replaceable>group</replaceable><literal>/</literal><replaceable>subdir</replaceable>.
	The <replaceable>site</replaceable><literal>:</literal> and
	<literal>/</literal><replaceable>subdir</replaceable>
	- part is optional. It is helpful when there are more
	+ parts are optional. It is helpful when there are more
	than one <application>GitLab</application> project from
	which to fetch.</entry>
	</row>
	@@ -3020,9 +3020,9 @@
	<title>More Complete Use of
	<varname>USE_GITLAB</varname></title>

	- <para>A more complete use of the above if
	+ <para>A more complete use of the above if the
	port had no versioning and <application>foobar</application>
	- from the foo user on project bar on a self hosted <application>GitLab</application>
	+ from the foo user on project bar on a self-hosted <application>GitLab</application>
	site <literal>https://gitlab.example.com</literal>, the <filename>Makefile</filename>
	ends up looking like this for fetching distribution files:</para>

	@@ -3047,7 +3047,7 @@
	</tip>

	<note>
	- <para><varname>GL_SITE</varname>'s protocol, port and
	+ <para><varname>GL_SITE</varname>'s protocol, port, and
	webroot can all be modified in the same variable.</para>
	</note>
	</example>
	@@ -3066,9 +3066,9 @@
	<para>Multiple values are added to
	<varname>GL_SITE</varname>,
	<varname>GL_ACCOUNT</varname>,
	- <varname>GL_PROJECT</varname> and
	+ <varname>GL_PROJECT</varname>, and
	<varname>GL_COMMIT</varname>. Each different value is
	- assigned a group.
	+ assigned to a group.
	<xref
	linkend="makefile-master_sites-gitlab-description"/>.</para>

	@@ -3231,12 +3231,12 @@
	automatically set <varname>EXTRACT_SUFX</varname> to the most
	common archives extensions as necessary, see <xref
	linkend="uses"/> for more details. If neither of
	- these are set then <varname>EXTRACT_SUFX</varname> defaults to
	+ these is set then <varname>EXTRACT_SUFX</varname> defaults to
	<literal>.tar.gz</literal>.</para>

	<note>
	<para>As <varname>EXTRACT_SUFX</varname> is only used in
	- <varname>DISTFILES</varname>, only set one of them..</para>
	+ <varname>DISTFILES</varname>, only set one of them.</para>
	</note>
	</sect2>

	@@ -3246,11 +3246,11 @@
	<para>Sometimes the names of the files to be downloaded have no
	resemblance to the name of the port. For example, it might be
	called <filename>source.tar.gz</filename> or similar. In
	- other cases the application's source code might be in several
	+ other cases, the application's source code might be in several
	different archives, all of which must be downloaded.</para>

	<para>If this is the case, set <varname>DISTFILES</varname> to
	- be a space separated list of all the files that must be
	+ be a space-separated list of all the files that must be
	downloaded.</para>

	<programlisting>DISTFILES= source1.tar.gz source2.tar.gz</programlisting>
	@@ -3997,7 +3997,7 @@

	<para>Do not let the port clutter
	<filename>/usr/ports/distfiles</filename>. If the port
	- requires a lot of files to be fetched, or contains a file that
	+ requires a lot of files to be fetched or contains a file that
	has a name that might conflict with other ports (for example,
	<filename>Makefile</filename>), set
	<varname>DIST_SUBDIR</varname> to the name of the port
	@@ -4074,7 +4074,7 @@
	<para>Blanket approval for most ports applies to fixes like
	infrastructure changes, or trivial and
	<emphasis>tested</emphasis> build and runtime fixes. The
	- current list is available in <link
	+ current list is available in the <link
	xlink:href="&url.articles.committers-guide;/ports.html#ports-qa-misc-blanket-approval">Ports
	section of the Committer's Guide</link>.</para>
	</note>
	@@ -4095,7 +4095,7 @@

	<para>We reserve the right to modify the maintainer's submission
	to better match existing policies and style of the Ports
	- Collection without explicit blessing from the submitter or the
	+ Collection without the explicit blessing from the submitter or the
	maintainer. Also,
	large infrastructural changes can result in a port being
	modified without the maintainer's consent. These kinds of
	@@ -5982,7 +5982,7 @@

	<para>(<filename>print/pkfonts118/Makefile</filename>,
	<filename>print/pkfonts600/Makefile</filename>, and all the
	- other are similar).
	+ others are similar).
	<varname>MASTERDIR</varname> definition tells
	<filename>bsd.port.mk</filename> that the regular set of
	subdirectories like <varname>FILESDIR</varname> and
	@@ -5991,7 +5991,7 @@
	<literal>RESOLUTION=360</literal> line will override the
	<literal>RESOLUTION=300</literal> line in
	<filename>pkfonts300/Makefile</filename> and the port will be
	- built with resolution set to 360.</para>
	+ built with the resolution set to 360.</para>
	</sect1>

	<sect1 xml:id="makefile-manpages">
	@@ -6035,7 +6035,7 @@
	<title>Makefile Options</title>

	<para>Many applications can be built with optional or differing
	- configurations. Examples include choice of natural (human)
	+ configurations. Examples include the choice of natural (human)
	language, GUI versus command-line, or type of database to
	support. Users may need a different configuration than the
	default, so the ports system provides hooks the port author can
	@@ -7612,7 +7612,7 @@

	<para>Each port is extracted into a working directory, which must
	be writable. The ports system defaults to having
	- <varname>DISTFILES</varname> unpack in to a directory called
	+ <varname>DISTFILES</varname> unpack into a directory called
	<literal>${DISTNAME}</literal>. In other words, if the
	<filename>Makefile</filename> has:</para>

	@@ -7655,7 +7655,7 @@
	<sect2 xml:id="makefile-no_wrksubdir">
	<title><varname>NO_WRKSUBDIR</varname></title>

	- <para>If the port does not extract in to a subdirectory at all,
	+ <para>If the port does not extract into a subdirectory at all,
	then set <varname>NO_WRKSUBDIR</varname> to
	indicate that.</para>

	@@ -7663,7 +7663,7 @@

	<note>
	<para>Because <varname>WRKDIR</varname> is the only directory
	- that is supposed to be writable during the build, and is
	+ that is supposed to be writable during the build and is
	used to store many files recording the status of the build,
	the port's extraction will be forced into a
	subdirectory.</para>
	@@ -7725,7 +7725,7 @@
	</varlistentry>
	</variablelist>

	- <para>The most common content of one of these variable is the
	+ <para>The most common content of one of these variables is the
	package base of another port. The package base is the package
	name without the appended version, it can be obtained by running
	<command>make -V PKGBASE</command>.</para>
	@@ -8150,7 +8150,7 @@
	will be prepended to <varname>PATH</varname>.</para>

	<para>Use it to substitute hardcoded commands the build phase
	- relies on without having to patch any build files.</para>
	+ relies on, without having to patch any build files.</para>

	<example xml:id="binary-alias-ex1">
	<title>Using <varname>BINARY_ALIAS</varname> to Make
	Index: en_US.ISO8859-1/books/porters-handbook/order/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/order/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/order/chapter.xml
	@@ -14,7 +14,7 @@
	<para>The first sections of the <filename>Makefile</filename>
	must always come in the same order. This standard makes it so
	everyone can easily read any port without having to search for
	- variables in a random order.</para>
	+ variables in random order.</para>

	<para>The first line of a <filename>Makefile</filename> is always
	a comment containing the <application>Subversion</application>
	@@ -32,7 +32,7 @@

	<note>
	<para>The sections and variables described here are mandatory in
	- a ordinary port. In a slave port, many sections variables and
	+ an ordinary port. In a slave port, many sections variables and
	can be skipped.</para>
	</note>

	@@ -401,7 +401,7 @@
	<title><varname>USES</varname> and
	<varname>USE_<replaceable>x</replaceable></varname></title>

	- <para>Start this section with defining <varname>USES</varname>,
	+ <para>Start this section with defining <varname>USES</varname>
	and then possible
	<varname>USE_<replaceable>x</replaceable></varname>.</para>

	@@ -420,7 +420,7 @@
	<filename>bsd.port.mk</filename> that do not belong in any
	of the previous section blocks.</para>

	- <para>Order is not important, however try to keep similar
	+ <para>Order is not important, however, try to keep similar
	variables together. For example uid and gid variables
	<varname>USERS</varname> and <varname>GROUPS</varname>.
	Configuration variables
	@@ -447,7 +447,7 @@
	<title>Options Variables Order Example</title>

	<para>The <literal>FOO</literal> and <literal>BAR</literal>
	- options do not have a standard description, so one need to
	+ options do not have a standard description, so one needs to
	be written. The other options already have one in
	<filename>Mk/bsd.options.desc.mk</filename> so writing one
	is not needed. The <literal>DOCS</literal> and
	@@ -528,7 +528,7 @@
	</itemizedlist>

	<tip>
	- <para>When using options helpers target keep them alphabetically
	+ <para>When using options helpers targets, keep them alphabetically
	sorted, but keep the
	<literal><replaceable>*</replaceable>-on</literal> before the
	<literal><replaceable>*</replaceable>-off</literal>. When
	Index: en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml
	@@ -196,8 +196,8 @@
	<varname>DOCSDIR</varname>, <varname>EXAMPLESDIR</varname>,
	<varname>WWWDIR</varname>, and <varname>ETCDIR</varname>. Any
	line beginning with <literal>@comment</literal> followed by a
	- space, will be deleted
	- from resulting files after a variable substitution.</para>
	+ space will be deleted
	+ from resulting files after variable substitution.</para>

	<para>This example replaces
	<literal>%%ARCH%%</literal> with the system architecture in a
	Index: en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
	@@ -17,8 +17,8 @@

	<para>Some ports, particularly the <literal>p5-</literal> ports,
	need to change their <filename>pkg-plist</filename> depending on
	- what options they are configured with (or version of
	- <literal>perl</literal>, in the case of <literal>p5-</literal>
	+ what options they are configured with (or the version of
	+ <application>Perl</application>, in the case of <literal>p5-</literal>
	ports). To make this easy, any instances in
	<filename>pkg-plist</filename> of <literal>%%OSREL%%</literal>,
	<literal>%%PERL_VER%%</literal>, and
	@@ -30,7 +30,7 @@
	of <command>perl</command> (for example,
	<literal>5.8.9</literal>). Several other
	<literal>%%<replaceable>VARS</replaceable>%%</literal> related
	- to port's documentation files are described in <link
	+ to ports' documentation files are described in <link
	linkend="install-documentation">the relevant
	section</link>.</para>

	@@ -118,7 +118,7 @@
	<literal><replaceable>TAG</replaceable></literal> to
	<varname>PLIST_SUB</varname>
	inside the <filename>Makefile</filename> with a special
	- value of <literal>@comment</literal>, makes package tools to
	+ value of <literal>@comment </literal> makes package tools to
	ignore the line. For instance, if some files are only installed
	when the <literal>X11</literal> option is on and the
	architecture is <literal>i386</literal>:</para>
	@@ -236,7 +236,7 @@
	<para>A <emphasis>static package list</emphasis> is a package
	list which is available in the Ports Collection either as
	<filename>pkg-plist</filename> (with or without variable
	- substitution), or embedded into the
	+ substitution) or embedded into the
	<filename>Makefile</filename> via
	<varname>PLIST_FILES</varname> and
	<varname>PLIST_DIRS</varname>. Even if the contents are
	@@ -384,7 +384,7 @@

	<warning>
	<para>If a keyword is used on an <link
	- linkend="makefile-options">optional</link> entry, it must to
	+ linkend="makefile-options">optional</link> entry, it must
	be added after the helper:</para>

	<programlisting>%%FOO%%@sample etc/orbit.conf.sample</programlisting>
	@@ -494,7 +494,7 @@
	<replaceable>file</replaceable>
	[<replaceable>file</replaceable>]</title>

	- <para>This is used to handle installation of configuration
	+ <para>This is used to handle the installation of configuration
	files, through example files bundled with the package. The
	<quote>actual</quote>, non-sample, file is either the second
	filename, if present, or the first filename without the
	@@ -667,7 +667,7 @@

	<listitem>
	<para>Expand to the filename part of the fully qualified
	- name, or the converse of <literal>%B</literal>. In
	+ name or the converse of <literal>%B</literal>. In
	the example case,
	<filename>emacs</filename>.</para>
	</listitem>
	@@ -688,7 +688,7 @@
	<replaceable>mode</replaceable></title>

	<para>Set default permission for all subsequently extracted
	- files to <replaceable>mode</replaceable>. Format is the
	+ files to <replaceable>mode</replaceable>. The format is the
	same as that used by &man.chmod.1;. Use without an arg to
	set back to default permissions (mode of the file while
	being packed).</para>
	@@ -736,7 +736,7 @@
	under <varname>PREFIX</varname> by a package installation
	are automatically removed. Use this when an empty directory
	under <varname>PREFIX</varname> needs to be created, or when
	- the directory needs to have non default owner, group, or
	+ the directory needs to have non-default owner, group, or
	mode. Directories outside of <varname>PREFIX</varname> need
	to be registered. For example,
	<filename>/var/db/${PORTNAME}</filename> needs to have a
	@@ -960,7 +960,7 @@
	<literal>pre-upgrade</literal>,
	<literal>post-upgrade</literal></title>

	- <para>These keywords contains a &man.sh.1; script to be
	+ <para>These keywords contain a &man.sh.1; script to be
	executed before or after installation, deinstallation, or
	upgrade of the package. In addition to the usual
	<literal>@exec</literal>
	@@ -981,7 +981,7 @@
	<para>This keyword does two things, it adds a
	<literal>@dirrmtry
	<replaceable>directory</replaceable></literal> line to
	- the packing list, and echoes the fact that the directory
	+ the packing list and echoes the fact that the directory
	is removed when deinstalling the package.</para>

	<programlisting>actions: [dirrmtry]
	Index: en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml
	@@ -67,7 +67,7 @@
	<para>Some code needs modifications or
	conditional compilation based upon what version of &os; Unix it
	is running under. The preferred way to tell &os; versions apart
	- are the <literal>__FreeBSD_version</literal> and
	+ is to use the <literal>__FreeBSD_version</literal> and
	<literal>__FreeBSD__</literal> macros defined in <link
	xlink:href="https://svnweb.freebsd.org/base/head/sys/sys/param.h?view=markup">sys/param.h</link>.
	If this file is not included add the code,</para>
	@@ -447,7 +447,7 @@
	is no released upgrade. Ideally upgrade ports as soon as
	possible when a security vulnerability is discovered so as
	to reduce the number of vulnerable &os; hosts (we like
	- being known for being secure), however sometimes there is
	+ being known for being secure), however, sometimes there is
	a noticeable time gap between disclosure of a
	vulnerability and an updated release of the vulnerable
	software. Do not mark a port <varname>FORBIDDEN</varname>
	@@ -656,7 +656,7 @@
	Verify that the changes are official and have been performed
	by the author. It has happened in the past that the distfile
	was silently altered on the download servers with the intent to
	- cause harm or compromise end user security.</para>
	+ cause harm or compromise end-user security.</para>

	<para>Put the old distfile aside, download the new one, unpack
	them and compare the content with &man.diff.1;. If there is
	Index: en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/porting-samplem/chapter.xml
	@@ -54,7 +54,7 @@
	PATCH_DIST_STRIP= -p1

	[maintainer; mandatory! This is the person who is volunteering to
	- handle port updates, build breakages, and to whom a users can direct
	+ handle port updates, build breakages, and to whom users can direct
	questions and bug reports. To keep the quality of the Ports Collection
	as high as possible, we do not accept new ports that are assigned to
	"ports@FreeBSD.org".]
	@@ -72,7 +72,7 @@
	USES= gmake
	[If it is an X application and requires "xmkmf -a" to be run...]
	USES= imake
	-[If the source is obtained from github, remove MASTER_SITE* and...]
	+[If the source is obtained from GitHub, remove MASTER_SITE* and...]
	USE_GITHUB= yes
	GH_ACCOUNT= example

	@@ -101,10 +101,10 @@

	[then the special rules, in the order they are called]
	pre-fetch:
	- i go fetch something, yeah
	+ I go fetch something, yeah

	post-patch:
	- i need to do something after patch, great
	+ I need to do something after patches are applied, great

	pre-install:
	and then some more stuff before installing, wow
	Index: en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
	@@ -94,7 +94,7 @@

	<note>
	<para>This is <emphasis>not</emphasis> a manual or an
	- in-depth description on how to use or compile the port!
	+ in-depth description of how to use or compile the port!
	<emphasis>Please be careful when copying from the
	<filename>README</filename> or manpage</emphasis>. Too
	often they are not a concise description of the port or
	Index: en_US.ISO8859-1/books/porters-handbook/security/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/security/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/security/chapter.xml
	@@ -36,12 +36,12 @@
	remain unnoticed for years because often it does not cause
	software malfunction. Second, a malicious party can use it to
	gain unauthorized access to a vulnerable system, to destroy or
	- alter sensitive data; and in the worst case the user will not
	+ alter sensitive data; and in the worst case, the user will not
	even notice the harm caused. Third, exposing a vulnerable
	system often assists attackers to break into other systems that
	could not be compromised otherwise. Therefore closing a
	vulnerability alone is not enough: notify the audience
	- of it in the most clear and comprehensive manner, which
	+ of it in the clearest and comprehensive manner, which
	will allow them to evaluate the danger and take appropriate
	action.</para>
	</sect1>
	@@ -150,7 +150,7 @@
	tags, that is, more complex rules of nesting them. This is
	similar to HTML. The major difference is that XML is
	e<emphasis>X</emphasis>tensible, that is, based on defining
	- custom tags. Due to its intrinsic structure XML puts
	+ custom tags. Due to its intrinsic structure, XML puts
	otherwise amorphous data into shape. VuXML is particularly
	tailored to mark up descriptions of security
	vulnerabilities.</para>
	@@ -298,7 +298,7 @@
	<para>Several related package groups (essentially, ports)
	can be listed in the <literal><affected></literal>
	section. This can be used if several software products
	- (say FooBar, FreeBar and OpenBar) grow from the same code
	+ (say FooBar, FreeBar, and OpenBar) grow from the same code
	base and still share its bugs and vulnerabilities. Note
	the difference from listing multiple names within a single
	<package> section.</para>
	@@ -321,7 +321,7 @@
	field. At least enclosing <literal><p></literal>
	and <literal></p></literal> has to appear. More
	complex mark-up may be used, but only for the sake of
	- accuracy and clarity: No eye candy please.</para>
	+ accuracy and clarity: No eye candy, please.</para>
	</callout>

	<callout arearefs="co-vx-ref">
	Index: en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
	@@ -38,7 +38,7 @@
	files in <varname>DISTDIR</varname> it will look up the URL
	<varname>MASTER_SITES</varname>, which is set in the
	Makefile, as well as our FTP mirrors where we put distfiles
	- as backup. It will then attempt to fetch the named
	+ as a backup. It will then attempt to fetch the named
	distribution file with <varname>FETCH</varname>, assuming
	that the requesting site has direct access to the Internet.
	If that succeeds, it will save the file in
	@@ -126,7 +126,7 @@

	<para>For example, if there is a
	<buildtarget>post-extract</buildtarget> target defined in the
	- <filename>Makefile</filename>, and a file
	+ <filename>Makefile</filename> and a file
	<filename>pre-build</filename> in the
	<filename>scripts</filename> subdirectory, the
	<buildtarget>post-extract</buildtarget> target will be called
	@@ -134,7 +134,7 @@
	<filename>pre-build</filename> will be executed before
	the default build rules are done. It is recommended to
	use <filename>Makefile</filename> targets if the actions are
	- simple enough, because it will be easier for someone to figure
	+ simple enough because it will be easier for someone to figure
	out what kind of non-default action the port requires.</para>

	<para>The default actions are done by the
	@@ -187,7 +187,7 @@
	<xref linkend="makefile-master_sites"/> for details.</para>

	<para>If there is no FTP/HTTP site that is well-connected to
	- the net, or can only find sites that have irritatingly
	+ the net or can only find sites that have irritatingly
	non-standard formats, put a copy on a reliable
	FTP or HTTP server (for example, a home
	page).</para>
	@@ -536,7 +536,7 @@
	<para>Include any additional customization commands in the
	<filename>configure</filename> script and save it in the
	<filename>scripts</filename> subdirectory. As mentioned above,
	- it is also possible do this with <filename>Makefile</filename>
	+ it is also possible to do this with <filename>Makefile</filename>
	targets and/or scripts with the name
	<filename>pre-configure</filename> or
	<filename>post-configure</filename>.</para>
	Index: en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
	@@ -170,7 +170,7 @@
	porter must fix them, or upgrade to a non-vulnerable
	version, and send a patch to the author. This all takes
	time, which results in software being vulnerable longer
	- than necessary. This in turn makes it harder to
	+ than necessary. This, in turn, makes it harder to
	coordinate a fix without unnecessarily leaking
	information about the vulnerability.</para>
	</listitem>
	@@ -181,7 +181,7 @@

	<listitem>
	<para>This problem is similar to the problem with security
	- in the last paragraph, but generally less severe.</para>
	+ in the last paragraph but generally less severe.</para>
	</listitem>
	</varlistentry>

	@@ -320,10 +320,10 @@
	<package role="port">lang/mosml</package> for an
	example), or through a shell-wrapper which sets
	<varname>LD_LIBRARY_PATH</varname> before invoking the binary,
	- like <package role="port">www/seamonkey</package>
	+ as <package role="port">www/seamonkey</package>
	does.</para>

	- <para>When installing 32-bit libraries on 64-bit system, use
	+ <para>When installing 32-bit libraries on a 64-bit system, use
	<varname>USE_LDCONFIG32</varname> instead.</para>

	<para>If the software uses <link
	@@ -377,7 +377,7 @@
	must always be compiled from the source code, use
	<varname>NO_PACKAGE</varname>. For
	example, if the application has configuration information
	- that is site specific hard coded into it at compile time,
	+ that is site specific hard-coded into it at compile time,
	set <varname>NO_PACKAGE</varname>.</para>

	<para>Set <varname>NO_PACKAGE</varname> to a string
	@@ -519,10 +519,10 @@
	<important>
	<para>When setting <varname>MAKE_JOBS_UNSAFE</varname>, it
	is very important to explain either with a comment in the
	- <filename>Makefile</filename>, or at least in the commit
	+ <filename>Makefile</filename> or at least in the commit
	message, <emphasis>why</emphasis> the port does not build
	when enabling. Otherwise, it is almost impossible to
	- either fix the problem, or test if it has been fixed when
	+ either fix the problem or test if it has been fixed when
	committing an update at a later date.</para>
	</important>
	</sect2>
	@@ -598,13 +598,13 @@
	<row>
	<entry><varname>GNU_CONFIGURE</varname></entry>
	<entry>The port uses <command>configure</command>
	- script to prepare build.</entry>
	+ script to prepare the build.</entry>
	</row>

	<row>
	<entry><varname>HAS_CONFIGURE</varname></entry>
	<entry>Same as <varname>GNU_CONFIGURE</varname>,
	- except default configure target is not added to
	+ except the default configure target is not added to
	<varname>CONFIGURE_ARGS</varname>.</entry>
	</row>

	@@ -1357,7 +1357,7 @@

	<para>The exception to this rule is when the relevant directory
	does not exist or the distfile does not exist in that
	- directory. In such case, using author's id as
	+ directory. In such a case, using the author's id as
	<varname>MASTER_SITE_SUBDIR</varname> is allowed.
	The <literal>CPAN:AUTHOR</literal> macro can be used, which will
	be translated to the hashed author directory. For example,
	@@ -1376,7 +1376,7 @@
	<tgroup cols="2">
	<thead>
	<row>
	- <entry>Read only variables</entry>
	+ <entry>Read-only variables</entry>
	<entry>Means</entry>
	</row>
	</thead>
	@@ -1422,7 +1422,7 @@

	<row>
	<entry><varname>SITE_PERL</varname></entry>
	- <entry>Directory name where site specific
	+ <entry>Directory name where site-specific
	Perl packages go. This value is
	added to <varname>PLIST_SUB</varname>.</entry>
	</row>
	@@ -1584,7 +1584,7 @@

	<row>
	<entry><literal>ice</literal></entry>
	- <entry>Inter Client Exchange library for X11</entry>
	+ <entry>Inter-Client Exchange library for X11</entry>
	</row>

	<row>
	@@ -1849,7 +1849,7 @@
	components of this project, use <literal>USES= gl</literal>
	and <varname>USE_GL</varname>. See
	<xref linkend="uses-gl" /> for a full list of available
	- components. For backwards compatibility, the value of
	+ components. For backward compatibility, the value of
	<literal>yes</literal> maps to <literal>glu</literal>.</para>

	<example xml:id="use-xorg-example">
	@@ -2077,7 +2077,7 @@
	<varname>USE_GNOME</varname> infrastructure. Include all the
	needed components as a space-separated list. The
	<varname>USE_GNOME</varname> components are divided into
	- these virtual lists: basic components, GNOME 3 components
	+ these virtual lists: basic components, GNOME 3 components,
	and legacy components. If the port needs only GTK3 libraries,
	this is the shortest way to define it:</para>

	@@ -2127,7 +2127,7 @@
	<title>Variables</title>

	<para>This section explains which macros are available and how
	- they are used. Like they are used in the above example. The
	+ they are used. Like they are used in the above example.
	<xref linkend="gnome-components"/> has a more in-depth
	explanation. <varname>USE_GNOME</varname> has to be set for
	these macros to be of use.</para>
	@@ -2146,7 +2146,7 @@
	<filename>icon-theme.cache</filename>. Do not include
	that file in <filename>pkg-plist</filename>. This macro
	handles that automatically. This macro is not needed
	- for <application>Qt</application>, which use a
	+ for <application>Qt</application>, which uses an
	internal method.</para>
	</listitem>
	</varlistentry>
	@@ -2224,7 +2224,7 @@
	<para>Open Source Metadata Framework
	(<acronym>OMF</acronym>) files are commonly used by
	GNOME 2 applications. These files contain the
	- application help file information, and require special
	+ application help file information and require special
	processing by ScrollKeeper/rarian. To properly register
	<acronym>OMF</acronym> files when installing GNOME
	applications from packages, make sure that
	@@ -2258,7 +2258,7 @@
	page</link> has contact information if more help is
	needed. The components are divided into GNOME components
	that are currently in use and legacy components. If the
	- component supports argument, they are listed between
	+ component supports arguments, they are listed between
	parenthesis in the description. The first is the default.
	"Both" is shown if the component defaults to adding to both
	build and run dependencies.</para>
	@@ -2428,7 +2428,7 @@
	<entry>devel/gobject-introspection</entry>
	<entry>Basic introspection bindings and tools to
	generate introspection bindings. Most of the time
	- :build is enough, :both/:run is only need for
	+ :build is enough, :both/:run is only needed for
	applications that use introspection bindings.
	(both, build, run)</entry>
	</row>
	@@ -3401,7 +3401,7 @@
	implies a dependency on the core library,
	<literal>core</literal> does not need to be specified.
	The Qt 5 code generation tools <command>moc</command>,
	- <command>uic</command> and <command>rcc</command>, as well
	+ <command>uic</command>, and <command>rcc</command>, as well
	as the Makefile generator <command>qmake</command> are
	only needed at buildtime, thus they are specified with the
	<literal>_build</literal> suffix:</para>
	@@ -3747,7 +3747,7 @@

	<row>
	<entry><literal>breeze</literal></entry>
	- <entry>Plasma5 artwork, styles and assets for the Breeze
	+ <entry>Plasma5 artwork, styles, and assets for the Breeze
	visual style</entry>
	</row>

	@@ -3862,7 +3862,7 @@

	<row>
	<entry><literal>eventviews</literal></entry>
	- <entry>Event view libriares for KDEPim</entry>
	+ <entry>Event view libraires for KDEPim</entry>
	</row>

	<row>
	@@ -3878,7 +3878,7 @@

	<row>
	<entry><literal>gapi</literal></entry>
	- <entry>KDE based library to access google
	+ <entry>KDE based library to access Google
	services</entry>
	</row>

	@@ -3937,7 +3937,7 @@

	<row>
	<entry><literal>idletime</literal></entry>
	- <entry>KF5 library for monitoring user activity</entry>
	+ <entry>KF5 library for monitoring users activity</entry>
	</row>

	<row>
	@@ -3947,7 +3947,7 @@

	<row>
	<entry><literal>incidenceeditor</literal></entry>
	- <entry>Incidence editor libriares for KDEPim</entry>
	+ <entry>Incidence editor libraires for KDEPim</entry>
	</row>

	<row>
	@@ -4282,7 +4282,7 @@

	<row>
	<entry><literal>libksieve</literal></entry>
	- <entry>Sieve libriares for KDEPim</entry>
	+ <entry>Sieve libraires for KDEPim</entry>
	</row>

	<row>
	@@ -4293,7 +4293,7 @@

	<row>
	<entry><literal>mailcommon</literal></entry>
	- <entry>Common libriares for KDEPim</entry>
	+ <entry>Common libraires for KDEPim</entry>
	</row>

	<row>
	@@ -4396,7 +4396,7 @@

	<row>
	<entry><literal>pimcommon</literal></entry>
	- <entry>Common libriares for KDEPim</entry>
	+ <entry>Common libraires for KDEPim</entry>
	</row>

	<row>
	@@ -4951,7 +4951,7 @@

	<row>
	<entry><varname>JAVAJARDIR</varname></entry>
	- <entry>The directory where JAR files is
	+ <entry>The directory where JAR files are
	installed. Default:
	<filename>${JAVASHAREDIR}/classes</filename>.</entry>
	</row>
	@@ -4980,7 +4980,7 @@
	be the sub-make command. When no
	<buildtarget>do-build</buildtarget> target is defined by the
	port, a default one will be set that runs Ant according to
	- <varname>MAKE_ENV</varname>, <varname>MAKE_ARGS</varname> and
	+ <varname>MAKE_ENV</varname>, <varname>MAKE_ARGS</varname>, and
	<varname>ALL_TARGET</varname>. This is similar to the
	<literal>USES= gmake</literal> mechanism, which is documented
	in <xref linkend="building"/>.</para>
	@@ -5046,8 +5046,8 @@
	for any other port. The Javadoc tool is known to produce a
	different set of files depending on the version of the
	<acronym>JDK</acronym> that is used. For ports that do not
	- enforce the use of a particular <acronym>JDK</acronym>, it is
	- therefore a complex task to specify the packing list
	+ enforce the use of a particular <acronym>JDK</acronym>, it is,
	+ therefore, a complex task to specify the packing list
	(<filename>pkg-plist</filename>). This is one reason why
	porters are strongly encouraged to use
	<varname>PORTDOCS</varname>. Moreover, even if the set of
	@@ -5140,7 +5140,7 @@
	<entry><varname>APACHE_VERSION</varname></entry>
	<entry>The version of present Apache installation
	(read-only variable). This variable is only
	- available after inclusion of
	+ available after the inclusion of
	<filename>bsd.port.pre.mk</filename>. Possible
	values: <literal>22</literal>,
	<literal>24</literal>.</entry>
	@@ -5293,19 +5293,19 @@

	<tip>
	<para><application>PEAR</application> modules will
	- automatically be flavorized using <link
	+ automatically be flavored using <link
	linkend="flavors-auto-php"><application>PHP</application>
	flavors</link>.</para>
	</tip>

	<note>
	- <para>If a non default <varname>PEAR_CHANNEL</varname> is
	+ <para>If a non-default <varname>PEAR_CHANNEL</varname> is
	used, the build and run-time dependencies will automatically
	be added.</para>
	</note>

	<important>
	- <para>PEAR modules do not need to defined
	+ <para>PEAR modules do not need to define
	<varname>PKGNAMESUFFIX</varname> it is automatically filled
	in using <varname>PEAR_PKGNAMEPREFIX</varname>. If a port
	needs to add to <varname>PKGNAMEPREFIX</varname>, it must
	@@ -5363,7 +5363,7 @@
	<tip>
	<para>As <application>Horde</application> modules are also
	<application>PEAR</application> modules they will also
	- automatically be flavorized using <link
	+ automatically be flavored using <link
	linkend="flavors-auto-php"><application>PHP</application>
	flavors</link>.</para>
	</tip>
	@@ -5374,7 +5374,7 @@
	<sect1 xml:id="using-python">
	<title>Using Python</title>

	- <para>The Ports Collection supports parallel installation of
	+ <para>The Ports Collection supports the parallel installation of
	multiple Python versions. Ports must use a
	correct <command>python</command> interpreter, according to
	the user-settable <varname>PYTHON_VERSION</varname>.
	@@ -5426,7 +5426,7 @@

	<row>
	<entry><varname>USE_PYTHON=concurrent</varname></entry>
	- <entry>The port will use an unique prefix, typically
	+ <entry>The port will use a unique prefix, typically
	<literal>PYTHON_PKGNAMEPREFIX</literal> for certain
	directories, such as <literal>EXAMPLESDIR</literal> and
	<literal>DOCSDIR</literal> and also will append a
	@@ -5483,7 +5483,7 @@
	<row>
	<entry><varname>PYTHON_CMD</varname></entry>
	<entry>Python interpreter command line, including
	- version number.</entry>
	+ the version number.</entry>
	</row>
	</tbody>
	</tgroup>
	@@ -5502,7 +5502,7 @@
	<row>
	<entry><varname>PYNUMPY</varname></entry>
	<entry>Dependency line for the new numeric extension,
	- numpy. (PYNUMERIC is deprecated by upstream
	+ numpy. (PYNUMERIC is deprecated by the upstream
	vendor).</entry>
	</row>

	@@ -5613,7 +5613,7 @@
	<sect1 xml:id="using-tcl">
	<title>Using <application>Tcl/Tk</application></title>

	- <para>The Ports Collection supports parallel installation of
	+ <para>The Ports Collection supports the parallel installation of
	multiple <application>Tcl/Tk</application> versions. Ports
	should try to support at least the default
	<application>Tcl/Tk</application> version and higher with
	@@ -5957,7 +5957,7 @@
	<para>There are many versions of the
	<application>wxWidgets</application> libraries which
	conflict between them (install files under the same name).
	- In the ports tree this problem has been solved by installing
	+ In the ports tree, this problem has been solved by installing
	each version under a different name using version number
	suffixes.</para>

	@@ -5967,9 +5967,9 @@
	<command>wx-config</command> script to determine the
	necessary compiler and linker flags. The script is named
	differently for every available version. Majority of
	- applications respect an environment variable, or accept a
	+ applications respect an environment variable or accept a
	configure argument, to specify which
	- <command>wx-config</command> script to call. Otherwise they
	+ <command>wx-config</command> script to call. Otherwise, they
	have to be patched.</para>
	</sect2>

	@@ -6327,7 +6327,7 @@
	<entry><varname>WX_CONFIG</varname></entry>
	<entry>The path to the
	<application>wxWidgets</application>
	- <command>wx-config</command> script (with different
	+ <command>wx-config</command> script (with a different
	name)</entry>
	</row>

	@@ -6335,7 +6335,7 @@
	<entry><varname>WXRC_CMD</varname></entry>
	<entry>The path to the
	<application>wxWidgets</application>
	- <command>wxrc</command> program (with different
	+ <command>wxrc</command> program (with a different
	name)</entry>
	</row>

	@@ -6360,7 +6360,7 @@

	<important>
	<para>When defining <varname>WX_PREMK</varname>, then the
	- version, dependencies, components and defined variables
	+ version, dependencies, components, and defined variables
	will not change if modifying the
	<application>wxWidgets</application> port variables
	<emphasis>after</emphasis> including
	@@ -6405,7 +6405,7 @@
	<literal>WX_CONFIG</literal> environment variable set,
	requiring additional arguments.
	<varname>WX_CONF_ARGS</varname> can be used for
	- provide them.</para>
	+ providing them.</para>

	<table frame="none" xml:id="wx-conf-args-values">
	<title>Legal Values for
	@@ -6449,7 +6449,7 @@
	<para>There are many versions of the
	<application>Lua</application> libraries and corresponding
	interpreters, which conflict between them (install files
	- under the same name). In the ports tree this problem has
	+ under the same name). In the ports tree, this problem has
	been solved by installing each version under a different
	name using version number suffixes.</para>

	@@ -6900,7 +6900,7 @@
	<title>Using MySQL</title>

	<para>When a port needs the <application>MySQL</application>
	- client library add</para>
	+ client library add:</para>

	<programlisting>USES= mysql</programlisting>

	@@ -6913,7 +6913,7 @@

	<para>When a port needs the
	<application>PostgreSQL</application> server version 9.6
	- or later add</para>
	+ or later add:</para>

	<programlisting>USES= pgsql:9.6+
	WANT_PGSQL= server</programlisting>
	@@ -6942,7 +6942,7 @@
	Ports integrate into the system <filename>rc.d</filename>
	framework. Details on its usage can be found in <link
	xlink:href="&url.books.handbook;/configtuning-rcd.html">the
	- rc.d Handbook chapter</link>. Detailed explanation of
	+ rc.d Handbook chapter</link>. A detailed explanation of
	the available commands is provided in &man.rc.8; and
	&man.rc.subr.8;. Finally, there is
	<link xlink:href="&url.articles.rc-scripting;">an
	@@ -6960,7 +6960,7 @@
	Scripts must be placed in the <filename>files</filename>
	subdirectory and a <literal>.in</literal> suffix must be added
	to their filename. Standard <varname>SUB_LIST</varname>
	- expansions will be ran against this file. Use of the
	+ expansions will be run against this file. Use of the
	<literal>%%PREFIX%%</literal> and
	<literal>%%LOCALBASE%%</literal> expansions is strongly
	encouraged as well. More on <varname>SUB_LIST</varname> in
	@@ -7023,7 +7023,7 @@
	<para>If the script is not starting a persistent service this is
	not necessary.</para>

	- <para>For optional configuration elements the "="
	+ <para>For optional configuration elements, the "="
	style of default variable assignment is preferable to the
	":=" style here, since the former sets a default
	value only if the variable is unset, and the latter sets one
	@@ -7035,7 +7035,7 @@
	<para>in their <filename>rc.conf.local</filename>, and a
	variable substitution using ":=" would
	inappropriately override the user's intention. The
	- <literal>_enable</literal> variable is not optional,
	+ <literal>_enable</literal> variable is not optional
	and must use the ":" for the default.</para>

	<important>
	@@ -7057,7 +7057,7 @@

	<para>The <package role="port">devel/rclint</package>
	port can check for most of these, but it is not a
	- substitute for proper review.</para>
	+ substitute for a proper review.</para>

	<procedure>
	<step>
	@@ -7177,7 +7177,7 @@

	<step>
	<para>Does the script execute any code unconditionally?
	- This is frowned on. Usually these things must be
	+ This is frowned on. Usually, these things must be
	dealt with through a
	<function>start_precmd</function>.</para>
	</step>
	@@ -7256,7 +7256,7 @@
	<title>Go Libraries</title>

	<para>Ports must not package or install Go libs or source code.
	- Go ports must fetch the required deps at the normal fetch time
	+ Go ports must fetch the required dependencies at the normal fetch time
	and should only install the programs and things users need, not
	the things Go developers would need.</para>

	@@ -7264,17 +7264,17 @@

	<itemizedlist>
	<listitem>
	- <para>Use vendored dependencies included with the package
	+ <para>Use vendor dependencies included with the package
	source.</para>
	</listitem>

	<listitem>
	- <para>Fetch the versions of deps specified by upstream (in the
	+ <para>Fetch the versions of dependencies specified by upstream (in the
	case of go.mod, vendor.json or similar).</para>
	</listitem>

	<listitem>
	- <para>As a last resort (deps are not included nor versions
	+ <para>As a last resort (dependencies are not included nor versions
	specified exactly) fetch versions of dependencies available
	at the time of upstream development/release.</para>
	</listitem>
	Index: en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml
	@@ -38,7 +38,7 @@
	<filename>bsd.port.mk</filename> for the meaning of the string
	produced.</para>

	- <para>Also note that running a recent version of
	+ <para>Also, note that running a recent version of
	<command>portlint</command> (as specified in the next section)
	will cause <command>make describe</command> to be run
	automatically.</para>
	@@ -98,7 +98,7 @@
	installed system mounted somewhere other than
	<filename>/</filename>. A port will actually install into
	<filename>DESTDIR/PREFIX</filename>, and register with the
	- package database in <filename>DESTDIR/var/db/pkg</filename>. As
	+ package database in <filename>DESTDIR/var/db/pkg</filename>.
	<varname>DESTDIR</varname> is handled automatically by the ports
	infrastructure with &man.chroot.8;. There is no need for
	modifications or any extra care to write
	@@ -287,7 +287,7 @@
	version because it is what is used in production, and has all
	the new features that will make sure everything is exactly
	right. A contributor will not necessarily need those as the
	- most important fixes are backported to released version. The
	+ most important fixes are backported to the released version. The
	main reason for the use of the development version to build
	the official package is because it is faster, in a way that
	will shorten a full build from 18 hours to 17 hours when using
	@@ -383,7 +383,7 @@
	<para>The <acronym>FTP</acronym>/<acronym>HTTP</acronym>
	server to use when the jails are installed from &os;
	releases and updated with &man.freebsd-update.8;.
	- Choose a server location which is close, for example if
	+ Choose a server location which is close, for example, if
	the machine is located in Australia, use
	<literal>ftp.au.freebsd.org</literal>.</para>
	</listitem>
	@@ -419,7 +419,7 @@

	<screen>&prompt.root; <userinput>poudriere jail -c -j 111Ramd64 -v 11.1-RELEASE -a amd64</userinput></screen>

	- <para>Fetch a <literal>11.1-RELEASE</literal> for
	+ <para>Fetch an <literal>11.1-RELEASE</literal> for
	<literal>amd64</literal> from the <acronym>FTP</acronym>
	server given by <varname>FREEBSD_HOST</varname> in
	<filename>poudriere.conf</filename>, create the zfs file
	@@ -464,12 +464,12 @@
	<screen>&prompt.root; <userinput>poudriere jail -c -j 12amd64 -v head -a amd64 -m svn+https</userinput></screen>

	<para>In order to run a <literal>12.0-CURRENT</literal>
	- <application>Poudriere</application> jail you must be
	+ <application>Poudriere</application> jail, you must be
	running <literal>12.0-CURRENT</literal>. In general, newer
	kernels can build and run older jails. For instance, a
	- <literal>12.0-CURRENT</literal> kernel can build and run a
	+ <literal>12.0-CURRENT</literal> kernel can build and run an
	<literal>11.1-STABLE</literal>
	- <application>Poudriere</application> jails if the
	+ <application>Poudriere</application> jail if the
	<literal>COMPAT_FREEBSD11</literal> kernel option was
	compiled in (on by default in
	<literal>12.0-CURRENT</literal>
	@@ -539,7 +539,7 @@
	<para>This command creates
	<literal>tank/poudriere/ports/default</literal>, mount it on
	<filename>/poudriere/ports/default</filename>, and populate it
	- using &man.portsnap.8;. Afterward it is included in the list
	+ using &man.portsnap.8;. Afterward, it is included in the list
	of known ports trees:</para>

	<screen>&prompt.root; <userinput>poudriere ports -l</userinput>
	@@ -721,7 +721,7 @@
	format
	<literal><replaceable>category</replaceable>/<replaceable>portname</replaceable></literal>
	will use the specified options, all dependencies will use the
	- default options. Testing dependent ports with non-default
	+ default options. Testing the dependent ports with non-default
	options can be accomplished using sets, see <xref
	linkend="testing-poudriere-sets"/>.</para>

	@@ -750,7 +750,7 @@
	<filename>/var/db/ports</filename> in its configuration
	directory. This directory is then &man.nullfs.5;-mounted into the
	jails where the ports and their dependencies are built.
	- Usually a suitable starting point can be obtained by
	+ Usually, a suitable starting point can be obtained by
	recursively copying the existing <varname>PORT_DBDIR</varname>
	to
	<filename>/usr/local/etc/poudriere.d/<replaceable>jailname</replaceable>-<replaceable>portname</replaceable>-<replaceable>setname</replaceable>-options</filename>.
	@@ -815,7 +815,7 @@

	<note>
	<para><application>Poudriere</application> is very flexible in
	- the option configuration. They can be set for particular
	+ the options configuration. They can be set for particular
	jails, ports trees, and for multiple ports by one command.
	Refer to &man.poudriere.8; for details.</para>
	</note>
	@@ -872,11 +872,11 @@
	<para>Unlike with sets, all of the found files will be appended,
	<emphasis>in that order</emphasis>, into one
	<filename>make.conf</filename> inside the build jails. It is
	- hence possible to have general make variables, intended to
	+ hence possible to have global make variables, intended to
	affect all builds in
	<filename>/usr/local/etc/poudriere.d/make.conf</filename>.
	Special variables, intended to affect only certain jails or
	- sets can be set in specialised <filename>make.conf</filename>
	+ sets can be set in specialized <filename>make.conf</filename>
	files, such as
	<filename>/usr/local/etc/poudriere.d/111Ramd64-development-devset-make.conf</filename>.</para>

	@@ -884,7 +884,7 @@
	<title>Using <filename>make.conf</filename> to Change Default
	<application>Perl</application></title>

	- <para>To build a set with a non default
	+ <para>To build a set with a non-default
	<application>Perl</application> version, for example,
	<literal>5.20</literal>, using a set named
	<literal>perl5-20</literal>, create a
	Index: en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
	@@ -36,7 +36,7 @@
	<para>However, sometimes people forget to put the name of the port
	into the Summary field in an unambiguous fashion. In that
	case, try searching in the <literal>Comment</literal> field in
	- the <literal>Detailled Bug Information</literal> section, or try
	+ the <literal>Detailed Bug Information</literal> section, or try
	the
	<link linkend="portsmon">&os; Ports Monitoring System</link>
	(also known as <literal>portsmon</literal>). This system
	@@ -122,7 +122,7 @@
	maintaining the port, be sure to put
	<literal>[MAINTAINER]</literal> at the beginning of the
	<literal>Summary</literal> line. Always include the category
	- with the port name, followed by colon, and brief descripton of the
	+ with the port name, followed by a colon, and brief description of the
	issue. For example:
	<literal><replaceable>category/portname</replaceable>:
	<replaceable>add FOO option</replaceable></literal>, or if
	@@ -168,7 +168,7 @@
	<para>When possible, please submit a &man.svn.1; diff. They
	are easier to handle than diffs between
	<quote>new and old</quote> directories. It is easier
	- to see what has changed, and to update the diff if
	+ to see what has changed and to update the diff if
	something was modified in the Ports Collection since the
	work on it began, or if the
	committer asks for something to be fixed. Also, a patch
	@@ -217,7 +217,7 @@
	<calloutlist>
	<callout arearefs="svn-update">
	<para>This will attempt to merge the differences between the
	- patch and current repository version. Watch the output
	+ patch and the current repository version. Watch the output
	carefully. The letter in front of each file name
	indicates what was done with it. See
	<xref linkend="table-svn-up"/> for a complete list.</para>
	@@ -244,13 +244,13 @@

	<row>
	<entry>M</entry>
	- <entry>The file had been modified, and was merged
	+ <entry>The file had been modified and was merged
	without conflicts.</entry>
	</row>

	<row>
	<entry>C</entry>
	- <entry>The file had been modified, and was merged with
	+ <entry>The file had been modified and was merged with
	conflicts.</entry>
	</row>
	</tbody>
	@@ -262,7 +262,7 @@
	the <application>Subversion</application> repository and
	&man.svn.1; was not able to merge the local changes with those
	from the repository. It is always a good idea to inspect the
	- changes anyway, since &man.svn.1; does not know anything about
	+ changes anyway since &man.svn.1; does not know anything about
	the structure of a port, so it might (and probably will) merge
	things that do not make sense.</para>

	Index: en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
	===================================================================
	--- en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
	+++ en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
	@@ -35,11 +35,11 @@
	requirements and settings for a port. They can add
	dependencies, change building behavior, add metadata to
	packages, and so on, all by selecting simple, preset
	- values..</para>
	+ values.</para>

	<para>Each section in this chapter describes a possible value for
	<varname>USES</varname>, along with its possible arguments.
	- Arguments are appeneded to the value after a colon
	+ Arguments are appended to the value after a colon
	(<literal>:</literal>). Multiple arguments are separated by
	commas (<literal>,</literal>).</para>

	@@ -269,15 +269,15 @@
	<para>Uses <application>CMake</application> for configuring and
	building.</para>

	- <para>By default an out-of-source build is performed, leaving the
	+ <para>By default, an out-of-source build is performed, leaving the
	sources in <varname>WRKSRC</varname> free from build artifacts.
	With the <literal>insource</literal> argument, an in-source
	build will be performed instead. Setting it should be the
	exception when a regular out-of-source build does not
	work.</para>

	- <para>By default <application>Ninja</application> is used for
	- the build. In some cases this does not work correctly. With
	+ <para>By default, <application>Ninja</application> is used for
	+ the build. In some cases, this does not work correctly. With
	the <literal>noninja</literal> argument, the build will
	fallback to using regular <command>make</command> for builds.
	It should only be used if a
	@@ -447,7 +447,7 @@
	<para>Uses the Comprehensive R Archive Network. Specify
	<varname>auto-plist</varname> to automatically generate
	<filename>pkg-plist</filename>. Specify
	- <literal>compiles</literal> if the port has code that need to be
	+ <literal>compiles</literal> if the port has code that needs to be
	compiled.</para>
	</sect1>

	@@ -537,7 +537,7 @@
	<literal>7</literal>, <literal>module</literal>,
	<literal>theme</literal></para>

	- <para>Automate installation of a port that is a
	+ <para>Automate the installation of a port that is a
	<application>Drupal</application> theme or module. Use with the
	version of Drupal that the port is expecting. For example,
	<literal>USES=drupal:7,module</literal> says that this port
	@@ -1147,7 +1147,7 @@
	<para>Possible arguments: (none),
	<literal>modules</literal></para>

	- <para>Sets default values and targets used to build
	+ <para>Sets default, values and targets used to build
	<application>Go</application> software. A build-time dependency
	on <package role="port">lang/go</package> is added. By default
	the build is performed in GOPATH mode. If Go software uses
	@@ -1170,7 +1170,7 @@
	as a default for <varname>GO_TARGET</varname>. If not set
	explicitly and <varname>GH_SUBDIR</varname> is present,
	<varname>GO_PKGNAME</varname> value will be inferred from
	- <varname>${GH_SUBDIR}</varname>, otherwise it will be set
	+ <varname>${GH_SUBDIR}</varname>, otherwise, it will be set
	to <varname>${PORTNAME}</varname>.</para>
	</listitem>
	</varlistentry>
	@@ -1387,7 +1387,7 @@
	<buildtarget>configure</buildtarget> target is not set. If the
	<option>-a</option> flag is a problem for the port, add the
	<literal>notall</literal> argument. If <command>xmkmf</command>
	- does not generate a <buildtarget>install.man</buildtarget>
	+ does not generate an <buildtarget>install.man</buildtarget>
	target, add the <literal>noman</literal> argument.</para>
	</sect1>

	@@ -1510,7 +1510,7 @@

	<para>Ports <application>Linux</application> compatibility
	framework. Specify <literal>c6</literal> to depend on
	- <application>CentOS</application> 6 packags. Specify
	+ <application>CentOS</application> 6 packages. Specify
	<literal>c7</literal> to depend on
	<application>CentOS</application> 7 packages. The available
	packages are:</para>
	@@ -1835,9 +1835,9 @@
	<literal>build</literal>, <literal>run</literal></para>

	<para>Adds a dependency on <application>Lua</application>. By
	- default this is a library dependency, unless overridden by the
	+ default, this is a library dependency unless overridden by the
	<literal>build</literal> or <literal>run</literal> option. The
	- default version is 5.2, unless set by the
	+ default version is 5.2 unless set by the
	<literal><replaceable>XY</replaceable></literal> parameter (for
	example, <literal>51</literal> or
	<literal>52+</literal>).</para>
	@@ -2182,8 +2182,8 @@
	<literal><replaceable>X.Y</replaceable>+</literal>,
	<literal><replaceable>X.Y</replaceable>-</literal></para>

	- <para>Provide support for PostgreSQL. Maintainer can set version
	- required. Minimum and maximum versions can be specified; for
	+ <para>Provide support for PostgreSQL. The maintainer can set the
	+ required version. Minimum and maximum versions can be specified; for
	example, 9.0-, 8.4+.</para>

	<para>Add PostgreSQL component dependency, using
	@@ -2412,7 +2412,7 @@
	<literal>20</literal>, for extensions that depend on
	another extension, the priority is automatically set to
	<literal>30</literal>. Some extensions may need to be
	- loaded before every other extension, for example <package
	+ loaded before every other extension, for example, <package
	role="port">www/php56-opcache</package>. Some may need
	to be loaded after an extension with a priority of
	<literal>30</literal>. In that case, add
	@@ -2493,7 +2493,7 @@
	<para>Possible arguments: (none), <literal>ffi</literal></para>

	<para>Uses <package role="port">lang/pure</package>. Largely used
	- for building related <application>pure</application> ports.
	+ to build related <application>pure</application> ports.
	With the <literal>ffi</literal> argument, it implies <package
	role="port">devel/pure-ffi</package> as a run-time
	dependency.</para>
	@@ -2799,7 +2799,7 @@
	<package role="port">misc/shared-mime-info</package>. This uses
	will automatically add a post-install step in such a way that
	the port itself still can specify there own post-install step if
	- needed. It also add an <link
	+ needed. It also adds an <link
	linkend="plist-keywords-shared-mime-info"><literal>@shared-mime-info</literal></link>
	entry to the plist.</para>
	</sect1>
	@@ -2854,7 +2854,7 @@
	</varlistentry>
	</variablelist>

	- <para>Currently
	+ <para>Currently,
	<application>Bash</application>,
	<application>Java</application>, <application>Ksh</application>,
	<application>Lua</application>,
	@@ -2889,7 +2889,7 @@
	<term><varname><replaceable>interp</replaceable>_OLD_CMD</varname></term>
	<listitem>
	<para>The list of wrong invocations of interpreters. These
	- are typically obsolete paths, or paths used on other
	+ are typically obsolete paths or paths used on other
	operating systems that are incorrect on &os;. They
	will be replaced by the correct path in
	<varname><replaceable>interp</replaceable>_CMD</varname>.</para>
	@@ -2919,7 +2919,7 @@
	<buildtarget>patch</buildtarget> phase. If scripts are
	created with incorrect shebangs during the
	<buildtarget>build</buildtarget> phase, the build process (for
	- example, the <filename>configure</filename> script, or the
	+ example, the <filename>configure</filename> script or the
	<filename>Makefiles</filename>) must be patched or given the
	right path (for example, with
	<varname>CONFIGURE_ENV</varname>,
	@@ -3356,7 +3356,7 @@
	<literal>infozip</literal></para>

	<para>Indicates that the distribution files use the ZIP
	- compression algorithm. For files using the InfoZip algorithm
	+ compression algorithm. For files using the InfoZip algorithm,
	the <literal>infozip</literal> argument must be passed to set
	the appropriate dependencies.</para>
	</sect1>

File Metadata

Mime Type: text/plain
Expires: Mon, Feb 3, 1:28 PM (19 h, 33 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 16434859
Default Alt Text: D20171.diff (71 KB)

D20171.diffNo OneTemporaryActions

D20171.diffView Options

File Metadata

Event Timeline

D20171.diff
No OneTemporary
Actions

D20171.diff
View Options