remove indirect calls

diff --git a/usr.sbin/pkg_add/OpenBSD/Getopt.pm b/usr.sbin/pkg_add/OpenBSD/Getopt.pm
index d25bf2b..f382c3f 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/Getopt.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Getopt.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Getopt.pm,v 1.13 2023/05/17 15:51:58 espie Exp $
+# $OpenBSD: Getopt.pm,v 1.14 2023/05/19 07:25:16 espie Exp $
 #
 # Copyright (c) 2006 Marc Espie <espie@openbsd.org>
 #
@@ -82,7 +82,7 @@ sub getopts
        }
     }
     local $Exporter::ExportLevel = 1;
-    import OpenBSD::Getopt;
+    OpenBSD::Getopt->import;
     return $hash;
 }
 

diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm
index 178245e..6ca9fdb 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/State.pm
+++ b/usr.sbin/pkg_add/OpenBSD/State.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: State.pm,v 1.71 2022/02/12 09:46:19 espie Exp $
+# $OpenBSD: State.pm,v 1.72 2023/05/19 07:25:16 espie Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -242,7 +242,7 @@ sub handle_options
                push(@EXPORT, "\$opt_$k");
        }
        local $Exporter::ExportLevel = $state->{export_level};
-       import OpenBSD::State;
+       OpenBSD::State->import;
 }
 
 sub defines