okay, prevent pkg_* from looking into /usr/local BUT special-case quirks

diff --git a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
index 5d5ab0d..7f61d44 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddDelete.pm,v 1.94 2021/01/30 10:24:19 espie Exp $
+# $OpenBSD: AddDelete.pm,v 1.95 2021/05/04 10:19:28 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -347,6 +347,7 @@ sub run_quirks
 
        if (!exists $state->{quirks}) {
                eval {
+                       use lib ('/usr/local/libdata/perl5/site_perl');
                        require OpenBSD::Quirks;
                        # interface version number.
                        $state->{quirks} = OpenBSD::Quirks->new(1);

diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 5d4e39b..3b69bfe 100644 (file)
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.485 2021/05/04 08:53:15 espie Exp $
+# $OpenBSD: pkg_add,v 1.486 2021/05/04 10:19:28 espie Exp $
 #
 # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 #
@@ -18,7 +18,7 @@
 
 use strict;
 use warnings;
-#no lib ('/usr/local/libdata/perl5/site_perl');
+no lib ('/usr/local/libdata/perl5/site_perl');
 
 sub run
 {