summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2016-06-28 15:30:29 +0000
committerespie <espie@openbsd.org>2016-06-28 15:30:29 +0000
commit9336f34436f46160f3d2e5d7445a3d1cf4d665ba (patch)
treeeda508afbff50e295717af93c3328a972151f43c
parentdon't report errors for 'rm -rf ""'. report by rkitover. (diff)
downloadwireguard-openbsd-9336f34436f46160f3d2e5d7445a3d1cf4d665ba.tar.xz
wireguard-openbsd-9336f34436f46160f3d2e5d7445a3d1cf4d665ba.zip
document is-branch
-rw-r--r--usr.sbin/pkg_add/pkg_create.111
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index 97bb6a9531e..8632a5b6c52 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_create.1,v 1.101 2016/04/25 10:16:33 espie Exp $
+.\" $OpenBSD: pkg_create.1,v 1.102 2016/06/28 15:30:29 espie Exp $
.\"
.\" Documentation and design originally from FreeBSD. All the code has
.\" been rewritten since. We keep the documentation's notice:
@@ -21,7 +21,7 @@
.\" [jkh] Took John's changes back and made some additional extensions for
.\" better integration with FreeBSD's new ports collection.
.\"
-.Dd $Mdocdate: April 25 2016 $
+.Dd $Mdocdate: June 28 2016 $
.Dt PKG_CREATE 1
.Os
.Sh NAME
@@ -601,6 +601,13 @@ uses some simplified information to decide whether an installed package
needs updating.
With this option, the package is updated whenever anything changes.
To be used sparingly, as this is more expensive.
+.It Ar is-branch
+Annotate the few rare ports where several branches are present in the
+ports tree (such as autoconf), to help
+.Xr pkg_info 1
+produce
+.Ar stem Ns % Ns Ar branch
+annotations when needed.
.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