Minor changes for building packages on FreeBSD 6.0

install/ports/emulab-boss/Makefile

@@ -31,12 +31,14 @@ MAINTAINER=	ricci@cs.utah.edu
 
 #
 # For SWIG, so that it doesn't feel the need to suck in php and apache
+# XXX Something is broken on FreeBSD 6.X and SWIG_LANGUAGES='x y z' breaks.
 #
-.MAKEFLAGS+=	SWIG_LANGUAGES="perl python tcl"
+.MAKEFLAGS+=	SWIG_LANGUAGES= 
+.MAKEFLAGS+=    WANT_SWIG_PERL=yes WANT_SWIG_PYTHON=yes WANT_SWIG_TCL=yes
 
 #
-# For the PHP ports, so they will depend on the actual version of apache we're
-# installing
+# Various ports need to agree on what version of apache. Make sure this
+# agrees with what is in the emulab-ops and emulab-php4 metaports.
 #
 .MAKEFLAGS+=	APACHE_PORT=www/apache13-modssl
 
@@ -90,7 +92,7 @@ RUN_DEPENDS=	\
 	${PYTHON_SITELIBDIR}/MySQLdb/times.py:${PORTSDIR}/databases/py-MySQLdb
 
 .if ${OSMAJOR} >= 5
-RUN_DEPENDS= ${RUN_DEPENDS} python:${PORTSDIR}/lang/python \
+RUN_DEPENDS+= \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 	swig:${PORTSDIR}/devel/swig13
 .else

install/ports/emulab-ops/Makefile

@@ -31,8 +31,16 @@ MAINTAINER=	ricci@cs.utah.edu
 
 #
 # For SWIG, so that it doesn't feel the need to suck in php and apache
+# XXX Something is broken on FreeBSD 6.X and SWIG_LANGUAGES='x y z' breaks.
 #
-.MAKEFLAGS+=	SWIG_LANGUAGES="perl python tcl"
+.MAKEFLAGS+=	SWIG_LANGUAGES= 
+.MAKEFLAGS+=    WANT_SWIG_PERL=yes WANT_SWIG_PYTHON=yes WANT_SWIG_TCL=yes
+
+#
+# Various ports need to agree on what version of apache. Make sure this
+# agrees with what is in the emulab-ops and emulab-php4 metaports.
+#
+.MAKEFLAGS+=	APACHE_PORT=www/apache13-modssl
 
 #
 # For samba, so that it doesn't suck in everything under the sun
@@ -65,7 +73,7 @@ RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
 	${PYTHON_SITELIBDIR}/M2Crypto/ASN1.py:${PORTSDIR}/security/py-m2crypto
 
 .if ${OSMAJOR} >= 5
-RUN_DEPENDS+= python:${PORTSDIR}/lang/python \
+RUN_DEPENDS+= \
 	${LOCALBASE}/etc/apache/ssl.crl:${PORTSDIR}/www/apache13-modssl \
 	${LOCALBASE}/libexec/apache/libauth_mysql.so:${PORTSDIR}/www/mod_auth_mysql \
 	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql323-server \
@@ -80,6 +88,7 @@ RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
+USE_PERL5=	yes
 
 do-install:	# empty
 

install/ports/emulab-php4/Makefile

@@ -26,12 +26,12 @@ APACHE_PORT=www/apache13-modssl
 #
 BATCH=yes
 
+# Disgusting. When we build the php4 port, we have to tell it we're going
+# to be building an SSL extension later. The port appears to be fixed at
+# 4.4.2, so this can go when we upgrade our base to that (currently at
+# 4.4.1).
 #
-# Disgusting. When we build the php4 port, we have to tell it we're going to be
-# building an SSL extention later. The port appears to be fixed at 4.4.2, so
-# this can go when we upgrade our base to that (currently at 4.4.1).
-#
-.MAKEFLAGS+=    CFLAGS=-DHAVE_OPENSSL_EXT WITH_OPENSSL=yes
+.MAKEFLAGS+=    EXTRA_CFLAGS=-DHAVE_OPENSSL_EXT WITH_OPENSSL=yes
 
 #
 # But need this too!