Commit 85c3f6ff authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

More screwing around with the package stuff; Install rsync and samba

by hand since it will be too hard to get them into the meta port this
week or next.
parent 742f73f3
...@@ -368,6 +368,10 @@ Phase "portfixup", "Fixing up packages", sub { ...@@ -368,6 +368,10 @@ Phase "portfixup", "Fixing up packages", sub {
PhaseSkip("rsync already installed"); PhaseSkip("rsync already installed");
} }
if (exists($ENV{"PKG_PATH"})) {
ExecQuietFatal("$PKG_ADD rsync-2.6.3_1");
}
else {
# #
# This port is dead-simple, so it's safe to do it from this script # This port is dead-simple, so it's safe to do it from this script
# #
...@@ -377,6 +381,7 @@ Phase "portfixup", "Fixing up packages", sub { ...@@ -377,6 +381,7 @@ Phase "portfixup", "Fixing up packages", sub {
PhaseFail "Unable to change to $PORTSDIR/net/rsync: $!"; PhaseFail "Unable to change to $PORTSDIR/net/rsync: $!";
ExecQuietFatal("make -DBATCH install"); ExecQuietFatal("make -DBATCH install");
chdir $pwd; chdir $pwd;
}
}; };
}; };
......
...@@ -253,11 +253,15 @@ Phase "ports", "Installing ports", sub { ...@@ -253,11 +253,15 @@ Phase "ports", "Installing ports", sub {
# XXX Temporary. # XXX Temporary.
Phase "portfixup", "Fixing up packages", sub { Phase "portfixup", "Fixing up packages", sub {
Phase "rsync", "Looking for rsync", sub { Phase "rsync", "Looking for rsync and installing", sub {
if (!ExecQuiet("$PKG_INFO -x rsync")) { if (!ExecQuiet("$PKG_INFO -x rsync")) {
PhaseSkip("rsync already installed"); PhaseSkip("rsync already installed");
} }
if (exists($ENV{"PKG_PATH"})) {
ExecQuietFatal("$PKG_ADD rsync-2.6.3_1");
}
else {
# #
# This port is dead-simple, so it's safe to do it from this script # This port is dead-simple, so it's safe to do it from this script
# #
...@@ -267,7 +271,28 @@ Phase "portfixup", "Fixing up packages", sub { ...@@ -267,7 +271,28 @@ Phase "portfixup", "Fixing up packages", sub {
PhaseFail "Unable to change to $PORTSDIR/net/rsync: $!"; PhaseFail "Unable to change to $PORTSDIR/net/rsync: $!";
ExecQuietFatal("make -DBATCH install"); ExecQuietFatal("make -DBATCH install");
chdir $pwd; chdir $pwd;
}
}; };
if ($WINSUPPORT) {
Phase "samba", "Looking for Samba and installing", sub {
if (!ExecQuiet("$PKG_INFO -x samba")) {
PhaseSkip("samba already installed");
}
if (exists($ENV{"PKG_PATH"})) {
ExecQuietFatal("$PKG_ADD samba-3.0.7,1");
}
else {
my $pwd = `$PWD`;
chomp $pwd;
chdir "$PORTSDIR/net/samba3" or
PhaseFail "Unable to change to $PORTSDIR/net/samba3: $!";
ExecQuietFatal("make -DBATCH -DSAMBA_SUBPORT install");
ExecQuietFatal("make -k post-install");
chdir $pwd;
}
};
}
}; };
Phase "patches", "Applying patches", sub { Phase "patches", "Applying patches", sub {
......
Supports Markdown
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