3 files changed, 75 insertions, 45 deletions

diff --git a/net/xbone-gui/Makefile b/net/xbone-gui/Makefile
index 4982fbabf230..e0a226cc4db6 100644
--- a/net/xbone-gui/Makefile
+++ b/net/xbone-gui/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	XBone-GUI
-PORTVERSION=	3.1.1
-PORTREVISION=	1
-CATEGORIES=     net perl5
-MASTER_SITES=   http://www.isi.edu/xbone/software/xbone/
+PORTVERSION=	3.2
+CATEGORIES=	net perl5
+MASTER_SITES=	http://www.isi.edu/xbone/software/xbone/
 DISTNAME=	XBone-${PORTVERSION}
 
-MAINTAINER=     xbone@isi.edu
-COMMENT=	The GUI for XBone, a tool to deploy and manage IP-based VPNs (aka "virtual Internets")
+MAINTAINER=	xbone@isi.edu
+COMMENT=	The GUI for XBone, a tool to deploy and manage IP-based VPNs
 
 BUILD_DEPENDS=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
+		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
 		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
 		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
 		${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
@@ -27,13 +27,20 @@ BUILD_DEPENDS=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-S
 		${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\
-		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2
+		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+		${SITE_PERL}/${PERL_ARCH}/APR.pm:${PORTSDIR}/www/mod_perl2 \
+		${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
+		${SITE_PERL}/Tk/Getopt.pm:${PORTSDIR}/x11-toolkits/p5-Tk-Getopt \
+		${SITE_PERL}/${PERL_ARCH}/Tk/TableMatrix.pm:${PORTSDIR}/x11-toolkits/p5-Tk-TableMatrix
 
 USE_GMAKE=	yes
-NO_BUILD=       yes
-USE_PERL5=      yes
-WRKSRC=		${WRKDIR}/XBone-3.1.1
-INSTALL_TARGET= gui
+NO_BUILD=	yes
+USE_PERL5=	yes
+WRKSRC=		${WRKDIR}/XBone-${PORTVERSION}
+INSTALL_TARGET=	gui
+
+MAN5=		xbone-gui.conf.5
+MAN8=		xb-gui-control.8 xb-apache-config.8
 
 .include <bsd.port.pre.mk>
 
@@ -42,7 +49,7 @@ FORBIDDEN=	"X-Bone ${PORTVERSION} does not support FreeBSD prior to 4.7"
 .endif
 
 .if ${PERL_LEVEL} < 500601
-IGNORE= "X-Bone requires Perl version 5.6.1 or higher. Install lang/perl5.8 and try again."
+IGNORE=		X-Bone requires Perl version 5.6.1 or higher. Install lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/xbone-gui/distinfo b/net/xbone-gui/distinfo
index 814a69903904..20aafc9e6987 100644
--- a/net/xbone-gui/distinfo
+++ b/net/xbone-gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (XBone-3.1.1.tar.gz) = d8fc700d80bb8defafd2efbda145436f
-SIZE (XBone-3.1.1.tar.gz) = 552769
+MD5 (XBone-3.2.tar.gz) = a5e44948761a6a1b4bba0dbded5e86fc
+SIZE (XBone-3.2.tar.gz) = 663309
diff --git a/net/xbone-gui/pkg-plist b/net/xbone-gui/pkg-plist
index a536409d256c..147da5b8462e 100644
--- a/net/xbone-gui/pkg-plist
+++ b/net/xbone-gui/pkg-plist
@@ -1,9 +1,46 @@
-bin/xb-gui-config
 etc/xbone/cert/CAcert.pem
-etc/xbone/cert/CAcert.der
+etc/xbone/cert/README
+etc/xbone/apache/README
+etc/xbone/apache/xb-apache-config.pl
+etc/xbone/apache/xbone-apache.conf.template
+www/xbone/htdocs/images/zoom.png
+www/xbone/htdocs/images/background_light_tan.gif
+www/xbone/htdocs/images/background_med_tan.gif
+www/xbone/htdocs/images/background_tan.gif
+www/xbone/htdocs/images/background_tan.jpg
+www/xbone/htdocs/images/face.gif
+www/xbone/htdocs/images/face.png
+www/xbone/htdocs/images/h1.gif
+www/xbone/htdocs/images/h2.gif
+www/xbone/htdocs/images/h3.gif
+www/xbone/htdocs/images/h4.gif
+www/xbone/htdocs/images/h5.gif
+www/xbone/htdocs/images/h6.gif
+www/xbone/htdocs/images/h7.gif
+www/xbone/htdocs/images/h8.gif
+www/xbone/htdocs/images/linear.gif
+www/xbone/htdocs/images/link.gif
+www/xbone/htdocs/images/link.png
+www/xbone/htdocs/images/main_background.gif
+www/xbone/htdocs/images/new-ovl.gif
+www/xbone/htdocs/images/new-ovl.png
+www/xbone/htdocs/images/overlays.png
+www/xbone/htdocs/images/ring.gif
+www/xbone/htdocs/images/stag.gif
+www/xbone/htdocs/images/star.gif
+www/xbone/htdocs/images/tree.gif
+www/xbone/htdocs/images/zoom.gif
+www/xbone/htdocs/images/background.gif
 www/xbone/htdocs/index.html
 www/xbone/htdocs/robots.txt
 www/xbone/htdocs/xbone.css
+www/xbone/lib/XB_Common.pm
+www/xbone/lib/XB_Params.pm
+www/xbone/lib/XB_XML_GUI.pm
+www/xbone/lib/XB_XML_scan.pm
+www/xbone/lib/api-2.0.dtd
+www/xbone/lib/api-1.0.dtd
+www/xbone/lib/xb-gui-control.pl
 www/xbone/s-cgi-bin/xb-xml-status.pl
 www/xbone/s-cgi-bin/mroutedctl.pl
 www/xbone/s-cgi-bin/xb-create-dynabone.pl
@@ -63,45 +100,31 @@ www/xbone/xb-cgi-bin/xb-index.pl
 www/xbone/xb-cgi-bin/xb-redirect.pl
 www/xbone/xb-cgi-bin/xb-req-user-cert.pl
 www/xbone/cpan/IO/Socket/SSLv6.pm
+www/xbone/cpan/IO/Socket/Multicast6.pm
 www/xbone/cpan/Net/IP/XB_IP.pm
 www/xbone/cpan/auto/IO/Socket/Multicast6/Multicast6.so
 www/xbone/cpan/auto/IO/Socket/Multicast6/Multicast6.bs
 www/xbone/cpan/auto/IO/Socket/Multicast6/.packlist
-www/xbone/cpan/IO/Socket/Multicast6.pm
-www/xbone/cpan/perllocal.pod
-www/xbone/cpan/IO::Socket::Multicast6.3
-www/xbone/lib/api-1.0.dtd
-www/xbone/lib/api-2.0.dtd
-www/xbone/lib/XB_Params.pm
-www/xbone/lib/XB_Common.pm
-www/xbone/lib/XB_XML_GUI.pm
-www/xbone/lib/XB_XML_scan.pm
-www/xbone/lib/xb-gui-config.pl
-www/xbone/apache-conf/httpsd-13ssl.conf
-www/xbone/apache-conf/httpd-2.0.conf
-www/xbone/apache-conf/ssl-2.0.conf
-www/xbone/apache-conf/linux-httpd-2.0.conf
-www/xbone/apache-conf/linux-ssl-2.0.conf
-@dirrm www/xbone/xb-cgi-bin
+bin/xb-apache-config
+bin/xb-gui-control
+@dirrm etc/xbone/cert
+@dirrm etc/xbone/apache
+@dirrm etc/xbone
+@dirrm www/xbone/htdocs/images
+@dirrm www/xbone/htdocs
+@dirrm www/xbone/lib
+@dirrm www/xbone/s-cgi-bin
 @dirrm www/xbone/s-htdocs/xml/images
 @dirrm www/xbone/s-htdocs/xml
 @dirrm www/xbone/s-htdocs
-@dirrm www/xbone/s-cgi-bin
-@dirrm www/xbone/lib
-@dirrm www/xbone/htdocs
+@dirrm www/xbone/xb-cgi-bin
+@dirrm www/xbone/cpan/IO/Socket
+@dirrm www/xbone/cpan/IO
+@dirrm www/xbone/cpan/Net/IP
+@dirrm www/xbone/cpan/Net
 @dirrm www/xbone/cpan/auto/IO/Socket/Multicast6
 @dirrm www/xbone/cpan/auto/IO/Socket
 @dirrm www/xbone/cpan/auto/IO
 @dirrm www/xbone/cpan/auto
-@dirrm www/xbone/cpan/lib/perl5/%%PERL_VER%%
-@dirrm www/xbone/cpan/lib/perl5
-@dirrm www/xbone/cpan/lib
-@dirrm www/xbone/cpan/Net/IP
-@dirrm www/xbone/cpan/Net
-@dirrm www/xbone/cpan/IO/Socket
-@dirrm www/xbone/cpan/IO
 @dirrm www/xbone/cpan
-@dirrm www/xbone/apache-conf
 @dirrm www/xbone
-@dirrm etc/xbone/cert
-@dirrm etc/xbone