ports/99112: [PATCH] www/p5-Maypole: update to 2.11.3

Aaron Dalton aaron at FreeBSD.org
Sun Jun 18 19:10:26 UTC 2006


>Number:         99112
>Category:       ports
>Synopsis:       [PATCH] www/p5-Maypole: update to 2.11.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 18 19:10:24 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Aaron Dalton
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD moondance.itsy-bitsy.net 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Sun May  8 10:21:06 UTC
>Description:
- Update to 2.11.3
- Update and reorder _DEPENDS to match Makefile.PL
- Update plist
- Regen patchfile

Port maintainer (lth at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- p5-Maypole-2.11.3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Maypole/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- Makefile	28 May 2006 11:44:50 -0000	1.11
+++ Makefile	18 Jun 2006 18:59:37 -0000
@@ -5,11 +5,12 @@
 # $FreeBSD: ports/www/p5-Maypole/Makefile,v 1.11 2006/05/28 11:44:50 lth Exp $
 
 PORTNAME=	Maypole
-PORTVERSION=	2.10
+PORTVERSION=	2.11.3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TE/TEEJAY
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-2.11_pre3
 
 MAINTAINER=	lth at FreeBSD.org
 COMMENT=	MVC web application framework
@@ -18,21 +19,25 @@
 		${SITE_PERL}/Class/DBI/AbstractSearch.pm:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \
 		${SITE_PERL}/Class/DBI/Pager.pm:${PORTSDIR}/databases/p5-Class-DBI-Pager \
 		${SITE_PERL}/Class/DBI/Plugin/RetrieveAll.pm:${PORTSDIR}/databases/p5-Class-DBI-Plugin-RetrieveAll \
-		${SITE_PERL}/Class/DBI/AsForm.pm:${PORTSDIR}/databases/p5-Class-DBI-AsForm \
 		${SITE_PERL}/Class/DBI/FromCGI.pm:${PORTSDIR}/databases/p5-Class-DBI-FromCGI \
 		${SITE_PERL}/Class/DBI/Loader/Relationship.pm:${PORTSDIR}/databases/p5-Class-DBI-Loader-Relationship \
+		${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI \
+		${SITE_PERL}/Class/DBI/SQLite.pm:${PORTSDIR}/databases/p5-Class-DBI-SQLite \
 		${SITE_PERL}/CGI/Untaint.pm:${PORTSDIR}/www/p5-CGI-Untaint \
+		${SITE_PERL}/CGI/Untaint/date.pm:${PORTSDIR}/www/p5-CGI-Untaint-date \
+		${SITE_PERL}/CGI/Untaint/email.pm:${PORTSDIR}/www/p5-CGI-Untaint-email \
 		${SITE_PERL}/UNIVERSAL/moniker.pm:${PORTSDIR}/devel/p5-UNIVERSAL-moniker \
 		${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		${SITE_PERL}/Template/Plugin/Class.pm:${PORTSDIR}/www/p5-Template-Plugin-Class \
-		${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \
-		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${SITE_PERL}/Lingua/EN/Inflect/Number.pm:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
+		${SITE_PERL}/URI/QueryParam.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/CGI/Simple.pm:${PORTSDIR}/www/p5-CGI-Simple \
 		${SITE_PERL}/HTTP/Headers.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+		${SITE_PERL}/HTTP/Body.pm:${PORTSDIR}/www/p5-HTTP-Body \
+		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
+		${SITE_PERL}/Template/Plugin/Class.pm:${PORTSDIR}/www/p5-Template-Plugin-Class \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/File/MMagic/XS.pm:${PORTSDIR}/devel/p5-File-MMagic-XS \
+		${SITE_PERL}/Class/DBI/Plugin/Type.pm:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type
 BUILD_DEPENDS=	${RUN_DEPENDS}
 BUILD_DEPENDS+=	${SITE_PERL}/Test/MockModule.pm:${PORTSDIR}/devel/p5-Test-MockModule
 
@@ -67,15 +72,18 @@
 		Maypole::Manual::About.3 \
 		Maypole::Manual::Beer.3 \
 		Maypole::Manual::BuySpy.3 \
+		Maypole::Manual::Cookbook.3 \
 		Maypole::Manual::Flox.3 \
+		Maypole::Manual::Inheritance.3 \
+		Maypole::Manual::Install.3 \
 		Maypole::Manual::Model.3 \
 		Maypole::Manual::Plugins.3 \
-		Maypole::Manual::Request.3 \
 		Maypole::Manual::StandardTemplates.3 \
 		Maypole::Manual::View.3 \
 		Maypole::Manual::Workflow.3 \
 		Maypole::Model::Base.3 \
 		Maypole::Model::CDBI.3 \
+		Maypole::Model::CDBI::AsForm.3 \
 		Maypole::Model::CDBI::Plain.3 \
 		Maypole::Session.3 \
 		Maypole::View::Base.3 \
@@ -85,23 +93,30 @@
 		About.pod \
 		Beer.pod \
 		BuySpy.pod \
+		Cookbook.pod \
 		Flox.pod \
+		Inheritance.pod \
+		Install.pod \
 		Model.pod \
-		Request.pod \
+		Plugins.pod \
 		StandardTemplates.pod \
 		View.pod \
 		Workflow.pod
-EXAMPLE_FILES=	BeerDB.pm
-TEMPLATE_FILES=	maypole.css \
-		beer/addnew \
+EXAMPLE_FILES=	BeerDB.pm \
+		beerdb.sql \
+		BeerDB/Base.pm \
+		BeerDB/Beer.pm
+TEMPLATE_FILES=	beer/addnew \
 		factory/addnew \
 		factory/edit \
 		factory/footer \
 		factory/frontpage \
 		factory/header \
 		factory/list \
+		factory/login \
 		factory/macros \
 		factory/maypole \
+		factory/maypole.css \
 		factory/navbar \
 		factory/pager \
 		factory/search_form \
@@ -119,14 +134,17 @@
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/Maypole/Manual/${FILE} ${DOCSDIR}
 .endfor
 	@ ${MKDIR} ${EXAMPLESDIR}
+	@ ${MKDIR} ${EXAMPLESDIR}/BeerDB
 .for FILE in ${EXAMPLE_FILES}
 	@ ${INSTALL_DATA} ${WRKSRC}/ex/${FILE} ${EXAMPLESDIR}
 .endfor
 .endif
+	@ ${MKDIR} ${DATADIR}
+	@ ${MKDIR} ${DATADIR}/templates
 	@ ${MKDIR} ${DATADIR}/templates/beer
 	@ ${MKDIR} ${DATADIR}/templates/factory
 .for FILE in ${TEMPLATE_FILES}
-	@ ${INSTALL_DATA} ${WRKSRC}/templates/${FILE} ${DATADIR}/templates/${FILE}
+	@ ${INSTALL_DATA} ${WRKSRC}/lib/Maypole/templates/${FILE} ${DATADIR}/templates/${FILE}
 .endfor
 	@ ${CAT} ${PKGMESSAGE}
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/p5-Maypole/distinfo,v
retrieving revision 1.9
diff -u -u -r1.9 distinfo
--- distinfo	24 Jan 2006 03:13:55 -0000	1.9
+++ distinfo	18 Jun 2006 18:59:37 -0000
@@ -1,3 +1,3 @@
-MD5 (Maypole-2.10.tar.gz) = 5d908a447d4e6f6364403aa56b1ab211
-SHA256 (Maypole-2.10.tar.gz) = 8a89c082b0eb9530693076ca595169ed52ed39f749ef3c7b402b972e83d0e3da
-SIZE (Maypole-2.10.tar.gz) = 87985
+MD5 (Maypole-2.11_pre3.tar.gz) = 6933f7b976b6ae1f520165b6b10bb066
+SHA256 (Maypole-2.11_pre3.tar.gz) = a7469e8559b90d3244f5e4e3f71f220d73804901fd1b5cb3867a2343d369ebc8
+SIZE (Maypole-2.11_pre3.tar.gz) = 129734
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/p5-Maypole/pkg-plist,v
retrieving revision 1.7
diff -u -u -r1.7 pkg-plist
--- pkg-plist	22 Jan 2006 02:58:09 -0000	1.7
+++ pkg-plist	18 Jun 2006 18:59:37 -0000
@@ -10,32 +10,39 @@
 %%SITE_PERL%%/Maypole/Manual/About.pod
 %%SITE_PERL%%/Maypole/Manual/Beer.pod
 %%SITE_PERL%%/Maypole/Manual/BuySpy.pod
+%%SITE_PERL%%/Maypole/Manual/Cookbook.pod
 %%SITE_PERL%%/Maypole/Manual/Flox.pod
+%%SITE_PERL%%/Maypole/Manual/Inheritance.pod
+%%SITE_PERL%%/Maypole/Manual/Install.pod
 %%SITE_PERL%%/Maypole/Manual/Model.pod
 %%SITE_PERL%%/Maypole/Manual/Plugins.pod
-%%SITE_PERL%%/Maypole/Manual/Request.pod
 %%SITE_PERL%%/Maypole/Manual/StandardTemplates.pod
 %%SITE_PERL%%/Maypole/Manual/View.pod
 %%SITE_PERL%%/Maypole/Manual/Workflow.pod
 %%SITE_PERL%%/Maypole/Model/Base.pm
 %%SITE_PERL%%/Maypole/Model/CDBI.pm
+%%SITE_PERL%%/Maypole/Model/CDBI/AsForm.pm
 %%SITE_PERL%%/Maypole/Model/CDBI/Plain.pm
 %%SITE_PERL%%/Maypole/Session.pm
 %%SITE_PERL%%/Maypole/View/Base.pm
 %%SITE_PERL%%/Maypole/View/TT.pm
+%%SITE_PERL%%/Maypole/templates/beer/addnew
+%%SITE_PERL%%/Maypole/templates/factory/addnew
+%%SITE_PERL%%/Maypole/templates/factory/edit
+%%SITE_PERL%%/Maypole/templates/factory/footer
+%%SITE_PERL%%/Maypole/templates/factory/frontpage
+%%SITE_PERL%%/Maypole/templates/factory/header
+%%SITE_PERL%%/Maypole/templates/factory/list
+%%SITE_PERL%%/Maypole/templates/factory/login
+%%SITE_PERL%%/Maypole/templates/factory/macros
+%%SITE_PERL%%/Maypole/templates/factory/maypole
+%%SITE_PERL%%/Maypole/templates/factory/maypole.css
+%%SITE_PERL%%/Maypole/templates/factory/navbar
+%%SITE_PERL%%/Maypole/templates/factory/pager
+%%SITE_PERL%%/Maypole/templates/factory/search_form
+%%SITE_PERL%%/Maypole/templates/factory/title
+%%SITE_PERL%%/Maypole/templates/factory/view
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/.packlist
-%%PORTDOCS%%%%DOCSDIR%%/About.pod
-%%PORTDOCS%%%%DOCSDIR%%/Beer.pod
-%%PORTDOCS%%%%DOCSDIR%%/BuySpy.pod
-%%PORTDOCS%%%%DOCSDIR%%/Flox.pod
-%%PORTDOCS%%%%DOCSDIR%%/Manual.pod
-%%PORTDOCS%%%%DOCSDIR%%/Model.pod
-%%PORTDOCS%%%%DOCSDIR%%/Request.pod
-%%PORTDOCS%%%%DOCSDIR%%/StandardTemplates.pod
-%%PORTDOCS%%%%DOCSDIR%%/View.pod
-%%PORTDOCS%%%%DOCSDIR%%/Workflow.pod
-%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB.pm
-%%DATADIR%%/templates/maypole.css
 %%DATADIR%%/templates/beer/addnew
 %%DATADIR%%/templates/factory/addnew
 %%DATADIR%%/templates/factory/edit
@@ -43,24 +50,47 @@
 %%DATADIR%%/templates/factory/frontpage
 %%DATADIR%%/templates/factory/header
 %%DATADIR%%/templates/factory/list
+%%DATADIR%%/templates/factory/login
 %%DATADIR%%/templates/factory/macros
 %%DATADIR%%/templates/factory/maypole
+%%DATADIR%%/templates/factory/maypole.css
 %%DATADIR%%/templates/factory/navbar
 %%DATADIR%%/templates/factory/pager
 %%DATADIR%%/templates/factory/search_form
 %%DATADIR%%/templates/factory/title
 %%DATADIR%%/templates/factory/view
+%%PORTDOCS%%%%DOCSDIR%%/About.pod
+%%PORTDOCS%%%%DOCSDIR%%/Beer.pod
+%%PORTDOCS%%%%DOCSDIR%%/BuySpy.pod
+%%PORTDOCS%%%%DOCSDIR%%/Cookbook.pod
+%%PORTDOCS%%%%DOCSDIR%%/Flox.pod
+%%PORTDOCS%%%%DOCSDIR%%/Inheritance.pod
+%%PORTDOCS%%%%DOCSDIR%%/Install.pod
+%%PORTDOCS%%%%DOCSDIR%%/Manual.pod
+%%PORTDOCS%%%%DOCSDIR%%/Model.pod
+%%PORTDOCS%%%%DOCSDIR%%/Plugins.pod
+%%PORTDOCS%%%%DOCSDIR%%/StandardTemplates.pod
+%%PORTDOCS%%%%DOCSDIR%%/View.pod
+%%PORTDOCS%%%%DOCSDIR%%/Workflow.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/Base.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/Beer.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/beerdb.sql
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/BeerDB
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/templates/factory
 @dirrm %%DATADIR%%/templates/beer
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
- at dirrmtry %%SITE_PERL%%/Maypole/Manual
- at dirrmtry %%SITE_PERL%%/Maypole/Model/CDBI
- at dirrmtry %%SITE_PERL%%/Maypole/Model
- at dirrmtry %%SITE_PERL%%/Maypole/View
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
+ at dirrm %%SITE_PERL%%/Maypole/templates/factory
+ at dirrm %%SITE_PERL%%/Maypole/templates/beer
+ at dirrm %%SITE_PERL%%/Maypole/templates
+ at dirrm %%SITE_PERL%%/Maypole/View
+ at dirrm %%SITE_PERL%%/Maypole/Model/CDBI
+ at dirrm %%SITE_PERL%%/Maypole/Model
+ at dirrm %%SITE_PERL%%/Maypole/Manual
 @dirrmtry %%SITE_PERL%%/Maypole
 @dirrmtry %%SITE_PERL%%/CGI
 @dirrmtry %%SITE_PERL%%/Apache
Index: files/patch-Makefile.PL
===================================================================
RCS file: /home/pcvs/ports/www/p5-Maypole/files/patch-Makefile.PL,v
retrieving revision 1.5
diff -u -u -r1.5 patch-Makefile.PL
--- files/patch-Makefile.PL	22 Jul 2005 15:39:19 -0000	1.5
+++ files/patch-Makefile.PL	18 Jun 2006 18:59:37 -0000
@@ -1,19 +1,11 @@
---- Makefile.PL.orig	Fri Jul 22 15:06:47 2005
-+++ Makefile.PL	Fri Jul 22 15:08:01 2005
-@@ -24,7 +24,6 @@
-         HTTP::Headers                    => 1.59,
-         Template                         => 0,
-         Template::Plugin::Class          => 0,
--        Test::MockModule                 => 0,
- 	Digest::MD5			 => 0,
-     },    # e.g., Module::Name => 1.1
-     (
-@@ -51,7 +50,7 @@
+--- Makefile.PL.orig	Mon Apr 17 11:58:59 2006
++++ Makefile.PL	Sun Jun 18 11:28:22 2006
+@@ -56,7 +56,7 @@
      eval { require DBD::SQLite } or do {
          print "Error loading DBD::SQLite, trying DBD::SQLite2\n";
          eval {require DBD::SQLite2} ? $driver = 'SQLite2'
 -            : die "DBD::SQLite2 is not installed";
-+            : do { warn "DBD::SQLite2 is not installed"; exit ; }
++		: do { warn "DBD::SQLite2 is not installed"; exit ; }
      };
      require DBI;
      my $dbh = DBI->connect("dbi:$driver:dbname=t/beerdb.db");
--- p5-Maypole-2.11.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list