kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to handle wildcard dependencies

Browse source
This commit is contained in:
abs 1999-12-16 11:59:13 +00:00
parent fd61b1c973
commit 2514942eb5
2 changed files with 191 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgtools/pkglint/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.22 1999/12/07 21:33:56 hubertf Exp $ # $NetBSD: Makefile,v 1.23 1999/12/16 11:59:13 abs Exp $
# #
DISTNAME= pkglint-1.81 DISTNAME= pkglint-1.82
CATEGORIES= pkgtools devel CATEGORIES= pkgtools devel
MASTER_SITES= # empty MASTER_SITES= # empty
DISTFILES= # empty DISTFILES= # empty

345
pkgtools/pkglint/files/lintpkgsrc.pl
View file

@ -1,6 +1,6 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# $NetBSD: lintpkgsrc.pl,v 1.7 1999/11/12 13:18:03 abs Exp $ # $NetBSD: lintpkgsrc.pl,v 1.8 1999/12/16 11:59:14 abs Exp $
# (Somewhat quickly) Written by David Brownlee <abs@netbsd.org>. # (Somewhat quickly) Written by David Brownlee <abs@netbsd.org>.
# Caveats: # Caveats:
@ -10,41 +10,41 @@
# The 'invalid distfiles' code picks up a couple of false positives in # The 'invalid distfiles' code picks up a couple of false positives in
# fastcap (which does strange things anyway). # fastcap (which does strange things anyway).
require 'getopts.pl'; $^W = 1;
$^W=1;
use strict; use strict;
use Getopt::Std;
use File::Find; use File::Find;
use vars qw($opt_P $opt_d $opt_h $opt_i $opt_l $opt_m $opt_o $opt_p $opt_r); my($pkgsrcdir, %pkgver2dir, %pkg2ver, %opt, @oldprebuiltpackages);
my(%pkg2dir,@oldprebuiltpackages);
$ENV{PATH}.=':/usr/sbin'; $ENV{PATH} .= ':/usr/sbin';
if (! &Getopts('P:dhilmopr') || $opt_h || if (! &getopts('P:dhilmopr', \%opt) || $opt{'h'} ||
! ( defined($opt_d) || defined($opt_i) || defined($opt_l) || ! ( defined($opt{'d'}) || defined($opt{'i'}) || defined($opt{'l'}) ||
defined($opt_m) || defined($opt_o) || defined($opt_p) || defined($opt{'m'}) || defined($opt{'o'}) || defined($opt{'p'}) ||
defined($opt_r) )) defined($opt{'r'}) ))
{ &usage_and_exit; } { &usage_and_exit; }
$|=1; $| = 1;
# main # main
{ {
my($pkgsrcdir,$pkglint_flags); my($pkglint_flags);
$pkglint_flags='-a -b -c -v'; $pkglint_flags = '-a -b -c -v';
if ($opt_P) if ($opt{'P'})
{ $pkgsrcdir=$opt_P; } # Check /etc/mk.conf for PKGSRCDIR { $pkgsrcdir = $opt{'P'}; } # Check /etc/mk.conf for PKGSRCDIR
else else
{ $pkgsrcdir=&set_pkgsrcdir; } # Check /etc/mk.conf for PKGSRCDIR { $pkgsrcdir = &set_pkgsrcdir; } # Check /etc/mk.conf for PKGSRCDIR
if ($opt_r && !$opt_o && !$opt_m && !$opt_p) if ($opt{'r'} && !$opt{'o'} && !$opt{'m'} && !$opt{'p'})
{ $opt_o=$opt_m=$opt_p=1; } { $opt{'o'} = $opt{'m'} = $opt{'p'} = 1; }
if ($opt_o || $opt_m) if ($opt{'o'} || $opt{'m'})
{ {
my(@baddist); my(@baddist);
@baddist=&scan_pkgsrc_distfiles_vs_md5($pkgsrcdir,$opt_o,$opt_m); @baddist = &scan_pkgsrc_distfiles_vs_md5($pkgsrcdir, $opt{'o'},
if ($opt_r) $opt{'m'});
if ($opt{'r'})
{ {
&safe_chdir("$pkgsrcdir/distfiles"); &safe_chdir("$pkgsrcdir/distfiles");
&verbose("Unlinking 'bad' distfiles\n"); &verbose("Unlinking 'bad' distfiles\n");
@ -53,12 +53,12 @@ $|=1;
} }
} }
if ($opt_p) if ($opt{'p'})
{ {
if (!%pkg2dir) if (!%pkgver2dir)
{ %pkg2dir=&scan_pkgsrc_makefiles($pkgsrcdir); } { &scan_pkgsrc_makefiles($pkgsrcdir); }
find(\&check_prebuilt_packages,"$pkgsrcdir/packages"); find(\&check_prebuilt_packages, "$pkgsrcdir/packages");
if ($opt_r) if ($opt{'r'})
{ {
&verbose("Unlinking 'old' prebuiltpackages\n"); &verbose("Unlinking 'old' prebuiltpackages\n");
foreach (@oldprebuiltpackages) foreach (@oldprebuiltpackages)
@ -66,20 +66,23 @@ $|=1;
} }
} }
if ($opt_d) if ($opt{'d'})
{ %pkg2dir=&scan_pkgsrc_makefiles($pkgsrcdir,1); } { &scan_pkgsrc_makefiles($pkgsrcdir, 1); }
if ($opt_i) if ($opt{'i'})
{ {
my(@pkgs,$pkg); my(@pkgs, $pkg);
@pkgs=&list_installed_packages; @pkgs = &list_installed_packages;
if (!%pkg2dir) if (!%pkgver2dir)
{ %pkg2dir=&scan_pkgsrc_makefiles($pkgsrcdir); } { &scan_pkgsrc_makefiles($pkgsrcdir); }
foreach $pkg ( @pkgs ) foreach $pkg ( @pkgs )
{ &list_possible_versions($pkg); } {
if ( $_ = &invalid_version($pkg) )
{ print $_; }
}
} }
if ($opt_l) if ($opt{'l'})
{ &pkglint_all_pkgsrc($pkgsrcdir,$pkglint_flags); } { &pkglint_all_pkgsrc($pkgsrcdir, $pkglint_flags); }
} }
exit; exit;
@ -87,41 +90,40 @@ sub check_prebuilt_packages
{ {
if (/(.*)\.tgz$/) if (/(.*)\.tgz$/)
{ {
if (!defined($pkg2dir{$1})) if (!defined($pkgver2dir{$1}))
{ {
print "$File::Find::dir/$_\n"; print "$File::Find::dir/$_\n";
push(@oldprebuiltpackages,"$File::Find::dir/$_"); push(@oldprebuiltpackages, "$File::Find::dir/$_");
} }
} }
} }
sub fail sub fail
{ print STDERR @_,"\n"; exit(3); } { print STDERR @_, "\n"; exit(3); }
# Given a package, strip version and report possible matches # Determine if a packake version is current. If not, report correct version
# if possible
# #
sub list_possible_versions sub invalid_version
{ {
my($pkg)=@_; my($pkg) = @_;
my($pkgname,@maybe,$fail,$len); my($pkgname, @maybe, $fail, $len);
if (!defined($pkg2dir{$pkg})) if (!defined($pkgver2dir{$pkg}))
{ {
$pkgname=$pkg; # Handle wildcard package versions
$pkgname =~ s/-[^-]+$/-/; if ( $pkg =~ /((.*)-(\d.*|))\*$/ ) # (package)-(ver)*
$len=length($pkgname);
foreach ( sort keys %pkg2dir )
{ {
if (substr($_,0,$len) eq $pkgname && substr($_,$len,1) =~ /[0-9]/) if (defined($pkg2ver{$2}) &&
{ push(@maybe,$_); } substr($pkg2ver{$2}, 0, length($1)) eq $1)
{ return(undef); }
} }
$_="Unknown package: '$pkg'"; $pkgname = $pkg;
if( @maybe ) $pkgname =~ s/-[\d*].*$//;
{ $_.=" (Maybe @maybe)"; } if (defined($pkg2ver{$pkgname}))
{ $fail = "Incorrect version: '$pkg' ($pkg2ver{$pkgname})\n"; }
else else
{ $_.=" ($pkgname)"; } { $fail = "Unknown: '$pkg' ($pkgname)\n"; }
print "$_\n";
$fail=1;
} }
$fail; $fail;
} }
@ -130,27 +132,27 @@ sub list_possible_versions
# #
sub listdir sub listdir
{ {
my($base,$dir)=@_; my($base, $dir) = @_;
my($thisdir,$entry); my($thisdir, $entry);
my(@list,@thislist); my(@list, @thislist);
$thisdir=$base; $thisdir = $base;
if (defined($dir)) if (defined($dir))
{ {
$thisdir.="/$dir"; $thisdir .= "/$dir";
$dir.='/'; $dir .= '/';
} }
else else
{ $dir=''; } { $dir = ''; }
opendir(DIR,$thisdir) || &fail("Unable to opendir($thisdir): $!"); opendir(DIR, $thisdir) || &fail("Unable to opendir($thisdir): $!");
@thislist=grep(substr($_,0,1) ne '.' && $_ ne 'CVS',readdir(DIR)); @thislist = grep(substr($_, 0, 1) ne '.' && $_ ne 'CVS', readdir(DIR));
closedir(DIR); closedir(DIR);
foreach $entry (@thislist) foreach $entry (@thislist)
{ {
if (-d "$thisdir/$entry") if (-d "$thisdir/$entry")
{ push(@list,&listdir($base,"$dir$entry")); } { push(@list, &listdir($base, "$dir$entry")); }
else else
{ push(@list,"$dir$entry"); } { push(@list, "$dir$entry"); }
} }
@list; @list;
} }
@ -161,9 +163,9 @@ sub list_installed_packages
{ {
my(@pkgs); my(@pkgs);
open(PKG_INFO,'pkg_info -a|') || &fail("Unable to run pkg_info: $!"); open(PKG_INFO, 'pkg_info -a|') || &fail("Unable to run pkg_info: $!");
while ( <PKG_INFO> ) while ( <PKG_INFO> )
{ push(@pkgs,(split)[0]); } { push(@pkgs, (split)[0]); }
close(PKG_INFO); close(PKG_INFO);
@pkgs; @pkgs;
} }
@ -172,11 +174,11 @@ sub list_installed_packages
# #
sub list_pkgsrc_categories sub list_pkgsrc_categories
{ {
my($pkgsrcdir)=@_; my($pkgsrcdir) = @_;
my(@categories); my(@categories);
opendir(BASE,$pkgsrcdir) || die("Unable to opendir($pkgsrcdir): $!"); opendir(BASE, $pkgsrcdir) || die("Unable to opendir($pkgsrcdir): $!");
@categories=grep(substr($_,0,1) ne '.' && -f "$pkgsrcdir/$_/Makefile", @categories = grep(substr($_, 0, 1) ne '.' && -f "$pkgsrcdir/$_/Makefile",
readdir(BASE)); readdir(BASE));
closedir(BASE); closedir(BASE);
@categories; @categories;
@ -187,52 +189,73 @@ sub list_pkgsrc_categories
# #
sub parse_makefile sub parse_makefile
{ {
my($file)=@_; my($file) = @_;
my($pkgname,%vars); my($pkgname, %vars);
my($key,$plus,$value); my($key, $plus, $value, @data);
if (open(FILE,$file)) if (! open(FILE, $file))
{ return(undef); }
@data = <FILE>;
close(FILE);
while( $_ = shift(@data) )
{ {
while( <FILE> ) s/#.*//;
if ( m#^\.include "([^"]+)"# )
{ {
s/#.*//; $_ = $1;
if (/^\s*(\w+)(\+?)=\s+(\S*)/) if (! m#/mk/#)
{ {
$key=$1; my($newfile) = ($file);
$plus=$2;
$value=$3;
if ($plus)
{ $vars{$key}.="\n$value"; }
else
{ $vars{$key}=$value; }
}
}
foreach $key ( keys %vars, keys %vars)
{
foreach $value ( keys %vars )
{
if ($vars{$key} =~ m#\${(\w+):S/(\w+)/(\w+)/}#)
{
my($var,$from,$to)=($1,$2,$3);
if (defined($vars{$var})) $newfile =~ s#[^/]+$#$_#; # Use old file to
{ # determine path to new
$_=$vars{$var}; if (!open(FILE, $newfile))
s/$from/$to/; { &verbose("Unable to open '$newfile': $!\n"); }
$vars{$key} =~ s#\${$var:S/$from/$to/}#$_#; else
} {
unshift(@data, <FILE>);
close(FILE);
} }
$vars{$key} =~ s/\$\{$value\}/$vars{$value}/g;
} }
next;
}
if (/^\s*(\w+)([+?]?)=\s*(\S*)/)
{
$key = $1;
$plus = $2;
$value = $3;
if ($plus eq '+')
{ $vars{$key} .= "\n$value"; }
elsif ($plus ne '?' || !defined($vars{$key}) )
{ $vars{$key} = $value; }
}
}
foreach $key ( keys %vars, keys %vars)
{
foreach $value ( keys %vars )
{
if ($vars{$key} =~ m#\${(\w+):S/([^/]+)/([^/]*)/}#)
{
my($var, $from, $to) = ($1, $2, $3);
if (defined($vars{$var}))
{
$_ = $vars{$var};
s/$from/$to/;
$vars{$key} =~ s#\${$var:S/$from/$to/}#$_#;
}
}
$vars{$key} =~ s/\$\{$value\}/$vars{$value}/g;
} }
close(FILE);
} }
if (defined($vars{'PKGNAME'})) if (defined($vars{'PKGNAME'}))
{ $pkgname=$vars{'PKGNAME'}; } { $pkgname = $vars{'PKGNAME'}; }
elsif (defined($vars{'DISTNAME'})) elsif (defined($vars{'DISTNAME'}))
{ $pkgname=$vars{'DISTNAME'}; } { $pkgname = $vars{'DISTNAME'}; }
if (defined($pkgname)) if (defined($pkgname))
{ return($pkgname,%vars); } { return($pkgname, %vars); }
else else
{ return(undef); } { return(undef); }
} }
@ -241,32 +264,32 @@ sub parse_makefile
# #
sub pkglint_all_pkgsrc sub pkglint_all_pkgsrc
{ {
my($pkgsrcdir,$pkglint_flags)=@_; my($pkgsrcdir, $pkglint_flags) = @_;
my($cat,$pkg,@categories,@output); my($cat, $pkg, @categories, @output);
@categories=&list_pkgsrc_categories($pkgsrcdir); @categories = &list_pkgsrc_categories($pkgsrcdir);
foreach $cat ( sort @categories ) foreach $cat ( sort @categories )
{ {
&safe_chdir("$pkgsrcdir/$cat"); &safe_chdir("$pkgsrcdir/$cat");
if (! opendir(CAT,'.')) if (! opendir(CAT, '.'))
{ die("Unable to opendir($pkgsrcdir/$cat): $!"); } { die("Unable to opendir($pkgsrcdir/$cat): $!"); }
foreach $pkg ( grep(substr($_,0,1) ne '.',readdir(CAT) ) ) foreach $pkg ( grep(substr($_, 0, 1) ne '.', readdir(CAT) ) )
{ {
if (-f "$pkg/Makefile") if (-f "$pkg/Makefile")
{ {
if (!open(PKGLINT,"pkglint $pkglint_flags $pkg|")) if (!open(PKGLINT, "pkglint $pkglint_flags $pkg|"))
{ &fail("Unable to run pkglint: $!"); } { &fail("Unable to run pkglint: $!"); }
@output=grep(!/^OK:/ && @output = grep(!/^OK:/ &&
!/^WARN: be sure to cleanup .* work before/ && !/^WARN: be sure to cleanup .* work before/ &&
!/^WARN: is it a new port/ && !/^WARN: is it a new port/ &&
!/^\d+ fatal errors and \d+ warnings found/ !/^\d+ fatal errors and \d+ warnings found/
,<PKGLINT> ); , <PKGLINT> );
close(PKGLINT); close(PKGLINT);
if (@output) if (@output)
{ {
print "===> $cat/$pkg\n", print "===> $cat/$pkg\n",
"pkglint $pkglint_flags $pkg\n", "pkglint $pkglint_flags $pkg\n",
@output,"\n"; @output, "\n";
} }
} }
} }
@ -278,7 +301,7 @@ sub pkglint_all_pkgsrc
# #
sub safe_chdir sub safe_chdir
{ {
my($dir)=@_; my($dir) = @_;
if (! chdir($dir)) if (! chdir($dir))
{ &fail("Unable to chdir($dir): $!"); } { &fail("Unable to chdir($dir): $!"); }
@ -288,74 +311,84 @@ sub safe_chdir
# #
sub scan_pkgsrc_makefiles sub scan_pkgsrc_makefiles
{ {
my($pkgsrcdir,$check_depends)=@_; my($pkgsrcdir, $check_depends) = @_;
my($cat,@categories,$pkg,$pkgname); my($cat, @categories, $pkg, $pkgname);
my(%pkg2dir,%depends); my(%depends);
@categories=&list_pkgsrc_categories($pkgsrcdir); @categories = &list_pkgsrc_categories($pkgsrcdir);
&verbose("Scanning pkgsrc Makefiles: ".'_'x@categories."\b"x@categories); &verbose("Scanning pkgsrc Makefiles: ".'_'x@categories."\b"x@categories);
# foreach $cat ( 'misc' ) # XXX
foreach $cat ( sort @categories ) foreach $cat ( sort @categories )
{ {
if (! opendir(CAT,"$pkgsrcdir/$cat")) if (! opendir(CAT, "$pkgsrcdir/$cat"))
{ die("Unable to opendir($pkgsrcdir/$cat): $!"); } { die("Unable to opendir($pkgsrcdir/$cat): $!"); }
foreach $pkg ( grep(substr($_,0,1) ne '.',readdir(CAT) ) ) foreach $pkg ( grep(substr($_, 0, 1) ne '.', readdir(CAT) ) )
# foreach $pkg ( 'staroffice' ) # XXX
{ {
my(%vars); my(%vars);
($pkgname,%vars)=&parse_makefile("$pkgsrcdir/$cat/$pkg/Makefile"); ($pkgname, %vars) =
&parse_makefile("$pkgsrcdir/$cat/$pkg/Makefile");
if ($pkgname) if ($pkgname)
{ {
$pkg2dir{$pkgname}="$cat/$pkg"; if ( $pkgname =~ /\$/ )
{ print "\rBogus: $pkgname $cat/$pkg\n"; }
else
{
$_ = $pkgname;
s/-\d.*//;
$pkg2ver{$_} = $pkgname;
}
$pkgver2dir{$pkgname} = "$cat/$pkg";
if (defined($vars{'DEPENDS'})) if (defined($vars{'DEPENDS'}))
{ $depends{$pkgname}=$vars{'DEPENDS'}; } { $depends{$pkgname} = $vars{'DEPENDS'}; }
} }
} }
close(CAT); close(CAT);
&verbose('.'); &verbose('.');
} }
&verbose(' (',scalar(keys %pkg2dir)," packages)\n"); &verbose(' (', scalar(keys %pkgver2dir), " packages)\n");
if ($check_depends) if ($check_depends)
{ {
foreach $pkg ( sort keys %depends ) foreach $pkg ( sort keys %depends )
{ {
my($err); my($err, $msg);
foreach (split("\n",$depends{$pkg})) foreach (split("\n", $depends{$pkg}))
{ {
s/:.*// || next; s/:.*// || next;
if (!defined($pkg2dir{$_})) if (($msg = &invalid_version($_)) )
{ {
if (!defined($err)) if (!defined($err))
{ print "DEPENDS errors for $pkg2dir{$pkg}:\n"; } { print "DEPENDS errors for $pkgver2dir{$pkg}:\n"; }
$err=1; $err = 1;
print "\t"; print "\t$msg";
&list_possible_versions($_);
} }
} }
} }
} }
%pkg2dir; %pkgver2dir;
} }
# Extract all md5 entries, then verify contents of distfiles # Extract all md5 entries, then verify contents of distfiles
# #
sub scan_pkgsrc_distfiles_vs_md5 sub scan_pkgsrc_distfiles_vs_md5
{ {
my($pkgsrcdir,$check_unref,$check_md5)=@_; my($pkgsrcdir, $check_unref, $check_md5) = @_;
my($cat,@categories,$pkg); my($cat, @categories, $pkg);
my(%distfiles,%md5,@distwarn,$file,$numpkg); my(%distfiles, %md5, @distwarn, $file, $numpkg);
my(@distfiles,@bad_distfiles); my(@distfiles, @bad_distfiles);
@categories=&list_pkgsrc_categories($pkgsrcdir); @categories = &list_pkgsrc_categories($pkgsrcdir);
&verbose("Scanning pkgsrc md5s: ".'_'x@categories."\b"x@categories); &verbose("Scanning pkgsrc md5s: ".'_'x@categories."\b"x@categories);
$numpkg=0; $numpkg = 0;
foreach $cat ( sort @categories ) foreach $cat ( sort @categories )
{ {
if (! opendir(CAT,"$pkgsrcdir/$cat")) if (! opendir(CAT, "$pkgsrcdir/$cat"))
{ die("Unable to opendir($pkgsrcdir/$cat): $!"); } { die("Unable to opendir($pkgsrcdir/$cat): $!"); }
foreach $pkg ( grep(substr($_,0,1) ne '.',readdir(CAT) ) ) foreach $pkg ( grep(substr($_, 0, 1) ne '.', readdir(CAT) ) )
{ {
if (open(MD5,"$pkgsrcdir/$cat/$pkg/files/md5")) if (open(MD5, "$pkgsrcdir/$cat/$pkg/files/md5"))
{ {
++$numpkg; ++$numpkg;
while( <MD5> ) while( <MD5> )
@ -364,12 +397,12 @@ sub scan_pkgsrc_distfiles_vs_md5
{ {
if (!defined($distfiles{$1})) if (!defined($distfiles{$1}))
{ {
$distfiles{$1}="$cat/$pkg"; $distfiles{$1} = "$cat/$pkg";
$md5{$1}=$2; $md5{$1} = $2;
} }
elsif( $md5{$1} ne $2 ) elsif( $md5{$1} ne $2 )
{ {
push(@distwarn,"md5 mismatch between '$1' in ". push(@distwarn, "md5 mismatch between '$1' in ".
"$cat/$pkg and $distfiles{$1}\n"); "$cat/$pkg and $distfiles{$1}\n");
} }
} }
@ -385,32 +418,32 @@ sub scan_pkgsrc_distfiles_vs_md5
foreach $file (&listdir("$pkgsrcdir/distfiles")) foreach $file (&listdir("$pkgsrcdir/distfiles"))
{ {
if (!defined($distfiles{$file})) if (!defined($distfiles{$file}))
{ push(@bad_distfiles,$file); } { push(@bad_distfiles, $file); }
else else
{ push(@distfiles,$file); } { push(@distfiles, $file); }
} }
if ($check_unref && @bad_distfiles) if ($check_unref && @bad_distfiles)
{ {
&verbose(scalar(@bad_distfiles), &verbose(scalar(@bad_distfiles),
" unreferenced file(s) in '$pkgsrcdir/distfiles':\n"); " unreferenced file(s) in '$pkgsrcdir/distfiles':\n");
print join("\n",sort @bad_distfiles),"\n"; print join("\n", sort @bad_distfiles), "\n";
} }
if ($check_md5) if ($check_md5)
{ {
if (@distwarn) if (@distwarn)
{ &verbose(@distwarn); } { &verbose(@distwarn); }
&verbose("md5 mismatches\n"); &verbose("md5 mismatches\n");
@distfiles=sort @distfiles; @distfiles = sort @distfiles;
&safe_chdir("$pkgsrcdir/distfiles"); &safe_chdir("$pkgsrcdir/distfiles");
open(MD5,"md5 @distfiles|") || &fail("Unable to run md5: $!"); open(MD5, "md5 @distfiles|") || &fail("Unable to run md5: $!");
while (<MD5>) while (<MD5>)
{ {
if (m/^MD5 \(([^\)]+)\) = (\S+)/) if (m/^MD5 \(([^\)]+)\) = (\S+)/)
{ {
if ($md5{$1} ne 'IGNORE' && $md5{$1} ne $2) if ($md5{$1} ne 'IGNORE' && $md5{$1} ne $2)
{ {
print $1,"\n"; print $1, "\n";
push(@bad_distfiles,$1); push(@bad_distfiles, $1);
} }
} }
} }
@ -423,13 +456,13 @@ sub set_pkgsrcdir # Parse /etc/mk.conf (if present) for PKGSRCDIR
{ {
my($pkgsrcdir); my($pkgsrcdir);
$pkgsrcdir='/usr/pkgsrc'; $pkgsrcdir = '/usr/pkgsrc';
if (open(MK_CONF,'/etc/mk.conf')) if (open(MK_CONF, '/etc/mk.conf'))
{ {
while (<MK_CONF>) while (<MK_CONF>)
{ {
if( /PKGSRCDIR\s*=\s*(\S+)/ ) if( /PKGSRCDIR\s*=\s*(\S+)/ )
{ $pkgsrcdir=$1; last; } { $pkgsrcdir = $1; last; }
} }
close(MK_CONF); close(MK_CONF);
} }