From 389525cae55ac950e6cf22c466f32932825e0638 Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 8 Apr 2012 22:04:40 +0000 Subject: [PATCH] Update textproc/p5-Catalyst-View-TT-FunctionGenerator to version 0.02. Replace NEXT by MRO::Compat. Fix a test. Catalyst::View::TT::FunctionGenerator is deprecated. from Andreas Voegele --- .../Makefile | 13 ++++++------ .../distinfo | 10 +++++----- ...-lib_Catalyst_View_TT_FunctionGenerator_pm | 20 +++++++++++++++++++ .../patches/patch-t_basic_t | 12 +++++++++++ .../pkg/MESSAGE | 1 + .../pkg/PLIST | 3 +-- 6 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-lib_Catalyst_View_TT_FunctionGenerator_pm create mode 100644 textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-t_basic_t create mode 100644 textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/MESSAGE diff --git a/textproc/p5-Catalyst-View-TT-FunctionGenerator/Makefile b/textproc/p5-Catalyst-View-TT-FunctionGenerator/Makefile index 27292319bad..9eeb7f9faeb 100644 --- a/textproc/p5-Catalyst-View-TT-FunctionGenerator/Makefile +++ b/textproc/p5-Catalyst-View-TT-FunctionGenerator/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2010/12/03 11:46:48 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2012/04/08 22:04:40 sthen Exp $ -COMMENT= use shorter names in catalyst tt views +COMMENT= use shorter names in catalyst tt views (deprecated) MODULES= cpan -DISTNAME= Catalyst-View-TT-FunctionGenerator-0.01 -REVISION= 0 +DISTNAME= Catalyst-View-TT-FunctionGenerator-0.02 CATEGORIES= textproc devel USE_GROFF = Yes @@ -15,8 +14,10 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes RUN_DEPENDS= textproc/p5-Catalyst-View-TT \ - www/p5-Catalyst-Plugin-Singleton + www/p5-Catalyst-Plugin-Singleton \ + devel/p5-MRO-Compat -MAKE_ENV= TEST_POD=Yes +post-build: + @rm -f ${WRKBUILD}/blib/lib/Catalyst/View/TT/FunctionGenerator.pm.orig .include diff --git a/textproc/p5-Catalyst-View-TT-FunctionGenerator/distinfo b/textproc/p5-Catalyst-View-TT-FunctionGenerator/distinfo index 690375e0fb5..7cdfc21a8cd 100644 --- a/textproc/p5-Catalyst-View-TT-FunctionGenerator/distinfo +++ b/textproc/p5-Catalyst-View-TT-FunctionGenerator/distinfo @@ -1,5 +1,5 @@ -MD5 (Catalyst-View-TT-FunctionGenerator-0.01.tar.gz) = N1VI3Kb0kR6gmFK72hYxxw== -RMD160 (Catalyst-View-TT-FunctionGenerator-0.01.tar.gz) = DHYJ24Wy2HsP15595fmwR3eqMNc= -SHA1 (Catalyst-View-TT-FunctionGenerator-0.01.tar.gz) = hKTFE0a6147LTS0NdvRoHyupJSg= -SHA256 (Catalyst-View-TT-FunctionGenerator-0.01.tar.gz) = 4ZQnWucRbYjSh/khbl3v7UFsCcevKfMcsFvKPnH80SE= -SIZE (Catalyst-View-TT-FunctionGenerator-0.01.tar.gz) = 5256 +MD5 (Catalyst-View-TT-FunctionGenerator-0.02.tar.gz) = cX1nwScyPijS+YfVQn9r6w== +RMD160 (Catalyst-View-TT-FunctionGenerator-0.02.tar.gz) = x0ZPseKk9+KNr2+OORvvCDJF1pI= +SHA1 (Catalyst-View-TT-FunctionGenerator-0.02.tar.gz) = ux4TuORdiuT0GN2LqRawpP6W+eo= +SHA256 (Catalyst-View-TT-FunctionGenerator-0.02.tar.gz) = nG1QkbcI4M85oRYvWGAphLDozR+Svt5hRRIdaLmW0qU= +SIZE (Catalyst-View-TT-FunctionGenerator-0.02.tar.gz) = 5098 diff --git a/textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-lib_Catalyst_View_TT_FunctionGenerator_pm b/textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-lib_Catalyst_View_TT_FunctionGenerator_pm new file mode 100644 index 00000000000..29b13329dfb --- /dev/null +++ b/textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-lib_Catalyst_View_TT_FunctionGenerator_pm @@ -0,0 +1,20 @@ +$OpenBSD: patch-lib_Catalyst_View_TT_FunctionGenerator_pm,v 1.1 2012/04/08 22:04:40 sthen Exp $ +--- lib/Catalyst/View/TT/FunctionGenerator.pm.orig Wed Mar 7 03:57:07 2007 ++++ lib/Catalyst/View/TT/FunctionGenerator.pm Sun Nov 6 09:14:00 2011 +@@ -10,6 +10,7 @@ use Catalyst::Utils (); + use Class::Inspector (); + use Scalar::Util qw/weaken/; + use Carp (); ++use MRO::Compat; + + our $VERSION = "0.02"; + +@@ -56,7 +57,7 @@ sub template_vars { + my ( $self, $c ) = @_; + + return ( +- $self->NEXT::template_vars( $c ), ++ $self->maybe::next::method( $c ), + map { + my ( $obj, @methods ) = @$_; + weaken( $obj ) if ( $obj == $c ); diff --git a/textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-t_basic_t b/textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-t_basic_t new file mode 100644 index 00000000000..7740cd1f037 --- /dev/null +++ b/textproc/p5-Catalyst-View-TT-FunctionGenerator/patches/patch-t_basic_t @@ -0,0 +1,12 @@ +$OpenBSD: patch-t_basic_t,v 1.1 2012/04/08 22:04:40 sthen Exp $ +--- t/basic.t.orig Wed Mar 7 04:01:01 2007 ++++ t/basic.t Sun Nov 6 09:25:20 2011 +@@ -16,7 +16,7 @@ $SIG{__DIE__} = \&Carp::confess; + my $moose = bless {}, "Foodiness"; + sub moose { $moose } + +- my %config; ++ my %config = ( root => '/var/empty' ); + sub config { \%config } + + sub debug { 0 } diff --git a/textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/MESSAGE b/textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/MESSAGE new file mode 100644 index 00000000000..dde64f02c69 --- /dev/null +++ b/textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/MESSAGE @@ -0,0 +1 @@ +Catalyst::View::TT::FunctionGenerator is deprecated. diff --git a/textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/PLIST b/textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/PLIST index 2051e5b3ff7..7511ba2d207 100644 --- a/textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/PLIST +++ b/textproc/p5-Catalyst-View-TT-FunctionGenerator/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/06 13:00:43 espie Exp $ -${P5SITE}/Catalyst/View/ +@comment $OpenBSD: PLIST,v 1.2 2012/04/08 22:04:40 sthen Exp $ ${P5SITE}/Catalyst/View/TT/ ${P5SITE}/Catalyst/View/TT/FunctionGenerator.pm @man man/man3p/Catalyst::View::TT::FunctionGenerator.3p