o don't set anything in ports with NO_BUILD

o fix rubygem skipping
o next, not die

1 files changed, 3 insertions, 3 deletions

diff --git a/Tools/scripts/mark_safe.pl b/Tools/scripts/mark_safe.pl
index fa0b4ebfeb98..db5c53bf1146 100755
--- a/Tools/scripts/mark_safe.pl
+++ b/Tools/scripts/mark_safe.pl
@@ -122,7 +122,7 @@ sub mark {
     my @lines = <$mk>;
     close $mk or die "Can't close [$mfile] b/c [$!]";
     
-    next if grep { /MAKE_JOBS_(?:UN)?SAFE/ } @lines;
+    next if grep { /MAKE_JOBS_(?:UN)?SAFE|NO_BUILD/ } @lines;
 
     my $i_depends = 0;
     my $i_comment = 0;
@@ -138,7 +138,7 @@ sub mark {
 
     my $loc = $i_depends    > 0 ? $i_depends :
               $i_comment    > 0 ? $i_comment :
-              $i_maintainer > 0 ? $i_maintainer : die "Can't find location to insert";
+              $i_maintainer > 0 ? $i_maintainer : print "Can't find location to insert", next;
 
     my @newlines = @lines[0..$loc];
     push @newlines, "\n", "MAKE_JOBS_" . ($Safe ? "SAFE" : "UNSAFE")  . "=  yes\n";
@@ -177,7 +177,7 @@ sub ports_get {
     close $fh or die "Can't close [$index] b/c [$!]";
   }
 
-  @ports = grep { !/^rubygem-// } @ports;
+  @ports = grep { !/rubygem-/ } @ports;
 
   return \@ports;
 }