diff --git a/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml index 887c1dbd02..c70bbdb33c 100644 --- a/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/pkg-files/chapter.xml @@ -12,7 +12,7 @@ The <filename>pkg-*</filename> Files There are some tricks we have not mentioned yet about the - pkg-* files that come in handy + pkg-* files that come in handy sometimes. @@ -84,16 +84,16 @@ Changing the Names of - <filename>pkg-*</filename> Files + pkg-* Files - All the names of pkg-* files are + All the names of pkg-* files are defined using variables so you can change them in your Makefile if need be. This is especially - useful when you are sharing the same pkg-* + useful when you are sharing the same pkg-* files among several ports or have to write to one of the above files (see writing to places other than WRKDIR for why it is a - bad idea to write directly into the pkg-* + bad idea to write directly into the pkg-* subdirectory). Here is a list of variable names and their default values. diff --git a/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml index fc69d4e759..71bc2a2c92 100644 --- a/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml @@ -28,15 +28,15 @@ 4.9). %%PERL_VERSION%% and %%PERL_VER%% is the full version number of perl (e.g., 5.8.9). - Several other %%VARS%% related to port's + Several other %%VARS%% related to port's documentation files are described in the relevant section. If you need to make other substitutions, you can set the PLIST_SUB variable with a list of - VAR=VALUE pairs and instances of - %%VAR%% will be substituted with + VAR=VALUE pairs and instances of + %%VAR%% will be substituted with VALUE in the pkg-plist. @@ -97,7 +97,7 @@ OPTIONS_SUB= yes PLIST contents. Names listed in PLIST_FILES, PLIST_DIRS, and PLIST_DIRSTRY are subject to - %%VAR%% substitution as described above. + %%VAR%% substitution as described above. Except for that, names from PLIST_FILES will appear in the final packing list unchanged, while @dirrm and @dirrmtry will @@ -190,7 +190,7 @@ lib/X11/oneko/sounds/cat.au out. Instead, install sample file(s) with a - filename.sample suffix. Then copy the + filename.sample suffix. Then copy the sample file to the real configuration file name, if it does not already exist. On deinstall delete the configuration file, but only if it is identical to the .sample @@ -291,7 +291,7 @@ etc/orbit.conf.sample can get it wrong. User configuration files should be installed as - filename.sample, as it is described in + filename.sample, as it is described in . The info/dir file should not be listed and appropriate install-info lines should be diff --git a/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml index 93da6d6f93..8c2df9fbe6 100644 --- a/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/porting-dads/chapter.xml @@ -36,7 +36,7 @@ xlink:href="&url.books.handbook;/ports-using.html#PORTS-CD"> installing ports from a CDROM for an example of building ports from a read-only tree). If you need to modify - one of the pkg-* files, do so by + one of the pkg-* files, do so by redefining a variable, not by writing over it. @@ -48,9 +48,9 @@ Most ports do not have to worry about this. In particular, if you are referring to a WRKDIR of another port, note that the correct location is - WRKDIRPREFIXPORTSDIR/subdir/name/work not - PORTSDIR/subdir/name/work or - .CURDIR/../../subdir/name/work or some + WRKDIRPREFIXPORTSDIR/subdir/name/work not + PORTSDIR/subdir/name/work or + .CURDIR/../../subdir/name/work or some such. Also, if you are defining WRKDIR diff --git a/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml index 5d717249fe..9ce6b5cbcf 100644 --- a/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml @@ -302,7 +302,7 @@ PLIST_DIRS= lib/X11/oneko - pkg add package-filename + pkg add package-filename diff --git a/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml index 4a1146476e..221fe63dc6 100644 --- a/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml @@ -469,7 +469,7 @@ section of your entry will match correct package(s), issue the following command: - &prompt.user; portaudit -f /usr/ports/INDEX -r uuid + &prompt.user; portaudit -f /usr/ports/INDEX -r uuid Please refer to &man.portaudit.1; for better diff --git a/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml index 7df33d9f2b..eb3bc6ced1 100644 --- a/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml @@ -59,7 +59,7 @@ The patch target is run. First, any patches defined in PATCHFILES are applied. Second, if any patch files named - patch-* are found in + patch-* are found in PATCHDIR (defaults to the files subdirectory), they are applied at this time in alphabetical order. @@ -170,7 +170,7 @@ Get the original sources (normally) as a compressed tarball (foo.tar.gz or - foo.tar.bz2) and copy it into + foo.tar.bz2) and copy it into DISTDIR. Always use mainstream sources when and where you can. diff --git a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml index f703460c37..19f29e830c 100644 --- a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml @@ -1217,7 +1217,7 @@ USE_XORG= x11 xpm Updating Desktop Database If a port has a MimeType entry in its - portname.desktop, the desktop database + portname.desktop, the desktop database must be updated after install and deinstall. To do this, define USES= desktop-file-utils. @@ -1228,7 +1228,7 @@ USE_XORG= x11 xpm Desktop entries can be easily created for applications by using the DESKTOP_ENTRIES variable. A - file named name.desktop will be + file named name.desktop will be created, installed, and added to the pkg-plist automatically. Syntax is: @@ -2428,7 +2428,7 @@ do-install: Web Applications Web applications should be installed into - PREFIX/www/appname. + PREFIX/www/appname. For your convenience, this path is available both in Makefile and in pkg-plist as WWWDIR, @@ -4748,7 +4748,7 @@ run_rc_command "$1" SUB_LIST and using %%PERL%%. Otherwise, - &prompt.root; service name stop + &prompt.root; service name stop will probably not work properly. See &man.service.8; for more information. diff --git a/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml index 1b5480ee0a..cb6b171804 100644 --- a/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml @@ -153,7 +153,7 @@ committer. &prompt.user; cd ~/my_wrkdir -&prompt.user; svn co https://svn0.us-west.FreeBSD.org/ports/head/dns/pdnsd +&prompt.user; svn co https://svn0.us-west.FreeBSD.org/ports/head/dns/pdnsd &prompt.user; cd ~/my_wrkdir/pdnsd