Commit a1094b33 authored by Mike Hibler's avatar Mike Hibler

Initial support for FreeBSD 9.2 servers.

Works for 32-bit build.
parent a020f67d
......@@ -607,7 +607,7 @@ sub doboot()
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-8.3-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-3.0";
}
elsif ($FBSD_VERSION >= 9.0) {
elsif ($FBSD_VERSION >= 9.0 && $FBSD_VERSION < 9.2) {
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/9.0/packages";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
......@@ -616,6 +616,16 @@ sub doboot()
$emulabconfig{BOSS_PKG} = "emulab-boss-5.0";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-9.0-packages.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-3.0";
} elsif ($FBSD_VERSION >= 9.2) {
my $suf = ($FBSD_ARCH eq "amd64") ? "-64" : "";
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/9.2/packages${suf}";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{FS_PKG} = "emulab-fs-5.1";
$emulabconfig{OPS_PKG} = "emulab-ops-5.1";
$emulabconfig{BOSS_PKG} = "emulab-boss-5.1";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-9.2-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-3.1";
}
if (exists($emulabconfig{"PACKAGE_TARBALL"})) {
$emulabconfig{FS_PKG_DIR} = "$TBDIR/packages";
......
#!/usr/bin/perl -w
#
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
# Copyright (c) 2003-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -64,7 +64,11 @@ $BOSS_PORT = "emulab-boss-1.8";
$OPS_PORT = "emulab-ops-1.4";
$FS_PORT = "emulab-fs-1.4";
if ($FBSD_MAJOR > 4) {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
if ($FBSD_MAJOR > 9 || ($FBSD_MAJOR == 9 && $FBSD_MINOR > 1)) {
$BOSS_PORT = "emulab-boss-5.1";
$OPS_PORT = "emulab-ops-5.1";
$FS_PORT = "emulab-fs-5.1";
} elsif ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
$BOSS_PORT = "emulab-boss-5.0";
$OPS_PORT = "emulab-ops-5.0";
$FS_PORT = "emulab-fs-5.0";
......@@ -96,7 +100,9 @@ $PHP_VERSION = 4;
$PHP_PORT = "php4-extensions-1.0";
if ($FBSD_MAJOR > 7 || ($FBSD_MAJOR == 7 && $FBSD_MINOR > 2)) {
$PHP_VERSION = 5;
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
if ($FBSD_MAJOR > 9 || ($FBSD_MAJOR == 9 && $FBSD_MINOR > 1)) {
$PHP_PORT = "php5-extensions-1.7";
} elsif ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
$PHP_PORT = "php5-extensions-1.6";
} elsif ($FBSD_MAJOR > 7) {
$PHP_PORT = "php5-extensions-1.4";
......@@ -108,7 +114,7 @@ if ($FBSD_MAJOR > 7 || ($FBSD_MAJOR == 7 && $FBSD_MINOR > 2)) {
# XXX temporary for tftp
$TFTPD_PKG = "emulab-tftp-hpa-0.48";
# XXX temporary for perl DBD mysql access
# XXX temporary for perl DBD mysql access (only needed for FBSD7 and below)
$P5DBD_PKG = "p5-DBD-mysql50-3.0002";
# Lots of patches
......
......@@ -64,9 +64,9 @@ sub Install($$$)
Phase "perlselfloaderpatch", "Fixing perl self-loader", sub {
my $perldir;
# need for 5.10 or 5.12
$perldir = "/usr/local/lib/perl5/5.12.4";
if (! -d $perldir) {
$perldir = "/usr/local/lib/perl5/5.10.1";
foreach my $pdir ("5.12", "5.12.4", "5.10.1") {
$perldir = "/usr/local/lib/perl5/$pdir";
last if (-d $perldir);
}
DoneIfDoesntExist("$perldir/SelfLoader.pm");
my $ver = `fgrep 'our \$VERSION =' $perldir/SelfLoader.pm 2>/dev/null`;
......
......@@ -35,7 +35,12 @@ sub Install($$$)
};
}
Phase "perlselfloaderpatch", "Fixing perl self-loader", sub {
my $perldir = "/usr/local/lib/perl5/5.10.1";
my $perldir;
# need for 5.10 or 5.12
foreach my $pdir ("5.12", "5.12.4", "5.10.1") {
$perldir = "/usr/local/lib/perl5/$pdir";
last if (-d $perldir);
}
DoneIfDoesntExist("$perldir/SelfLoader.pm");
my $ver = `fgrep 'our \$VERSION =' $perldir/SelfLoader.pm 2>/dev/null`;
if ($? == 0 && $ver =~ /1\.18/) {
......
......@@ -24,7 +24,9 @@ MAINTAINER= testbed-ops@flux.utah.edu
# We must make sure PERL is built with this.
#
.MAKEFLAGS+= ENABLE_SUIDPERL=yes
.if ${PORTVERSION} == "5.0"
.if ${PORTVERSION} == "5.1"
.MAKEFLAGS+= PERL_VERSION=5.12.5 PERL_VER=5.12 PERL_ARCH=mach
.elif ${PORTVERSION} == "5.0"
.MAKEFLAGS+= PERL_VERSION=5.12.4 PERL_VER=5.12.4 PERL_ARCH=mach
.elif (${PORTVERSION} == "3.1" || ${PORTVERSION} == "4.0")
.MAKEFLAGS+= PERL_VERSION=5.10.1 PERL_VER=5.10.1 PERL_ARCH=mach
......@@ -50,7 +52,7 @@ MAINTAINER= testbed-ops@flux.utah.edu
# agrees with what is in the emulab-ops and emulab-php* metaports.
#
.MAKEFLAGS+= -DWITH_APACHE
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || ${PORTVERSION} == "5.1")
.MAKEFLAGS+= APACHE_PORT=www/apache22
.MAKEFLAGS+= WITH_SUEXEC=yes
.else
......@@ -79,11 +81,12 @@ MAINTAINER= testbed-ops@flux.utah.edu
#
.if (${PORTVERSION} == "1.7" || ${PORTVERSION} == "2.0")
BUILD_DEPENDS= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
.elif (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
# back to a standard p5-DBD-mysql50 install
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
.elif (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
# back to a standard p5-DBD-mysql5x install
BUILD_DEPENDS= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \
${LOCALBASE}/libexec/apache22/libphp${PHP_VER}.so:${PORTSDIR}/misc/emulab-php${PHP_VER}
.else
BUILD_DEPENDS= \
......@@ -94,9 +97,9 @@ BUILD_DEPENDS= \
# XXX force our version of tcl early to prevent installing a newer version
BUILD_DEPENDS+= tclsh8.4:${PORTSDIR}/lang/tcl84
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \
mhash.2:${PORTSDIR}/security/mhash \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
mysqlclient:${PORTSDIR}/databases/mysql${MYSQL_VER}-client \
snmp.4:${PORTSDIR}/misc/net-snmp4
.if ${OSMAJOR} >= 6
......@@ -136,7 +139,7 @@ RUN_DEPENDS+= \
rsync:${PORTSDIR}/net/rsync \
neato:${PORTSDIR}/graphics/graphviz \
swish-e:${PORTSDIR}/www/swish-e \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server \
anytopnm:${PORTSDIR}/graphics/netpbm \
otclsh:${PORTSDIR}/lang/otcl \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/${P5SNMP_PORT} \
......@@ -160,13 +163,21 @@ RUN_DEPENDS+= \
${LOCALBASE}/include/boost:${PORTSDIR}/${BOOST_PORT} \
gmake:${PORTSDIR}/devel/gmake \
git:${PORTSDIR}/devel/git \
kmetis:${PORTSDIR}/math/metis \
curl:${PORTSDIR}/ftp/curl \
${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb \
mysqlhotcopy:${PORTSDIR}/databases/mysql50-scripts
mysqlhotcopy:${PORTSDIR}/databases/mysql${MYSQL_VER}-scripts
.if ${PORTVERSION} == "5.1"
RUN_DEPENDS+= \
kmetis:${PORTSDIR}/math/metis4
.else
RUN_DEPENDS+= \
kmetis:${PORTSDIR}/math/metis
.endif
# apache related ports
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
RUN_DEPENDS+= \
${LOCALBASE}/libexec/apache22/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/libexec/apache22/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
......@@ -178,7 +189,8 @@ RUN_DEPENDS+= \
# m2crypto port
.if (${PORTVERSION} == "3.0" || ${PORTVERSION} == "3.1" || \
${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
# must handle patching of m2crypto when the port is built
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/misc/emulab-py-m2crypto
......@@ -189,7 +201,8 @@ RUN_DEPENDS+= \
.endif
# dhcpd port
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
RUN_DEPENDS+= \
dhcpd:${PORTSDIR}/net/isc-dhcp42-server
.elif (${PORTVERSION} == "3.1" || ${PORTVERSION} == "3.0")
......@@ -201,7 +214,8 @@ RUN_DEPENDS+= \
.endif
# misc. old vs. new port stuff
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
RUN_DEPENDS+= \
autoconf:${PORTSDIR}/devel/autoconf \
libtool:${PORTSDIR}/devel/libtool
......@@ -221,7 +235,7 @@ RUN_DEPENDS+= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Privileges/Drop.pm:${PORTSDIR}/misc/p5-Privileges-Drop \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/EventMux.pm:${PORTSDIR}/misc/p5-IO-EventMux \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO/EventMux/Socket/MsgHdr.pm:${PORTSDIR}/misc/p5-IO-EventMux-Socket-MsgHdr
.if ${PORTVERSION} == "5.0"
.if (${PORTVERSION} == "5.0" || ${PORTVERSION} == "5.1")
# perl 5.12 and beyond wants this
RUN_DEPENDS+= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA
......
......@@ -8,30 +8,34 @@ OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//'
OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/'
OSARCH != /usr/bin/uname -m
.if ${OSMAJOR} > 8
EMULAB_PORTVERSION= 5.0
.if (${OSMAJOR} > 8 && ${OSMINOR} >= 2)
EMULAB_PORTVERSION= 5.1
.else
. if (${OSMAJOR} > 7 && ${OSMINOR} >= 3)
. if ${OSMAJOR} > 8
EMULAB_PORTVERSION= 5.0
. else
. if ${OSMAJOR} > 7
EMULAB_PORTVERSION= 4.0
. if (${OSMAJOR} > 7 && ${OSMINOR} >= 3)
EMULAB_PORTVERSION= 5.0
. else
. if ${OSMAJOR} > 6
. if ${OSMINOR} > 2
EMULAB_PORTVERSION= 3.1
. else
EMULAB_PORTVERSION= 3.0
. endif
. if ${OSMAJOR} > 7
EMULAB_PORTVERSION= 4.0
. else
. if ${OSMAJOR} > 5
. if ${OSMINOR} >= 3
EMULAB_PORTVERSION= 2.1
. if ${OSMAJOR} > 6
. if ${OSMINOR} > 2
EMULAB_PORTVERSION= 3.1
. else
EMULAB_PORTVERSION= 2.0
EMULAB_PORTVERSION= 3.0
. endif
. else
. if ${OSMAJOR} > 5
. if ${OSMINOR} >= 3
EMULAB_PORTVERSION= 2.1
. else
EMULAB_PORTVERSION= 2.0
. endif
. else
EMULAB_PORTVERSION= 1.7
. endif
. endif
. endif
. endif
......@@ -42,30 +46,42 @@ EMULAB_PORTVERSION= 1.7
# Select PHP and Apache versions
# Fix up some port diffs
#
.if ${EMULAB_PORTVERSION} == "5.0"
.if ${EMULAB_PORTVERSION} == "5.1"
PHP_VER= 5
PERL_VER= 5.12
PYTHON_DEFAULT_VERSION=python2.7
APACHE_PORT= www/apache22
BOOST_PORT= devel/boost-all
P5SNMP_PORT= misc/p5-SNMP
MYSQL_VER= 51
.elif ${EMULAB_PORTVERSION} == "5.0"
PHP_VER= 5
PERL_VER= 5.12.4
PYTHON_DEFAULT_VERSION=python2.7
APACHE_PORT= www/apache22
BOOST_PORT= devel/boost-all
P5SNMP_PORT= misc/p5-SNMP
MYSQL_VER= 50
.elif ${EMULAB_PORTVERSION} == "4.0"
PHP_VER= 5
PERL_VER= 5.10.1
APACHE_PORT= www/apache22
BOOST_PORT= devel/boost-all
P5SNMP_PORT= misc/p5-SNMP
MYSQL_VER= 50
.elif ${EMULAB_PORTVERSION} == "3.1"
PHP_VER= 5
PERL_VER= 5.10.1
APACHE_PORT= www/apache13-modssl
BOOST_PORT= devel/boost-all
P5SNMP_PORT= misc/p5-SNMP
MYSQL_VER= 50
.else
PHP_VER= 4
APACHE_PORT= www/apache13-modssl
BOOST_PORT= devel/boost
P5SNMP_PORT= net-mgmt/p5-SNMP
MYSQL_VER= 50
.endif
.endif
......@@ -26,6 +26,7 @@ NO_BUILD= yes
.MAKEFLAGS+= WITHOUT_DBUS=yes
.MAKEFLAGS+= WITHOUT_GCONF=yes
.MAKEFLAGS+= WITHOUT_GIF=yes
.MAKEFLAGS+= WITHOUT_GSETTINGS=yes
.MAKEFLAGS+= WITHOUT_GTK2=yes
.MAKEFLAGS+= WITH_JPEG=yes
.MAKEFLAGS+= WITHOUT_M17N=yes
......@@ -45,6 +46,9 @@ NO_BUILD= yes
.MAKEFLAGS+= WITHOUT_XIM=yes
.MAKEFLAGS+= WITHOUT_XPM=yes
# XXX avoid dragging in 4.1 in portupgrade/ruby/ruby-bdb
.MAKEFLAGS+= WITH_BDB_VER=42
# XXX do vim-lite to avoid dragging in gtk
RUN_DEPENDS= \
${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
......
......@@ -22,7 +22,9 @@ MAINTAINER= testbed-ops@flux.utah.edu
# We must make sure PERL is built with this.
#
.MAKEFLAGS+= ENABLE_SUIDPERL=yes
.if ${PORTVERSION} == "5.0"
.if ${PORTVERSION} == "5.1"
.MAKEFLAGS+= PERL_VERSION=5.12.5 PERL_VER=5.12 PERL_ARCH=mach
.elif ${PORTVERSION} == "5.0"
.MAKEFLAGS+= PERL_VERSION=5.12.4 PERL_VER=5.12.4 PERL_ARCH=mach
.elif (${PORTVERSION} == "3.1" || ${PORTVERSION} == "4.0")
.MAKEFLAGS+= PERL_VERSION=5.10.1 PERL_VER=5.10.1 PERL_ARCH=mach
......@@ -54,7 +56,8 @@ RUN_DEPENDS+= \
sudo:${PORTSDIR}/security/sudo \
rsync:${PORTSDIR}/net/rsync \
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
RUN_DEPENDS+= \
smbd:${PORTSDIR}/net/samba36
.else
......
......@@ -28,7 +28,9 @@ MAINTAINER= testbed-ops@flux.utah.edu
# We must make sure PERL is built with this.
#
.MAKEFLAGS+= ENABLE_SUIDPERL=yes
.if ${PORTVERSION} == "5.0"
.if ${PORTVERSION} == "5.1"
.MAKEFLAGS+= PERL_VERSION=5.12.5 PERL_VER=5.12 PERL_ARCH=mach
.elif ${PORTVERSION} == "5.0"
.MAKEFLAGS+= PERL_VERSION=5.12.4 PERL_VER=5.12.4 PERL_ARCH=mach
.elif (${PORTVERSION} == "3.1" || ${PORTVERSION} == "4.0")
.MAKEFLAGS+= PERL_VERSION=5.10.1 PERL_VER=5.10.1 PERL_ARCH=mach
......@@ -54,7 +56,7 @@ MAINTAINER= testbed-ops@flux.utah.edu
# agrees with what is in the emulab-ops and emulab-php* metaports.
#
.MAKEFLAGS+= -DWITH_APACHE
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || ${PORTVERSION} == "5.1")
.MAKEFLAGS+= APACHE_PORT=www/apache22
.MAKEFLAGS+= WITH_SUEXEC=yes
.else
......@@ -83,11 +85,12 @@ MAINTAINER= testbed-ops@flux.utah.edu
#
.if (${PORTVERSION} == "1.4" || ${PORTVERSION} == "2.0")
BUILD_DEPENDS= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
.elif (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
# back to a standard p5-DBD-mysql50 install
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
.elif (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
# back to a standard p5-DBD-mysql${MYSQL_VER} install
BUILD_DEPENDS= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \
${LOCALBASE}/libexec/apache22/libphp${PHP_VER}.so:${PORTSDIR}/misc/emulab-php${PHP_VER}
.else
BUILD_DEPENDS= \
......@@ -111,7 +114,7 @@ LIB_DEPENDS+= ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
.if ${OSMAJOR} >= 6
LIB_DEPENDS+= mhash.2:${PORTSDIR}/security/mhash \
mysqlclient.15:${PORTSDIR}/databases/mysql50-client
mysqlclient:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
.endif
.if ${OSMAJOR} >= 7
LIB_DEPENDS+= xmlrpc:${PORTSDIR}/net/xmlrpc-c
......@@ -143,7 +146,8 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/elvind:${PORTSDIR}/misc/elvind
.endif
# apache related ports
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
RUN_DEPENDS+= \
${LOCALBASE}/libexec/apache22/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/libexec/apache22/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
......@@ -155,7 +159,8 @@ RUN_DEPENDS+= \
# m2crypto port
.if (${PORTVERSION} == "3.0" || ${PORTVERSION} == "3.1" || \
${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
# must handle patching of m2crypto when the port is built
# also needs swig to install!
RUN_DEPENDS+= \
......@@ -168,7 +173,8 @@ RUN_DEPENDS+= \
.endif
# misc. old vs. new port stuff
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0")
.if (${PORTVERSION} == "4.0" || ${PORTVERSION} == "5.0" || \
${PORTVERSION} == "5.1")
RUN_DEPENDS+= \
autoconf:${PORTSDIR}/devel/autoconf \
libtool:${PORTSDIR}/devel/libtool
......@@ -179,7 +185,7 @@ RUN_DEPENDS+= \
.if ${OSMAJOR} >= 6
RUN_DEPENDS+= \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server \
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
......@@ -191,7 +197,7 @@ RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb \
curl:${PORTSDIR}/ftp/curl \
snort:${PORTSDIR}/security/snort \
mysqlhotcopy:${PORTSDIR}/databases/mysql50-scripts \
mysqlhotcopy:${PORTSDIR}/databases/mysql${MYSQL_VER}-scripts \
${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
.else
RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
......
......@@ -5,7 +5,9 @@
.include "../emulab-boss/Makefile.emulab"
# XXX deal with out-of-sync-edness of meta ports
.if ${EMULAB_PORTVERSION} == "5.0"
.if ${EMULAB_PORTVERSION} == "5.1"
PORTVERSION= 3.1
.elif ${EMULAB_PORTVERSION} == "5.0"
PORTVERSION= 3.0
.elif ${EMULAB_PORTVERSION} == "4.0"
PORTVERSION= 2.0
......
......@@ -25,7 +25,9 @@ USE_PERL5_RUN= yes
# We must make sure PERL is built with this.
#
.MAKEFLAGS+= ENABLE_SUIDPERL=yes
.if ${PORTVERSION} == "5.0"
.if ${PORTVERSION} == "5.1"
.MAKEFLAGS+= PERL_VERSION=5.12.5 PERL_VER=5.12 PERL_ARCH=mach
.elif ${PORTVERSION} == "5.0"
.MAKEFLAGS+= PERL_VERSION=5.12.4 PERL_VER=5.12.4 PERL_ARCH=mach
.elif (${PORTVERSION} == "3.1" || ${PORTVERSION} == "4.0")
.MAKEFLAGS+= PERL_VERSION=5.10.1 PERL_VER=5.10.1 PERL_ARCH=mach
......
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