summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_install/create/pkg_create.1
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2000-03-27 17:15:01 +0000
committerMarc Espie <espie@cvs.openbsd.org>2000-03-27 17:15:01 +0000
commit0b47be7e2d7bf34795c9ae58d986cefaba5715aa (patch)
treef2e45a7b0b6b87676b256b415c9aaf18a8df1da7 /usr.sbin/pkg_install/create/pkg_create.1
parent1d3ecbdd0bc056ae1f8e344d820e64225f9a8cf1 (diff)
Add and document option no-default-conflict.
Diffstat (limited to 'usr.sbin/pkg_install/create/pkg_create.1')
-rw-r--r--usr.sbin/pkg_install/create/pkg_create.114
1 files changed, 12 insertions, 2 deletions
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 52b3e40b242..9bb11d8641b 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_create.1,v 1.13 2000/03/27 17:09:02 espie Exp $
+.\" $OpenBSD: pkg_create.1,v 1.14 2000/03/27 17:15:00 espie Exp $
.\"
.\" FreeBSD install - a package for the installation and maintainance
.\" of non-core utilities.
@@ -437,10 +437,20 @@ package must
be installed if
.Ar pkgname
package gets installed cause they install the same files and thus conflict.
+.Ar pkgcflname
+may use
+.Xr fnmatch 3
+wildcards.
.It Cm @option Ar name
Effects vary depending on
.Ar name .
-No options are documented yet.
+Some options are not documented yet.
+.Bl -tag -width indent
+.It Ar no-default-conflict
+By default, a package conflicts with other versions of the same package.
+With this option, the older package version will still be noticed, but the
+installation will proceed anyway.
+.El
.El
.Sh SEE ALSO
.Xr pkg_add 1 ,