kill old code to handle deprecated pkgcfl.

3 files changed, 4 insertions, 25 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm
index 3f57924582a..00ef24aaf2a 100644
--- a/usr.sbin/pkg_add/OpenBSD/Delete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Delete.pm,v 1.38 2007/05/02 15:17:36 espie Exp $
+# $OpenBSD: Delete.pm,v 1.39 2007/05/07 08:24:16 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -28,7 +28,7 @@ sub keep_old_files
 {
 	my ($state, $plist, $dir) = @_;
 	my $p = new OpenBSD::PackingList;
-	for my $i (qw(cvstags name no-default-conflict pkgcfl conflict) ) {
+	for my $i (qw(cvstags name no-default-conflict conflict) ) {
 		if (defined $plist->{$i}) {
 			$p->{$i} = $plist->{$i};
 		}
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
index 774346ac63f..108ed4e7a10 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCfl.pm,v 1.14 2007/05/02 15:05:30 espie Exp $
+# $OpenBSD: PkgCfl.pm,v 1.15 2007/05/07 08:24:16 espie Exp $
 #
 # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org>
 #
@@ -23,16 +23,6 @@ use OpenBSD::PackageName;
 use OpenBSD::PkgSpec;
 use OpenBSD::PackageInfo;
 
-sub glob2re
-{
-	local $_ = shift;
-	s/\./\\\./g;
-	s/\+/\\\+/g;
-	s/\*/\.\*/g;
-	s/\?/\./g;
-	return "^$_\$";
-}
-
 sub make_conflict_list
 {
 	my ($class, $plist, $pkg) = @_;
@@ -51,12 +41,6 @@ sub make_conflict_list
 		push(@$l, sub { my $a; grep { $a = $_; $a =~ s/p\d+$//; $a eq $pkgname || $a eq "partial-$pkgname"} @_;});
 	}
 	push(@$l, sub { OpenBSD::PkgSpec::match(".libs-$stem-*", @_); });
-	if (defined $plist->{pkgcfl}) {
-		for my $cfl (@{$plist->{pkgcfl}}) {
-			my $re = glob2re($cfl->{name});
-			push(@$l, sub { grep { m/$re/ } @_; });
-		}
-	}
 	if (defined $plist->{conflict}) {
 		for my $cfl (@{$plist->{conflict}}) {
 		    push(@$l, sub { OpenBSD::PkgSpec::match($cfl->{name}, @_); });
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm
index 68181c38de7..bbf7cbfd5ba 100644
--- a/usr.sbin/pkg_add/OpenBSD/Replace.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Replace.pm,v 1.7 2007/05/02 15:09:04 espie Exp $
+# $OpenBSD: Replace.pm,v 1.8 2007/05/07 08:24:16 espie Exp $
 #
 # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org>
 #
@@ -346,11 +346,6 @@ sub split_libs
 			$item->clone()->add_object($splitted);
 		}
 	}
-	if (defined $plist->{pkgcfl}) {
-		for my $item (@{$plist->{pkgcfl}}) {
-			$item->clone()->add_object($splitted);
-		}
-	}
 	if (defined $plist->{'no-default-conflict'}) {
 		# we conflict with the package we just removed...
 		OpenBSD::PackingElement::Conflict->add($splitted, $plist->pkgname);