Commit 9ac3ddf6 authored by Mike Hibler's avatar Mike Hibler
Browse files

tweaks to get elabinelab to install on 4.10 again

parent e4fe1be0
......@@ -50,6 +50,7 @@ my $GROUPROOT = "@GROUPSROOT_DIR@";
my $USERROOT = "@USERSROOT_DIR@";
my $SCRATCHROOT = "@SCRATCHROOT_DIR@";
my $SHAREROOT = "@SHAREROOT_DIR@";
my $ELVIN_COMPAT= @ELVIN_COMPAT@;
#
# Some programs we use
......@@ -452,10 +453,11 @@ Phase "ports", "Installing ports", sub {
};
# XXX Also temporary
Phase "pubsub", "Installing pubsub package", sub {
if (!ExecQuiet("$PKG_INFO -x pubsub")) {
PhaseSkip("pubsub already installed");
my $pspkg = $ELVIN_COMPAT ? "pubsub-elvincompat" : "pubsub";
if (!ExecQuiet("$PKG_INFO -x $pspkg")) {
PhaseSkip("$pspkg already installed");
}
my $pname = GetPackage("pubsub", $packagedir);
my $pname = GetPackage($pspkg, $packagedir);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
};
# XXX Ditto
......
......@@ -363,10 +363,11 @@ Phase "ports", "Installing ports", sub {
}
# XXX Also temporary
Phase "pubsub", "Installing pubsub package", sub {
if (!ExecQuiet("$PKG_INFO -x pubsub")) {
PhaseSkip("pubsub already installed");
my $pspkg = $ELVIN_COMPAT ? "pubsub-elvincompat" : "pubsub";
if (!ExecQuiet("$PKG_INFO -x $pspkg")) {
PhaseSkip("$pspkg already installed");
}
my $pname = GetPackage("pubsub", $packagedir);
my $pname = GetPackage($pspkg, $packagedir);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
};
# XXX Ditto
......@@ -1021,6 +1022,9 @@ Phase "apache", "Installing apache config file", sub {
ExecQuietFatal("$GMAKE -C $TOP_OBJDIR/apache control-install");
};
Phase "wikidocs", "Installing wikidocs redirect", sub {
PhaseSkip("wikidocs not supported on ops")
if ($FBSD_MAJOR == 4);
DoneIfExists("$WWWDIR/wikidocs/.htaccess");
if (! -e "$WWWDIR/wikidocs") {
......
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