Commit c6a3c283 authored by Mike Hibler's avatar Mike Hibler

Bug Fix: add a nascent emulab-tipserv port, fix other port-related issues.

Tipserv port only includes libtelnet which is only needed for the icebox,
so this port is not "linked in" to the documentation yet and is not required
anywhere but on our PRObE cluster.

Added a couple of missing ports to "boss" and "extras".
parent 4fd9839b
......@@ -142,10 +142,12 @@ RUN_DEPENDS+= \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/${P5SNMP_PORT} \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Math/BigInt.pm:${PORTSDIR}/math/p5-Math-BigInt \
${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 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MD5.pm:${PORTSDIR}/security/p5-MD5 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Expect.pm:${PORTSDIR}/lang/p5-Expect \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO/Pty.pm:${PORTSDIR}/devel/p5-IO-Tty \
rpm:${PORTSDIR}/archivers/rpm4 \
xvcg:${PORTSDIR}/graphics/vcg \
......
......@@ -24,8 +24,8 @@ PKGNAMEPREFIX= isc-
PKGNAMESUFFIX= 31-client
DISTNAME= ${PORTNAME}-3.1-ESV
MAINTAINER= jpaetzel@FreeBSD.org
COMMENT?= The ISC Dynamic Host Configuration Protocol server
MAINTAINER= testbed-ops@flux.utah.edu
COMMENT?= The old ISC 3.1 DHCP client for Emulab
PORTREVISION_SERVER= 0
PORTREVISION_CLIENT= 0
......@@ -54,8 +54,6 @@ MAN5+= dhcp-eval.5 dhcp-options.5
MSG_FILE= ${.CURDIR}/pkg-message
DESCR= ${.CURDIR}/pkg-descr
PKGINSTALL= ${.CURDIR}/pkg-install
PKGDEINSTALL= ${PKGINSTALL}
PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST= ${.CURDIR}/pkg-plist
......
#!/bin/sh
#
# $FreeBSD: ports/net/isc-dhcp31-server/pkg-install,v 1.3 2006/08/27 16:04:02 sem Exp $
#
[ $# != 2 ] && exit 1
[ -z "${PKG_PREFIX}" ] && exit 1
[ -n "${BATCH}" ] && exit 0
case $2 in
POST-INSTALL)
if [ -x ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
fi
;;
DEINSTALL)
if [ -x ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
else
${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
fi
;;
POST-DEINSTALL|PRE-INSTALL)
;;
*)
echo "usage: $0 <PKG_NAME> {PRE-INSTALL|POST-INSTALL|DEINSTALL|POST-DEINSTALL}" >&2
exit 1
;;
esac
......@@ -51,6 +51,7 @@ RUN_DEPENDS= \
${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs \
${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim-lite \
${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof \
${LOCALBASE}/bin/nc:${PORTSDIR}/net/netcat \
${LOCALBASE}/bin/ttcp:${PORTSDIR}/benchmarks/ttcp \
${LOCALBASE}/sbin/e2fsck:${PORTSDIR}/sysutils/e2fsprogs \
${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade \
......
......@@ -5,8 +5,16 @@
.include "../emulab-boss/Makefile.emulab"
#
# These are for the php5-extensions port
# These are for the php5-extensions port.
# We need a specific set of extensions that is slightly different than
# the default.
#
#
# This prevents the option screen.
#
BATCH=yes
WITH_XMLRPC=yes
WITH_CURL=yes
WITH_OPENSSL=yes
......@@ -17,22 +25,10 @@ WITH_MHASH=yes
WITH_MYSQL=yes
WITH_XML=yes
WITH_SOCKETS=yes
# Additions for mediawiki
#WITH_ICONV=yes
#WITH_READLINE=yes
#WITH_MBSTRING=yes
WITHOUT_SQLITE=true
WITHOUT_PDO_SQLITE=true
#
# This prevents the option screen.
#
BATCH=yes
# XXX avoid recursive variable defn
AP_PORT=${APACHE_PORT}
.MAKEFLAGS+= -DBATCH APACHE_PORT=www/apache22 WITH_APACHE=yes
PKGORIGIN= misc/emulab-php5
......
#
# New ports collection makefile for: emulab-tipserv
#
.include "../emulab-boss/Makefile.emulab"
# XXX deal with out-of-sync-edness of original boss/ops ports
.if ${EMULAB_PORTVERSION} == "1.7"
EMULAB_PORTVERSION= 1.4
.endif
PORTNAME= emulab-tipserv
PORTVERSION= ${EMULAB_PORTVERSION}
CATEGORIES= misc
MASTER_SITES= #none
DISTFILES= #none
EXTRACT_ONLY= #none
COMMENT= "Meta-port for an Emulab tipserv node"
MAINTAINER= testbed-ops@flux.utah.edu
USE_PERL5_RUN= yes
#
# We must make sure PERL is built with this.
#
.MAKEFLAGS+= ENABLE_SUIDPERL=yes
.if ${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
.elif ${PORTVERSION} == "3.0"
.MAKEFLAGS+= PERL_VERSION=5.10.0 PERL_VER=5.10.0 PERL_ARCH=mach
.endif
#
# This prevents any ports from trying to run interactively - some, like the
# net-snmp port, ask silly questions without this option.
#
.MAKEFLAGS+= -DBATCH
#
# We do this here because we do this for emulab-boss.
#
.MAKEFLAGS+= WITHOUT_LATEX=yes
# We need the BUILD_DEPENDS above to wind up in the dependency list
RUN_DEPENDS:= ${BUILD_DEPENDS}
RUN_DEPENDS+= \
sudo:${PORTSDIR}/security/sudo \
telnet.2:${PORTSDIR}/misc/libtelnet
NO_BUILD= yes
do-install: # empty
.include <bsd.port.mk>
Meta-port for an emulab tipserv node. This port does not install the
Emulab software itself - it just ensures that the requisite ports are
installed.
@comment This packing list left intentionally empty
......@@ -7,10 +7,10 @@
PORTSDIR=${PORTSDIR:-/usr/ports}
PORTSUBDIR=misc
SRCDIR=`dirname $0`
PORTS="emulab-boss emulab-fs emulab-ops emulab-tftp-hpa net-snmp4 p5-GD-old p5-DBD-mysql50-old ulsshxmlrpcpp emulab-iperf emulab-php4 emulab-php5 emulab-py-m2crypto emulab-mailman emulab-pubsub emulab-extras emulab-clrhouse emulab-protogeni p5-IO-EventMux p5-IO-EventMux-Socket-MsgHdr p5-Privileges-Drop p5-RPC-Async p5-SNMP libtelnet emulab-dhcp31-client"
PORTS="emulab-boss emulab-fs emulab-ops emulab-tftp-hpa net-snmp4 p5-GD-old p5-DBD-mysql50-old ulsshxmlrpcpp emulab-iperf emulab-php4 emulab-php5 emulab-py-m2crypto emulab-mailman emulab-pubsub emulab-extras emulab-clrhouse emulab-protogeni p5-IO-EventMux p5-IO-EventMux-Socket-MsgHdr p5-Privileges-Drop p5-RPC-Async p5-SNMP libtelnet emulab-dhcp31-client emulab-tipserv"
EPORTS="elvind libelvin emulab-pubsub-elvincompat"
EPATCH=ports-elvin.patch
#EPORTS="elvind libelvin emulab-pubsub-elvincompat"
#EPATCH=ports-elvin.patch
echo "Copying ports ..."
for PORT in $PORTS
......
--- Makefile.old 2012-05-22 13:44:22.000000000 -0600
+++ Makefile 2012-05-22 13:44:30.000000000 -0600
@@ -563,5 +563,27 @@
@@ -563,5 +563,30 @@
SUBDIR += ytree
SUBDIR += zaptel
SUBDIR += zoneinfo
+ SUBDIR += emulab-boss
+ SUBDIR += emulab-clrhouse
+ SUBDIR += emulab-dhcp31-client
+ SUBDIR += emulab-extras
+ SUBDIR += emulab-fs
+ SUBDIR += emulab-iperf
+ SUBDIR += emulab-mailman
......@@ -17,7 +18,9 @@
+ SUBDIR += emulab-pubsub
+ SUBDIR += emulab-py-m2crypto
+ SUBDIR += emulab-tftp-hpa
+ SUBDIR += emulab-tipserv
+ SUBDIR += libtelnet
+ SUBDIR += net-snmp4
+ SUBDIR += p5-DBD-mysql50-old
+ SUBDIR += p5-GD-old
+ SUBDIR += p5-IO-EventMux
......
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