Changes for new ports/packages version 2.1 to be used under FreeBSD 6.3

install/ports/emulab-boss/Makefile

@@ -4,10 +4,15 @@
 
 # Need the major version number to figure out to do.
 OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//'
+OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/'
 
 PORTNAME=	emulab-boss
 .if ${OSMAJOR} >= 6
+.if ${OSMINOR} >= 3
+PORTVERSION=	2.1
+.else
 PORTVERSION=	2.0
+.endif
 .else
 PORTVERSION=	1.7
 .endif
@@ -36,6 +41,11 @@ MAINTAINER=	ricci@cs.utah.edu
 .MAKEFLAGS+=	SWIG_LANGUAGES= 
 .MAKEFLAGS+=    WANT_SWIG_PERL=yes WANT_SWIG_PYTHON=yes WANT_SWIG_TCL=yes
 
+#
+# Have not taken the plunge to PHP5
+#
+.MAKEFLAGS+=	PHP_VER=4
+
 #
 # 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.
@@ -96,12 +106,19 @@ RUN_DEPENDS=	\
 	${PYTHON_SITELIBDIR}/M2Crypto/ASN1.py:${PORTSDIR}/security/py-m2crypto \
 	${LOCALBASE}/include/boost:${PORTSDIR}/devel/boost \
 	gmake:${PORTSDIR}/devel/gmake \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \
 	kmetis:${PORTSDIR}/math/metis \
         curl:${PORTSDIR}/ftp/curl \
 	${PYTHON_SITELIBDIR}/MySQLdb/times.py:${PORTSDIR}/databases/py-MySQLdb \
 	mysqlhotcopy:${PORTSDIR}/databases/mysql50-scripts
 
+.if ${PORTVERSION} == "2.1"
+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
+
 .if ${OSMAJOR} >= 6
 RUN_DEPENDS+= \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \

install/ports/emulab-fs/Makefile

@@ -3,10 +3,15 @@
 
 # Need the major version number to figure out to do.
 OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//'
+OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/'
 
 PORTNAME=	emulab-fs
 .if ${OSMAJOR} >= 6
+.if ${OSMINOR} >= 3
+PORTVERSION=	2.1
+.else
 PORTVERSION=	2.0
+.endif
 .else
 PORTVERSION=	1.4
 .endif
@@ -43,6 +48,11 @@ RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
 RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
 .endif
 
+.if ${PORTVERSION} == "2.1"
+# not sure why we don't build this for 6.0-6.2...
+RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
+.endif
+
 NO_BUILD=	yes
 
 do-install:	# empty

install/ports/emulab-ops/Makefile

@@ -4,10 +4,15 @@
 
 # Need the major version number to figure out to do.
 OSMAJOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/\..*//'
+OSMINOR!= /usr/bin/uname -r | /usr/bin/sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/'
 
 PORTNAME=	emulab-ops
 .if ${OSMAJOR} >= 6
+.if ${OSMINOR} >= 3
+PORTVERSION=	2.1
+.else
 PORTVERSION=	2.0
+.endif
 .else
 PORTVERSION=	1.4
 .endif
@@ -36,6 +41,11 @@ MAINTAINER=	ricci@cs.utah.edu
 .MAKEFLAGS+=	SWIG_LANGUAGES= 
 .MAKEFLAGS+=    WANT_SWIG_PERL=yes WANT_SWIG_PYTHON=yes WANT_SWIG_TCL=yes
 
+#
+# Have not taken the plunge to PHP5
+#
+.MAKEFLAGS+=	PHP_VER=4
+
 #
 # 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.
@@ -87,7 +97,6 @@ RUN_DEPENDS+= \
 	${LOCALBASE}/libexec/apache/libauth_mysql.so:${PORTSDIR}/www/mod_auth_mysql \
 	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser:${PORTSDIR}/textproc/p5-XML-Parser \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/CGI/Session.pm:${PORTSDIR}/www/p5-CGI-Session \
@@ -103,6 +112,16 @@ RUN_DEPENDS+= \
 RUN_DEPENDS+= smbd:${PORTSDIR}/net/samba3
 .endif
 
+.if ${PORTVERSION} == "2.1"
+# 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
 USE_PYTHON=	yes
 USE_PERL5=	yes

install/ports/ulsshxmlrpcpp/Makefile

@@ -14,4 +14,6 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+BUILD_DEPENDS= ${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat2
+
 .include <bsd.port.mk>

install/ports/ulsshxmlrpcpp/pkg-plist

@@ -38,7 +38,6 @@ include/ulxr_wbxmlparse.h
 include/ulxr_xmlparse.h
 include/ulxr_xmlparse_base.h
 lib/libulsshxmlrpcpp.a
-lib/libulsshxmlrpcpp.la
 lib/libulsshxmlrpcpp.so
 lib/libulsshxmlrpcpp.so.0
 lib/libulxmlrpcpp.so