Commit 0a6ec84b authored by Mike Hibler's avatar Mike Hibler

A few more fixes to try to keep installs from blowing up.

parent 022aa50b
......@@ -82,6 +82,17 @@ sub Install($$$)
ExecQuietFatal("mv /var/tmp$egg $pydir/$egg.bak");
};
}
if ($FBSD_MAJOR == 9) {
#
# Ports that were added after the 9.0 packages were made.
# As of 05/2014, the 9.0 stuff is still needed on geniracks.
#
Phase "p5-JSON", "Looking for p5-JSON and installing", sub {
DoneIfPackageInstalled("p5-JSON");
my $pname = GetPackage("p5-JSON", $packagedir);
AddPackage($pname, $packagedir);
};
}
};
return 0;
}
......
......@@ -53,12 +53,15 @@ sub Install($$$)
ExecQuietFatal("cd $BUILDDIR; make install");
};
Phase "json", "Installing json port", sub {
DoneIfPackageInstalled("p5-JSON");
ExecQuietFatal("cd /usr/ports/converters/p5-JSON; make install");
};
Phase "hmac", "Installing hmac digest port", sub {
DoneIfPackageInstalled("p5-Digest-HMAC");
ExecQuietFatal("cd /usr/ports/security/p5-Digest-HMAC; make install");
};
Phase "sha1", "Installing sha1 digest port", sub {
DoneIfPackageInstalled("p5-Digest-SHA1");
ExecQuietFatal("cd /usr/ports/security/p5-Digest-SHA1; make install");
};
Phase "logfile", "Creating $LOGFILE", sub {
......
......@@ -168,9 +168,7 @@ RUN_DEPENDS+= \
curl:${PORTSDIR}/ftp/curl \
${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb \
mysqlhotcopy:${PORTSDIR}/databases/mysql${MYSQL_VER}-scripts \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/JSON.pm:${PORTSDIR}/converters/p5-JSON \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/JSON.pm:${PORTSDIR}/converters/p5-JSON
.if (${PORTVERSION} == "5.1" || ${PORTVERSION} == "6.0")
RUN_DEPENDS+= \
......
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