Commands of show build_conflict_pkgs and show inst_conflict_pkgs are added.

[portsreinstall/current.git] / man / portsreinstall.8

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 41c760a..0da02ef 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -268,7 +268,7 @@ Manually reinstalled ports registered by \fBok\fR command.
 With \fB\-a\fR option, the first and second columns denote the flavored origin and initial/new/current package name, respectively.
 .TP
 \fBinst_by_pkg\fR
-Ports installed by official prebuilt packages because their configurations are default.
+Ports installed by the default packages because their configurations are default.
 With \fB\-a\fR option, the first and second columns denote the flavored origin and initial/new/current package name, respectively.
 .TP
 \fBfailure\fR
@@ -307,6 +307,14 @@ With \fB\-a\fR option, the first and second columns denote the flavored origin a
 Conflicting ports which are temporarily deleted.
 With \fB\-a\fR option, the first, second and third columns denote the flavored origin, initial/new/current package name, and opponent ports concatenated by comma respectively.
 .TP
+\fBbuild_conflict_pkgs\fR \fIglob\fR [\fIglob2\fR...]
+Installed packages which conflict with ports matching \fIglob\fRs in the build.
+The package names are listed in a single column.
+.TP
+\fBinst_conflict_pkgs\fR \fIglob\fR [\fIglob2\fR...]
+Installed packages which conflict with ports matching \fIglob\fRs in the installation.
+The package names are listed in a single column.
+.TP
 \fBleaves\fR [\fBselected\fR | \fBunselected\fR]
 All detected leaf ports.
 Keywords \fBselected\fR and \fBunselected\fR are for filtering only selected (to be deleted) and unselected (to be preserved) ones, respectively.
@@ -1121,7 +1129,7 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [NEW] \fBauto\fR command is added to \fBportsreinstall\-chroot\fR(8).
 .PP
-[NEW] \fBpkg\fR, \fBmake\fR, \fBshow errormessage\fR, \fBshow inst_by_pkg\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
+[NEW] \fBpkg\fR, \fBmake\fR, \fBshow build_conflict_pkgs\fR, \fBshow inst_conflict_pkgs\fR, \fBshow errormessage\fR, \fBshow inst_by_pkg\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
 .PP
 [NEW] Command \fBshow status\fR newly supports \fBinst_by_pkg\fR.
 .PP
@@ -1165,7 +1173,7 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [BUG FIX] Evaluation of globs was incorrect for the regular expression form.
 .PP
-[BUG FIX] Flavored requirements were incorrectly inspected. This also caused disability of the use of prebuilt official packages for flavord ports with the default configuration. 
+[BUG FIX] Flavored requirements were incorrectly inspected. This also caused disability of the use of default packages for flavord ports with the default configuration. 
 .PP
 [BUG FIX] The message about the evaluated dependency level in \fBshow\fR command was wrong. 
 .RE
@@ -1367,8 +1375,6 @@ and select "y" in the queries for spoiled packages.
 .PP
 [CHANGED] Changes are made so that FORCE_PKG_REGISTER is disabled in the all operations. This had become obsolete and even harmful after the implementation of the automatic workaround function for conflicts.
 .PP
-[MISC] Minor changes are made on HISTORY section of the manual page in the level of coding and terminology.
-.PP
 [BUG FIX] Configuration changes in replacement were not completely reflected by redo with \fB\-L\fR option and ended up with errors.
 .PP
 [BUG FIX] Deinstallation of obsolete or new leaf ports did not work in version 3.0.1.
@@ -1376,6 +1382,8 @@ and select "y" in the queries for spoiled packages.
 [BUG FIX] Conflicts escape was not implemented for (re)installation by prebuilt packages.
 .PP
 [BUG FIX] The message format in enumerating port origins or so on was broken.
+.PP
+[MISC] Minor changes are made on HISTORY section of the manual page in the level of coding and terminology.
 .RE
 .TP
 3.0.1 (11 June 2013)