7 files changed, 285 insertions, 477 deletions

diff --git a/net/xbone/Makefile b/net/xbone/Makefile
index 549c37952020..5234a91a82bf 100644
--- a/net/xbone/Makefile
+++ b/net/xbone/Makefile
@@ -6,60 +6,48 @@
 #
 
 PORTNAME=	XBone
-PORTVERSION=	2.0
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://www.isi.edu/xbone/software/x-bone/
+PORTVERSION=	3.0
+CATEGORIES=	net perl5
+MASTER_SITES=	http://www.isi.edu/xbone/software/xbone/
 
-MAINTAINER=	yushunwa@isi.edu
-COMMENT=	A system for dynamic internet overlay deployment and management
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 320000
-BROKEN=	"X-Bone does not support FreeBSD prior to 3.2"
-.endif
+MAINTAINER=	xbone@isi.edu
+COMMENT=	Deploys and manages IP-based VPNs (aka "virtual Internets")
 
 USE_GMAKE=	yes
-USE_PERL5=	yes
 IS_INTERACTIVE=	yes
 NO_BUILD=	yes
+USE_PERL5=	yes
 
-.if !defined(OPTION) || ${OPTION}!=RD && ${OPTION}!=OMGUI
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "! You must set variable OPTION=OMGUI or OPTION=RD."
-	@${ECHO} "  OMGUI: Install & configure the system for:"
-	@${ECHO} "         (1) X-Bone Overlay Manager"
-	@${ECHO} "         (2) X-Bone GUI files (html & CGI scripts)"
-	@${ECHO} "         (3) X-Bone Overlay DNS server"
-	@${ECHO} "  ** NORMALLY, YOU ONLY NEED ONE OMGUI-HOST TO RUN XBONE."
-	@${ECHO} ""
-	@${ECHO} "  RD: Install the X-Bone Resource Daemon which enables the"
-	@${ECHO} "      system to participate in overlays as either a host"
-	@${ECHO} "      or a router."
-	@${ECHO} "  **  YOU NEED MULTIPLE RD-HOSTS TO CONSTRUCT OVERLAYS."
-	@${FALSE}
-.elif defined(OPTION)
-.if ${OPTION}==RD
-BUILD_DEPENDS=	${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
-INSTALL_TARGET=	rd
-PLIST=		${PKGDIR}/pkg-plist.rd
-.else
-BUILD_DEPENDS=	${PREFIX}/sbin/httpsd:${PORTSDIR}/www/apache13-ssl\
-		${SITE_PERL}/CGI/Carp.pm:${PORTSDIR}/www/p5-CGI.pm \
-		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask\
-		${SITE_PERL}/File/CounterFile.pm:${PORTSDIR}/misc/p5-File-CounterFile \
+INSTALL_TARGET=	node
+
+BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
+		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		${SITE_PERL}/${PERL_ARCH}/IO/Socket/Multicast.pm:${PORTSDIR}/net/p5-IO-Socket-Multicast \
+		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
+		${SITE_PERL}/Parallel/ForkManager.pm:${PORTSDIR}/devel/p5-Parallel-ForkManager \
+		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
+		${SITE_PERL}/Graph/Base.pm:${PORTSDIR}/math/p5-Graph \
+		${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
+		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
+		${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
+		${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
+		${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
+		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
-		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
-INSTALL_TARGET=	omgui
-MAKE_ARGS=	PERL5=${PERL5} SYS=${SYS}
-.endif
+		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
+		${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 470000
+FORBIDDEN=	"X-Bone ${PORTVERSION} does not support FreeBSD prior to 4.7"
 .endif
 
-MAN1=		xb-pick.1
-MAN5=		XB_Defs.pm.5 Xbone_daemon.conf.5 Xbone_daemon.state.5
-MAN8=		X-Bone.8 xb-daemon.8 xb-overlay-manager.8 xb-config.8
+USE_PERL5=	yes
+NO_BUILD=	yes
+
+MAN5=		XB_Params.pm.5 xbone.conf.5
+MAN8=		X-Bone.8 xb-node-daemon.8 xb-config.8
 
 .include <bsd.port.post.mk>
diff --git a/net/xbone/distinfo b/net/xbone/distinfo
index adc6feb8e4b0..6082c54fdf05 100644
--- a/net/xbone/distinfo
+++ b/net/xbone/distinfo
@@ -1 +1 @@
-MD5 (XBone-2.0.tar.gz) = c4f882eb2f2932f8a74c525abc2f4028
+MD5 (XBone-3.0.tar.gz) = 98c3c558996292707d3d84e1d8413687
diff --git a/net/xbone/files/patch-XB_Defs.pm b/net/xbone/files/patch-XB_Defs.pm
deleted file mode 100644
index 506b2841a275..000000000000
--- a/net/xbone/files/patch-XB_Defs.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbone/lib/XB_Defs.pm.orig	Thu Dec 19 16:50:25 2002
-+++ xbone/lib/XB_Defs.pm	Thu Dec 19 16:51:40 2002
-@@ -153,7 +153,7 @@
- ############################################################
- 
- $XB_Defs::XBONE_VERSION_DATE =	    # Date this version was created.
--  "30/10/2001";                     # "<day_num>/<month_num>/<year_num>"
-+  "10/1/2003";                      # "<day_num>/<month_num>/<year_num>"
- # `date "+%d/%m/%Y"`;               # <- for development
- 
- $XB_Defs::XBONE_OBSOLETE_LIMIT =    # Seconds after the version date
diff --git a/net/xbone/pkg-deinstall b/net/xbone/pkg-deinstall
deleted file mode 100644
index 6148c6469db5..000000000000
--- a/net/xbone/pkg-deinstall
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-if [ -z $2 ]; then
-  exit 0
-fi
-if [ $2 != "POST-DEINSTALL" ]; then
-  echo "!!! This script is for post-deinstallation only."; \
-  exit 0
-fi
-echo "==> Post-deinstallation cleanup:"
-echo "    Check the following directories to clean X-Bone related files:"
-dirs="/etc/xbone /etc/named/xbone /usr/local/etc/xbone /usr/local/xbone /usr/local/www/xbone"
-for p in $dirs; do
-  if [ -d $p ]; then
-    echo "      $p"
-  fi
-done
-
diff --git a/net/xbone/pkg-descr b/net/xbone/pkg-descr
index e8661dbc2894..d94f77de1428 100644
--- a/net/xbone/pkg-descr
+++ b/net/xbone/pkg-descr
@@ -1,15 +1,16 @@
-X-Bone dynamically deploys and manages Internet overlays to reduce 
-their configuration effort and increase network component sharing. 
-X-Bone discovers, configures, and monitors network resources to 
-create overlays over existing IP networks. 
+The X-Bone dynamically deploys and manages Internet overlays to reduce
+configuration effort and increase network component sharing. The
+X-Bone discovers, configures, and monitors network resources to create
+overlays over existing IP networks. Overlays are useful for deploying
+overlapping virtual networks on shared infrastructure and for
+simplifying topology.
 
-X-Bone uses two-layer IP in IP tunneled overlays and supports existing 
-applications and unmodified routing, multicast, and DNS services in 
-unmodified operating systems. X-Bone also support IPSec within overlays.
-
-Full details can be found on the web at:
+The X-Bone's two-layer IP in IP tunneled overlays support existing
+applications and unmodified routing, multicast, and DNS services in
+unmodified host operating systems. This two-layer scheme uniquely
+supports node revisitation and recursive overlays, which is critical
+for fault tolerance and dynamic relocation. The X-Bone uses multicast
+to simplify resource discovery, and provides secure deployment as well
+as secure overlays (VPNs).
 
 WWW:	http://www.isi.edu/xbone/
-
-- Joe Touch, Project Leader, X-Bone group, USC/ISI
-  touch@isi.edu; the group can be reached at xbone@isi.edu
diff --git a/net/xbone/pkg-plist b/net/xbone/pkg-plist
index 0ecf9ed89c07..5d207810b541 100644
--- a/net/xbone/pkg-plist
+++ b/net/xbone/pkg-plist
@@ -1,235 +1,257 @@
-etc/xbone/apache-conf/.cvsignore
-etc/xbone/apache-conf/access.conf
-etc/xbone/apache-conf/httpsd.conf
-etc/xbone/apache-conf/magic
-etc/xbone/apache-conf/mime.types
-etc/xbone/apache-conf/srm.conf
-etc/xbone/cert/CAcert.der
-etc/xbone/cert/CAcert.pem
-etc/xbone/named-conf/named.conf
-etc/xbone/named-conf/resolv.conf
+etc/xbone/xbone.sh.sample
+etc/xbone/zebra.conf.sample
+etc/xbone/xbone.conf.sample
+etc/xbone/ripd.conf.sample
+etc/xbone/ripngd.conf.sample
 etc/xbone/named-conf/xbone/xbone-forward.zone
 etc/xbone/named-conf/xbone/xbone-reverse.zone
-xbone/apps/abone-script
-xbone/doc/README.security
+etc/xbone/named-conf/xbone/xbone-reverse6.zone
+etc/xbone/named-conf/named.conf
+etc/xbone/named-conf/resolv.conf
+etc/xbone/apache-conf/httpd-2.0.conf
+etc/xbone/apache-conf/httpsd-13ssl.conf
+etc/xbone/apache-conf/ssl-2.0.conf
+etc/xbone/xbone.conf
+xbone/doc/README
+xbone/doc/v6/modules.README
+xbone/doc/v6/xbone-v6-support.txt
+xbone/doc/v6/Linux-v6-status.txt
 xbone/doc/api-language.doc
-xbone/doc/arch
-xbone/doc/daemon_data_structures
-xbone/doc/disclaimer
-xbone/doc/gui
+xbone/doc/dynamic_dns.txt
 xbone/doc/mrouted.conf.example
-xbone/doc/om_data_structures
-xbone/doc/plan
-xbone/doc/protocol
-xbone/doc/rd.data-structures
-xbone/install/apache-conf/.cvsignore
-xbone/install/apache-conf/access.conf
-xbone/install/apache-conf/httpsd.conf
-xbone/install/apache-conf/httpsd.conf.ORIG
-xbone/install/apache-conf/magic
-xbone/install/apache-conf/mime.types
-xbone/install/apache-conf/srm.conf
-xbone/install/named-conf/xbone/xbone-forward.zone
-xbone/install/named-conf/xbone/xbone-forward.zone.ORIG
-xbone/install/named-conf/xbone/xbone-reverse.zone
-xbone/install/named-conf/xbone/xbone-reverse.zone.ORIG
-xbone/install/named-conf/named.conf
-xbone/install/named-conf/named.conf.ORIG
-xbone/install/named-conf/resolv.conf
-xbone/install/named-conf/resolv.conf.ORIG
-xbone/install/patches/linux/ipip.c.patch71
-xbone/install/patches/linux/ipip.c.patch72
-xbone/install/CHANGES
-xbone/install/COPYRIGHT
-xbone/install/FAQ
-xbone/install/FILELIST
-xbone/install/INSTALL
-xbone/install/Makefile
-xbone/install/README
-xbone/install/REQUIREMENTS
-xbone/install/SECURITY
-xbone/install/setkey.tar.gz
-xbone/install/xb-Host-check.pl
-xbone/install/xb-Source-patch.pl
-xbone/lib/cert/CAcert.der
-xbone/lib/cert/CAcert.pem
-xbone/lib/XB_API.pm
-xbone/lib/XB_API_GUI.pm
-xbone/lib/XB_API_OM.pm
-xbone/lib/XB_API_parser.pm
-xbone/lib/XB_AppScript.pm
-xbone/lib/XB_Common.pm
-xbone/lib/XB_Defs.pm
-xbone/lib/XB_Defs.pm.ORIG
-xbone/lib/XB_Defs.pm.orig
-xbone/lib/XB_IPsec.pm
-xbone/lib/XB_Log.pm
-xbone/lib/XB_Overlay_List.pm
-xbone/lib/XB_SMIME.pm
-xbone/lib/XB_SSL.pm
-xbone/lib/XB_Utils.pm
-xbone/lib/XB_XOL.pm
-xbone/man/man1/xb-pick.1
-xbone/man/man5/XB_Defs.pm.5
-xbone/man/man5/Xbone_daemon.conf.5
-xbone/man/man5/Xbone_daemon.state.5
+xbone/doc/xbone-QoS-support.txt
+xbone/doc/xbone-control-protocol.txt
+xbone/doc/xbone-data-structure.txt
+xbone/doc/xbone-dynamic-routing.txt
+xbone/doc/xbone-app-deployment.txt
+xbone/doc/xbone-acl-rules.txt
+xbone/doc/xbone-networking-req.txt
+xbone/apps/prm/webvis/gen.pl
+xbone/apps/prm/webvis/index.html
+xbone/apps/prm/webvis/title-bg.png
+xbone/apps/prm/webvis/webvis.css
+xbone/apps/prm/webvis/webvis.svg
+xbone/apps/prm/Divert.pm
+xbone/apps/prm/HTTP.pm
+xbone/apps/prm/IPIP.pm
+xbone/apps/prm/Mux.pm
+xbone/apps/prm/Tun.pm
+xbone/apps/prm/Utilities.pm
+xbone/apps/prm/BARP.pm
+xbone/apps/prm/barp.example
+xbone/apps/prm/dump.pl
+xbone/apps/prm/innerlay
+xbone/apps/prm/outerlay
+xbone/apps/prm/prm.pl
+xbone/apps/prm/tg.sh
+xbone/apps/prm/barp-table.pl
+xbone/apps/test-script/README.v1
+xbone/apps/test-script/xbone-test.conf
+xbone/apps/test-script/xbone-test.sh
+xbone/apps/README.abone
+xbone/apps/abone-script
+xbone/apps/vserver-script.pl
+xbone/apps/sample-app-deploy-script.sh
+xbone/conf/cert/CAcert.pem
+xbone/conf/ripd.conf.sample
+xbone/conf/ripngd.conf.sample
+xbone/conf/xbone.conf.sample
+xbone/conf/xbone.sh.sample
+xbone/conf/zebra.conf.sample
+xbone/man/man5/XB_Params.pm.5
+xbone/man/man5/xbone.conf.5
 xbone/man/man8/X-Bone.8
 xbone/man/man8/xb-config.8
-xbone/man/man8/xb-daemon.8
-xbone/man/man8/xb-overlay-manager.8
-xbone/om/XB_IP_Allocation.pm
-xbone/om/XB_MIB.pm
-xbone/om/XB_OM_App_Start.pm
-xbone/om/XB_Ping.pm
-xbone/om/XB_RPC.pm
-xbone/om/XB_Topology.pm
-xbone/om/xb-overlay-manager.pl
-xbone/rd/apps/xb-config.pl
-xbone/rd/apps/xb-config.pl.ORIG
-xbone/rd/apps/xb-overlay-list.pl
-xbone/rd/apps/xb-pick
-xbone/rd/XB_App_Start.pm
-xbone/rd/XB_AppCmds.pm
-xbone/rd/XB_Commands.pm
-xbone/rd/XB_DNS.pm
-xbone/rd/XB_Dummynet.pm
-xbone/rd/XB_Node_DB.pm
-xbone/rd/XB_Route.pm
-xbone/rd/XB_Tunnel.pm
-xbone/rd/xb-daemon.pl
+xbone/man/man8/xb-node-daemon.8
+xbone/programs/modules/cpan/IO/Socket/SSLv6.pm
+xbone/programs/modules/cpan/Net/IP/XB_IP.pm
+xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/IO/Socket/Multicast6/Multicast6.so
+xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/IO/Socket/Multicast6/Multicast6.bs
+xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/IO/Socket/Multicast6/.packlist
+xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/IO/Socket/Multicast6.pm
+xbone/programs/modules/cpan/lib/perl5/%%PERL_VER%%/mach/perllocal.pod
+xbone/programs/modules/cpan/lib/perl5/%%PERL_VER%%/man/man3/IO::Socket::Multicast6.3
+xbone/programs/modules/XB_API_GUI.pm
+xbone/programs/modules/XB_API_OM.pm
+xbone/programs/modules/XB_API_SUBS.pm
+xbone/programs/modules/XB_API_grammar.pm
+xbone/programs/modules/XB_API_parser.pm
+xbone/programs/modules/XB_AppCmds.pm
+xbone/programs/modules/XB_AppDeploy.pm
+xbone/programs/modules/XB_CTL_parser.pm
+xbone/programs/modules/XB_Common.pm
+xbone/programs/modules/XB_Defs.pm
+xbone/programs/modules/XB_Dummynet.pm
+xbone/programs/modules/XB_IPsec.pm
+xbone/programs/modules/XB_Log.pm
+xbone/programs/modules/XB_Route.pm
+xbone/programs/modules/XB_SMIME.pm
+xbone/programs/modules/XB_Tunnel.pm
+xbone/programs/modules/XB_Utils.pm
+xbone/programs/modules/XB_VN_DNS.pm
+xbone/programs/modules/XB_VN_Graph.pm
+xbone/programs/modules/XB_VN_IPalloc.pm
+xbone/programs/modules/XB_VN_funcs.pm
+xbone/programs/modules/XB_XML_GUI.pm
+xbone/programs/modules/XB_XML_scan.pm
+xbone/programs/modules/XB_XOL.pm
+xbone/programs/modules/XB_Zebra.pm
+xbone/programs/modules/api-1.0.dtd
+xbone/programs/modules/api-2.0.dtd
+xbone/programs/modules/zebractl
+xbone/programs/XB_CTL.pm
+xbone/programs/XB_API.pm
+xbone/programs/xb-api-client.pl
+xbone/programs/xb-node-daemon.pl
+xbone/programs/XB_Params.pm
 xbone/www/htdocs/index.html
 xbone/www/htdocs/robots.txt
 xbone/www/htdocs/xbone.css
-xbone/www/s-cgi-bin/XB_Interface.pm
-xbone/www/s-cgi-bin/XB_Interface.pm.ORIG
-xbone/www/s-cgi-bin/xb-admin.pl
-xbone/www/s-cgi-bin/xb-admin.pl.ORIG
-xbone/www/s-cgi-bin/xb-cookies.pl
-xbone/www/s-cgi-bin/xb-cookies.pl.ORIG
-xbone/www/s-cgi-bin/xb-create.pl
-xbone/www/s-cgi-bin/xb-create.pl.ORIG
-xbone/www/s-cgi-bin/xb-destroy.pl
-xbone/www/s-cgi-bin/xb-destroy.pl.ORIG
-xbone/www/s-cgi-bin/xb-discover.pl
-xbone/www/s-cgi-bin/xb-discover.pl.ORIG
-xbone/www/s-cgi-bin/xb-index.pl
-xbone/www/s-cgi-bin/xb-index.pl.ORIG
+xbone/www/lib/XB_Common.pm
+xbone/www/s-cgi-bin/xb-xml-status.pl
+xbone/www/s-cgi-bin/mroutedctl.pl
+xbone/www/s-cgi-bin/xb-create-dynabone.pl
+xbone/www/s-cgi-bin/xb-mcast-conf.pl
 xbone/www/s-cgi-bin/xb-req-host-cert.pl
-xbone/www/s-cgi-bin/xb-req-host-cert.pl.ORIG
-xbone/www/s-cgi-bin/xb-status.pl
-xbone/www/s-cgi-bin/xb-status.pl.ORIG
-xbone/www/s-htdocs/images/h1.gif
-xbone/www/s-htdocs/images/h2.gif
-xbone/www/s-htdocs/images/h3.gif
-xbone/www/s-htdocs/images/h4.gif
-xbone/www/s-htdocs/images/h5.gif
-xbone/www/s-htdocs/images/h6.gif
-xbone/www/s-htdocs/images/h7.gif
-xbone/www/s-htdocs/images/h8.gif
-xbone/www/s-htdocs/images/linear.gif
-xbone/www/s-htdocs/images/ring.gif
-xbone/www/s-htdocs/images/stag.gif
-xbone/www/s-htdocs/images/star.gif
-xbone/www/s-htdocs/images/tree.gif
+xbone/www/s-cgi-bin/xb-xml-admin.pl
+xbone/www/s-cgi-bin/xb-xml-create.pl
+xbone/www/s-cgi-bin/xb-xml-destroy.pl
+xbone/www/s-cgi-bin/xb-xml-discover.pl
+xbone/www/s-cgi-bin/xb-xml-index.pl
+xbone/www/s-cgi-bin/XB_XML_Interface.pm
+xbone/www/s-htdocs/xml/images/zoom.png
+xbone/www/s-htdocs/xml/images/background_light_tan.gif
+xbone/www/s-htdocs/xml/images/background_med_tan.gif
+xbone/www/s-htdocs/xml/images/background_tan.gif
+xbone/www/s-htdocs/xml/images/background_tan.jpg
+xbone/www/s-htdocs/xml/images/face.gif
+xbone/www/s-htdocs/xml/images/face.png
+xbone/www/s-htdocs/xml/images/h1.gif
+xbone/www/s-htdocs/xml/images/h2.gif
+xbone/www/s-htdocs/xml/images/h3.gif
+xbone/www/s-htdocs/xml/images/h4.gif
+xbone/www/s-htdocs/xml/images/h5.gif
+xbone/www/s-htdocs/xml/images/h6.gif
+xbone/www/s-htdocs/xml/images/h7.gif
+xbone/www/s-htdocs/xml/images/h8.gif
+xbone/www/s-htdocs/xml/images/linear.gif
+xbone/www/s-htdocs/xml/images/link.gif
+xbone/www/s-htdocs/xml/images/link.png
+xbone/www/s-htdocs/xml/images/main_background.gif
+xbone/www/s-htdocs/xml/images/new-ovl.gif
+xbone/www/s-htdocs/xml/images/new-ovl.png
+xbone/www/s-htdocs/xml/images/overlays.png
+xbone/www/s-htdocs/xml/images/ring.gif
+xbone/www/s-htdocs/xml/images/stag.gif
+xbone/www/s-htdocs/xml/images/star.gif
+xbone/www/s-htdocs/xml/images/tree.gif
+xbone/www/s-htdocs/xml/images/zoom.gif
+xbone/www/s-htdocs/xml/images/background.gif
+xbone/www/s-htdocs/xml/cookie.js
+xbone/www/s-htdocs/xml/create-reply-xsl.xml
+xbone/www/s-htdocs/xml/create-xsl.xml
+xbone/www/s-htdocs/xml/destroy-xsl.xml
+xbone/www/s-htdocs/xml/discover-reply-xsl.xml
+xbone/www/s-htdocs/xml/discover-xsl.xml
+xbone/www/s-htdocs/xml/admin-xsl.xml
+xbone/www/s-htdocs/xml/index-xsl.xml
+xbone/www/s-htdocs/xml/notes.html
+xbone/www/s-htdocs/xml/status-reply-xsl.xml
+xbone/www/s-htdocs/xml/status-xsl.xml
+xbone/www/s-htdocs/xml/xbone.css
+xbone/www/s-htdocs/xml/error-xsl.xml
 xbone/www/s-htdocs/index.html
 xbone/www/s-htdocs/robots.txt
-xbone/www/s-htdocs/xbone.css
 xbone/www/xb-cgi-bin/xb-get-ca-cert.pl
-xbone/www/xb-cgi-bin/xb-get-ca-cert.pl.ORIG
 xbone/www/xb-cgi-bin/xb-index.pl
-xbone/www/xb-cgi-bin/xb-index.pl.ORIG
+xbone/www/xb-cgi-bin/xb-redirect.pl
 xbone/www/xb-cgi-bin/xb-req-user-cert.pl
-xbone/www/xb-cgi-bin/xb-req-user-cert.pl.ORIG
-www/xbone/index.html
-www/xbone/robots.txt
-www/xbone/xbone.css
-www/xbone/htdocs/index.html
-www/xbone/htdocs/robots.txt
-www/xbone/htdocs/xbone.css
-www/xbone/lib/cert/CAcert.der
-www/xbone/lib/cert/CAcert.pem
-www/xbone/lib/XB_API.pm
-www/xbone/lib/XB_API_GUI.pm
-www/xbone/lib/XB_API_OM.pm
-www/xbone/lib/XB_API_parser.pm
-www/xbone/lib/XB_AppScript.pm
-www/xbone/lib/XB_Common.pm
-www/xbone/lib/XB_Defs.pm
-www/xbone/lib/XB_Defs.pm.orig
-www/xbone/lib/XB_IPsec.pm
-www/xbone/lib/XB_Log.pm
-www/xbone/lib/XB_Overlay_List.pm
-www/xbone/lib/XB_SMIME.pm
-www/xbone/lib/XB_SSL.pm
-www/xbone/lib/XB_Utils.pm
-www/xbone/lib/XB_XOL.pm
-www/xbone/s-cgi-bin/XB_Interface.pm
-www/xbone/s-cgi-bin/xb-admin.pl
-www/xbone/s-cgi-bin/xb-cookies.pl
-www/xbone/s-cgi-bin/xb-create.pl
-www/xbone/s-cgi-bin/xb-destroy.pl
-www/xbone/s-cgi-bin/xb-discover.pl
-www/xbone/s-cgi-bin/xb-index.pl
-www/xbone/s-cgi-bin/xb-req-host-cert.pl
-www/xbone/s-cgi-bin/xb-status.pl
-www/xbone/s-htdocs/images/h1.gif
-www/xbone/s-htdocs/images/h2.gif
-www/xbone/s-htdocs/images/h3.gif
-www/xbone/s-htdocs/images/h4.gif
-www/xbone/s-htdocs/images/h5.gif
-www/xbone/s-htdocs/images/h6.gif
-www/xbone/s-htdocs/images/h7.gif
-www/xbone/s-htdocs/images/h8.gif
-www/xbone/s-htdocs/images/linear.gif
-www/xbone/s-htdocs/images/ring.gif
-www/xbone/s-htdocs/images/stag.gif
-www/xbone/s-htdocs/images/star.gif
-www/xbone/s-htdocs/images/tree.gif
-www/xbone/s-htdocs/index.html
-www/xbone/s-htdocs/robots.txt
-www/xbone/s-htdocs/xbone.css
-www/xbone/xb-cgi-bin/xb-get-ca-cert.pl
-www/xbone/xb-cgi-bin/xb-index.pl
-www/xbone/xb-cgi-bin/xb-req-user-cert.pl
-etc/apache/httpsd.conf.xbone
+xbone/install/named-conf/xbone/xbone-forward.zone
+xbone/install/named-conf/xbone/xbone-reverse.zone
+xbone/install/named-conf/xbone/xbone-reverse6.zone
+xbone/install/named-conf/named.conf
+xbone/install/named-conf/resolv.conf
+xbone/install/patches/linux/ipip.c.patch71
+xbone/install/patches/linux/ipip.c.patch72
+xbone/install/ports/IO-Socket-Multicast6-0.10/Changes
+xbone/install/ports/IO-Socket-Multicast6-0.10/MANIFEST
+xbone/install/ports/IO-Socket-Multicast6-0.10/Makefile.PL
+xbone/install/ports/IO-Socket-Multicast6-0.10/Multicast6.pm
+xbone/install/ports/IO-Socket-Multicast6-0.10/Multicast6.xs
+xbone/install/ports/IO-Socket-Multicast6-0.10/README
+xbone/install/ports/IO-Socket-Multicast6-0.10/test.pl
+xbone/install/ports/IO-Socket-Multicast6-0.10/examples/client.pl
+xbone/install/ports/IO-Socket-Multicast6-0.10/examples/server.pl
+xbone/install/ports/IO-Socket-Multicast6-0.10/examples/v6_client.pl
+xbone/install/ports/IO-Socket-Multicast6-0.10/examples/v6_server.pl
+xbone/install/apache-conf/httpd-2.0.conf
+xbone/install/apache-conf/httpsd-13ssl.conf
+xbone/install/apache-conf/ssl-2.0.conf
+xbone/install/INSTALL
+xbone/install/Makefile
+xbone/install/README
+xbone/install/xb-config.pl
+xbone/install/QuickInstall
+xbone/install/REQUIREMENTS
+xbone/install/CHANGES
+xbone/install/COPYRIGHT
+xbone/install/FAQ
+xbone/install/FILELIST
+bin/xb-node-daemon
+bin/xb-api-client
 bin/xb-config
-bin/xb-daemon
-bin/xb-overlay-manager
-bin/xb-pick
-@dirrm www/xbone/htdocs
-@dirrm www/xbone/lib/cert
-@dirrm www/xbone/lib
-@dirrm www/xbone/s-cgi-bin
-@dirrm www/xbone/s-htdocs/images
-@dirrm www/xbone/s-htdocs
-@dirrm www/xbone/xb-cgi-bin
-@dirrm www/xbone
-@dirrm etc/xbone/apache-conf
-@dirrm etc/xbone/cert
-@dirrm etc/xbone/named-conf/xbone
-@dirrm etc/xbone/named-conf
-@dirrm etc/xbone
-@dirrm xbone/apps
-@dirrm xbone/doc
-@dirrm xbone/install/apache-conf
-@dirrm xbone/install/named-conf/xbone
-@dirrm xbone/install/named-conf
+@dirrm xbone/www/xb-cgi-bin
+@dirrm xbone/www/s-htdocs/xml/images
+@dirrm xbone/www/s-htdocs/xml
+@dirrm xbone/www/s-htdocs
+@dirrm xbone/www/s-cgi-bin
+@dirrm xbone/www/htdocs
+@dirrm xbone/www/lib
+@dirrm xbone/www
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/IO/Socket/Multicast6
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/IO/Socket
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/auto/IO
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/auto
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/IO/Socket
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach/IO
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%/mach
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl/%%PERL_VER%%
+@dirrm xbone/programs/modules/cpan/lib/perl5/site_perl
+@dirrm xbone/programs/modules/cpan/lib/perl5/%%PERL_VER%%/man/man3
+@dirrm xbone/programs/modules/cpan/lib/perl5/%%PERL_VER%%/man
+@dirrm xbone/programs/modules/cpan/lib/perl5/%%PERL_VER%%/mach
+@dirrm xbone/programs/modules/cpan/lib/perl5/%%PERL_VER%%
+@dirrm xbone/programs/modules/cpan/lib/perl5
+@dirrm xbone/programs/modules/cpan/lib
+@dirrm xbone/programs/modules/cpan/Net/IP
+@dirrm xbone/programs/modules/cpan/Net
+@dirrm xbone/programs/modules/cpan/IO/Socket
+@dirrm xbone/programs/modules/cpan/IO
+@dirrm xbone/programs/modules/cpan
+@dirrm xbone/programs/modules
+@dirrm xbone/programs
+@dirrm xbone/man/man8
+@dirrm xbone/man/man5
+@dirrm xbone/man
+@dirrm xbone/install/ports/IO-Socket-Multicast6-0.10/examples
+@dirrm xbone/install/ports/IO-Socket-Multicast6-0.10
+@dirrm xbone/install/ports
 @dirrm xbone/install/patches/linux
 @dirrm xbone/install/patches
+@dirrm xbone/install/named-conf/xbone
+@dirrm xbone/install/named-conf
+@dirrm xbone/install/apache-conf
 @dirrm xbone/install
-@dirrm xbone/man/man1
-@dirrm xbone/man/man5
-@dirrm xbone/man/man8
-@dirrm xbone/man
-@dirrm xbone/lib/cert
-@dirrm xbone/lib
-@dirrm xbone/om
-@dirrm xbone/rd/apps
-@dirrm xbone/rd
-@dirrm xbone/www/htdocs
-@dirrm xbone/www/s-cgi-bin
-@dirrm xbone/www/s-htdocs/images
-@dirrm xbone/www/s-htdocs
-@dirrm xbone/www/xb-cgi-bin
-@dirrm xbone/www
+@dirrm xbone/doc/v6
+@dirrm xbone/doc
+@dirrm xbone/conf/cert
+@dirrm xbone/conf
+@dirrm xbone/apps/test-script
+@dirrm xbone/apps/prm/webvis
+@dirrm xbone/apps/prm
+@dirrm xbone/apps
 @dirrm xbone
+@dirrm etc/xbone/named-conf/xbone
+@dirrm etc/xbone/named-conf
+@dirrm etc/xbone/apache-conf
+@dirrm etc/xbone
diff --git a/net/xbone/pkg-plist.rd b/net/xbone/pkg-plist.rd
deleted file mode 100644
index 62bafc3e7b8f..000000000000
--- a/net/xbone/pkg-plist.rd
+++ /dev/null
@@ -1,175 +0,0 @@
-etc/xbone/apache-conf/.cvsignore
-etc/xbone/apache-conf/access.conf
-etc/xbone/apache-conf/httpsd.conf
-etc/xbone/apache-conf/magic
-etc/xbone/apache-conf/mime.types
-etc/xbone/apache-conf/srm.conf
-etc/xbone/cert/CAcert.der
-etc/xbone/cert/CAcert.pem
-etc/xbone/named-conf/named.conf
-etc/xbone/named-conf/resolv.conf
-etc/xbone/named-conf/xbone/xbone-forward.zone
-etc/xbone/named-conf/xbone/xbone-reverse.zone
-xbone/apps/abone-script
-xbone/doc/api-language.doc
-xbone/doc/README.security
-xbone/doc/arch
-xbone/doc/daemon_data_structures
-xbone/doc/disclaimer
-xbone/doc/gui
-xbone/doc/mrouted.conf.example
-xbone/doc/om_data_structures
-xbone/doc/plan
-xbone/doc/protocol
-xbone/doc/rd.data-structures
-xbone/install/apache-conf/.cvsignore
-xbone/install/apache-conf/access.conf
-xbone/install/apache-conf/httpsd.conf
-xbone/install/apache-conf/httpsd.conf.ORIG
-xbone/install/apache-conf/magic
-xbone/install/apache-conf/mime.types
-xbone/install/apache-conf/srm.conf
-xbone/install/named-conf/xbone/xbone-forward.zone
-xbone/install/named-conf/xbone/xbone-forward.zone.ORIG
-xbone/install/named-conf/xbone/xbone-reverse.zone
-xbone/install/named-conf/xbone/xbone-reverse.zone.ORIG
-xbone/install/named-conf/named.conf
-xbone/install/named-conf/named.conf.ORIG
-xbone/install/named-conf/resolv.conf
-xbone/install/named-conf/resolv.conf.ORIG
-xbone/install/patches/linux/ipip.c.patch71
-xbone/install/patches/linux/ipip.c.patch72
-xbone/install/CHANGES
-xbone/install/COPYRIGHT
-xbone/install/FAQ
-xbone/install/FILELIST
-xbone/install/INSTALL
-xbone/install/Makefile
-xbone/install/README
-xbone/install/REQUIREMENTS
-xbone/install/SECURITY
-xbone/install/setkey.tar.gz
-xbone/install/xb-Host-check.pl
-xbone/install/xb-Source-patch.pl
-xbone/lib/cert/CAcert.der
-xbone/lib/cert/CAcert.pem
-xbone/lib/XB_API.pm
-xbone/lib/XB_API_GUI.pm
-xbone/lib/XB_API_OM.pm
-xbone/lib/XB_API_parser.pm
-xbone/lib/XB_AppScript.pm
-xbone/lib/XB_Common.pm
-xbone/lib/XB_Defs.pm
-xbone/lib/XB_Defs.pm.ORIG
-xbone/lib/XB_Defs.pm.orig
-xbone/lib/XB_IPsec.pm
-xbone/lib/XB_Log.pm
-xbone/lib/XB_Overlay_List.pm
-xbone/lib/XB_SMIME.pm
-xbone/lib/XB_SSL.pm
-xbone/lib/XB_Utils.pm
-xbone/lib/XB_XOL.pm
-xbone/man/man1/xb-pick.1
-xbone/man/man5/XB_Defs.pm.5
-xbone/man/man5/Xbone_daemon.conf.5
-xbone/man/man5/Xbone_daemon.state.5
-xbone/man/man8/X-Bone.8
-xbone/man/man8/xb-config.8
-xbone/man/man8/xb-daemon.8
-xbone/man/man8/xb-overlay-manager.8
-xbone/om/XB_IP_Allocation.pm
-xbone/om/XB_MIB.pm
-xbone/om/XB_OM_App_Start.pm
-xbone/om/XB_Ping.pm
-xbone/om/XB_RPC.pm
-xbone/om/XB_Topology.pm
-xbone/om/xb-overlay-manager.pl
-xbone/rd/apps/xb-config.pl
-xbone/rd/apps/xb-config.pl.ORIG
-xbone/rd/apps/xb-overlay-list.pl
-xbone/rd/apps/xb-pick
-xbone/rd/XB_App_Start.pm
-xbone/rd/XB_AppCmds.pm
-xbone/rd/XB_Commands.pm
-xbone/rd/XB_DNS.pm
-xbone/rd/XB_Dummynet.pm
-xbone/rd/XB_Node_DB.pm
-xbone/rd/XB_Route.pm
-xbone/rd/XB_Tunnel.pm
-xbone/rd/xb-daemon.pl
-xbone/www/htdocs/index.html
-xbone/www/htdocs/robots.txt
-xbone/www/htdocs/xbone.css
-xbone/www/s-cgi-bin/XB_Interface.pm
-xbone/www/s-cgi-bin/XB_Interface.pm.ORIG
-xbone/www/s-cgi-bin/xb-admin.pl
-xbone/www/s-cgi-bin/xb-admin.pl.ORIG
-xbone/www/s-cgi-bin/xb-cookies.pl
-xbone/www/s-cgi-bin/xb-cookies.pl.ORIG
-xbone/www/s-cgi-bin/xb-create.pl
-xbone/www/s-cgi-bin/xb-create.pl.ORIG
-xbone/www/s-cgi-bin/xb-destroy.pl
-xbone/www/s-cgi-bin/xb-destroy.pl.ORIG
-xbone/www/s-cgi-bin/xb-discover.pl
-xbone/www/s-cgi-bin/xb-discover.pl.ORIG
-xbone/www/s-cgi-bin/xb-index.pl
-xbone/www/s-cgi-bin/xb-index.pl.ORIG
-xbone/www/s-cgi-bin/xb-req-host-cert.pl
-xbone/www/s-cgi-bin/xb-req-host-cert.pl.ORIG
-xbone/www/s-cgi-bin/xb-status.pl
-xbone/www/s-cgi-bin/xb-status.pl.ORIG
-xbone/www/s-htdocs/images/h1.gif
-xbone/www/s-htdocs/images/h2.gif
-xbone/www/s-htdocs/images/h3.gif
-xbone/www/s-htdocs/images/h4.gif
-xbone/www/s-htdocs/images/h5.gif
-xbone/www/s-htdocs/images/h6.gif
-xbone/www/s-htdocs/images/h7.gif
-xbone/www/s-htdocs/images/h8.gif
-xbone/www/s-htdocs/images/linear.gif
-xbone/www/s-htdocs/images/ring.gif
-xbone/www/s-htdocs/images/stag.gif
-xbone/www/s-htdocs/images/star.gif
-xbone/www/s-htdocs/images/tree.gif
-xbone/www/s-htdocs/index.html
-xbone/www/s-htdocs/robots.txt
-xbone/www/s-htdocs/xbone.css
-xbone/www/xb-cgi-bin/xb-get-ca-cert.pl
-xbone/www/xb-cgi-bin/xb-get-ca-cert.pl.ORIG
-xbone/www/xb-cgi-bin/xb-index.pl
-xbone/www/xb-cgi-bin/xb-index.pl.ORIG
-xbone/www/xb-cgi-bin/xb-req-user-cert.pl
-xbone/www/xb-cgi-bin/xb-req-user-cert.pl.ORIG
-bin/xb-config
-bin/xb-daemon
-bin/xb-overlay-manager
-bin/xb-pick
-@dirrm etc/xbone/apache-conf
-@dirrm etc/xbone/cert
-@dirrm etc/xbone/named-conf/xbone
-@dirrm etc/xbone/named-conf
-@dirrm etc/xbone
-@dirrm xbone/apps
-@dirrm xbone/doc
-@dirrm xbone/install/apache-conf
-@dirrm xbone/install/named-conf/xbone
-@dirrm xbone/install/named-conf
-@dirrm xbone/install/patches/linux
-@dirrm xbone/install/patches
-@dirrm xbone/install
-@dirrm xbone/man/man1
-@dirrm xbone/man/man5
-@dirrm xbone/man/man8
-@dirrm xbone/man
-@dirrm xbone/lib/cert
-@dirrm xbone/lib
-@dirrm xbone/om
-@dirrm xbone/rd/apps
-@dirrm xbone/rd
-@dirrm xbone/www/htdocs
-@dirrm xbone/www/s-cgi-bin
-@dirrm xbone/www/s-htdocs/images
-@dirrm xbone/www/s-htdocs
-@dirrm xbone/www/xb-cgi-bin
-@dirrm xbone/www
-@dirrm xbone