pkgmk.conf: if PKGMK_ARCH is unset we default to 64

[pkgutils-cross.git] / pkgadd.8.in

diff --git a/pkgadd.8.in b/pkgadd.8.in
index 1cfb19583a079ea21376364eae451a742d3521a8..34dcb52e929fcc37a2c165ab6d391f317c24e1d1 100644 (file)
--- a/pkgadd.8.in
+++ b/pkgadd.8.in
@@ -32,13 +32,7 @@ Print version and exit.
 .B "\-h, \-\-help"
 Print help and exit.
 .SH CONFIGURATION
-When using \fBpkgadd\fP in upgrade mode (i.e. option -u is used) the
-file \fI/etc/pkgadd.conf\fP will be read. This file can contain rules describing
-how pkgadd should behave when doing upgrades. A rule is built out of three
-fragments, \fIevent\fP, \fIpattern\fP and \fIaction\fP. The event describes
-in what kind of situation this rule applies. Currently only one type of event is
-supported, that is \fBUPGRADE\fP. The pattern is a regular expression and the action
-applicable to the \fBUPGRADE\fP event is \fBYES\fP and \fBNO\fP. More than one rule of the same
+\fBpkgadd\fP is configured by the file \fI/etc/pkgadd.conf\fP. This file can contain rules, that are built out of three fragments: \fIevent\fP, \fIpattern\fP and \fIaction\fP. The event describes in what kind of situation this rule applies. Currently there are two types of events: \fBUPGRADE\fP and \fBINSTALL\fP. \fBUPGRADE\fP rules are applied when a package is installed over an existing version, and \fBINSTALL\fP rules are applied in any case. The pattern is a regular expression. The action applicable to both the \fBUPGRADE\fP and \fBINSTALL\fP event is \fBYES\fP and \fBNO\fP. More than one rule of the same
 event type is allowed, in which case the first rule will have the lowest priority and the last rule
 will have the highest priority. Example:
 
@@ -51,7 +45,7 @@ UPGRADE         ^etc/X11/XF86Config$    NO
 
 The above example will cause pkgadd to never upgrade anything in /etc/ or /var/log/ (subdirectories included),
 except files in /etc/X11/ (subdirectories included), unless it is the file /etc/X11/XF86Config.
-The default rule is to upgrade everything, rules in this file are exceptions to that rule.
+The default rule is to upgrade/install everything, rules in this file are exceptions to that rule.
 (NOTE! A \fIpattern\fP should never contain an initial "/" since you are referring to the files in the
 package, not the files on the disk.)
 
@@ -64,5 +58,6 @@ Configuration file.
 .SH SEE ALSO
 pkgrm(8), pkginfo(8), pkgmk(8), rejmerge(8)
 .SH COPYRIGHT
-pkgadd (pkgutils) is Copyright (c) 2000-2005 Per Liden and is licensed through
-the GNU General Public License. Read the COPYING file for the complete license.
+pkgadd (pkgutils) is Copyright (c) 2000-2005 Per Liden and Copyright (c) 2006-2010 CRUX team (http://crux.nu).
+pkgadd (pkgutils) is licensed through the GNU General Public License.
+Read the COPYING file for the complete license.