More tweaks:

 * add www/p5-CGI package which is deprecated in CORE and will be removed
   in perl 5.22,
 * rename xerces-c2-devel port to xerces-c2 to avoid needing to fix our
   scripts that check for a particular package

install/ports/emulab-boss/Makefile

@@ -102,16 +102,13 @@ RUN_DEPENDS+=	\
 	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server \
 	${LOCALBASE}/include/boost/config.hpp:${PORTSDIR}/devel/boost-all
 
-## only needed for mysql 5.1
-#RUN_DEPENDS+=	\
-#	mysqlhotcopy:${PORTSDIR}/databases/mysql${MYSQL_VER}-scripts
-
 # perl packages
 # XXX all the versions listed here are ones that are known to work
 #     on a 10.0 system.
 #
 RUN_DEPENDS+=	\
 	p5-BSD-Resource>=1.2907:${PORTSDIR}/devel/p5-BSD-Resource \
+	p5-CGI>=4.13:${PORTSDIR}/www/p5-CGI \
 	p5-Class-ISA>=0.36:${PORTSDIR}/devel/p5-Class-ISA \
 	p5-DBD-mysql>=4.025:${PORTSDIR}/databases/p5-DBD-mysql \
 	p5-DBI>=1.630:${PORTSDIR}/databases/p5-DBI \

install/ports/emulab-ops/Makefile

@@ -46,11 +46,6 @@ LIB_DEPENDS=	\
 	libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c \
 	libpubsub.so:${PORTSDIR}/misc/emulab-pubsub
 
-# old libtool in ulsshxmlrpcpp causes shlibs to be whacked
-#.if ${OSARCH} == "i386"
-#LIB_DEPENDS+=	ulsshxmlrpcpp.0:${PORTSDIR}/misc/ulsshxmlrpcpp
-#.endif
-
 # We need the BUILD_DEPENDS above to wind up in the dependency list
 RUN_DEPENDS:= ${BUILD_DEPENDS}
 
@@ -78,16 +73,13 @@ RUN_DEPENDS+=	\
 	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 
-## only needed for mysql 5.1
-#RUN_DEPENDS+=	\
-#	mysqlhotcopy:${PORTSDIR}/databases/mysql${MYSQL_VER}-scripts
-
 # perl packages
 # XXX all the versions listed here are ones that are known to work
 #     on a 10.0 system.
 #
 RUN_DEPENDS+=	\
 	p5-BSD-Resource>=1.2907:${PORTSDIR}/devel/p5-BSD-Resource \
+	p5-CGI>=4.13:${PORTSDIR}/www/p5-CGI \
 	p5-CGI-Session>=4.48:${PORTSDIR}/www/p5-CGI-Session \
 	p5-DBI>=1.630:${PORTSDIR}/databases/p5-DBI \
 	p5-GD-Graph>=1.48:${PORTSDIR}/graphics/p5-GD-Graph \
@@ -123,10 +115,6 @@ RUN_DEPENDS+= \
 #	${LOCALBASE}/bin/gcc46:${PORTSDIR}/lang/gcc46
 #.endif
 
-## I think this was just for workbench stuff...
-#RUN_DEPENDS+=	\
-#        snort:${PORTSDIR}/security/snort
-
 # For reasons lost in the mists of time, we install this
 RUN_DEPENDS+=	\
 	${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/xorg-libraries

install/ports/ports-install

@@ -7,7 +7,7 @@
 PORTSDIR=${PORTSDIR:-/usr/ports}
 PORTSUBDIR=misc
 SRCDIR=`dirname $0`
-PORTS="emulab-boss emulab-fs emulab-ops emulab-tipserv emulab-tftp-hpa emulab-py-m2crypto emulab-mailman emulab-pubsub emulab-extras emulab-protogeni p5-IO-EventMux p5-IO-EventMux-Socket-MsgHdr p5-Privileges-Drop p5-RPC-Async libtelnet otcl ipmitool-devel xerces-c2-devel"
+PORTS="emulab-boss emulab-fs emulab-ops emulab-tipserv emulab-tftp-hpa emulab-py-m2crypto emulab-mailman emulab-pubsub emulab-extras emulab-protogeni p5-IO-EventMux p5-IO-EventMux-Socket-MsgHdr p5-Privileges-Drop p5-RPC-Async libtelnet otcl ipmitool-devel xerces-c2"
 
 echo "Copying ports ..."
 for PORT in $PORTS

install/ports/ports.patch

@@ -19,7 +19,7 @@
 +    SUBDIR += ipmitool-devel
 +    SUBDIR += libtelnet
 +    SUBDIR += otcl
-+    SUBDIR += xerces-c2-devel
++    SUBDIR += xerces-c2
 +    SUBDIR += p5-IO-EventMux
 +    SUBDIR += p5-IO-EventMux-Socket-MsgHdr
 +    SUBDIR += p5-Privileges-Drop

install/ports/xerces-c2-devel/Makefile → install/ports/xerces-c2/Makefile

+# XXX FreeBSD has removed the xerces-c2 port. This is a copy of the
+# last (xerces-c2-devel) version that existed. We need this to compile
+# assign right now. Note that we call this package xerces-c2 rather than
+# xerces-c2-devel so we don't mess up any of our packages existance checks
+# (e.g., in protogeni/scripts/initsite).
+#
 # Created by: "Bjoern A. Zeeb" (bzeeb+freebsdports@zabbadoz.net)
 # $FreeBSD: branches/2014Q3/textproc/xerces-c2-devel/Makefile 347131 2014-03-05 18:19:46Z thierry $
 
-PORTNAME=	xerces-c2-devel
+PORTNAME=	xerces-c2
 PORTVERSION=	2.8.0
 PORTREVISION=	1
 CATEGORIES=	misc textproc
@@ -12,7 +18,7 @@ DISTNAME=	xerces-c-src_${PORTVERSION:S/./_/g}
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Validating XML parser from the Apache XML Project
 
-CONFLICTS=	xerces_c2-[0-9]* xerces-c3-[0-9]*
+CONFLICTS=	xerces-c3-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes