From cc115f2ce57b8a13a5bf226207a608e7be8d7727 Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 20 Aug 2010 14:09:59 +0000 Subject: [PATCH] finish renaming check-conflicts, add (c), document check-conflicts --- infrastructure/bin/check-conflicts | 4 +- infrastructure/man/man1/check-conflicts.1 | 85 +++++++++++++++++++++++ infrastructure/man/man1/dpb.1 | 20 +++++- 3 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 infrastructure/man/man1/check-conflicts.1 diff --git a/infrastructure/bin/check-conflicts b/infrastructure/bin/check-conflicts index c728386ef41..4a192af1d7f 100644 --- a/infrastructure/bin/check-conflicts +++ b/infrastructure/bin/check-conflicts @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $OpenBSD: check-conflicts,v 1.1 2010/08/20 13:50:11 espie Exp $ +# $OpenBSD: check-conflicts,v 1.2 2010/08/20 14:09:59 espie Exp $ # Copyright (c) 2000-2005 # Marc Espie. All rights reserved. # Redistribution and use in source and binary forms, with or without @@ -231,7 +231,7 @@ sub handle_portsdir } } -my $ui = OpenBSD::AddCreateDelete::State->new('find-all-conflicts'); +my $ui = OpenBSD::AddCreateDelete::State->new('check-conflicts'); $ui->handle_options('d:p:', '[-v] [-d plist_dir] [-p ports_dir] [pkgname ...]'); $ui->progress->set_header("Scanning"); diff --git a/infrastructure/man/man1/check-conflicts.1 b/infrastructure/man/man1/check-conflicts.1 new file mode 100644 index 00000000000..f3cf9f804be --- /dev/null +++ b/infrastructure/man/man1/check-conflicts.1 @@ -0,0 +1,85 @@ +.\" $OpenBSD: check-conflicts.1,v 1.1 2010/08/20 14:09:59 espie Exp $ +.\" +.\" Copyright (c) 2010 Marc Espie +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.Dd $Mdocdate: August 20 2010 $ +.Dt CHECK-CONFLICTS 1 +.Os +.Sh NAME +.Nm check-conflicts +.Nd verify conflicts between packages +.Sh SYNOPSIS +.Nm check-conflicts +.Op Fl v +.Op Fl d Ar plist_dir +.Op Fl p ports_dir +.Op Ar pkgname ... +.Sh DESCRIPTION +.Nm +is used to check a collection of packages for unregistered conflicts. +A conflict is a file that belongs to two distinct packages. +Common directories are not a problem. +.Pp +By default, packages with the same stem +.Po +see +.Xr packages-specs 7 +.Pc +are registered to conflict. +This can be changed to add or remove extra conflict registration with +.Cm @option no-default-conflict +or +.Cm @conflict +.Po +see +.Xr package-create 1 +.Pc . +.Pp +Conflicts between packages means a user can't install both packages at +once. +In some cases (same software, different version), this is expected, but +the packages should be marked as conflicting, so that +.Xr pkg_add 1 +knows how to deal with it. +In other cases, this is an oversight from the ports maintainer, and action +should be taken to make sure both packages can be installed simultaneously. +Conflicts also interact with dependencies, and sometimes a missing dependency +will show up as an unregistered conflict. +.Nm +requires a set of packing-lists to operate, which it can obtain from the +package itself, or from external sources. +.Pp +Options are as follows: +.Bl -tag -width packing-list +.It Fl v +Be verbose +.It Fl d Ar plist-dir +Scan directory +.Ar plist-dir +for packing-lists +.Po +see the description of +.Ev PLIST_DB +in +.Xr bsd.port.mk 5 +.Pc . +.It Fl p Ar portsdir +Traverse the ports directory for packing-lists, using +.Ar print-plist-all . +.Sh SEE ALSO +.Xr pkg_add 1 , +.Xr pkg_create 1 , +.Xr bsd.port.mk 5 , +.Xr packages-specs 7 diff --git a/infrastructure/man/man1/dpb.1 b/infrastructure/man/man1/dpb.1 index 7b4049090e0..d43235eee51 100644 --- a/infrastructure/man/man1/dpb.1 +++ b/infrastructure/man/man1/dpb.1 @@ -1,4 +1,18 @@ -.\" $OpenBSD: dpb.1,v 1.1 2010/08/20 13:42:29 espie Exp $ +.\" $OpenBSD: dpb.1,v 1.2 2010/08/20 14:09:59 espie Exp $ +.\" +.\" Copyright (c) 2010 Marc Espie +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .Dd $Mdocdate: August 20 2010 $ .Dt DPB 1 @@ -7,7 +21,7 @@ .Nm dpb .Nd distributed ports builder .Sh SYNOPSIS -.Nm dpb3 +.Nm dpb .Bk -words .Op Fl acersuUx .Op Fl A Ar arch @@ -144,7 +158,7 @@ by anything that has yet to build. .It I= number of packages that can be installed, and can be needed for other builds. .It B= -number of built packages, not yet known to be installable, +number of built packages, not yet known to be installable, because of possibly run depends that still need to be built. .It Q= number of packages in the queue, e.g., stuff that can be built now, assuming