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 - The first flavor is the default one, and is called, + The first flavor is the default one and is called, here, default. It is not an obligation, and if possible, use a more specific flavor name, like in . @@ -283,7 +283,7 @@ Simple <literal>USES=php</literal> Extension - This will generate package for all the supported + This will generate a packages for all the supported versions: PORTNAME= some-ext @@ -292,7 +292,7 @@ USES= php:ext - This will generate package for all the supported + This will generate a packages for all the supported versions but 7.2: PORTNAME= some-ext @@ -306,14 +306,14 @@ PHP Flavors with PHP Applications - PHP applications can also be flavorized. + PHP applications can also be flavored. - This allows generating packages for all PHP versions, so + This allows generating packages for all PHP versions so that users can use them with whatever version they need on their servers. - PHP applications that are flavorized + PHP applications that are flavored must append PHP_PKGNAMESUFFIX to their package names. @@ -368,7 +368,7 @@ USE_PYTHON= distutils allflavors Will get these flavors: py27, - py34, py35 and + py34, py35, and py36. @@ -408,7 +408,7 @@ on the correct version of Python modules. All dependencies on flavored Python ports should use PY_FLAVOR, and not - FLAVOR directly.. + FLAVOR directly. 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 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 @@ DISTVERSION as the variable name. Set PORTVERSION to the computed version based on the variable you - created, and set DISTNAME + created and set DISTNAME accordingly. If the upstream version scheme cannot easily be coerced @@ -1921,11 +1921,11 @@ BIND9 uses a version scheme that is not compatible with the ports versions (it has - in its versions) and cannot be derived - using DISTVERSION because after the 9.9.9 + using DISTVERSION, because after the 9.9.9 release, it will release a patchlevels in the form of 9.9.9-P1. DISTVERSION would translate that into 9.9.9.p1, 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 PORTVERSION is manually derived from an ISCVERSION variable to output @@ -2469,7 +2469,7 @@ While trying to make a port for version 1.2.7 of pkg - from the &os; user on github, at , The Makefile would end up looking like this (slightly stripped for the example): @@ -2492,7 +2492,7 @@ While trying to make a port for the bleeding edge version of pkg from the &os; - user on github, at , the Makefile ends up looking like this (slightly stripped for the example): @@ -2668,7 +2668,7 @@ GH_ACCOUNT, GH_PROJECT, and GH_TAGNAME. 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 :DEFAULT group. A value can be omitted if it is the same as the default as listed in This will fetch three distribution files from - github. The default one comes from + GitHub. The default one comes from foo/foo and is version 1.0.2. The second one, with the icons group, comes from @@ -2827,7 +2827,7 @@ It has a .gitmodules 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: @@ -2984,7 +2984,7 @@ site:account:project:commit:group/subdir. The site: and /subdir - part is optional. It is helpful when there are more + parts are optional. It is helpful when there are more than one GitLab project from which to fetch. @@ -3020,9 +3020,9 @@ More Complete Use of <varname>USE_GITLAB</varname> - A more complete use of the above if + A more complete use of the above if the port had no versioning and foobar - from the foo user on project bar on a self hosted GitLab + from the foo user on project bar on a self-hosted GitLab site https://gitlab.example.com, the Makefile ends up looking like this for fetching distribution files: @@ -3047,7 +3047,7 @@ - GL_SITE's protocol, port and + GL_SITE's protocol, port, and webroot can all be modified in the same variable. @@ -3066,9 +3066,9 @@ Multiple values are added to GL_SITE, GL_ACCOUNT, - GL_PROJECT and + GL_PROJECT, and GL_COMMIT. Each different value is - assigned a group. + assigned to a group. . @@ -3231,12 +3231,12 @@ automatically set EXTRACT_SUFX to the most common archives extensions as necessary, see for more details. If neither of - these are set then EXTRACT_SUFX defaults to + these is set then EXTRACT_SUFX defaults to .tar.gz. As EXTRACT_SUFX is only used in - DISTFILES, only set one of them.. + DISTFILES, only set one of them. @@ -3246,11 +3246,11 @@ Sometimes the names of the files to be downloaded have no resemblance to the name of the port. For example, it might be called source.tar.gz 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. If this is the case, set DISTFILES 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. DISTFILES= source1.tar.gz source2.tar.gz @@ -3997,7 +3997,7 @@ Do not let the port clutter /usr/ports/distfiles. 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, Makefile), set DIST_SUBDIR to the name of the port @@ -4074,7 +4074,7 @@ Blanket approval for most ports applies to fixes like infrastructure changes, or trivial and tested build and runtime fixes. The - current list is available in Ports section of the Committer's Guide. @@ -4095,7 +4095,7 @@ 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 @@ (print/pkfonts118/Makefile, print/pkfonts600/Makefile, and all the - other are similar). + others are similar). MASTERDIR definition tells bsd.port.mk that the regular set of subdirectories like FILESDIR and @@ -5991,7 +5991,7 @@ RESOLUTION=360 line will override the RESOLUTION=300 line in pkfonts300/Makefile and the port will be - built with resolution set to 360. + built with the resolution set to 360. @@ -6035,7 +6035,7 @@ Makefile Options 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 @@ Each port is extracted into a working directory, which must be writable. The ports system defaults to having - DISTFILES unpack in to a directory called + DISTFILES unpack into a directory called ${DISTNAME}. In other words, if the Makefile has: @@ -7655,7 +7655,7 @@ <varname>NO_WRKSUBDIR</varname> - If the port does not extract in to a subdirectory at all, + If the port does not extract into a subdirectory at all, then set NO_WRKSUBDIR to indicate that. @@ -7663,7 +7663,7 @@ Because WRKDIR 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. @@ -7725,7 +7725,7 @@ - The most common content of one of these variable is the + 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 make -V PKGBASE. @@ -8150,7 +8150,7 @@ will be prepended to PATH. Use it to substitute hardcoded commands the build phase - relies on without having to patch any build files. + relies on, without having to patch any build files. 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> - Start this section with defining USES, + Start this section with defining USES and then possible USE_x. @@ -420,7 +420,7 @@ bsd.port.mk that do not belong in any of the previous section blocks. - Order is not important, however try to keep similar + Order is not important, however, try to keep similar variables together. For example uid and gid variables USERS and GROUPS. Configuration variables @@ -447,7 +447,7 @@ Options Variables Order Example The FOO and BAR - 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 Mk/bsd.options.desc.mk so writing one is not needed. The DOCS and @@ -528,7 +528,7 @@ - When using options helpers target keep them alphabetically + When using options helpers targets, keep them alphabetically sorted, but keep the *-on before the *-off. 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 @@ DOCSDIR, EXAMPLESDIR, WWWDIR, and ETCDIR. Any line beginning with @comment followed by a - space, will be deleted - from resulting files after a variable substitution. + space will be deleted + from resulting files after variable substitution. This example replaces %%ARCH%% 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 @@ Some ports, particularly the p5- ports, need to change their pkg-plist depending on - what options they are configured with (or version of - perl, in the case of p5- + what options they are configured with (or the version of + Perl, in the case of p5- ports). To make this easy, any instances in pkg-plist of %%OSREL%%, %%PERL_VER%%, and @@ -30,7 +30,7 @@ of perl (for example, 5.8.9). Several other %%VARS%% related - to port's documentation files are described in the relevant section. @@ -118,7 +118,7 @@ TAG to PLIST_SUB inside the Makefile with a special - value of @comment, makes package tools to + value of @comment makes package tools to ignore the line. For instance, if some files are only installed when the X11 option is on and the architecture is i386: @@ -236,7 +236,7 @@ A static package list is a package list which is available in the Ports Collection either as pkg-plist (with or without variable - substitution), or embedded into the + substitution) or embedded into the Makefile via PLIST_FILES and PLIST_DIRS. Even if the contents are @@ -384,7 +384,7 @@ If a keyword is used on an optional entry, it must to + linkend="makefile-options">optional entry, it must be added after the helper: %%FOO%%@sample etc/orbit.conf.sample @@ -494,7 +494,7 @@ file [file] - This is used to handle installation of configuration + This is used to handle the installation of configuration files, through example files bundled with the package. The actual, non-sample, file is either the second filename, if present, or the first filename without the @@ -667,7 +667,7 @@ Expand to the filename part of the fully qualified - name, or the converse of %B. In + name or the converse of %B. In the example case, emacs. @@ -688,7 +688,7 @@ mode Set default permission for all subsequently extracted - files to mode. Format is the + files to mode. 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). @@ -736,7 +736,7 @@ under PREFIX by a package installation are automatically removed. Use this when an empty directory under PREFIX 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 PREFIX need to be registered. For example, /var/db/${PORTNAME} needs to have a @@ -960,7 +960,7 @@ pre-upgrade, post-upgrade - These keywords contains a &man.sh.1; script to be + 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 @exec @@ -981,7 +981,7 @@ This keyword does two things, it adds a @dirrmtry directory 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. 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 @@ 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 __FreeBSD_version and + is to use the __FreeBSD_version and __FreeBSD__ macros defined in sys/param.h. If this file is not included add the code, @@ -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 FORBIDDEN @@ -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. + cause harm or compromise end-user security. 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 @@ This is not 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! Please be careful when copying from the README or manpage. 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. @@ -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 eXtensible, 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. @@ -298,7 +298,7 @@ Several related package groups (essentially, ports) can be listed in the <affected> 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. @@ -321,7 +321,7 @@ field. At least enclosing <p> and </p> has to appear. More complex mark-up may be used, but only for the sake of - accuracy and clarity: No eye candy please. + accuracy and clarity: No eye candy, please. 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 DISTDIR it will look up the URL MASTER_SITES, 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 FETCH, assuming that the requesting site has direct access to the Internet. If that succeeds, it will save the file in @@ -126,7 +126,7 @@ For example, if there is a post-extract target defined in the - Makefile, and a file + Makefile and a file pre-build in the scripts subdirectory, the post-extract target will be called @@ -134,7 +134,7 @@ pre-build will be executed before the default build rules are done. It is recommended to use Makefile 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. The default actions are done by the @@ -187,7 +187,7 @@ for details. 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). @@ -536,7 +536,7 @@ Include any additional customization commands in the configure script and save it in the scripts subdirectory. As mentioned above, - it is also possible do this with Makefile + it is also possible to do this with Makefile targets and/or scripts with the name pre-configure or post-configure. 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. @@ -181,7 +181,7 @@ This problem is similar to the problem with security - in the last paragraph, but generally less severe. + in the last paragraph but generally less severe. @@ -320,10 +320,10 @@ lang/mosml for an example), or through a shell-wrapper which sets LD_LIBRARY_PATH before invoking the binary, - like www/seamonkey + as www/seamonkey does. - When installing 32-bit libraries on 64-bit system, use + When installing 32-bit libraries on a 64-bit system, use USE_LDCONFIG32 instead. If the software uses NO_PACKAGE. 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 NO_PACKAGE. Set NO_PACKAGE to a string @@ -519,10 +519,10 @@ When setting MAKE_JOBS_UNSAFE, it is very important to explain either with a comment in the - Makefile, or at least in the commit + Makefile or at least in the commit message, why 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. @@ -598,13 +598,13 @@ GNU_CONFIGURE The port uses configure - script to prepare build. + script to prepare the build. HAS_CONFIGURE Same as GNU_CONFIGURE, - except default configure target is not added to + except the default configure target is not added to CONFIGURE_ARGS. @@ -1357,7 +1357,7 @@ 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 MASTER_SITE_SUBDIR is allowed. The CPAN:AUTHOR macro can be used, which will be translated to the hashed author directory. For example, @@ -1376,7 +1376,7 @@ - Read only variables + Read-only variables Means @@ -1422,7 +1422,7 @@ SITE_PERL - Directory name where site specific + Directory name where site-specific Perl packages go. This value is added to PLIST_SUB. @@ -1584,7 +1584,7 @@ ice - Inter Client Exchange library for X11 + Inter-Client Exchange library for X11 @@ -1849,7 +1849,7 @@ components of this project, use USES= gl and USE_GL. See for a full list of available - components. For backwards compatibility, the value of + components. For backward compatibility, the value of yes maps to glu. @@ -2077,7 +2077,7 @@ USE_GNOME infrastructure. Include all the needed components as a space-separated list. The USE_GNOME 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: @@ -2127,7 +2127,7 @@ Variables 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. has a more in-depth explanation. USE_GNOME has to be set for these macros to be of use. @@ -2146,7 +2146,7 @@ icon-theme.cache. Do not include that file in pkg-plist. This macro handles that automatically. This macro is not needed - for Qt, which use a + for Qt, which uses an internal method. @@ -2224,7 +2224,7 @@ Open Source Metadata Framework (OMF) 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 OMF files when installing GNOME applications from packages, make sure that @@ -2258,7 +2258,7 @@ page 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. @@ -2428,7 +2428,7 @@ devel/gobject-introspection 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) @@ -3401,7 +3401,7 @@ implies a dependency on the core library, core does not need to be specified. The Qt 5 code generation tools moc, - uic and rcc, as well + uic, and rcc, as well as the Makefile generator qmake are only needed at buildtime, thus they are specified with the _build suffix: @@ -3747,7 +3747,7 @@ breeze - Plasma5 artwork, styles and assets for the Breeze + Plasma5 artwork, styles, and assets for the Breeze visual style @@ -3862,7 +3862,7 @@ eventviews - Event view libriares for KDEPim + Event view libraires for KDEPim @@ -3878,7 +3878,7 @@ gapi - KDE based library to access google + KDE based library to access Google services @@ -3937,7 +3937,7 @@ idletime - KF5 library for monitoring user activity + KF5 library for monitoring users activity @@ -3947,7 +3947,7 @@ incidenceeditor - Incidence editor libriares for KDEPim + Incidence editor libraires for KDEPim @@ -4282,7 +4282,7 @@ libksieve - Sieve libriares for KDEPim + Sieve libraires for KDEPim @@ -4293,7 +4293,7 @@ mailcommon - Common libriares for KDEPim + Common libraires for KDEPim @@ -4396,7 +4396,7 @@ pimcommon - Common libriares for KDEPim + Common libraires for KDEPim @@ -4951,7 +4951,7 @@ JAVAJARDIR - The directory where JAR files is + The directory where JAR files are installed. Default: ${JAVASHAREDIR}/classes. @@ -4980,7 +4980,7 @@ be the sub-make command. When no do-build target is defined by the port, a default one will be set that runs Ant according to - MAKE_ENV, MAKE_ARGS and + MAKE_ENV, MAKE_ARGS, and ALL_TARGET. This is similar to the USES= gmake mechanism, which is documented in . @@ -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 JDK that is used. For ports that do not - enforce the use of a particular JDK, it is - therefore a complex task to specify the packing list + enforce the use of a particular JDK, it is, + therefore, a complex task to specify the packing list (pkg-plist). This is one reason why porters are strongly encouraged to use PORTDOCS. Moreover, even if the set of @@ -5140,7 +5140,7 @@ APACHE_VERSION The version of present Apache installation (read-only variable). This variable is only - available after inclusion of + available after the inclusion of bsd.port.pre.mk. Possible values: 22, 24. @@ -5293,19 +5293,19 @@ PEAR modules will - automatically be flavorized using PHP flavors. - If a non default PEAR_CHANNEL is + If a non-default PEAR_CHANNEL is used, the build and run-time dependencies will automatically be added. - PEAR modules do not need to defined + PEAR modules do not need to define PKGNAMESUFFIX it is automatically filled in using PEAR_PKGNAMEPREFIX. If a port needs to add to PKGNAMEPREFIX, it must @@ -5363,7 +5363,7 @@ As Horde modules are also PEAR modules they will also - automatically be flavorized using PHP flavors. @@ -5374,7 +5374,7 @@ Using Python - The Ports Collection supports parallel installation of + The Ports Collection supports the parallel installation of multiple Python versions. Ports must use a correct python interpreter, according to the user-settable PYTHON_VERSION. @@ -5426,7 +5426,7 @@ USE_PYTHON=concurrent - The port will use an unique prefix, typically + The port will use a unique prefix, typically PYTHON_PKGNAMEPREFIX for certain directories, such as EXAMPLESDIR and DOCSDIR and also will append a @@ -5483,7 +5483,7 @@ PYTHON_CMD Python interpreter command line, including - version number. + the version number. @@ -5502,7 +5502,7 @@ PYNUMPY Dependency line for the new numeric extension, - numpy. (PYNUMERIC is deprecated by upstream + numpy. (PYNUMERIC is deprecated by the upstream vendor). @@ -5613,7 +5613,7 @@ Using <application>Tcl/Tk</application> - The Ports Collection supports parallel installation of + The Ports Collection supports the parallel installation of multiple Tcl/Tk versions. Ports should try to support at least the default Tcl/Tk version and higher with @@ -5957,7 +5957,7 @@ There are many versions of the wxWidgets 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. @@ -5967,9 +5967,9 @@ wx-config 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 - wx-config script to call. Otherwise they + wx-config script to call. Otherwise, they have to be patched. @@ -6327,7 +6327,7 @@ WX_CONFIG The path to the wxWidgets - wx-config script (with different + wx-config script (with a different name) @@ -6335,7 +6335,7 @@ WXRC_CMD The path to the wxWidgets - wxrc program (with different + wxrc program (with a different name) @@ -6360,7 +6360,7 @@ When defining WX_PREMK, then the - version, dependencies, components and defined variables + version, dependencies, components, and defined variables will not change if modifying the wxWidgets port variables after including @@ -6405,7 +6405,7 @@ WX_CONFIG environment variable set, requiring additional arguments. WX_CONF_ARGS can be used for - provide them. + providing them. 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 MySQLWhen a port needs the MySQL - client library add + client library add:USES= mysql @@ -6913,7 +6913,7 @@ When a port needs the PostgreSQL server version 9.6 - or later add + or later add:USES= pgsql:9.6+ WANT_PGSQL= server @@ -6942,7 +6942,7 @@ Ports integrate into the system rc.d framework. Details on its usage can be found in the - rc.d Handbook chapter. Detailed explanation of + rc.d Handbook chapter. A detailed explanation of the available commands is provided in &man.rc.8; and &man.rc.subr.8;. Finally, there is an @@ -6960,7 +6960,7 @@ Scripts must be placed in the files subdirectory and a .in suffix must be added to their filename. Standard SUB_LIST - expansions will be ran against this file. Use of the + expansions will be run against this file. Use of the %%PREFIX%% and %%LOCALBASE%% expansions is strongly encouraged as well. More on SUB_LIST in @@ -7023,7 +7023,7 @@ If the script is not starting a persistent service this is not necessary. - For optional configuration elements the "=" + 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 @@ in their rc.conf.local, and a variable substitution using ":=" would inappropriately override the user's intention. The - _enable variable is not optional, + _enable variable is not optional and must use the ":" for the default. @@ -7057,7 +7057,7 @@ The devel/rclint port can check for most of these, but it is not a - substitute for proper review. + substitute for a proper review. @@ -7177,7 +7177,7 @@ 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 start_precmd. @@ -7256,7 +7256,7 @@ Go Libraries 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. @@ -7264,17 +7264,17 @@ - Use vendored dependencies included with the package + Use vendor dependencies included with the package source. - Fetch the versions of deps specified by upstream (in the + Fetch the versions of dependencies specified by upstream (in the case of go.mod, vendor.json or similar). - As a last resort (deps are not included nor versions + As a last resort (dependencies are not included nor versions specified exactly) fetch versions of dependencies available at the time of upstream development/release. 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 @@ bsd.port.mk for the meaning of the string produced. - Also note that running a recent version of + Also, note that running a recent version of portlint (as specified in the next section) will cause make describe to be run automatically. @@ -98,7 +98,7 @@ installed system mounted somewhere other than /. A port will actually install into DESTDIR/PREFIX, and register with the - package database in DESTDIR/var/db/pkg. As + package database in DESTDIR/var/db/pkg. DESTDIR 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 @@ The FTP/HTTP 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 ftp.au.freebsd.org. @@ -419,7 +419,7 @@ &prompt.root; poudriere jail -c -j 111Ramd64 -v 11.1-RELEASE -a amd64 - Fetch a 11.1-RELEASE for + Fetch an 11.1-RELEASE for amd64 from the FTP server given by FREEBSD_HOST in poudriere.conf, create the zfs file @@ -464,12 +464,12 @@ &prompt.root; poudriere jail -c -j 12amd64 -v head -a amd64 -m svn+https In order to run a 12.0-CURRENT - Poudriere jail you must be + Poudriere jail, you must be running 12.0-CURRENT. In general, newer kernels can build and run older jails. For instance, a - 12.0-CURRENT kernel can build and run a + 12.0-CURRENT kernel can build and run an 11.1-STABLE - Poudriere jails if the + Poudriere jail if the COMPAT_FREEBSD11 kernel option was compiled in (on by default in 12.0-CURRENT @@ -539,7 +539,7 @@ This command creates tank/poudriere/ports/default, mount it on /poudriere/ports/default, 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: &prompt.root; poudriere ports -l @@ -721,7 +721,7 @@ format category/portname 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 . @@ -750,7 +750,7 @@ /var/db/ports 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 PORT_DBDIR to /usr/local/etc/poudriere.d/jailname-portname-setname-options. @@ -815,7 +815,7 @@ Poudriere 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. @@ -872,11 +872,11 @@ Unlike with sets, all of the found files will be appended, in that order, into one make.conf 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 /usr/local/etc/poudriere.d/make.conf. Special variables, intended to affect only certain jails or - sets can be set in specialised make.conf + sets can be set in specialized make.conf files, such as /usr/local/etc/poudriere.d/111Ramd64-development-devset-make.conf. @@ -884,7 +884,7 @@ Using <filename>make.conf</filename> to Change Default <application>Perl</application> - To build a set with a non default + To build a set with a non-default Perl version, for example, 5.20, using a set named perl5-20, 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 @@ 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 Comment field in - the Detailled Bug Information section, or try + the Detailed Bug Information section, or try the &os; Ports Monitoring System (also known as portsmon). This system @@ -122,7 +122,7 @@ maintaining the port, be sure to put [MAINTAINER] at the beginning of the Summary 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: category/portname: add FOO option, or if @@ -168,7 +168,7 @@ When possible, please submit a &man.svn.1; diff. They are easier to handle than diffs between new and old 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 @@ 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 for a complete list. @@ -244,13 +244,13 @@ M - The file had been modified, and was merged + The file had been modified and was merged without conflicts. C - The file had been modified, and was merged with + The file had been modified and was merged with conflicts. @@ -262,7 +262,7 @@ the Subversion 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. 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.. + values. Each section in this chapter describes a possible value for USES, along with its possible arguments. - Arguments are appeneded to the value after a colon + Arguments are appended to the value after a colon (:). Multiple arguments are separated by commas (,). @@ -269,15 +269,15 @@ Uses CMake for configuring and building. - By default an out-of-source build is performed, leaving the + By default, an out-of-source build is performed, leaving the sources in WRKSRC free from build artifacts. With the insource 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. - By default Ninja is used for - the build. In some cases this does not work correctly. With + By default, Ninja is used for + the build. In some cases, this does not work correctly. With the noninja argument, the build will fallback to using regular make for builds. It should only be used if a @@ -447,7 +447,7 @@ Uses the Comprehensive R Archive Network. Specify auto-plist to automatically generate pkg-plist. Specify - compiles if the port has code that need to be + compiles if the port has code that needs to be compiled. @@ -537,7 +537,7 @@ 7, module, theme - Automate installation of a port that is a + Automate the installation of a port that is a Drupal theme or module. Use with the version of Drupal that the port is expecting. For example, USES=drupal:7,module says that this port @@ -1147,7 +1147,7 @@ Possible arguments: (none), modules - Sets default values and targets used to build + Sets default, values and targets used to build Go software. A build-time dependency on lang/go is added. By default the build is performed in GOPATH mode. If Go software uses @@ -1170,7 +1170,7 @@ as a default for GO_TARGET. If not set explicitly and GH_SUBDIR is present, GO_PKGNAME value will be inferred from - ${GH_SUBDIR}, otherwise it will be set + ${GH_SUBDIR}, otherwise, it will be set to ${PORTNAME}. @@ -1387,7 +1387,7 @@ configure target is not set. If the flag is a problem for the port, add the notall argument. If xmkmf - does not generate a install.man + does not generate an install.man target, add the noman argument. @@ -1510,7 +1510,7 @@ Ports Linux compatibility framework. Specify c6 to depend on - CentOS 6 packags. Specify + CentOS 6 packages. Specify c7 to depend on CentOS 7 packages. The available packages are: @@ -1835,9 +1835,9 @@ build, run Adds a dependency on Lua. By - default this is a library dependency, unless overridden by the + default, this is a library dependency unless overridden by the build or run option. The - default version is 5.2, unless set by the + default version is 5.2 unless set by the XY parameter (for example, 51 or 52+). @@ -2182,8 +2182,8 @@ X.Y+, X.Y- - Provide support for PostgreSQL. Maintainer can set version - required. Minimum and maximum versions can be specified; for + Provide support for PostgreSQL. The maintainer can set the + required version. Minimum and maximum versions can be specified; for example, 9.0-, 8.4+. Add PostgreSQL component dependency, using @@ -2412,7 +2412,7 @@ 20, for extensions that depend on another extension, the priority is automatically set to 30. Some extensions may need to be - loaded before every other extension, for example www/php56-opcache. Some may need to be loaded after an extension with a priority of 30. In that case, add @@ -2493,7 +2493,7 @@ Possible arguments: (none), ffi Uses lang/pure. Largely used - for building related pure ports. + to build related pure ports. With the ffi argument, it implies devel/pure-ffi as a run-time dependency. @@ -2799,7 +2799,7 @@ misc/shared-mime-info. 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 @shared-mime-info entry to the plist. @@ -2854,7 +2854,7 @@ - Currently + Currently, Bash, Java, Ksh, Lua, @@ -2889,7 +2889,7 @@ interp_OLD_CMD 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 interp_CMD. @@ -2919,7 +2919,7 @@ patch phase. If scripts are created with incorrect shebangs during the build phase, the build process (for - example, the configure script, or the + example, the configure script or the Makefiles) must be patched or given the right path (for example, with CONFIGURE_ENV, @@ -3356,7 +3356,7 @@ infozip 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 infozip argument must be passed to set the appropriate dependencies.