diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-01-07 16:28:17 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-01-07 16:28:17 +0000 |
| commit | 7e3f72fa46412400b62be465257caa2b4018f965 (patch) | |
| tree | 024a812d66c0353ea2ebd35448c106ccbcb67aa3 /usr.sbin | |
| parent | 75509189fb7b873124ff6e8cdaedeb0eb8265b5c (diff) | |
sloppy Ingo, whatis.db + whatis.index
fix PkgCheck to use the proper API.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Paths.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCheck.pm | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Paths.pm b/usr.sbin/pkg_add/OpenBSD/Paths.pm index 9ca0a3e2ffd..5da14ed6201 100644 --- a/usr.sbin/pkg_add/OpenBSD/Paths.pm +++ b/usr.sbin/pkg_add/OpenBSD/Paths.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Paths.pm,v 1.18 2012/01/05 23:03:57 schwarze Exp $ +# $OpenBSD: Paths.pm,v 1.19 2012/01/07 16:28:16 espie Exp $ # # Copyright (c) 2007 Marc Espie <espie@openbsd.org> # @@ -66,7 +66,7 @@ sub master_keys() { ("/etc/master_key") } sub pkgconf() { "/etc/pkg.conf" } sub font_cruft() { ("fonts.alias", "fonts.dir", "fonts.cache-1", "fonts.scale") } -sub man_cruft() { ("whatis.db") } +sub man_cruft() { ("whatis.db", "whatis.index") } sub info_cruft() { ("dir") } 1; diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm index 613601afd3d..d78b8f0d19d 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCheck.pm,v 1.32 2011/11/26 17:35:09 espie Exp $ +# $OpenBSD: PkgCheck.pm,v 1.33 2012/01/07 16:28:16 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -141,7 +141,9 @@ sub basic_check my ($self, $state) = @_; $self->SUPER::basic_check($state); my $name = $state->{destdir}.$self->fullname; - $state->{known}{$name}{'whatis.db'} = 1; + for my $file (OpenBSD::Paths::man_cruft()) { + $state->{known}{$name}{$file} = 1; + } } package OpenBSD::PackingElement::Fontdir; @@ -584,7 +586,9 @@ sub localbase_check my ($self, $state) = @_; $state->{known} //= {}; my $base = $state->{destdir}.OpenBSD::Paths->localbase; - $state->{known}{$base."/man"}{'whatis.db'} = 1; + for my $file (OpenBSD::Paths::man_cruft()) { + $state->{known}{$base."/man"}{$file} = 1; + } $state->{known}{$base."/info"}{'dir'} = 1; $state->{known}{$base."/lib/X11"}{'app-defaults'} = 1; $state->{known}{$base."/libdata"} = {}; |