Add elvind as a dependancy on ops, and bump the emulab-ops port

version number.

Also add a phase to ops-install to install the elvind config file.

install/ops-install.in

@@ -42,6 +42,14 @@ use lib '@srcdir@';
 use English;
 use libinstall;
 
+#
+# Figure out which directory we live in, so that some stages can do thing
+# relative to it.
+#
+my $OBJDIR = `/usr/bin/dirname $0`;
+chomp $OBJDIR;
+my $TOP_OBJDIR = "$OBJDIR/..";
+
 #
 # Some programs we use
 #
@@ -52,6 +60,7 @@ my $NEWALIASES = "/usr/bin/newaliases";
 my $SH         = "/bin/sh";
 my $PKG_INFO   = "/usr/sbin/pkg_info";
 my $PWD        = "/bin/pwd";
+my $CP         = "/bin/cp";
 
 #
 # Some files we edit/create
@@ -88,6 +97,12 @@ my @MAILING_LIST_NAMES = map { /^([\w-]+)\@/ } @MAILING_LISTS;
 my @TESTBED_DIRS       = ([$PREFIX, "0775"], ["/users", "0755"],
     ["/proj", "0755"], ["/groups", "0755"], ["/share", "0775"]);
 
+#
+# A few files we have to deal with
+#
+my $ELVIND_CONF     = "/usr/local/etc/elvind.conf";
+my $OPS_ELVIND_CONF = "$TOP_OBJDIR/event/etc/elvind-ops.conf";
+
 #
 # Make sure they know what they're getting into...
 #
@@ -139,7 +154,7 @@ Phase "ports", "Installing ports", sub {
 	ExecQuietFatal("$SH $SRCDIR/ports/ports-install");
     };
     Phase "pinstall", "Installing ports (may take a while)", sub {
-	if (!ExecQuiet("$PKG_INFO -e emulab-ops-1.1")) {
+	if (!ExecQuiet("$PKG_INFO -e emulab-ops-1.3")) {
 	    PhaseSkip("Ports already installed");
 	}
 
@@ -379,6 +394,13 @@ Phase "capture", "Setting up capture", sub {
     };
 };
 
+Phase "event", "Setting up event system", sub {
+    Phase "elvinconf", "Installing elvind config file", sub {
+	DoneIfExists("$ELVIND_CONF");
+	ExecQuietFatal("$CP $OPS_ELVIND_CONF $ELVIND_CONF");
+    };
+};
+
 print "----------------------------------------------------------------------\n";
 print "Installation completed succesfully!\n";
 print "Please reboot this machine before proceeding with boss setup\n";

install/ports/emulab-ops/Makefile

@@ -3,7 +3,7 @@
 # Whom:                 ricci@cs.utah.edu
 
 PORTNAME=	emulab-ops
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	misc
 MASTER_SITES=	#none
 DISTFILES=	#none
@@ -20,7 +20,8 @@ RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
 	otcl:${PORTSDIR}/lang/otcl \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-	wget:${PORTSDIR}/ftp/wget
+	wget:${PORTSDIR}/ftp/wget \
+	elvind:${PORTSDIR}/misc/elvind
 
 NO_BUILD=	yes