3 files changed, 46 insertions, 34 deletions

diff --git a/net/xbone/Makefile b/net/xbone/Makefile
index 5234a91a82bf..dba87e6bf8eb 100644
--- a/net/xbone/Makefile
+++ b/net/xbone/Makefile
@@ -6,20 +6,13 @@
 #
 
 PORTNAME=	XBone
-PORTVERSION=	3.0
+PORTVERSION=	3.1.1
 CATEGORIES=	net perl5
 MASTER_SITES=	http://www.isi.edu/xbone/software/xbone/
 
 MAINTAINER=	xbone@isi.edu
 COMMENT=	Deploys and manages IP-based VPNs (aka "virtual Internets")
 
-USE_GMAKE=	yes
-IS_INTERACTIVE=	yes
-NO_BUILD=	yes
-USE_PERL5=	yes
-
-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 \
@@ -36,7 +29,15 @@ BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
 		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+		${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6 \
+		${SITE_PERL}/Net/SSH/Perl.pm:${PORTSDIR}/net/p5-Net-SSH-Perl
+
+USE_GMAKE=	yes
+IS_INTERACTIVE=	yes
+NO_BUILD=	yes
+USE_PERL5=	yes
+
+INSTALL_TARGET=	node
 
 .include <bsd.port.pre.mk>
 
@@ -44,10 +45,7 @@ BUILD_DEPENDS=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 FORBIDDEN=	"X-Bone ${PORTVERSION} does not support FreeBSD prior to 4.7"
 .endif
 
-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
+MAN5=		XB_Params.pm.5 xbone.conf.5 xbone-gui.conf.5
+MAN8=		X-Bone.8 xb-node-daemon.8 xb-config.8 xb-gui-config.8 xbonectl.8
 
 .include <bsd.port.post.mk>
diff --git a/net/xbone/distinfo b/net/xbone/distinfo
index 5c06fa2664b3..814a69903904 100644
--- a/net/xbone/distinfo
+++ b/net/xbone/distinfo
@@ -1,2 +1,2 @@
-MD5 (XBone-3.0.tar.gz) = 98c3c558996292707d3d84e1d8413687
-SIZE (XBone-3.0.tar.gz) = 520829
+MD5 (XBone-3.1.1.tar.gz) = d8fc700d80bb8defafd2efbda145436f
+SIZE (XBone-3.1.1.tar.gz) = 552769
diff --git a/net/xbone/pkg-plist b/net/xbone/pkg-plist
index 5d207810b541..4221e6ec71d8 100644
--- a/net/xbone/pkg-plist
+++ b/net/xbone/pkg-plist
@@ -1,6 +1,6 @@
-etc/xbone/xbone.sh.sample
 etc/xbone/zebra.conf.sample
 etc/xbone/xbone.conf.sample
+etc/xbone/xbone.sh.sample
 etc/xbone/ripd.conf.sample
 etc/xbone/ripngd.conf.sample
 etc/xbone/named-conf/xbone/xbone-forward.zone
@@ -8,10 +8,13 @@ etc/xbone/named-conf/xbone/xbone-reverse.zone
 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/httpd-2.0.conf
 etc/xbone/apache-conf/ssl-2.0.conf
-etc/xbone/xbone.conf
+etc/xbone/apache-conf/linux-httpd-2.0.conf
+etc/xbone/apache-conf/linux-ssl-2.0.conf
+etc/xbone/cert/CAcert.pem
+etc/xbone/cert/CAcert.der
 xbone/doc/README
 xbone/doc/v6/modules.README
 xbone/doc/v6/xbone-v6-support.txt
@@ -26,6 +29,9 @@ 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/doc/xbone-cisco-support.txt
+xbone/doc/xbone-custom-topology.txt
+xbone/doc/xbone-ipsec-conf.txt
 xbone/apps/prm/webvis/gen.pl
 xbone/apps/prm/webvis/index.html
 xbone/apps/prm/webvis/title-bg.png
@@ -53,6 +59,7 @@ xbone/apps/abone-script
 xbone/apps/vserver-script.pl
 xbone/apps/sample-app-deploy-script.sh
 xbone/conf/cert/CAcert.pem
+xbone/conf/cert/CAcert.der
 xbone/conf/ripd.conf.sample
 xbone/conf/ripngd.conf.sample
 xbone/conf/xbone.conf.sample
@@ -60,16 +67,19 @@ 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/man5/xbone-gui.conf.5
 xbone/man/man8/X-Bone.8
 xbone/man/man8/xb-config.8
+xbone/man/man8/xb-gui-config.8
 xbone/man/man8/xb-node-daemon.8
+xbone/man/man8/xbonectl.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/auto/IO/Socket/Multicast6/Multicast6.so
+xbone/programs/modules/cpan/auto/IO/Socket/Multicast6/Multicast6.bs
+xbone/programs/modules/cpan/auto/IO/Socket/Multicast6/.packlist
+xbone/programs/modules/cpan/IO/Socket/Multicast6.pm
+xbone/programs/modules/cpan/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
@@ -96,6 +106,8 @@ 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/XB_CiscoSSH.pm
+xbone/programs/modules/XB_Cisco.pm
 xbone/programs/modules/api-1.0.dtd
 xbone/programs/modules/api-2.0.dtd
 xbone/programs/modules/zebractl
@@ -103,6 +115,7 @@ xbone/programs/XB_CTL.pm
 xbone/programs/XB_API.pm
 xbone/programs/xb-api-client.pl
 xbone/programs/xb-node-daemon.pl
+xbone/programs/xbonectl.pl
 xbone/programs/XB_Params.pm
 xbone/www/htdocs/index.html
 xbone/www/htdocs/robots.txt
@@ -185,13 +198,17 @@ 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/linux-httpd-2.0.conf
 xbone/install/apache-conf/httpsd-13ssl.conf
 xbone/install/apache-conf/ssl-2.0.conf
+xbone/install/apache-conf/linux-ssl-2.0.conf
 xbone/install/INSTALL
 xbone/install/Makefile
 xbone/install/README
 xbone/install/xb-config.pl
+xbone/install/xb-gui-config.pl
 xbone/install/QuickInstall
+xbone/install/perl-module-install.sh
 xbone/install/REQUIREMENTS
 xbone/install/CHANGES
 xbone/install/COPYRIGHT
@@ -200,6 +217,7 @@ xbone/install/FILELIST
 bin/xb-node-daemon
 bin/xb-api-client
 bin/xb-config
+bin/xbonectl
 @dirrm xbone/www/xb-cgi-bin
 @dirrm xbone/www/s-htdocs/xml/images
 @dirrm xbone/www/s-htdocs/xml
@@ -208,20 +226,15 @@ bin/xb-config
 @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/auto/IO/Socket/Multicast6
+@dirrm xbone/programs/modules/cpan/auto/IO/Socket
+@dirrm xbone/programs/modules/cpan/auto/IO
+@dirrm xbone/programs/modules/cpan/auto
 @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/%%PERL_VER%%
 @dirrm xbone/programs/modules/cpan/lib
 @dirrm xbone/programs/modules/cpan/Net/IP
 @dirrm xbone/programs/modules/cpan/Net
@@ -254,4 +267,5 @@ bin/xb-config
 @dirrm etc/xbone/named-conf/xbone
 @dirrm etc/xbone/named-conf
 @dirrm etc/xbone/apache-conf
+@dirrm etc/xbone/cert
 @dirrm etc/xbone