pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/doc regen (misc minor fixes, IGNORE_RECOMMENDED docume...
details: https://anonhg.NetBSD.org/pkgsrc/rev/61bd63714ddb
branches: trunk
changeset: 495254:61bd63714ddb
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jun 05 23:20:35 2005 +0000
description:
regen (misc minor fixes, IGNORE_RECOMMENDED documentation).
diffstat:
doc/pkgsrc.html | 83 ++++++++++++++++++++++++++++++--------------------------
doc/pkgsrc.txt | 69 +++++++++++++++++++++++++---------------------
2 files changed, 82 insertions(+), 70 deletions(-)
diffs (truncated from 351 to 300 lines):
diff -r a26d282b8389 -r 61bd63714ddb doc/pkgsrc.html
--- a/doc/pkgsrc.html Sun Jun 05 23:14:33 2005 +0000
+++ b/doc/pkgsrc.html Sun Jun 05 23:20:35 2005 +0000
@@ -66,8 +66,8 @@
</div>
<div xmlns="http://www.w3.org/TR/xhtml1/transitional";>
- <p xmlns="" class="pubdate">$NetBSD: pkgsrc.xml,v 1.7
- 2005/05/24 12:39:00 wiz Exp $</p>
+ <p xmlns="" class="pubdate">$NetBSD: pkgsrc.xml,v 1.8
+ 2005/06/03 12:27:48 jmmv Exp $</p>
</div>
<div>
@@ -7578,11 +7578,8 @@
In many cases, new versions of packages work just fine
with older dependencies. See <a href="#dependencies"
title="14.1.4. Handling dependencies">Section
- 14.1.4, “Handling dependencies”</a> and
- <a href="#buildlink" title=
- "Chapter 10. Buildlink methodology">Chapter
- 10, <i>Buildlink methodology</i></a> for more
- information about dependencies on other packages,
+ 14.1.4, “Handling dependencies”</a> for
+ more information about dependencies on other packages,
including the <code class=
"varname">BUILDLINK_RECOMMENDED</code> and <code class=
"varname">RECOMMENDED</code> definitions.</p>
@@ -8122,13 +8119,13 @@
<code class="varname">PKG_SYSCONFDIR</code>, and need
special treatment during installation (most of which is
automated by pkginstall). The main concept you must bear
- in mind is that files marked as a configuration are
+ in mind is that files marked as configuration files are
automatically copied to the right place (somewhere inside
<code class="varname">PKG_SYSCONFDIR</code>) during
installation <span class="emphasis"><em>if and only
if</em></span> they didn't exist before. Similarly, they
will not be removed if they have local modifications.
- This ensures that administrators never loose any custom
+ This ensures that administrators never lose any custom
changes they may have made.</p>
<div class="sect2" lang="en" xml:lang="en">
@@ -8155,9 +8152,9 @@
<p><code class="varname">PKG_SYSCONFBASE</code>:
The configuration's root directory. Defaults to
<code class="filename">${PREFIX}/etc</code>
- although may be overridden by the user to point
- to his preferred location (e.g., <code class=
- "filename">/etc</code>, <code class=
+ although it may be overridden by the user to
+ point to his preferred location (e.g.,
+ <code class="filename">/etc</code>, <code class=
"filename">/etc/pkg</code>, etc.). Packages must
not use it directly.</p>
</li>
@@ -8260,7 +8257,7 @@
<p>Given that pkgsrc (and users!) expect configuration
files to be in a known place, you need to teach each
- package where shall it install its files. In some cases
+ 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
@@ -8292,10 +8289,10 @@
"strong"><strong>the packages themselves must not touch
the contents of <code class=
"filename">${PKG_SYSCONFDIR}</code>
- directly</strong></span>. Bad news is that the software
- they build will, out of the box, mess with the contents
- of that directory. So which is the correct procedure to
- fix this issue?</p>
+ directly</strong></span>. Bad news is that many
+ software installation scripts will, out of the box,
+ mess with the contents of that directory. So what is
+ the correct procedure to fix this issue?</p>
<p>You must teach the package (usually by manually
patching it) to install any configuration files under
@@ -8368,8 +8365,7 @@
Section 11.1, “Files and directories outside the
installation prefix”</a> apply, and the same
solutions can be used. However, pkginstall provides a
- specific mechanism to handle these files, given that they
- are special.</p>
+ special mechanism to handle these files.</p>
<p>In order to provide system startup scripts, the
package has to:</p>
@@ -8384,7 +8380,7 @@
"http://www.w3.org/TR/xhtml1/transitional"; href=
"ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/print/cups/README.html";
class="pkgname">print/cups</a> package as an
- example, it has the <code class=
+ example, it has a <code class=
"filename">cupsd.sh</code> in its files
directory.</p>
</li>
@@ -8417,7 +8413,7 @@
<p>Copy the script from the files directory to the
examples hierarchy, <code class=
"filename">${PREFIX}/share/examples/rc.d/</code>.
- Note that the master file must be explicitly
+ Note that this master file must be explicitly
registered in the <code class=
"filename">PLIST</code>.</p>
</li>
@@ -8649,7 +8645,6 @@
. include "../../security/cyrus-sasl2/buildlink3.mk"
CONFIGURE_ARGS+= --enable-sasl=${BUILDLINK_PREFIX.sasl}
.endif
-
</pre>
<p>The first section contains the information about which
@@ -8696,19 +8691,17 @@
"quote">-</span>”, then that option is always
removed from the selected build options, e.g.</p>
<pre class="programlisting">
- PKG_DEFAULT_OPTIONS= kerberos ldap sasl
- PKG_OPTIONS_VAR= WIBBLE_OPTIONS
- WIBBLE_OPTIONS= ${PKG_DEFAULT_OPTIONS} -sasl
- # leads to PKG_OPTIONS = kerberos ldap
-
+PKG_DEFAULT_OPTIONS= kerberos ldap sasl
+PKG_OPTIONS_VAR= WIBBLE_OPTIONS
+WIBBLE_OPTIONS= ${PKG_DEFAULT_OPTIONS} -sasl
+# leads to PKG_OPTIONS = kerberos ldap
</pre>
<p>or</p>
<pre class="programlisting">
- PKG_OPTIONS_VAR= WIBBLE_OPTIONS
- WIBBLE_OPTIONS= kerberos -ldap ldap
- # leads to PKG_OPTIONS = kerberos
-
+PKG_OPTIONS_VAR= WIBBLE_OPTIONS
+WIBBLE_OPTIONS= kerberos -ldap ldap
+# leads to PKG_OPTIONS = kerberos
</pre>
<p>This variable should be set in <code class=
@@ -10242,12 +10235,26 @@
"varname">RECOMMENDED</code> entries will be
turned into dependencies unless explicitly
ignored (in which case a warning will be
- printed). Packages that are built with
- recommendations ignored may not be uploaded to
- ftp.NetBSD.org by developers and should not be
- used across different systems that may have
- different versions of binary packages
- installed.</p>
+ printed).</p>
+
+ <p>To ignore these dependency recommendations and
+ just use the required <code class=
+ "varname">DEPENDS</code>, set <code class=
+ "varname">IGNORE_RECOMMENDED=YES</code>. This may
+ make it easier and faster to update packages
+ built using pkgsrc, since older compatible
+ dependencies can continue to be used. This is
+ useful for people who watch their rebuilds very
+ carefully; it is not very good as a
+ general-purpose hammer. If you use it, you need
+ to be mindful of possible ABI changes, including
+ those from the underlying OS.</p>
+
+ <p>Packages that are built with recommendations
+ ignored may not be uploaded to ftp.NetBSD.org by
+ developers and should not be used across
+ different systems that may have different
+ versions of binary packages installed.</p>
<p>For security fixes, please update the package
vulnerabilities file as well as setting
@@ -11027,7 +11034,7 @@
autoconf:</p>
<pre class="programlisting">
AUTOMAKE_REQD= 1.7.1 # if default version is not good enough
-USE_TOOLS+= automake # use "automake14" for autoconf-1.4
+USE_TOOLS+= automake # use "automake14" for automake-1.4
...
pre-configure:
diff -r a26d282b8389 -r 61bd63714ddb doc/pkgsrc.txt
--- a/doc/pkgsrc.txt Sun Jun 05 23:14:33 2005 +0000
+++ b/doc/pkgsrc.txt Sun Jun 05 23:20:35 2005 +0000
@@ -14,7 +14,7 @@
Copyright (C) 1994-2004 The NetBSD Foundation, Inc
-$NetBSD: pkgsrc.xml,v 1.7 2005/05/24 12:39:00 wiz Exp $
+$NetBSD: pkgsrc.xml,v 1.8 2005/06/03 12:27:48 jmmv Exp $
Abstract
@@ -2958,9 +2958,9 @@
Please take careful consideration before adjusting BUILDLINK_DEPENDS.pkg as we
don't want to cause unneeded package deletions and rebuilds. In many cases, new
versions of packages work just fine with older dependencies. See Section
-14.1.4, "Handling dependencies" and Chapter 10, Buildlink methodology for more
-information about dependencies on other packages, including the
-BUILDLINK_RECOMMENDED and RECOMMENDED definitions.
+14.1.4, "Handling dependencies" for more information about dependencies on
+other packages, including the BUILDLINK_RECOMMENDED and RECOMMENDED
+definitions.
10.3. Writing builtin.mk files
@@ -3198,10 +3198,10 @@
Configuration files are special in the sense that they are installed in their
own specific directory, PKG_SYSCONFDIR, and need special treatment during
installation (most of which is automated by pkginstall). The main concept you
-must bear in mind is that files marked as a configuration are automatically
+must bear in mind is that files marked as configuration files are automatically
copied to the right place (somewhere inside PKG_SYSCONFDIR) during installation
if and only if they didn't exist before. Similarly, they will not be removed if
-they have local modifications. This ensures that administrators never loose any
+they have local modifications. This ensures that administrators never lose any
custom changes they may have made.
11.2.1. How PKG_SYSCONFDIR is set
@@ -3210,7 +3210,7 @@
shall be installed. Its contents are set based upon the following variables:
* PKG_SYSCONFBASE: The configuration's root directory. Defaults to ${PREFIX}/
- etc although may be overridden by the user to point to his preferred
+ etc although it may be overridden by the user to point to his preferred
location (e.g., /etc, /etc/pkg, etc.). Packages must not use it directly.
* PKG_SYSCONFSUBDIR: A subdirectory of PKG_SYSCONFBASE under which the
@@ -3249,7 +3249,7 @@
11.2.2. Telling the software were configuration files are
Given that pkgsrc (and users!) expect configuration files to be in a known
-place, you need to teach each package where shall it install its files. In some
+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 generated files:
@@ -3264,9 +3264,9 @@
As said before, pkginstall automatically handles configuration files. This
means that the packages themselves must not touch the contents of $
-{PKG_SYSCONFDIR} directly. Bad news is that the software they build will, out
-of the box, mess with the contents of that directory. So which is the correct
-procedure to fix this issue?
+{PKG_SYSCONFDIR} directly. Bad news is that many software installation scripts
+will, out of the box, mess with the contents of that directory. So what is the
+correct procedure to fix this issue?
You must teach the package (usually by manually patching it) to install any
configuration files under the examples hierarchy, share/examples/${PKGBASE}/.
@@ -3297,14 +3297,13 @@
place known by the underlying OS, usually outside the installation prefix.
Therefore, the same rules described in Section 11.1, "Files and directories
outside the installation prefix" apply, and the same solutions can be used.
-However, pkginstall provides a specific mechanism to handle these files, given
-that they are special.
+However, pkginstall provides a special mechanism to handle these files.
In order to provide system startup scripts, the package has to:
1. Store the script inside ${FILESDIR}, with the .sh suffix appended.
- Considering the print/cups package as an example, it has the cupsd.sh in
- its files directory.
+ Considering the print/cups package as an example, it has a cupsd.sh in its
+ files directory.
2. Tell pkginstall to handle it, appending the name of the script, without its
extension, to the RCD_SCRIPTS variable. Continuing the previous example:
@@ -3319,8 +3318,8 @@
substitutions described in the FILES_SUBST variable.
2. Copy the script from the files directory to the examples hierarchy, $
- {PREFIX}/share/examples/rc.d/. Note that the master file must be explicitly
- registered in the PLIST.
+ {PREFIX}/share/examples/rc.d/. Note that this master file must be
+ explicitly registered in the PLIST.
3. Add code to the installation scripts to copy the startup script from the
examples hierarchy into the system-wide startup scripts directory.
@@ -3430,7 +3429,6 @@
CONFIGURE_ARGS+= --enable-sasl=${BUILDLINK_PREFIX.sasl}
.endif
-
The first section contains the information about which build options are
supported by the package, and any default options settings if needed.
@@ -3450,18 +3448,16 @@
PKG_DEFAULT_OPTIONS. If any of the options begin with a "-", then that
option is always removed from the selected build options, e.g.
- PKG_DEFAULT_OPTIONS= kerberos ldap sasl
- PKG_OPTIONS_VAR= WIBBLE_OPTIONS
- WIBBLE_OPTIONS= ${PKG_DEFAULT_OPTIONS} -sasl
- # leads to PKG_OPTIONS = kerberos ldap
Home |
Main Index |
Thread Index |
Old Index