Commit 6ff7c573 authored by Mike Hibler's avatar Mike Hibler

Still more FBSD 10 fixups.

parent 17e9b92d
#!/usr/bin/perl -w
#
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
# Copyright (c) 2008-2014 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
......@@ -115,13 +115,18 @@ my %packlist = ("libxml2>=2.6.26" => "/usr/ports/textproc/libxml2",
);
my $needpkgs = 0;
# Check for new package tools
if (-x "/usr/sbin/pkg") {
$PKG_INFO = "/usr/sbin/pkg info -g";
}
foreach my $pkgname (sort(keys(%packlist))) {
my $pkgdir = $packlist{$pkgname};
print STDERR "Checking for package $pkgname\n";
next
if (system("$PKG_INFO -E '${pkgname}*' >/dev/null") == 0);
if (system("$PKG_INFO -e '${pkgname}*' >/dev/null") == 0);
print STDERR "Please install $pkgdir\n";
$needpkgs++;
......
#!/usr/bin/perl -w
#
# Copyright (c) 2008-2013 University of Utah and the Flux Group.
# Copyright (c) 2008-2014 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
......@@ -176,11 +176,15 @@ my %packlist =
my $needpkgs = 0;
Phase "ports", "Installing ports", sub {
# Check for new package tools
if (-x "/usr/sbin/pkg") {
$PKG_INFO = "/usr/sbin/pkg info -g";
}
foreach my $pkgname (sort(keys(%packlist))) {
my $pkgdir = $packlist{$pkgname};
Phase "$pkgname", "Checking for $pkgname", sub {
if (!ExecQuiet("$PKG_INFO -E '${pkgname}*'")) {
if (!ExecQuiet("$PKG_INFO -e '${pkgname}*'")) {
PhaseSkip("Already installed");
}
ExecQuietFatal("cd $pkgdir; make -DBATCH install");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment