Commit 8832955c authored by Mike Hibler's avatar Mike Hibler

More fixing up elvin_compat vs. not

parent 8798c50b
......@@ -53,9 +53,21 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
mhash.2:${PORTSDIR}/security/mhash \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 \
pubsub.1:${PORTSDIR}/misc/emulab-pubsub \
ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
#
# Until/unless the pubsub Makefile is changed, we must include libelvin.
# This is because the pubsub libraries have to be built with ELVIN_COMPAT
# to talk to pubsub on ops, and building with compat means that the gateway
# will be built. Building that requires elvin libraries...
#
.if defined(ELVIN_COMPAT)
LIB_DEPENDS+= vin4.2:${PORTSDIR}/misc/libelvin \
pubsub.1:${PORTSDIR}/misc/emulab-pubsub-elvincompat
.else
LIB_DEPENDS+= pubsub.1:${PORTSDIR}/misc/emulab-pubsub
.endif
RUN_DEPENDS= \
${LOCALBASE}/etc/apache/ssl.crl:${PORTSDIR}/www/apache13-modssl \
${LOCALBASE}/libexec/apache/libauth_mysql.so:${PORTSDIR}/www/mod_auth_mysql \
......
......@@ -54,9 +54,15 @@ MAINTAINER= ricci@cs.utah.edu
.MAKEFLAGS+= -DBATCH
LIB_DEPENDS= lthread.[23]:${PORTSDIR}/devel/linuxthreads \
pubsub.1:${PORTSDIR}/misc/emulab-pubsub \
ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
.if defined(ELVIN_COMPAT)
LIB_DEPENDS+= vin4.2:${PORTSDIR}/misc/libelvin \
pubsub.1:${PORTSDIR}/misc/emulab-pubsub-elvincompat
.else
LIB_DEPENDS+= pubsub.1:${PORTSDIR}/misc/emulab-pubsub
.endif
.if ${OSMAJOR} >= 6
LIB_DEPENDS+= mhash.2:${PORTSDIR}/security/mhash \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client
......@@ -69,7 +75,11 @@ RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
${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 \
${PYTHON_SITELIBDIR}/M2Crypto/ASN1.py:${PORTSDIR}/security/py-m2crypto \
${PYTHON_SITELIBDIR}/M2Crypto/ASN1.py:${PORTSDIR}/security/py-m2crypto
.if defined(ELVIN_COMPAT)
RUN_DEPENDS+= ${LOCALBASE}/libexec/elvind:${PORTSDIR}/misc/elvind
.endif
.if ${OSMAJOR} >= 6
RUN_DEPENDS+= \
......
MD5 (pubsub-elvincompat-0.8.tar.gz) = f6779bfec19c95f337ece81185f10e83
MD5 (pubsub-elvincompat-0.8.tar.gz) = 8262ef67c8e57a159f9ef5db49890d20
......@@ -3,6 +3,7 @@ libexec/elvin_gateway
include/pubsub/pubsub.h
include/pubsub/elvin_hash.h
lib/libpubsub.a
lib/libpubsub.so.1
lib/libpubsub.so
lib/libpubsub_r.a
etc/rc.d/2.pubsubd.sh
......
MD5 (pubsub-0.8.tar.gz) = 16975773d5ac0e4e56c0ee3767f8aa06
MD5 (pubsub-0.8.tar.gz) = 3ddd2d8399f67b13bea83f4ae6d9267b
......@@ -2,6 +2,7 @@ libexec/pubsubd
include/pubsub/pubsub.h
include/pubsub/elvin_hash.h
lib/libpubsub.a
lib/libpubsub.so.1
lib/libpubsub.so
lib/libpubsub_r.a
etc/rc.d/2.pubsubd.sh
......
......@@ -7,7 +7,7 @@
PORTSDIR=/usr/ports
PORTSUBDIR=misc
SRCDIR=`dirname $0`
PORTS="elvind emulab-boss emulab-fs emulab-ops libelvin emulab-tftp-hpa p5-GD-old ulsshxmlrpcpp emulab-iperf emulab-php4 emulab-mailman"
PORTS="elvind emulab-boss emulab-fs emulab-ops libelvin emulab-tftp-hpa p5-GD-old ulsshxmlrpcpp emulab-iperf emulab-php4 emulab-mailman emulab-pubsub emulab-pubsub-elvincompat"
for PORT in $PORTS
do
......
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