remove future code to handle modules, that is unused and possibly badly

designed as well.

2 files changed, 4 insertions, 19 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
index ce56c03edd1..ea701a684f8 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingList.pm,v 1.62 2007/05/02 15:17:36 espie Exp $
+# $OpenBSD: PackingList.pm,v 1.63 2007/05/03 14:47:29 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -60,7 +60,7 @@ sub new
 
 sub read
 {
-	my ($a, $fh, $code) = @_;
+	my ($a, $u, $code) = @_;
 	my $plist;
 	$code = \&defaultCode if !defined $code;
 	if (ref $a) {
@@ -68,16 +68,12 @@ sub read
 	} else {
 		$plist = new $a;
 	}
-	&$code($fh,
+	&$code($u,
 		sub {
 			local $_ = shift;
 			return if m/^\s*$/;
 			chomp;
 			OpenBSD::PackingElement->create($_, $plist);
-			if ($plist->{need_modules}) {
-				close($fh);
-				open($fh, '<', '/dev/null');
-			}
 		});
 	return $plist;
 }
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 3fc25461cd9..410560fb617 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.230 2007/05/02 15:17:36 espie Exp $
+# $OpenBSD: pkg_add,v 1.231 2007/05/03 14:47:29 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -510,17 +510,6 @@ sub install_package
 	}
 
 	my $plist = $handle->{plist};
-	if ($plist->{need_modules}) {
-	    if (!defined $handle->{solved_dependencies}) {
-		    my @deps = OpenBSD::Dependencies::solve($state, $handle, @todo);
-		    if (@deps > 0) {
-			    build_deptree($state, $pkg, @deps);
-			    return (@deps, $pkg);
-		    }
-	    } else {
-		    $plist = $handle->{plist} = $handle->plist;
-	    }
-	}
 
 	if (is_installed($plist->pkgname) && !$state->{forced}->{installed}) {
 		if ($state->{replace}) {