-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix build of "x11/qt3," : for multi-packages, when we find the default
subpackage, copy full options status. So, e.g., look for "x11/qt3," find "x11/qt3,,-main" and equate it with "x11/qt3," NOT "x11/qt3"
- Loading branch information
Showing
1 changed file
with
3 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# ex:ts=8 sw=4: | ||
# $OpenBSD: PkgPath.pm,v 1.10 2011/06/15 10:09:31 espie Exp $ | ||
# $OpenBSD: PkgPath.pm,v 1.11 2011/09/27 17:15:03 espie Exp $ | ||
# | ||
# Copyright (c) 2010 Marc Espie <[email protected]> | ||
# | ||
|
@@ -189,6 +189,7 @@ sub zap_default | |
return $self unless defined $subpackage; | ||
if ($subpackage->string eq $self->{multi}) { | ||
my $o = bless {pkgpath => $self->{pkgpath}, | ||
sawflavor => $self->{sawflavor}, | ||
flavors => $self->copy_flavors}, ref($self); | ||
return $o->normalize; | ||
} else { | ||
|
@@ -202,7 +203,7 @@ sub handle_default | |
my ($self, $h) = @_; | ||
my $m = $self->zap_default($self->{info}->{SUBPACKAGE}); | ||
if ($m ne $self) { | ||
#print $m->fullpkgpath, " vs. ", $self->fullpkgpath,"\n"; | ||
# print $m->fullpkgpath, " vs. ", $self->fullpkgpath,"\n"; | ||
$m->{info} = $self->{info}; | ||
$h->{$m} = $m; | ||
} | ||
|