Subject: Fixed some typos in the pkgsrc guide
To: None <tech-pkg@NetBSD.org>
From: Leonard Schmidt <lems@gmx.net>
List: tech-pkg
Date: 09/02/2005 14:50:27
--dkEUBIird37B8yKS
Content-Type: multipart/mixed; boundary="FkmkrVfFsRoUs1wW"
Content-Disposition: inline
--FkmkrVfFsRoUs1wW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi!
(Sorry if get this mail twice)
Attached is a patch which fixes some typos and things like manpage
versus man page, filesystem versus file system, et cetera, et cetera.
Cheers
Leonard
--FkmkrVfFsRoUs1wW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pkgsrc-guide.diff"
Content-Transfer-Encoding: quoted-printable
Index: binary.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/binary.xml,v
retrieving revision 1.14
diff -u -r1.14 binary.xml
--- binary.xml 27 Jul 2005 21:29:50 -0000 1.14
+++ binary.xml 2 Sep 2005 12:03:10 -0000
@@ -9,7 +9,7 @@
<para>
Once you have built and installed a package, you can create a
<emphasis>binary package</emphasis> which can be installed on
- another system with &man.pkg.add.1; This saves having to build
+ another system with &man.pkg.add.1;. This saves having to build
the same package on a group of hosts and wasting CPU time. It
also provides a simple means for others to install your package,
should you distribute it.
@@ -99,7 +99,7 @@
<title><filename>pre-build.local</filename></title>
=20
<para>It is possible to configure the bulk build to perform
- certain site specific tasks at the end of the pre-build
+ certain site-specific tasks at the end of the pre-build
stage. If the file=20
<filename>pre-build.local</filename> exists in
<filename>/usr/pkgsrc/mk/bulk</filename>, it will be executed
@@ -269,7 +269,7 @@
</sect2>
=20
<sect2 id=3D"setting-up-a-sandbox">
- <title>Setting up a sandbox for chroot'ed builds</title>
+ <title>Setting up a sandbox for chrooted builds</title>
=20
<para>
If you don't want all the packages nuked from a machine
@@ -393,7 +393,7 @@
</step>
</procedure>
=20
- <para>When the chroot sandbox is setup, you can start
+ <para>When the chroot sandbox is set up, you can start
the build with the following steps:</para>
=20
<screen>&rprompt; <userinput>cd /usr/sandbox/usr/pkgsrc</userinput>
@@ -413,7 +413,7 @@
<para> In addition to building a complete set of all packages in
pkgsrc, the <filename>pkgsrc/mk/bulk/build</filename> script
may be used to build a subset of the packages contained in
- pkgsrc. By setting defining <varname>SPECIFIC_PKGS</varname>
+ pkgsrc. By setting <varname>SPECIFIC_PKGS</varname>
in <filename>/etc/mk.conf</filename>, the variables</para>
=20
<itemizedlist>
@@ -468,7 +468,7 @@
<screen>RSYNC_DST=3D$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/pk=
gsrc-200xQy/NetBSD-a.b.c/arch/upload </screen>
=20
<para>
- Please use appropviate values for "pkgsrc-200xQy",
+ Please use appropriate values for "pkgsrc-200xQy",
"NetBSD-a.b.c" and "arch" here. If your login on
ftp.NetBSD.org is different from <varname>CVS_USER</varname>,
write your login directly into the variable, e.g. my local
@@ -494,7 +494,7 @@
=20
<para>
Before uploading the binary pkgs, ssh authentication needs to
- be set up. This example shows how to setup temporary keys
+ be set up. This example shows how to set up temporary keys
for the root account <emphasis>inside the sandbox</emphasis>
(assuming that no keys should be present there usually):
</para>
@@ -569,7 +569,7 @@
<filename role=3D"pkg">pkgtools/cdpack</filename> package provides=
=20
a simple tool for creating the ISO 9660 images.=20
<command>cdpack</command> arranges the packages on the CD-ROMs in a=
=20
- way that keeps all the dependencies for given package on the same=20
+ way that keeps all the dependencies for a given package on the same=
=20
CD as that package.
</para>
=20
@@ -578,7 +578,7 @@
=20
<para>
Complete documentation for cdpack is found in the cdpack(1)
- manpage. The following short example assumes that the binary
+ man page. The following short example assumes that the binary
packages are left in
<filename>/usr/pkgsrc/packages/All</filename> and that
sufficient disk space exists in <filename>/u2</filename> to
Index: build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- build.xml 27 Jul 2005 21:29:50 -0000 1.9
+++ build.xml 2 Sep 2005 12:03:12 -0000
@@ -55,8 +55,8 @@
</listitem>
=20
<listitem>
- <para>X11 based are special in that they may be installed in either
- <varname>X11BASE</varname> or <varname>LOCALBASE</varname>.</para>
+ <para>X11-based packages are special in that they may be installed in
+ either <varname>X11BASE</varname> or <varname>LOCALBASE</varname>.</par=
a>
=20
<para>Usually, X11 packages should be installed under
<varname>LOCALBASE</varname> whenever possible. Note that you will
@@ -202,8 +202,8 @@
<filename>.shar.Z</filename>, <filename>.shar</filename>,
<filename>.Z</filename>, <filename>.bz2</filename> and
<filename>.gz</filename>; see the definition of the
- various <varname>DECOMPRESS_CMD</varname> variables
- <filename>bsd.pkg.mk</filename> for a complete
+ various <varname>DECOMPRESS_CMD</varname> variables in
+ <filename>bsd.pkg.extract.mk</filename> for a complete
list). Here's an example on how to use the other variables
for a program that comes with a compressed shell archive
whose name ends in <filename>.msg.gz</filename>:</para>
@@ -409,7 +409,7 @@
updating in case a previous <command>make update</command> was interr=
upted
for some reason. However, in this case, make sure you don't call
<command>make clean</command> or otherwise remove the list of depende=
nt
- packages in <varname>WRKDIR</varname>. Otherwise you lose the
+ packages in <varname>WRKDIR</varname>. Otherwise, you lose the
ability to automatically update the current package along with the
dependent packages you have installed.</para>
=20
@@ -489,10 +489,10 @@
<command>make update</command> and only if you have a dirty package t=
ree
(e.g., if you used <varname>NOCLEAN</varname>).</para>
=20
- <para>If you unsure about whether your tree is clean you can either per=
form
- a <command>make clean</command> at the top of the tree, or use the
- following sequence of commands from the directory of the package you
- want to update (<emphasis>before</emphasis> running
+ <para>If you are unsure about whether your tree is clean, you can either
+ perform a <command>make clean</command> at the top of the tree, or use
+ the following sequence of commands from the directory of the package
+ you want to update (<emphasis>before</emphasis> running
<command>make update</command> for the first time, otherwise you lose
all the packages you wanted to update!):</para>
=20
@@ -669,10 +669,10 @@
<listitem>
<para>Used to do bulk builds. If an appropriate binary package already =
exists,
no action is taken. If not, this target will compile, install and
- package it (and it's depends, if <varname>PKG_DEPENDS</varname> is
- set properly. See <xref linkend=3D"binary.configuration"/>.
+ package it (and its depends, if <varname>PKG_DEPENDS</varname> is
+ set properly. See <xref linkend=3D"binary.configuration"/>).
After creating the binary
- package, the sources, the just-installed package and it's required
+ package, the sources, the just-installed package and its required
packages are removed, preserving free disk space.</para>
=20
<para><emphasis>Beware that this target may deinstall all
@@ -685,11 +685,11 @@
=20
<listitem>
<para>Used during bulk-installs to install required packages. If an
- upto-date binary package is available, it will be installed via
+ up-to-date binary package is available, it will be installed via
&man.pkg.add.1;. If not, <command>make bulk-package</command> will be=
executed,
- but the installed binary not be removed. </para>
+ but the installed binary won't be removed. </para>
=20
- <para> A binary package is considered <quote>upto-date</quote> to be
+ <para> A binary package is considered <quote>up-to-date</quote> to be
installed via &man.pkg.add.1; if:</para>
=20
<itemizedlist>
Index: buildlink.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/buildlink.xml,v
retrieving revision 1.6
diff -u -r1.6 buildlink.xml
--- buildlink.xml 27 Jul 2005 21:29:50 -0000 1.6
+++ buildlink.xml 2 Sep 2005 12:03:13 -0000
@@ -88,7 +88,7 @@
</listitem>
=20
<listitem>
- <para><filename>curses.buildlink3.mk</filename> If the system
+ <para><filename>curses.buildlink3.mk</filename>: If the system
comes with neither Curses nor NCurses, this will take care
to install the <filename=20
role=3D"pkg">devel/ncurses</filename> package.</para> =20
@@ -106,13 +106,13 @@
for a system-provided
Motif installation or adds a dependency on <filename=20
role=3D"pkg">x11/lesstif</filename> or
- <filename role=3D"pkg">x11/openmotif</filename>;</para>
+ <filename role=3D"pkg">x11/openmotif</filename>.</para>
</listitem>
=20
<listitem>
<para><filename>ossaudio.buildlink3.mk</filename> defines several
variables that may be used by packages that use the
- Open Sound System (OSS) API;</para>
+ Open Sound System (OSS) API.</para>
</listitem>
=20
<listitem>
@@ -125,7 +125,7 @@
<para><filename>pthread.buildlink3.mk</filename> uses the value of
<varname>PTHREAD_OPTS</varname> and checks for native pthreads or adds
a dependency on <filename=20
- role=3D"pkg">devel/pth</filename> as needed;</para>
+ role=3D"pkg">devel/pth</filename> as needed.</para>
</listitem>
=20
<listitem>
@@ -234,7 +234,7 @@
<listitem>
<para> <varname>BUILDLINK_PKGSRCDIR.<replaceable>pkg</replaceable></var=
name>
is the location of the <replaceable>pkg</replaceable>
- pkgsrc directory;</para>=20
+ pkgsrc directory.</para>=20
</listitem>
=09
<listitem>
@@ -359,7 +359,7 @@
<orderedlist>
<listitem>
<para> if the sonames (major number of the library version)
- of any installed shared libraries change; </para>
+ of any installed shared libraries change. </para>
</listitem>
=20
<listitem>
Index: components.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/components.xml,v
retrieving revision 1.12
diff -u -r1.12 components.xml
--- components.xml 4 Aug 2005 17:38:06 -0000 1.12
+++ components.xml 2 Sep 2005 12:03:14 -0000
@@ -100,9 +100,9 @@
<para>If the package has multiple
<varname>DISTFILES</varname> or multiple
<varname>PATCHFILES</varname> from different
- sites, set <varname>SITES_foo</varname> to a list of URI's
+ sites, set <varname>SITES_foo</varname> to a list of URIs
where file <quote>foo</quote> may be
- found. <quote>foo</quote> includes the suffix, e.g.</para>
+ found. <quote>foo</quote> includes the suffix, e.g.:</para>
<programlisting>DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+=3D foo-file.tar.gz
SITES_foo-file.tar.gz=3Dhttp://www.somewhere.com/somehow/ \
@@ -131,7 +131,7 @@
<para>The second section contains information about separately
downloaded patches, if any.
<itemizedlist>
- <listitem><para><varname>PATCHFILES</varname>
+ <listitem><para><varname>PATCHFILES:</varname>
Name(s) of additional files that contain distribution patches.
There is no default. pkgsrc will look for them at
<varname>PATCH_SITES</varname>.
@@ -187,7 +187,7 @@
=20
<itemizedlist>
<listitem>
- <para>Add <varname>MANCOMPRESSED</varname> if manpages are install=
ed in
+ <para>Add <varname>MANCOMPRESSED</varname> if man pages are instal=
led in
compressed form by the package; see comment in
<filename>bsd.pkg.mk</filename>.</para>
</listitem>
@@ -258,7 +258,7 @@
problems. (To force patches to apply
with fuzz you can set <varname>PATCH_FUZZ_FACTOR=3D-F2</varname>).
Furthermore, do not put changes for more than one file into a single
- patch-file, as this will make future modifications more difficult.</=
para>
+ patch file, as this will make future modifications more difficult.</=
para>
=20
<para>Similar, a file should be patched at most once, not several time=
s by
several different patches. If a file needs several patches, they sho=
uld
@@ -300,7 +300,7 @@
<quote>category/package</quote> structure as pkgsrc, and patches are
expected to be stored inside these dirs (also known as
<filename>$LOCALPATCHES/$PKGPATH</filename>). For
- example if you want to keep a private patch for
+ example, if you want to keep a private patch for
<filename>pkgsrc/graphics/png</filename>, keep
it in <filename>$LOCALPATCHES/graphics/png/mypatch</filename>. All
files in the named directory are expected to be patch files, and
@@ -392,7 +392,7 @@
<sect1 id=3D"work-dir">
<title><filename>work*</filename></title>
=20
- <para>When you type <command>make</command> the distribution files are
+ <para>When you type <command>make</command>, the distribution files are
unpacked into the directory denoted by
<varname>WRKDIR</varname>. It can be removed by running
<command>make clean</command>. Besides the sources, this
Index: configuring.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/configuring.xml,v
retrieving revision 1.5
diff -u -r1.5 configuring.xml
--- configuring.xml 3 Aug 2005 16:34:19 -0000 1.5
+++ configuring.xml 2 Sep 2005 12:03:15 -0000
@@ -6,9 +6,9 @@
<sect1 id=3D"general-configuration">
<title>General configuration</title>
=20
- <para>In this section you can find some variables that apply all
- pkgsrc packages. The preferred method of setting them is by
- setting them in <filename>/etc/mk.conf</filename>.
+ <para>In this section, you can find some variables that apply to all
+ pkgsrc packages. The preferred method of setting these variables
+ is by setting them in <filename>/etc/mk.conf</filename>.
<itemizedlist>
<listitem><para><varname>LOCALBASE</varname>: Where
packages will be installed. The default is
Index: editing.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/editing.xml,v
retrieving revision 1.7
diff -u -r1.7 editing.xml
--- editing.xml 24 May 2005 12:14:42 -0000 1.7
+++ editing.xml 2 Sep 2005 12:03:16 -0000
@@ -69,8 +69,8 @@
Make sure you have the packages needed to re-generate the
pkgsrc guide (and other XML-based NetBSD documentation)
installed. These are <quote>netbsd-doc</quote> for creating the
- ASCII- and HTML-version, and
- <quote>netbsd-doc-print</quote>for the PostScript- and PDF
+ ASCII and HTML version, and
+ <quote>netbsd-doc-print</quote> for the PostScript and PDF
version. You will need both packages installed, to make sure
documentation is consistent across all formats. The packages
can be found in
Index: examples.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/examples.xml,v
retrieving revision 1.6
diff -u -r1.6 examples.xml
--- examples.xml 27 Jul 2005 21:29:50 -0000 1.6
+++ examples.xml 2 Sep 2005 12:03:16 -0000
@@ -63,7 +63,7 @@
<screen>&uprompt; <userinput>pkglint</userinput>
looks fine.</screen>
=20
- <para>Depending on the supplied command line arguments (see pkglint(=
1))
+ <para>Depending on the supplied command line arguments (see pkglint(=
1)),
more verbose checks will be performed. Use e.g.
<command>pkglint -v</command> for a very verbose check.</para>
</sect2>
Index: faq.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/faq.xml,v
retrieving revision 1.14
diff -u -r1.14 faq.xml
--- faq.xml 27 Jul 2005 21:29:50 -0000 1.14
+++ faq.xml 2 Sep 2005 12:03:18 -0000
@@ -206,17 +206,12 @@
=20
</itemizedlist>
=20
-<para>Utilities for people maintaining pkgsrc (or more obscure pkg
+<para>Utilities for people maintaining pkgsrc (or: more obscure pkg
utilities)</para>
=20
<itemizedlist>
=20
<listitem>
- <para><filename role=3D"pkg">pkgtools/pkgconflict</filename>: Find=20
- packages that conflict but aren't marked as such.</para>
- </listitem>
-
- <listitem>
<para><filename role=3D"pkg">pkgtools/pkg_comp</filename>: Build=20
packages in a chrooted area.</para>
</listitem>
@@ -262,7 +257,7 @@
<sect1 id=3D"resume-transfers">
<title>How to resume transfers when fetching distfiles?</title>
=20
-<para>By default resuming transfers in pkgsrc is disabled, but you can
+<para>By default, resuming transfers in pkgsrc is disabled, but you can
enable this feature by adding the option
<varname>PKG_RESUME_TRANSFERS=3DYES</varname> into
<filename>/etc/mk.conf</filename>. If, during a fetch step, an incomplete
@@ -318,7 +313,7 @@
<para>If you are sitting behind a firewall which does not allow direct
connections to Internet hosts (i.e. non-NAT), you may specify the
relevant proxy hosts. This is done using an environment variable in the
-form of a URL e.g. in Amdahl, the machine
+form of a URL, e.g. in Amdahl, the machine
<quote>orpheus.amdahl.com</quote> is one of the firewalls, and it uses
port 80 as the proxy port number. So the proxy environment variables
are:</para>
@@ -371,7 +366,7 @@
but downloading the entire directory may not be appropriate.</para>
=20
<para>The answer here is to do a <command>make fetch-list</command> in
-<filename>/usr/pkgsrc</filename> or one of it's subdirectories, carry the
+<filename>/usr/pkgsrc</filename> or one of its subdirectories, carry the
resulting list to your machine at work/school and use it there. If you
don't have a NetBSD-compatible &man.ftp.1; (like lukemftp) at work, don't
forget to set <varname>FETCH_CMD</varname> to something that fetches a
@@ -417,7 +412,7 @@
<filename>/usr/share/tmac/tmac.andoc</filename>? This indicates that
you don't have installed the <quote>text</quote> set (nroff, ...) from
the NetBSD base distribution on your machine. It is recommended to do
-that to format manpages.</para>
+that to format man pages.</para>
=20
<para>In the case of the <filename=20
role=3D"pkg">pkgtools/pkg_install</filename> package, you
@@ -432,7 +427,7 @@
<title>What does <quote>Could not find bsd.own.mk</quote> mean?</title>
=20
<para> You didn't install the compiler set, <filename>comp.tgz</filename>,
-when you installed your NetBSD machine. Please get it and install it, by
+when you installed your NetBSD machine. Please get and install it, by
extracting it in <filename>/</filename>:</para>
=20
<screen><prompt>#</prompt> <userinput>cd /</userinput>
@@ -487,7 +482,7 @@
package you would like to modify, that is, the contents of
<varname>PKGBASE</varname>.</para>
=20
-<para>Note that, after changing these settings, you must rebuild and
+<para>Note that after changing these settings, you must rebuild and
reinstall any affected packages.</para>
=20
</sect1>
Index: fixes.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/fixes.xml,v
retrieving revision 1.28
diff -u -r1.28 fixes.xml
--- fixes.xml 28 Jul 2005 11:05:36 -0000 1.28
+++ fixes.xml 2 Sep 2005 12:03:20 -0000
@@ -12,14 +12,14 @@
<para>The problem with package-defined variables that can be
overridden via <varname>MAKECONF</varname> or
<filename>/etc/mk.conf</filename> is that &man.make.1; expands a
- variable as it is used, but evaluates preprocessor like
+ variable as it is used, but evaluates preprocessor-like
statements (.if, .ifdef and .ifndef) as they are read. So, to
use any variable (which may be set in
<filename>/etc/mk.conf</filename>) in one of the .if*
statements, the file <filename>/etc/mk.conf</filename> must be
included before that .if* statement.</para>
=20
- <para>Rather than have a number of ad-hoc ways of including
+ <para>Rather than having a number of ad-hoc ways of including
<filename>/etc/mk.conf</filename>, should it exist, or
<varname>MAKECONF</varname>, should it exist, include the
<filename>pkgsrc/mk/bsd.prefs.mk</filename> file in the package
@@ -33,7 +33,7 @@
.endif</programlisting>
=20
<para>If you wish to set the <varname>CFLAGS</varname> variable
- in <filename>/etc/mk.conf</filename> please make sure to use:=20
+ in <filename>/etc/mk.conf</filename>, please make sure to use:=20
=20
<programlisting>CFLAGS+=3D -your -flags</programlisting>
=20
@@ -299,12 +299,12 @@
pkgsrc tree.</para>
=20
<para>In this case you can set <varname>CONFLICTS</varname> to a
- space separated list of packages (including version string) your
+ space-separated list of packages (including version string) your
package conflicts with.</para>
=20
- <para>For example <filename role=3D"pkg">x11/Xaw3d</filename>=20
+ <para>For example, <filename role=3D"pkg">x11/Xaw3d</filename>=20
and <filename role=3D"pkg">x11/Xaw-Xpm</filename>
- install provide the same shared library, thus you set in
+ install the same shared library, thus you set in
<filename>pkgsrc/x11/Xaw3d/Makefile</filename>:</para>
=20
<programlisting>CONFLICTS=3D Xaw-Xpm-[0-9]*</programlisting>
@@ -391,7 +391,7 @@
are gcc internal errors or never finishing compiling a file.
</para>=20
=20
- <para>Typically a workaround involves testing the
+ <para>Typically, a workaround involves testing the
<varname>MACHINE_ARCH</varname> and compiler version, disabling
optimisation for that
file/<varname>MACHINE_ARCH</varname>/compiler combination, and
@@ -418,7 +418,7 @@
<quote>foo-17.42nb9</quote>.</para>
=20
<para>When a new release of the package is released, the
- <varname>PKGREVISION</varname> should be removed. e.g. on a new
+ <varname>PKGREVISION</varname> should be removed, e.g. on a new
minor release of the above package, things should be like:
</para>
=20
@@ -528,7 +528,7 @@
<filename role=3D"pkg">devel/libtool</filename> pkg
can help here, as it just <quote>knows</quote> how to build
both static and dynamic libraries from a set of source files,
- thus being platform independent.</para>
+ thus being platform-independent.</para>
=20
<para>Here's how to use libtool in a pkg in seven simple
steps:</para>=20
@@ -677,7 +677,7 @@
libraries built and installed, then use
<varname>SHLIBTOOL_OVERRIDE</varname> instead.</para>
=20
- <para>If your package makes use of the platform independent library
+ <para>If your package makes use of the platform-independent library
for loading dynamic shared objects, that comes with libtool
(libltdl), you should include devel/libltdl/buildlink3.mk.</para>
=20
@@ -788,7 +788,7 @@
=20
<para>Please use the <quote>__NetBSD__</quote> definition sparingly =
- it
should only apply to features of &os; that are not present in other
- 4.4-lite derived BSDs.</para>
+ 4.4-lite-derived BSDs.</para>
</sect2>
</sect1>
=20
@@ -822,7 +822,7 @@
=20
<para>The <varname>INTERACTIVE_STAGE</varname> definition is provide=
d to notify
the pkgsrc mechanism of an interactive stage which will be needed,=
and
- this should be set in the package's <filename>Makefile</filename>.=
e.g.</para>
+ this should be set in the package's <filename>Makefile</filename>,=
e.g.:</para>
=20
<programlisting>INTERACTIVE_STAGE=3D build</programlisting>
=20
@@ -1051,7 +1051,7 @@
<filename>INSTALL</filename> script, and it must use the
appropriate <command>makeinfo</command> command.</para>
=20
- <para>To achieve this goal the pkgsrc infrastructure creates
+ <para>To achieve this goal, the pkgsrc infrastructure creates
overriding scripts for the <command>install-info</command> and
<command>makeinfo</command> commands in a directory listed early
in <varname>PATH</varname>.</para>
@@ -1178,7 +1178,7 @@
<sect2 id=3D"gtk2-modules">
<title>Packages installing GTK2 modules</title>
=20
- <para>If a package installs gtk2 immodules or loaders, you need to
+ <para>If a package installs GTK2 immodules or loaders, you need to
take some extra steps to get them registered in the GTK2 database
properly:</para>
=20
@@ -1201,7 +1201,7 @@
</listitem>
=20
<listitem> <para>
- Patch the package to not touch any of the gtk2 databases directly.
+ Patch the package to not touch any of the GTK2 databases directly.
These are:
=20
<itemizedlist>
@@ -1295,7 +1295,7 @@
<emphasis>except</emphasis> for files saved under=20
<filename>share/mime/packages</filename>. The former are
handled automatically by=20
- the update-mime-database program, but the later are
+ the update-mime-database program, but the latter are
package-dependent and must be removed by the package that
installed them in the first place.</para>
</listitem>
Index: introduction.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/introduction.xml,v
retrieving revision 1.6
diff -u -r1.6 introduction.xml
--- introduction.xml 27 Jul 2005 21:29:50 -0000 1.6
+++ introduction.xml 2 Sep 2005 12:03:22 -0000
@@ -6,7 +6,7 @@
<sect1 id=3D"introduction-section">
<title>Introduction</title>
=20
- <para> There is a lot of software freely available for Unix based
+ <para> There is a lot of software freely available for Unix-based
systems, which usually runs on NetBSD and other Unix-flavoured
systems, too, sometimes with some modifications. The NetBSD
Packages Collection (pkgsrc) incorporates any such changes
@@ -221,7 +221,7 @@
=20
<listitem>
<para>The piece of software to be installed which will be constructed f=
rom
- all the files in the Distfile by the actions defined in the
+ all the files in the distfile by the actions defined in the
corresponding package.</para>
</listitem>
</varlistentry>
Index: makefile.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/makefile.xml,v
retrieving revision 1.17
diff -u -r1.17 makefile.xml
--- makefile.xml 27 Jul 2005 21:29:50 -0000 1.17
+++ makefile.xml 2 Sep 2005 12:03:22 -0000
@@ -42,7 +42,7 @@
backslash, the backslash, the newline, and any whitespace
immediately behind the newline are replaced with a single space. A
backspace character and an immediately following hash character are
- replaced with a single hash character. Otherwise the backslash is
+ replaced with a single hash character. Otherwise, the backslash is
passed as is. In a variable assignment, any hash character that is
not preceded by a backslash starts a comment that continues upto the
end of the logical line.</para>
@@ -56,14 +56,14 @@
variables is evaluating them. A variable is evaluated when it is
part of the right side of the ``:=3D'' or the ``!=3D'' operator, or
directly before executing a shell command which the variable is part
- of. In all other cases &man.make.1; performs lazy evaluation, that
+ of. In all other cases, &man.make.1; performs lazy evaluation, that
is, variables are not evaluated until there's no other way. The
``modifiers'' mentioned in the man page also evaluate the
variable.</para>
=20
<para>Some of the modifiers split the string into words and then
operate on the words, others operate on the string as a whole. When
- a string is splitted into words, it is splitted as you would expect
+ a string is split into words, it is split as you would expect
it from &man.sh.1;.</para>
=20
<para>No rule without exception—the <command>.for</command>
@@ -76,14 +76,14 @@
<itemizedlist>
=20
<listitem><para><emphasis>Strings</emphasis> can contain arbitrary
- characters. Nevertheless you should restrict yourself to only
+ characters. Nevertheless, you should restrict yourself to only
using printable characters. Examples are
<varname>PREFIX</varname> and
<varname>COMMENT</varname>.</para></listitem>
=20
<listitem><para><emphasis>Internal lists</emphasis> are lists that
are never exported to any shell command. Their elements are
- separated by whitespace. Therefore the elements themselves cannot
+ separated by whitespace. Therefore, the elements themselves cannot
have embedded whitespace. Any other characters are allowed.
Internal lists can be used in <command>.for</command> loops.
Examples are <varname>DEPENDS</varname> and
@@ -201,14 +201,14 @@
<para>Example 4 handles correctly every string that does not start
with a dash. In that case, the result depends on the
implementation of the &man.echo.1; command. As long as you can
- guarantee that your input does not start with a dash this form is
+ guarantee that your input does not start with a dash, this form is
appropriate.</para>
=20
<para>Example 5 handles even the case of a leading dash
correctly.</para>
=20
<para>The <varname>EXT_LIST</varname> does not need to be quoted
- because the quoting has already be done when adding elements to
+ because the quoting has already been done when adding elements to
the list.</para>
=20
<para>As internal lists shall not be passed to the shell, there is
@@ -226,7 +226,7 @@
=20
<listitem><para>Whenever you use the value of a list, think
about what happens to leading or trailing whitespace. If the
- list is a well-formed shell expression you can apply the
+ list is a well-formed shell expression, you can apply the
<varname>:M*</varname> modifier to strip leading and trailing
whitespace from each word. The <varname>:M</varname> operator
first splits its argument according to the rules of the shell,
@@ -235,7 +235,7 @@
One class of situations where this is needed is when adding a
variable like <varname>CPPFLAGS</varname> to
<varname>CONFIGURE_ARGS</varname>. If the configure script
- invokes other configure scripts it strips the leading and
+ invokes other configure scripts, it strips the leading and
trailing whitespace from the variable and then passes it to the
other configure scripts. But these configure scripts expect the
(child) <varname>CPPFLAGS</varname> variable to be the same as
@@ -267,7 +267,7 @@
operator for it, as this operator only works for the
shell.</para></listitem>
=20
- <listitem><para>Whenever a variable can be empty the
+ <listitem><para>Whenever a variable can be empty, the
<varname>:Q</varname> operator can have surprising results. Here
are two completely different cases which can be solved with the
same trick.</para>
Index: options.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/options.xml,v
retrieving revision 1.11
diff -u -r1.11 options.xml
--- options.xml 29 Aug 2005 22:43:11 -0000 1.11
+++ options.xml 2 Sep 2005 12:03:23 -0000
@@ -161,7 +161,7 @@
<varname>PKG_SUPPORTED_OPTIONS</varname>,
<varname>PKG_OPTIONS_OPTIONAL_GROUPS</varname>, and
<varname>PKG_OPTIONS_REQUIRED_GROUPS</varname> are defined (as can
-happen with platform specific options if none of them is supported on
+happen with platform-specific options if none of them is supported on
the current platform), <varname>PKG_OPTIONS</varname> is set to the
empty list and the package is otherwise treated as not using the
options framework.</para>
Index: pkginstall.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/pkginstall.xml,v
retrieving revision 1.5
diff -u -r1.5 pkginstall.xml
--- pkginstall.xml 10 Aug 2005 05:27:56 -0000 1.5
+++ pkginstall.xml 2 Sep 2005 12:03:24 -0000
@@ -33,7 +33,7 @@
</itemizedlist>
=20
<para>The following sections inspect each of the above points in detail.
-Note that, in order to use any of the described functionalities, you must
+Note that in order to use any of the described functionalities, you must
add the following to your package's <filename>Makefile</filename>:</para>
=20
<programlisting>USE_PKGINSTALL=3DYES</programlisting>
@@ -64,11 +64,11 @@
<para>The only way to achieve this is to create such files during
installation time by using the installation scripts. These scripts can run
arbitrary commands, so they have the potential to create and manage files
-anywhere in the filesystem. Here is where pkginstall comes into play: it
+anywhere in the file system. Here is where pkginstall comes into play: it
provides generic scripts to abstract the manipulation of such files and
directories based on variables set in the package's
-<filename>Makefile</filename>. The rest of this section describes which
-these variables are.</para>
+<filename>Makefile</filename>. The rest of this section describes these
+variables.</para>
=20
<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
=20
@@ -76,7 +76,7 @@
<title>Directory manipulation</title>
=20
<para>The following variables can be set to request the creation of
-directories anywhere in the filesystem:</para>
+directories anywhere in the file system:</para>
=20
<itemizedlist>
=20
@@ -196,8 +196,7 @@
<varname>PKG_SYSCONFBASE</varname> under which the configuration files
for the package being built shall be installed. The definition of this
variable only makes sense in the package's
- <filename>Makefile</filename> (i.e., it is not user
- customizable).</para>
+ <filename>Makefile</filename> (i.e., it is not user-customizable).</pa=
ra>
=20
<para>As an example, consider the Apache package,
<filename role=3D"pkg">www/apache2</filename>, which places its=20
@@ -265,7 +264,7 @@
known place, you need to teach each package where it shall install its
files. In some cases you will have to patch the package Makefiles to
achieve it. If you are lucky, though, it may be as easy as passing an
-extra flag to the configuration script; this is the case of GNU Autoconf
+extra flag to the configuration script; this is the case of GNU Autoconf-
generated files:</para>
=20
<programlisting>CONFIGURE_ARGS+=3D --sysconfdir=3D${PKG_SYSCONFDIR}</progr=
amlisting>
Index: platforms.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/platforms.xml,v
retrieving revision 1.12
diff -u -r1.12 platforms.xml
--- platforms.xml 27 Jul 2005 21:29:50 -0000 1.12
+++ platforms.xml 2 Sep 2005 12:03:25 -0000
@@ -75,7 +75,7 @@
</sect1>
=20
<sect1 id=3D"platform-specific-notes">
- <title>Platform specific notes</title>
+ <title>Platform-specific notes</title>
=20
<para>Here are some platform-specific notes you should be aware of.</p=
ara>
=20
@@ -102,7 +102,7 @@
=20
<note>
<para>You cannot use a HFS+ file system for pkgsrc, because pkgsrc curren=
tly
- requires the filesystem to be case-sensitive, and HFS+ is not.</para>
+ requires the file system to be case-sensitive, and HFS+ is not.</para>
</note>
=20
<sect3 id=3D"platform.osx-image">
@@ -200,7 +200,7 @@
<sect2 id=3D"interix">
<title>Interix</title>
=20
- <para>Interix is a POSIX compatible subsystem for the Windows NT ker=
nel,
+ <para>Interix is a POSIX-compatible subsystem for the Windows NT ker=
nel,
providing a Unix-like environment with a tighter kernel integration than
available with Cygwin. It is part of the Windows Services for Unix
package, available for free for any licensed copy of Windows 2000, XP
@@ -254,7 +254,7 @@
Add or Remove, then uncheck Utilities->UNIX Perl.</para>
</listitem>
<listitem>
- <para>To enable case-sensitivity for the filesystem, run REGEDIT.EXE,=
and
+ <para>To enable case-sensitivity for the file system, run REGEDIT.EXE=
, and
change the following registry key:</para>
<para>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Man=
ager\kernel</para>
<para>Set the DWORD value "obcaseinsensitive" to 0; then reboot.</par=
a>
@@ -322,7 +322,7 @@
<para>If you have the actual pkgsrc tree mounted via NFS from a diff=
erent host,
please make sure to set <varname>WRKOBJDIR</varname> to a local directory,
as it appears that IRIX linker occasionally runs into issues when trying =
to
- link over a network mounted filesystem.</para>
+ link over a network-mounted file system.</para>
=20
<para>The bootstrapping process should set all the right options for=
programs such
as imake(1), but you may want to set some options depending on your local
@@ -429,7 +429,7 @@
<filename>/etc/mk.conf.example</filename> file
when you use the bootstrap script. OpenBSD's make program uses
<filename>/etc/mk.conf</filename>
- as well. You can work around this by enclosing all the pkgsrc specifi=
c parts=20
+ as well. You can work around this by enclosing all the pkgsrc-specifi=
c parts=20
of the file with:</para>
=20
<programlisting>.ifdef BSD_PKG_MK
@@ -516,20 +516,20 @@
=20
<para>You should set <varname>CC</varname>, <varname>CXX</varname> and
optionally, <varname>CPP</varname> in <filename>/etc/mk.conf</filename>,
- eg.</para>
+ e.g.:</para>
=20
<programlisting>CC=3D cc
CXX=3D CC
CPP=3D /usr/ccs/lib/cpp</programlisting>
=20
- <para>You may also want to build 64-bit binaries, eg.</para>
+ <para>You may also want to build 64-bit binaries, e.g.:</para>
=20
<programlisting>CFLAGS=3D -xtarget=3Dultra -xarch=3Dv9</programlis=
ting>
=20
<para>Whichever compiler you use, please ensure the compiler tools and
your $prefix are in your <varname>PATH</varname>. This includes
<filename>/usr/ccs/{bin,lib}</filename>
- and eg. <filename>/usr/pkg/{bin,sbin}</filename>.</para>
+ and e.g. <filename>/usr/pkg/{bin,sbin}</filename>.</para>
</sect3>
</sect2>
</sect1>
Index: plist.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/plist.xml,v
retrieving revision 1.7
diff -u -r1.7 plist.xml
--- plist.xml 27 Jul 2005 21:29:51 -0000 1.7
+++ plist.xml 2 Sep 2005 12:03:26 -0000
@@ -7,7 +7,7 @@
<quote>packing list</quote>, i.e. a list of files that belong to
the package (relative to the <filename>${PREFIX}</filename>
directory it's been installed in) plus some additional statements
- - see the &man.pkg.create.1; manpage for a full list.
+ - see the &man.pkg.create.1; man page for a full list.
This chapter addresses some issues that need attention when
dealing with the <filename>PLIST</filename> file (or files, see
below!).</para>
@@ -84,7 +84,7 @@
<listitem>
<para>Some packages like emacs and perl embed information
about which architecture they were built on into the
- pathnames where they install their file. To handle this
+ pathnames where they install their files. To handle this
case, PLIST will be preprocessed before actually used, and
the symbol
<quote><varname>${MACHINE_ARCH}</varname></quote> will be
@@ -92,7 +92,7 @@
same is done if the string
<varname>${MACHINE_GNU_ARCH}</varname> is embedded in
PLIST somewhere - use this on packages that have GNU
- autoconf created configure scripts.</para>
+ autoconf-created configure scripts.</para>
=20
<note>
<title>Legacy note</title>
@@ -163,13 +163,13 @@
</sect1>
=20
<sect1 id=3D"manpage-compression">
- <title>Manpage-compression</title>
+ <title>Man page-compression</title>
=20
- <para>Manpages should be installed in compressed form if
+ <para>Man pages should be installed in compressed form if
<varname>MANZ</varname> is set (in <filename>bsd.own.mk</filename>),
and uncompressed otherwise. To handle this in the
<filename>PLIST</filename> file, the suffix <quote>.gz</quote> is
- appended/removed automatically for manpages according to
+ appended/removed automatically for man pages according to
<varname>MANZ</varname> and <varname>MANCOMPRESSED</varname> being s=
et
or not, see above for details. This modification of the
<filename>PLIST</filename> file is done on a copy of it, not
@@ -189,7 +189,7 @@
=20
=20
<sect1 id=3D"platform-specific-plist">
- <title>Platform specific and differing PLISTs</title>
+ <title>Platform-specific and differing PLISTs</title>
=20
<para>Some packages decide to install a different set of files based on
the operating system being used. These differences can be
@@ -286,7 +286,7 @@
print-PLIST</command>, you should get the right (commented out)
lines. </para>=20
=20
- <para> Note that, even if your package is using
+ <para> Note that even if your package is using
<filename>$X11BASE</filename>, it must not depend on the
*-x11-dirs packages. Just specify the name without that part and
pkgsrc (in particular, <filename>mk/dirs.mk</filename>) will take
Index: using.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/doc/guide/files/using.xml,v
retrieving revision 1.11
diff -u -r1.11 using.xml
--- using.xml 27 Jul 2005 21:29:51 -0000 1.11
+++ using.xml 2 Sep 2005 12:03:26 -0000
@@ -27,17 +27,17 @@
layout as in
<filename>/usr/pkgsrc/packages</filename>). </para>
=20
- <para> This same directory layout applies for CDROM
+ <para> This same directory layout applies for CD-ROM
distributions, only that the directory may be rooted somewhere
else, probably somewhere below
- <filename>/cdrom</filename>. Please consult your CDROMs
+ <filename>/cdrom</filename>. Please consult your CD-ROMs
documentation for the exact location. </para> =20
</sect2>
=20
<sect2 id=3D"how-to-use-binary-packages">
<title>How to use binary packages</title>
=20
- <para> If you have the files on a CDROM or downloaded them to
+ <para> If you have the files on a CD-ROM or downloaded them to
your hard disk, you can install them with the following command
(be sure to <command>su</command> to root first):</para>
=20
@@ -55,9 +55,9 @@
present where you install from. </para>
=20
<para>To save some typing, you can set the
- <varname>PKG_PATH</varname> environment variable to a semicolon
- separated list of paths (including remote URLs); trailing
- slashes are not allowed. </para>
+ <varname>PKG_PATH</varname> environment variable to a semicolon-se=
parated
+ list of paths (including remote URLs); trailing slashes are not allowed.
+ </para>
=20
<para>Additionally to the <filename>All</filename> directory
there exists a <filename>vulnerable</filename> directory to
@@ -66,7 +66,7 @@
use these packages, add the <filename>vulnerable</filename>
directory to your <varname>PKG_PATH</varname>. However, you should=
run
<filename role=3D"pkg">security/audit-packages</filename> regularl=
y,=20
- and especially after installing new packages, and verify that the=20
+ especially after installing new packages, and verify that the=20
vulnerabilities are acceptable for your configuration. An example
<varname>PKG_PATH</varname> would be:
<filename>ftp://ftp.NetBSD.org/pub/NetBSD/packages/<OSVERSION>=
/<ARCH>/All;ftp://ftp.NetBSD.org/pub/NetBSD/packages/<OSVERSION>=
;/<ARCH>/vulnerable</filename>
@@ -103,7 +103,7 @@
=20
<para> To build packages from source on a NetBSD system the
<quote>comp</quote> and the <quote>text</quote> distribution
- sets must be installed. If you want to build X11 related
+ sets must be installed. If you want to build X11-related
packages the <quote>xbase</quote> and <quote>xcomp</quote>
distribution sets are required, too.</para>
<!-- FIXME: what about installing x11/XFree86-*? -->
@@ -140,7 +140,7 @@
<title>How to build and install</title>
=20
<para>Assuming that the distfile has been fetched (see previous sect=
ion), become
- root and change into the relevant directory and running
+ root and change into the relevant directory and run
<command>make</command>. For example, type </para>
=20
<screen>&cprompt; <userinput>cd misc/figlet</userinput>
@@ -167,7 +167,7 @@
your packages tree. So, to use <filename>/usr/local</filename>, set
<varname>LOCALBASE=3D/usr/local</varname> in your environment. Pl=
ease note
that you should use a directory which is
- dedicated to packages and not shared with other programs (ie, do n=
ot try
+ dedicated to packages and not shared with other programs (i.e., do=
not try
and use <varname>LOCALBASE=3D/usr</varname>). Also, you should no=
t try to
add any of your own files or directories (such as <filename>src/</=
filename>,
<filename>obj/</filename>, or <filename>pkgsrc/</filename>) below =
the
@@ -225,7 +225,7 @@
into <varname>BIN_INSTALL_FLAGS</varname>.
See <filename>pkgsrc/mk/defaults/mk.conf</filename> for more detai=
ls.</para>
=20
- <para>A final word of warning: If you setup a system that has a non-=
standard
+ <para>A final word of warning: If you set up a system that has a non=
-standard
setting for <varname>LOCALBASE</varname>, be sure to set that
before any packages are installed, as you can not use several dire=
ctories
for the same purpose. Doing so will result in pkgsrc not being abl=
e to
--FkmkrVfFsRoUs1wW--
--dkEUBIird37B8yKS
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (NetBSD)
iD8DBQFDGGazeffumNo0U88RAu+hAKCfg5FFvVQWjBBLL4DXVwG0P0gMiQCfRfcT
KqiFS2mz+2pI5CpVJ/M/u2k=
=bjM4
-----END PGP SIGNATURE-----
--dkEUBIird37B8yKS--