upgrade to 1.09

PR:		40005
Submitted by:	maintainer

4 files changed, 75 insertions, 86 deletions

diff --git a/www/p5-Apache-PageKit/Makefile b/www/p5-Apache-PageKit/Makefile
index e2f6598d6ed0..d6847cf18a14 100644
--- a/www/p5-Apache-PageKit/Makefile
+++ b/www/p5-Apache-PageKit/Makefile
@@ -5,46 +5,45 @@
 # $FreeBSD$
 #
 
-PORTNAME=		Apache-PageKit
-PORTVERSION=		1.07
-PORTREVISION=		1
-CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
+PORTNAME=	Apache-PageKit
+PORTVERSION=	1.09
+PORTREVISION=	0
+CATEGORIES=	www perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-PKGNAMEPREFIX=		p5-
+PKGNAMEPREFIX=	p5-
 
-MAINTAINER=		svenasse@polaris.ca
+MAINTAINER=	svenasse@polaris.ca
 
-BUILD_DEPENDS=		${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
-			${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
-			${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
-			${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
-			${SITE_PERL}/Data/FormValidator.pm:${PORTSDIR}/textproc/p5-Data-FormValidator \
-			${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-			${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
-			${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
-			${SITE_PERL}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \
-			${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-			${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
-			${SITE_PERL}/MD5.pm:${PORTSDIR}/security/p5-MD5 \
-			${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-			${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath \
-			${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
-			${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
-			${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-			${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
-RUN_DEPENDS=		${BUILD_DEPENDS}
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
+		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/Data/FormValidator.pm:${PORTSDIR}/textproc/p5-Data-FormValidator \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
+		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
+		${SITE_PERL}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \
+		${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+		${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
+		${SITE_PERL}/MD5.pm:${PORTSDIR}/security/p5-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath \
+		${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
+		${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SITE_PERL=		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-EXAMPLESDIR?=		${PREFIX}/share/examples/${PORTNAME}
-PERL_CONFIGURE=		yes
+SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+EXAMPLESDIR?=	${PREFIX}/share/examples/${PORTNAME}
+PERL_CONFIGURE=	yes
 
-MAN3=			Apache::ErrorReport.3 \
-			Apache::PageKit.3 \
-			Apache::PageKit::Model.3 \
-			Apache::PageKit::Session.3 \
-			XML::XPathTemplate.3
-MANPREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		Apache::ErrorReport.3 \
+		Apache::PageKit.3 \
+		Apache::PageKit::Model.3 \
+		Apache::PageKit::Session.3
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -52,18 +51,29 @@ post-install:
 		${EXAMPLESDIR}/Config ${EXAMPLESDIR}/Content \
 		${EXAMPLESDIR}/Model ${EXAMPLESDIR}/Model/MyPageKit \
 		${EXAMPLESDIR}/View ${EXAMPLESDIR}/View/Default \
-		${EXAMPLESDIR}/View/pdf ${EXAMPLESDIR}/View/print \
-		${EXAMPLESDIR}/View/wml ${EXAMPLESDIR}/View/xml
+		${EXAMPLESDIR}/View/Default/pkit_edit ${EXAMPLESDIR}/View/pdf \
+		${EXAMPLESDIR}/View/print ${EXAMPLESDIR}/View/wml \
+		${EXAMPLESDIR}/View/xml ${EXAMPLESDIR}/contrib \
+		${EXAMPLESDIR}/contrib/bin ${EXAMPLESDIR}/contrib/locale \
+		${EXAMPLESDIR}/contrib/locale/templates \
+		${EXAMPLESDIR}/contrib/locale/templates/empty \
+		${EXAMPLESDIR}/contrib/locale/templates/po
 	@${INSTALL_DATA} ${WRKSRC}/docsrc/* ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/eg/README ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/eg/Config/* ${EXAMPLESDIR}/Config
 	@${INSTALL_DATA} ${WRKSRC}/eg/Content/* ${EXAMPLESDIR}/Content
 	@${INSTALL_DATA} ${WRKSRC}/eg/Model/MyPageKit/* ${EXAMPLESDIR}/Model/MyPageKit
-	@${INSTALL_DATA} ${WRKSRC}/eg/View/Default/* ${EXAMPLESDIR}/View/Default
+	@${INSTALL_DATA} ${WRKSRC}/eg/README ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/eg/View/Default/*.tmpl ${EXAMPLESDIR}/View/Default
+	@${INSTALL_DATA} ${WRKSRC}/eg/View/Default/*.xsl ${EXAMPLESDIR}/View/Default
+	@${INSTALL_DATA} ${WRKSRC}/eg/View/Default/pkit_edit/* ${EXAMPLESDIR}/View/Default/pkit_edit
 	@${INSTALL_DATA} ${WRKSRC}/eg/View/pdf/* ${EXAMPLESDIR}/View/pdf
 	@${INSTALL_DATA} ${WRKSRC}/eg/View/print/* ${EXAMPLESDIR}/View/print
 	@${INSTALL_DATA} ${WRKSRC}/eg/View/wml/* ${EXAMPLESDIR}/View/wml
 	@${INSTALL_DATA} ${WRKSRC}/eg/View/xml/* ${EXAMPLESDIR}/View/xml
+	@${INSTALL_DATA} ${WRKSRC}/eg/contrib/bin/* ${EXAMPLESDIR}/contrib/bin
+	@${INSTALL_DATA} ${WRKSRC}/eg/contrib/locale/README ${EXAMPLESDIR}/contrib/locale
+	@${INSTALL_DATA} ${WRKSRC}/eg/contrib/locale/templates/empty/* ${EXAMPLESDIR}/contrib/locale/templates/empty
+	@${INSTALL_DATA} ${WRKSRC}/eg/contrib/locale/templates/po/* ${EXAMPLESDIR}/contrib/locale/templates/po
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/p5-Apache-PageKit/distinfo b/www/p5-Apache-PageKit/distinfo
index fced272fa712..54ec0f02ab52 100644
--- a/www/p5-Apache-PageKit/distinfo
+++ b/www/p5-Apache-PageKit/distinfo
@@ -1 +1 @@
-MD5 (Apache-PageKit-1.07.tar.gz) = b5deb4157dc421ea4ed4dfdfdd09f385
+MD5 (Apache-PageKit-1.09.tar.gz) = 0121fd490e586bf2b4b5ee40a4aaa104
diff --git a/www/p5-Apache-PageKit/files/patch-src::lib::Apache::PageKit::Content.pm b/www/p5-Apache-PageKit/files/patch-src::lib::Apache::PageKit::Content.pm
deleted file mode 100644
index 76347bad316e..000000000000
--- a/www/p5-Apache-PageKit/files/patch-src::lib::Apache::PageKit::Content.pm
+++ /dev/null
@@ -1,35 +0,0 @@
---- lib/Apache/PageKit/Content.pm.orig	Tue Oct 23 23:49:55 2001
-+++ lib/Apache/PageKit/Content.pm	Thu Dec  6 15:13:16 2001
-@@ -20,11 +20,6 @@
-     require XML::LibXML;
-     require XML::LibXSLT;
- 
--    # call backs so that we can note the mtimes of dependant files
--    XML::LibXML->match_callback(\&match_uri);
--    XML::LibXML->open_callback(\&open_uri);
--    XML::LibXML->close_callback(\&close_uri);
--    XML::LibXML->read_callback(\&read_uri);
-   }
- 
-   $CONTENT = $content;
-@@ -62,6 +57,11 @@
- #  $INCLUDE_MTIMES->{$stylesheet_file} = $stylesheet_mtime;
- 
-   my $parser = XML::LibXML->new(ext_ent_handler => \&open_uri);
-+    # call backs so that we can note the mtimes of dependant files
-+    $parser->match_callback(\&match_uri);
-+    $parser->open_callback(\&open_uri);
-+    $parser->close_callback(\&close_uri);
-+    $parser->read_callback(\&read_uri);
-   my $xslt = XML::LibXSLT->new();
-   my $source = $parser->parse_file("/$component_id.xml");
-   my $style_doc = $parser->parse_file($stylesheet_file);
-@@ -155,7 +155,7 @@
- 
- sub match_uri {
-   my $uri = shift;
--  return $uri !~ /^\w+:/;
-+  return $uri !~ /(^\w+:)|(catalog$)/;
- }
- 
- sub open_uri {
diff --git a/www/p5-Apache-PageKit/pkg-plist b/www/p5-Apache-PageKit/pkg-plist
index 47c92e99caf2..be280d74a929 100644
--- a/www/p5-Apache-PageKit/pkg-plist
+++ b/www/p5-Apache-PageKit/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Content.pm
 lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/View.pm
+lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Content.pm
 lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Model.pm
 lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Param.pm
 lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Session.pm
 lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Config.pm
+lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit/Edit.pm
 lib/perl5/site_perl/%%PERL_VER%%/Apache/setup_eg.pl
 lib/perl5/site_perl/%%PERL_VER%%/Apache/PageKit.pm
 lib/perl5/site_perl/%%PERL_VER%%/Apache/ErrorReport.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XPathTemplate.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
 %%PORTDOCS%%share/doc/Apache-PageKit/README
 %%PORTDOCS%%share/doc/Apache-PageKit/features.xml
@@ -28,6 +28,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
 %%PORTDOCS%%share/examples/Apache-PageKit/Content/restricted.xml
 %%PORTDOCS%%share/examples/Apache-PageKit/Model/MyPageKit/Common.pm
 %%PORTDOCS%%share/examples/Apache-PageKit/Model/MyPageKit/MyModel.pm
+%%PORTDOCS%%share/examples/Apache-PageKit/README
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/begin_cell.tmpl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/bottom.tmpl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/charset.tmpl
@@ -42,6 +43,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/login1.tmpl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/media.tmpl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/newacct1.tmpl
+%%PORTDOCS%%share/examples/Apache-PageKit/View/Default/pkit_edit/open_file.tmpl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/restricted.tmpl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/simple_page.xsl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/Default/top.tmpl
@@ -53,18 +55,30 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit/.packlist
 %%PORTDOCS%%share/examples/Apache-PageKit/View/wml/simple_page.xsl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/xml/media.tmpl
 %%PORTDOCS%%share/examples/Apache-PageKit/View/xml/simple_page.xsl
-%%PORTDOCS%%share/examples/Apache-PageKit/README
+%%PORTDOCS%%share/examples/Apache-PageKit/contrib/bin/build_locale.pl
+%%PORTDOCS%%share/examples/Apache-PageKit/contrib/locale/README
+%%PORTDOCS%%share/examples/Apache-PageKit/contrib/locale/templates/empty/empty.po
+%%PORTDOCS%%share/examples/Apache-PageKit/contrib/locale/templates/po/de.po
+%%PORTDOCS%%share/examples/Apache-PageKit/contrib/locale/templates/po/fr.po
+%%PORTDOCS%%share/examples/Apache-PageKit/contrib/locale/templates/po/pt.po
 %%PORTDOCS%%@dirrm share/doc/Apache-PageKit
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Config
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Content
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Model/MyPageKit
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Model
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/Default
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/pdf
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/print
-%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/wml
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/contrib/locale/templates/po
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/contrib/locale/templates/empty
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/contrib/locale/templates
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/contrib/locale
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/contrib/bin
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/contrib
 %%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/xml
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/wml
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/print
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/pdf
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/Default/pkit_edit
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View/Default
 %%PORTDOCS%%@dirrm share/examples/Apache-PageKit/View
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Model/MyPageKit
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Model
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Content
+%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Config
 %%PORTDOCS%%@dirrm share/examples/Apache-PageKit
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/PageKit
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true