5 files changed, 103 insertions, 105 deletions

diff --git a/www/p5-AxKit/Makefile b/www/p5-AxKit/Makefile
index feb08f2d6bc9..7af64a8ed52b 100644
--- a/www/p5-AxKit/Makefile
+++ b/www/p5-AxKit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AxKit
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.axkit.org/download/
 PKGNAMEPREFIX=	p5-
@@ -15,24 +15,23 @@ MAINTAINER=	adam@migus.org
 COMMENT=	XML Delivery Toolkit for Apache/Perl
 
 BUILD_DEPENDS=	\
-		${SITE_PERL}/${PERL_ARCH}/Apache/libapreq.pm:${PORTSDIR}/www/p5-libapreq \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/${PERL_ARCH}/HTTP/GHTTP.pm:${PORTSDIR}/www/p5-HTTP-GHTTP \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
+		${SITE_PERL}/${PERL_ARCH}/Apache/libapreq.pm:${PORTSDIR}/www/p5-libapreq \
+		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test \
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT \
+		${SITE_PERL}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron \
+		${SITE_PERL}/Perl/Tidy.pm:${PORTSDIR}/devel/perltidy \
 		${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
-		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-# XXX Glitch in this release...
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.61
+WRKSRC=		${WRKDIR}/${PORTNAME}-1.62
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		\
 		Apache::AxKit::Language.3 \
 		Apache::AxKit::Language::AxPoint.3 \
@@ -42,6 +41,7 @@ MAN3=		\
 		Apache::AxKit::Language::XSP.3 \
 		Apache::AxKit::Language::XSP::SimpleTaglib.3 \
 		Apache::AxKit::Language::XSP::TaglibHelper.3 \
+		Apache::AxKit::LibXMLSupport.3 \
 		Apache::AxKit::MediaChooser::WAPCheck.3 \
 		Apache::AxKit::Plugin::Fragment.3 \
 		Apache::AxKit::Plugin::Passthru.3 \
diff --git a/www/p5-AxKit/distinfo b/www/p5-AxKit/distinfo
index 1f955a1a2e41..c2a894157719 100644
--- a/www/p5-AxKit/distinfo
+++ b/www/p5-AxKit/distinfo
@@ -1,2 +1,2 @@
-MD5 (AxKit-1.6.1.tar.gz) = 94b8149a9bf5337ce98d78629793c1b2
+MD5 (AxKit-1.6.2.tar.gz) = 1634ad62ac941c7d2ee3b1a2d129c14a
 SIZE (AxKit-1.6.1.tar.gz) = 300610
diff --git a/www/p5-AxKit/pkg-descr b/www/p5-AxKit/pkg-descr
index c96848e3b630..9ae00b65fcf8 100644
--- a/www/p5-AxKit/pkg-descr
+++ b/www/p5-AxKit/pkg-descr
@@ -1,10 +1,7 @@
-AxKit --- XML Delivery Toolkit for Apache
-
-AxKit allows serving XML pages through Apache and mod_perl.  It uses
-XSLT stylesheets to transform pages before sending them to the browser.
-It also allows Perl stylesheets for extra flexibility.
-
-AxKit has good caching of results, and can be up to 80% of the speed of
-Apache when serving from it's cache.
+Apache AxKit is an XML Application Server for Apache. It provides on-the-fly
+conversion from XML to any format, such as HTML, WAP or text using either W3C
+standard techniques, or flexible custom code. AxKit also uses a built-in Perl
+interpreter to provide some amazingly powerful techniques for XML
+transformation.
 
 WWW: http://www.axkit.org/
diff --git a/www/p5-AxKit/pkg-message b/www/p5-AxKit/pkg-message
index 9d0d3958428a..e9d33503eca3 100644
--- a/www/p5-AxKit/pkg-message
+++ b/www/p5-AxKit/pkg-message
@@ -1,14 +1,14 @@
 Please consult ``man AxKit'' for instructions on installing AxKit into
 your Apache configuration.
 
-NB: This version of AxKit is only compiled with the ability to use XSLT
-stylesheets.  If you wish to use XPathScript or XSP, you must also
-install the p5-XML-Sablotron port/package.  However, you must also
-recompile your Apache binary to *not* include a builtin version of
-expat.  To see if you need to do this, type in:
+AxKit may not function properly unless Apache is compiled WITHOUT
+expat support.  To compile Apache define:
+
+	WITHOUT_APACHE_EXPAT=yes
+
+To determine if your existing Apache installation supports expat:
 
 	strings `which httpd` | grep XML
 
-If this produces any output, you must recompile apache passing the
---disable-rule=EXPAT argument to the configure program.  See the FAQ on
+If this produces any output, see above.  See the FAQ on
 http://axkit.org for full details.
diff --git a/www/p5-AxKit/pkg-plist b/www/p5-AxKit/pkg-plist
index efa1774f8b1c..afb27a851e52 100644
--- a/www/p5-AxKit/pkg-plist
+++ b/www/p5-AxKit/pkg-plist
@@ -1,115 +1,116 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/AxKit.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/LibXMLSupport.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Cache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Makefile.PL
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/CharsetConv.xs
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/ConfigReader.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/AxPoint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/HtmlDoc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/LibXSLT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser/WAPCheck.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/SAXMachines.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/PassiveTeX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/LibXSLT.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/SAXMachines.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/Sablot.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsNITF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/HtmlDoc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/AxPoint.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsRDF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XMLNewsNITF.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XPathScript.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/SimpleTaglib.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/TaglibHelper.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Makefile.PL
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser/WAPCheck.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Fragment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Passthru.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/QueryStringCache.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP/SimpleTaglib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Scalar.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/File.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/FileWrite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Filter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Provider/Scalar.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/Cookie.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/UserAgent.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/FileSuffix.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/PathInfo.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/QueryString.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/StyleChooser/UserAgent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/AxKit.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/CharsetConv/CharsetConv.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Fragment.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/Passthru.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Plugin/QueryStringCache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/AxKit.so
-share/examples/AxKit/axkit.org/docs/associating_stylesheets.xml
-share/examples/AxKit/axkit.org/docs/index.xml
-share/examples/AxKit/axkit.org/docs/introduction.dkb
+share/examples/AxKit/default.notxslt
+share/examples/AxKit/default.xps
+share/examples/AxKit/docbook.dkb
+share/examples/AxKit/docbook_print.xps
+share/examples/AxKit/docbook_screen.xps
+share/examples/AxKit/docbook_tags.xps
+share/examples/AxKit/index.xml
+share/examples/AxKit/axkit.org/docs/xsp/guide.dkb
+share/examples/AxKit/axkit.org/docs/xsp/index.xml
 share/examples/AxKit/axkit.org/docs/presentations/tpc2001/ax_logo.png
-share/examples/AxKit/axkit.org/docs/presentations/tpc2001/redbg.png
 share/examples/AxKit/axkit.org/docs/presentations/tpc2001/tpc-axkit.axp
+share/examples/AxKit/axkit.org/docs/presentations/tpc2001/redbg.png
+share/examples/AxKit/axkit.org/docs/xpathscript/guide.dkb
 share/examples/AxKit/axkit.org/docs/provider-howto.dkb
 share/examples/AxKit/axkit.org/docs/quick_start.dkb
-share/examples/AxKit/axkit.org/docs/xpathscript/guide.dkb
-share/examples/AxKit/axkit.org/docs/xsp/guide.dkb
-share/examples/AxKit/axkit.org/docs/xsp/index.xml
-share/examples/AxKit/axkit.org/examples/cv.css
+share/examples/AxKit/axkit.org/docs/introduction.dkb
+share/examples/AxKit/axkit.org/docs/index.xml
+share/examples/AxKit/axkit.org/docs/associating_stylesheets.xml
 share/examples/AxKit/axkit.org/examples/cv.xml
+share/examples/AxKit/axkit.org/examples/resume.dtd
 share/examples/AxKit/axkit.org/examples/cv.xps
-share/examples/AxKit/axkit.org/examples/cv_example.xml
 share/examples/AxKit/axkit.org/examples/docbook.dkb
-share/examples/AxKit/axkit.org/examples/resume.dtd
-share/examples/AxKit/axkit.org/faq.xml
-share/examples/AxKit/axkit.org/features.xml
-share/examples/AxKit/axkit.org/img/arrow.gif
-share/examples/AxKit/axkit.org/img/arrow_sel.gif
-share/examples/AxKit/axkit.org/img/banner2.gif
+share/examples/AxKit/axkit.org/examples/cv.css
+share/examples/AxKit/axkit.org/examples/cv_example.xml
+share/examples/AxKit/axkit.org/stylesheets/new/sidebar_html.xps
+share/examples/AxKit/axkit.org/stylesheets/new/webpage_html.xps
+share/examples/AxKit/axkit.org/stylesheets/new/rdf_html.xps
+share/examples/AxKit/axkit.org/stylesheets/axkit_html.css
+share/examples/AxKit/axkit.org/stylesheets/spacer.xps
+share/examples/AxKit/axkit.org/stylesheets/navbar_html.xps
+share/examples/AxKit/axkit.org/stylesheets/docbook_print.xps
+share/examples/AxKit/axkit.org/stylesheets/error.xsl
+share/examples/AxKit/axkit.org/stylesheets/docbook_tags.xps
+share/examples/AxKit/axkit.org/stylesheets/docbook_example.xml
+share/examples/AxKit/axkit.org/stylesheets/sidebar_html.xps
+share/examples/AxKit/axkit.org/stylesheets/webpage_html.xps
+share/examples/AxKit/axkit.org/stylesheets/body_tag_html.xps
+share/examples/AxKit/axkit.org/stylesheets/docbook_screen.xps
+share/examples/AxKit/axkit.org/stylesheets/body_print_html.xps
+share/examples/AxKit/axkit.org/stylesheets/axkit.css
+share/examples/AxKit/axkit.org/stylesheets/rdf_html.xps
+share/examples/AxKit/axkit.org/stylesheets/irc.xps
+share/examples/AxKit/axkit.org/stylesheets/error.xps
+share/examples/AxKit/axkit.org/img/nav_top.gif
 share/examples/AxKit/axkit.org/img/banner3.gif
-share/examples/AxKit/axkit.org/img/banner_axkit.gif
-share/examples/AxKit/axkit.org/img/banner_bg.gif
-share/examples/AxKit/axkit.org/img/banner_end.gif
-share/examples/AxKit/axkit.org/img/bg.gif
-share/examples/AxKit/axkit.org/img/bullet.gif
 share/examples/AxKit/axkit.org/img/corner_logo.jpg
+share/examples/AxKit/axkit.org/img/nav_left.gif
 share/examples/AxKit/axkit.org/img/corner_logo.png
 share/examples/AxKit/axkit.org/img/nav_bot.gif
-share/examples/AxKit/axkit.org/img/nav_left.gif
-share/examples/AxKit/axkit.org/img/nav_right.gif
-share/examples/AxKit/axkit.org/img/nav_top.gif
-share/examples/AxKit/axkit.org/img/pix.gif
+share/examples/AxKit/axkit.org/img/arrow.gif
+share/examples/AxKit/axkit.org/img/bg.gif
+share/examples/AxKit/axkit.org/img/vsep.gif
+share/examples/AxKit/axkit.org/img/bullet.gif
+share/examples/AxKit/axkit.org/img/banner_axkit.gif
 share/examples/AxKit/axkit.org/img/rcorner_br.gif
 share/examples/AxKit/axkit.org/img/rcorner_wh.gif
-share/examples/AxKit/axkit.org/img/vsep.gif
-share/examples/AxKit/axkit.org/index.xml
-share/examples/AxKit/axkit.org/install.xml
-share/examples/AxKit/axkit.org/license.xml
-share/examples/AxKit/axkit.org/mailinglist.xml
-share/examples/AxKit/axkit.org/news.xml
+share/examples/AxKit/axkit.org/img/banner_bg.gif
+share/examples/AxKit/axkit.org/img/pix.gif
+share/examples/AxKit/axkit.org/img/banner2.gif
+share/examples/AxKit/axkit.org/img/banner_end.gif
+share/examples/AxKit/axkit.org/img/arrow_sel.gif
+share/examples/AxKit/axkit.org/img/nav_right.gif
 share/examples/AxKit/axkit.org/sidebar.xml
-share/examples/AxKit/axkit.org/stylesheets/axkit.css
-share/examples/AxKit/axkit.org/stylesheets/axkit_html.css
-share/examples/AxKit/axkit.org/stylesheets/body_print_html.xps
-share/examples/AxKit/axkit.org/stylesheets/body_tag_html.xps
-share/examples/AxKit/axkit.org/stylesheets/docbook_example.xml
-share/examples/AxKit/axkit.org/stylesheets/docbook_print.xps
-share/examples/AxKit/axkit.org/stylesheets/docbook_screen.xps
-share/examples/AxKit/axkit.org/stylesheets/docbook_tags.xps
-share/examples/AxKit/axkit.org/stylesheets/error.xps
-share/examples/AxKit/axkit.org/stylesheets/error.xsl
-share/examples/AxKit/axkit.org/stylesheets/irc.xps
-share/examples/AxKit/axkit.org/stylesheets/navbar_html.xps
-share/examples/AxKit/axkit.org/stylesheets/new/rdf_html.xps
-share/examples/AxKit/axkit.org/stylesheets/new/sidebar_html.xps
-share/examples/AxKit/axkit.org/stylesheets/new/webpage_html.xps
-share/examples/AxKit/axkit.org/stylesheets/rdf_html.xps
-share/examples/AxKit/axkit.org/stylesheets/sidebar_html.xps
-share/examples/AxKit/axkit.org/stylesheets/spacer.xps
-share/examples/AxKit/axkit.org/stylesheets/webpage_html.xps
+share/examples/AxKit/axkit.org/news.xml
+share/examples/AxKit/axkit.org/mailinglist.xml
+share/examples/AxKit/axkit.org/faq.xml
+share/examples/AxKit/axkit.org/features.xml
+share/examples/AxKit/axkit.org/index.xml
 share/examples/AxKit/axkit.org/support.xml
-share/examples/AxKit/default.notxslt
-share/examples/AxKit/default.xps
-share/examples/AxKit/docbook.dkb
-share/examples/AxKit/docbook_print.xps
-share/examples/AxKit/docbook_screen.xps
-share/examples/AxKit/docbook_tags.xps
-share/examples/AxKit/index.xml
+share/examples/AxKit/axkit.org/license.xml
+share/examples/AxKit/axkit.org/install.xml
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language/XSP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/Language
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/AxKit/MediaChooser