[patch] ufed-0.35-virtuals.patch

ufed-0.35-virtuals.patch (text/plain), 2.25 KB, created by Harald van Dijk (RETIRED) on 2004-09-29 03:00:18 UTC

--- ufed-0.35.orig/ufed.pl
+++ ufed-0.35/ufed.pl
@@ -520,7 +520,7 @@
       $package =~ s![ \t]!!g;
       chomp($package);
 
-      if ((defined($package)) and my_glob("/var/db/pkg/$package"))
+      if ((defined($package)) and my_glob($package))
       {
 
          #the package exists, therefore we add the use flag
@@ -544,21 +544,44 @@
    $base = $1;
    $end  = $2;
 
-   # we need to escape some metachars in $end or we will have problems with gtk++
-   $end =~ s!\+!\\\+!g;
-
-   opendir(CURDIR, $base);
-   for $f (readdir(CURDIR))
+   if ($base eq "virtual")
    {
-      #Bug 26360: myglob is recognizing partial matches when it shouldnt be
-      #           ie. its finding the mozilla-firebird directory when looking for mozilla,
-      #           so we need to strip the version number fron the directory and then try to
-      #           match the entire string rather than just the beginning 
-      $f =~ m!(.*?)-[0-9]!;  
-      $f = $1;
-      # end of bug fix 
-      if ($f =~ m!^$end$! != 0) 
-         { return (1); }
+      opendir(CURDIR, "/var/db/pkg");
+      for $f (readdir(CURDIR))
+      {
+         my ($g, $h);
+         opendir(SUBDIR, "/var/db/pkg/$f");
+         for $g (readdir(SUBDIR))
+         {
+            next if not open(PROVIDE, "/var/db/pkg/$f/$g/PROVIDE");
+            my $provide = join(" ",<PROVIDE>);
+            close(PROVIDE);
+            foreach $h (split(m![ \t\n]+!,$provide))
+            {
+               next if $h eq "";
+               $h =~ s!^virtual/!!;
+               $h =~ m!(.*?)-[0-9]! and $h = $1;
+               if ($h eq $end)
+                  { return (1); }
+            }
+         }
+      }
+   }
+   else
+   {
+      opendir(CURDIR, "/var/db/pkg/$base");
+      for $f (readdir(CURDIR))
+      {
+         #Bug 26360: myglob is recognizing partial matches when it shouldnt be
+         #           ie. its finding the mozilla-firebird directory when looking for mozilla,
+         #           so we need to strip the version number fron the directory and then try to
+         #           match the entire string rather than just the beginning 
+         $f =~ m!(.*?)-[0-9]!;  
+         $f = $1;
+         # end of bug fix 
+         if ($f eq $end) 
+            { return (1); }
+      }
    }
    return (0);
 }