add the conflict info to what's stored in pkglocatedb, as it's meta-info

that's not readily available otherwise.

diff --git a/usr.sbin/pkg_add/pkg_mklocatedb b/usr.sbin/pkg_add/pkg_mklocatedb
index 295b482..c17522a 100644 (file)
--- a/usr.sbin/pkg_add/pkg_mklocatedb
+++ b/usr.sbin/pkg_add/pkg_mklocatedb
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org>
-# $OpenBSD: pkg_mklocatedb,v 1.45 2018/07/11 09:57:59 espie Exp $
+# $OpenBSD: pkg_mklocatedb,v 1.46 2018/09/11 09:43:08 espie Exp $
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -101,6 +101,18 @@ sub print_name
            $self->keyword, " ", $self->{expanded}, "\n";
 }
 
+package OpenBSD::PackingElement::Conflict;
+sub print_name
+{
+       &OpenBSD::PackingElement::Action::print_name;
+}
+
+package OpenBSD::PackingElement::NoDefaultConflict;
+sub print_name
+{
+       &OpenBSD::PackingElement::Action::print_name;
+}
+
 package OpenBSD::PackingElement::TagBase;
 sub print_name
 {