Commit 47798d81 authored by Mike Hibler's avatar Mike Hibler

More fixes for new packages

parent a27ffef3
......@@ -70,6 +70,10 @@ my $CONTROL_NETMASK = "@CONTROL_NETMASK@";
# Should be configure variable
my $TBADMINGID = 101;
#
# XXX temporary for perl DBD mysql access
my $P5DBD_PKG = "p5-DBD-mysql50-3.0002";
#
# Allow this to work if the library is left in the source directory
#
......@@ -176,6 +180,7 @@ my $NEWALIASES = "/usr/bin/newaliases";
my $SH = "/bin/sh";
my $PKG_INFO = "/usr/sbin/pkg_info";
my $PKG_ADD = "/usr/sbin/pkg_add";
my $PKG_DEL = "/usr/sbin/pkg_delete";
my $PWD = "/bin/pwd";
my $CP = "/bin/cp";
my $MV = "/bin/mv";
......@@ -364,6 +369,22 @@ Phase "ports", "Installing ports", sub {
my $pname = GetPackage("pubsub", $packagedir);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
};
# XXX Ditto
if ($FBSD_MAJOR == 6 && $FBSD_MINOR > 2) {
Phase "p5-DBD-mysql50", "Installing old Perl Mysql package", sub {
my $pname = `$PKG_INFO -E 'p5-DBD-mysql50-*' 2>/dev/null`;
chomp($pname);
if ($pname eq $P5DBD_PKG) {
PhaseSkip("p5-DBD-mysql50 already up to date");
}
if (!$packagedir) {
PhaseSkip("No package directory provided");
}
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_DEL -f $pname")
if ($pname);
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $P5DBD_PKG");
};
}
};
Phase "fs-packages", "Installing FS packages", sub {
if (!$ISFS) {
......@@ -542,7 +563,8 @@ Phase "rc.conf", "Adding testbed content to rc.conf", sub {
qq|mountd_flags="-r -p 900"|,
(($ISFS && $WINSUPPORT) ? qq|smbd_enable="YES"| : ()),
qq|apache_enable="YES"|,
qq|syslogd_flags=""|);
qq|syslogd_flags=""|,
($CVSSUPPORT ? qq|cvsd_enable="YES"| : ()));
};
Phase "hosts", "Adding boss/ops/fs IP addresses to $HOSTS", sub {
......@@ -1209,6 +1231,9 @@ if ($CVSSUPPORT) {
};
Phase "cvsd.sh", "Installing cvsd.sh", sub {
# FBSD 6.3 package should install this in place
DoneIfExists("$RCDIR/cvsd")
if ($FBSD_MINOR > 2);
DoneIfExists("$RCDIR/cvsd.sh");
ExecQuietFatal("mv $RCDIR/cvsd.sh.sample $RCDIR/cvsd.sh");
ExecQuietFatal("$CHMOD a+x $RCDIR/cvsd.sh");
......
......@@ -63,6 +63,18 @@ MAINTAINER= ricci@cs.utah.edu
#
.MAKEFLAGS+= -DBATCH
#
# XXX not really a build dependency, but needs to get installed before
# any attempt to install mysql50-* ports
#
.if ${PORTVERSION} == "2.1"
BUILD_DEPENDS= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/misc/p5-DBD-mysql50-old
.else
BUILD_DEPENDS= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
.endif
LIB_DEPENDS= lthread.[23]:${PORTSDIR}/devel/linuxthreads \
ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
......@@ -117,11 +129,6 @@ RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
RUN_DEPENDS+= ${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries
# not sure why we don't build this for 6.0-6.2...
RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
RUN_DEPENDS+= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
.else
RUN_DEPENDS+= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
.endif
NO_BUILD= yes
......
......@@ -14,6 +14,7 @@ WITH_GD=yes
WITH_MCRYPT=yes
WITH_MYSQL=yes
WITH_XML=yes
WITH_APACHE=yes
# Additions for mediawiki
#WITH_ICONV=yes
#WITH_IMAGICK=yes
......@@ -36,7 +37,9 @@ BATCH=yes
# 4.4.2, so this can go when we upgrade our base to that (currently at
# 4.4.1).
#
.MAKEFLAGS+= EXTRA_CFLAGS=-DHAVE_OPENSSL_EXT WITH_OPENSSL=yes
# And, with 4.4.7 we need to add WITH_APACHE as well
#
.MAKEFLAGS+= EXTRA_CFLAGS=-DHAVE_OPENSSL_EXT WITH_OPENSSL=yes WITH_APACHE=yes
#
# But need this too!
......
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