kill unused stuff

3 files changed, 7 insertions, 67 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
index 63c43438b79..b0a4b0383d9 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageLocator.pm,v 1.66 2007/05/13 13:12:21 espie Exp $
+# $OpenBSD: PackageLocator.pm,v 1.67 2007/05/13 13:37:00 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -115,28 +115,10 @@ sub cleanup
 	$pkgpath->cleanup;
 }
 
-sub match_spec
-{
-	my ($class, $spec, $filter) = @_;
-	return $pkgpath->match_spec($spec, $filter);
-}
-
-sub findstem
-{
-	my ($class, $stem, $filter) = @_;
-	return $pkgpath->findstem($stem, $filter);
-}
-
-sub find_partialstem
-{
-	my ($class, $partial, $filter) = @_;
-	return $pkgpath->find_partialstem($partial, $filter);
-}
-
 sub match
 {
 	my ($class, $search, $filter) = @_;
-	return $pkgpath->match_repo($search, $filter);
+	return $pkgpath->match($search, $filter);
 }
 
 1;
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
index c264e2eaf18..4b735608bc6 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageRepository.pm,v 1.27 2007/05/13 13:32:36 espie Exp $
+# $OpenBSD: PackageRepository.pm,v 1.28 2007/05/13 13:37:00 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
@@ -65,24 +65,6 @@ sub stemlist
 	return $self->{stemlist};
 }
 
-sub findstem
-{
-	my ($self, $stem) = @_;
-	return $self->stemlist->findstem($stem);
-}
-
-sub find_partialstem
-{
-	my ($self, $partial) = @_;
-	return $self->stemlist->find_partialstem($partial);
-}
-
-sub match_spec
-{
-	my ($self, $spec) = @_;
-	return $spec->match_repo($self);
-}
-
 sub match
 {
 	my ($self, $search) = @_;
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm
index acef08fa53d..eefd342e48b 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageRepositoryList.pm,v 1.9 2007/05/13 13:32:36 espie Exp $
+# $OpenBSD: PackageRepositoryList.pm,v 1.10 2007/05/13 13:37:00 espie Exp $
 #
 # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
 #
@@ -101,11 +101,11 @@ sub available
 	return keys %{$self->{avail}};
 }
 
-sub _first_of
+sub match
 {
-	my ($self, $method, $filter, @args) = @_;
+	my ($self, $search, $filter) = @_;
 	for my $repo (@{$self->{list}}) {
-		my @l = $repo->$method(@args);
+		my @l = $repo->match($search);
 		if (defined $filter) {
 			@l = &$filter(@l);
 		}
@@ -116,30 +116,6 @@ sub _first_of
 	return ();
 }
 
-sub find_partialstem
-{
-	my ($self, $partial, $filter) = @_;
-	return $self->_first_of('find_partialstem', $filter, $partial);
-}
-
-sub findstem
-{
-	my ($self, $stem, $filter) = @_;
-	return $self->_first_of('findstem', $filter, $stem);
-}
-
-sub match_spec
-{
-	my ($self, $spec, $filter) = @_;
-	return $self->_first_of('match_spec', $filter, $spec);
-}
-
-sub match
-{
-	my ($self, $spec, $filter) = @_;
-	return $self->_first_of('match', $filter, $spec);
-}
-
 sub cleanup
 {
 	my $self = shift;