pkgApp.pl   pkgApp.pl 
skipping to change at line 46 skipping to change at line 46
$name =~ s,\s*\(compa.+$,,; $name =~ s,\s*\(compa.+$,,;
## we've already dealt with this name on this executable, ie, itself ## we've already dealt with this name on this executable, ie, itself
if ( index($name, $main_executable) >= 0 || if ( index($name, $main_executable) >= 0 ||
index($main_executable, $name) >= 0 ) { index($main_executable, $name) >= 0 ) {
next NAME_LOOP; next NAME_LOOP;
} }
## leave sys libraries alone and dont include them ## leave sys libraries alone and dont include them
if ( $name =~ m,^(/System/Library|/usr/lib|\@executable_name), && if ( $name =~ m,^(/System/Library|/usr/lib|\@executable_name), &&
$name !~ m,^(/usr/lib/libiconv), ){ $name !~ m,^(/usr/lib/libiconv), && $name !~ m,^(/usr/lib/libin tl),){
next NAME_LOOP; next NAME_LOOP;
} }
## a rooted Framework ## a rooted Framework
if ( $name =~ m,([^/]+\.framework)/(\S+)$, ) {
my $fwname = $1;
my $binary = $2;
my $absname = &locateFramework($fwname);
my $arch = &architecture("$absname/$binary");
if ( $arch eq $current_arch || $arch eq 'fat' ) {
my $relPath = "\@executable_path/../Frameworks/$fwname/$bina
ry";
my $fwPath = "$frameworks_dir/$fwname/$binary";
my $not_existed = 1;
if ( ! -e $fwPath ) {
my $c = "cp -RP -p $absname $frameworks_dir/$fwname";
`$c`;
} else {
$not_existed = 0;
}
my $c = sprintf($id_inmt, $relPath, $fwPath);
`$c`;
$c = sprintf($ch_inmt, $name, $relPath, $main_executable);
`$c`;
if ( $not_existed ) {
&recurse($fwPath, $frameworks_dir, $current_arch);
}
} else {
warn qq{$0: [1] for $main_executable: what to do about $absn
ame being $arch!!!!!\n};
}
next NAME_LOOP;
}
## an unrooted Framework ## an unrooted Framework
if ( $name =~ m,^([^/]+\.framework)/(\S+)$, ) { if ( $name =~ m,^([^/]+\.framework)/(\S+)$, ) {
my $fwname = $1; my $fwname = $1;
my $binary = $2; my $binary = $2;
my $absname = &locateFramework($fwname); my $absname = &locateFramework($fwname);
my $arch = &architecture("$absname/$binary"); my $arch = &architecture("$absname/$binary");
if ( $arch eq $current_arch || $arch eq 'fat' ) { if ( $arch eq $current_arch || $arch eq 'fat' ) {
skipping to change at line 190 skipping to change at line 222
elsif ( grep(m/i386/, @output) ) { elsif ( grep(m/i386/, @output) ) {
$retval = 'i386'; $retval = 'i386';
} }
# warn qq{$0: $file isa '$retval' arch\n}; # warn qq{$0: $file isa '$retval' arch\n};
return $retval; return $retval;
} }
sub locateFramework { sub locateFramework {
my $fname = shift; my $fname = shift;
my $lib; my $lib;
foreach $lib ( '~/Library/Frameworks', '/Library/Frameworks', '/usr/loc al/Trolltech/Qt-4.5.0/lib' ) { foreach $lib ( '~/Library/Frameworks', '/Library/Frameworks', '/usr/loc al/Trolltech/Qt-4.7.1/lib' ) {
if ( -e "$lib/$fname" ) { if ( -e "$lib/$fname" ) {
return "$lib/$fname"; return "$lib/$fname";
} }
} }
warn qq{$0: couldnt find $fname!!!!\n}; warn qq{$0: couldnt find $fname!!!!\n};
return undef; return undef;
} }
 End of changes. 3 change blocks. 
2 lines changed or deleted 36 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/