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

Fix up PORTSDIR breakage that I created.

parent 63177b2b
...@@ -125,7 +125,8 @@ my $MYSQL_LOGDIR = "$LOGDIR/mysql"; ...@@ -125,7 +125,8 @@ my $MYSQL_LOGDIR = "$LOGDIR/mysql";
my $RCDIR = "/usr/local/etc/rc.d"; my $RCDIR = "/usr/local/etc/rc.d";
my $USERSVAR_DIR = "$PREFIX/usersvar"; my $USERSVAR_DIR = "$PREFIX/usersvar";
my $OPSDIR_DIR = "$PREFIX/opsdir"; my $OPSDIR_DIR = "$PREFIX/opsdir";
my $PORTSDIR = "/usr/ports/misc"; my $PORTSDIR = "/usr/ports";
my $PORTSMISCDIR = "$PORTSDIR/misc";
my $MIBPATH = "/usr/local/share/snmp/mibs"; my $MIBPATH = "/usr/local/share/snmp/mibs";
my $TFTP_DIR = "$PREFIX/tftpboot"; my $TFTP_DIR = "$PREFIX/tftpboot";
my $TFTP_PROJ_DIR = "$TFTP_DIR/proj"; my $TFTP_PROJ_DIR = "$TFTP_DIR/proj";
...@@ -343,7 +344,7 @@ Phase "ports", "Installing ports", sub { ...@@ -343,7 +344,7 @@ Phase "ports", "Installing ports", sub {
PhaseSkip("Packages installed okay"); PhaseSkip("Packages installed okay");
} }
Phase "pcopy", "Copying ports into place", sub { Phase "pcopy", "Copying ports into place", sub {
DoneIfExists("$PORTSDIR/emulab-boss"); DoneIfExists("$PORTSMISCDIR/emulab-boss");
ExecQuietFatal("$SH $SRCDIR/ports/ports-install"); ExecQuietFatal("$SH $SRCDIR/ports/ports-install");
}; };
# Ick. The php4 port is broken with SSL, so we have to patch it - hopefully # Ick. The php4 port is broken with SSL, so we have to patch it - hopefully
...@@ -356,7 +357,7 @@ Phase "ports", "Installing ports", sub { ...@@ -356,7 +357,7 @@ Phase "ports", "Installing ports", sub {
}; };
PhaseFail("Please install ports manually, since some\n of them are " . PhaseFail("Please install ports manually, since some\n of them are " .
"interactive. Run: \n" . "interactive. Run: \n" .
"cd $PORTSDIR/emulab-boss && make install\n" . "cd $PORTSMISCDIR/emulab-boss && make install\n" .
"then re-run this script."); "then re-run this script.");
}; };
......
...@@ -130,12 +130,13 @@ my $SMBCONF_HEAD = "$SMBCONF_FILE.head"; ...@@ -130,12 +130,13 @@ my $SMBCONF_HEAD = "$SMBCONF_FILE.head";
# #
# Some directories we care about # Some directories we care about
# #
my $LIST_DIR = "/etc/mail/lists"; my $LIST_DIR = "/etc/mail/lists";
my $TIPLOG_DIR = "/var/log/tiplogs"; my $TIPLOG_DIR = "/var/log/tiplogs";
my $PORTSDIR = "/usr/ports/misc"; my $PORTSDIR = "/usr/ports";
my $SRCDIR = '@srcdir@'; my $PORTSMISCDIR = "$PORTSDIR/misc";
my $TOP_SRCDIR = "@top_srcdir@"; my $SRCDIR = '@srcdir@';
my $RCDIR = "/usr/local/etc/rc.d"; my $TOP_SRCDIR = "@top_srcdir@";
my $RCDIR = "/usr/local/etc/rc.d";
# #
# And some lists that we use # And some lists that we use
...@@ -227,7 +228,7 @@ Phase "ports", "Installing ports", sub { ...@@ -227,7 +228,7 @@ Phase "ports", "Installing ports", sub {
if ($packagedir) { if ($packagedir) {
PhaseSkip("Package directory provided"); PhaseSkip("Package directory provided");
} }
DoneIfExists("$PORTSDIR/emulab-ops"); DoneIfExists("$PORTSMISCDIR/emulab-ops");
ExecQuietFatal("$SH $SRCDIR/ports/ports-install"); ExecQuietFatal("$SH $SRCDIR/ports/ports-install");
}; };
Phase "pinstall", "Installing ports (may take a while)", sub { Phase "pinstall", "Installing ports (may take a while)", sub {
...@@ -243,8 +244,8 @@ Phase "ports", "Installing ports", sub { ...@@ -243,8 +244,8 @@ Phase "ports", "Installing ports", sub {
# #
my $pwd = `$PWD`; my $pwd = `$PWD`;
chomp $pwd; chomp $pwd;
chdir "$PORTSDIR/emulab-ops" or chdir "$PORTSMISCDIR/emulab-ops" or
PhaseFail "Unable to change to $PORTSDIR/emulab-ops: $!"; PhaseFail "Unable to change to $PORTSMISCDIR/emulab-ops: $!";
ExecQuietFatal("make -DBATCH install"); ExecQuietFatal("make -DBATCH install");
chdir $pwd; chdir $pwd;
}; };
......
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