--- /var/tmp/portage/ufed-0.2/work/ufed-0.2/ufed.pl 2002-12-28 18:06:41.000000000 -0800 +++ ufed.pl 2003-04-17 17:13:09.000000000 -0700 @@ -43,7 +43,7 @@ { if ($break_if_found == 1) { - die('did not find USE in ' . $file); + die('dd not find USE in ' . $file); } return 'EMPTY'; @@ -66,7 +66,7 @@ # @flags = get_use_flags() sub get_use_flags { - my @flags = get_use_flags_from_file('/etc/make.conf', 0); + my @flags = get_use_flags_from_file('/etc/make.conf.d/use', 0); if (($#flags + 1) == 1) { @@ -141,9 +141,9 @@ # $onoff = get_onoff_conf($flag) # returns: -# -1 if $flag is '-xyz' in make.conf -# 0 if $flag is not in make.conf -# 1 if $flag is '+xyz' in make.conf +# -1 if $flag is '-xyz' in make.conf.d/use +# 0 if $flag is not in make.conf.d/use +# 1 if $flag is '+xyz' in make.conf.d/use sub get_onoff_conf { my $flag = shift(); @@ -312,11 +312,11 @@ } $use =~ s/^(.*)[ ]$/\1/; - unlink('/etc/make.conf.old'); - rename('/etc/make.conf', '/etc/make.conf.old'); + unlink('/etc/make.conf.d/use.old'); + rename('/etc/make.conf.d/use', '/etc/make.conf.d/use.old'); - open(FILE, '/etc/make.conf.old') or die('couldn\'t open /etc/make.conf.old'); - open(OUTFILE, '>/etc/make.conf') or die('couldn\'t open /etc/make.conf'); + open(FILE, '/etc/make.conf.d/use.old') or die('couldn\'t open /etc/make.conf.d/use.old'); + open(OUTFILE, '>/etc/make.conf.d/use') or die('couldn\'t open /etc/make.conf.d/use'); if ($use_in_conf == 1) { @@ -376,7 +376,7 @@ close(OUTFILE); close(FILE); - chmod(0644, '/etc/make.conf'); + chmod(0644, '/etc/make.conf.d/use'); } @@ -488,6 +488,7 @@ save_use_flags($selected_flags); last; + `update-make.conf` } }