diff options
| author | cube <cube@pkgsrc.org> | 2005-09-21 21:23:46 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2005-09-21 21:23:46 +0000 |
| commit | b709ff4fecb4c0c9bf535ff8966abd630472aa2b (patch) | |
| tree | b4dd64fc8cb173090226159328217bc84635f301 | |
| parent | e8cee2eee3efd865db143957a1d08cba1cdaccdc (diff) | |
| download | pkgsrc-b709ff4fecb4c0c9bf535ff8966abd630472aa2b.tar.gz | |
Mason API has changed after version 1.28. Add a patch to catch up with the
change (it breaks for callbacks).
Inspired from the commit to solve the same issue on the 3.4 branch of RT.
Bump PKGREVISION and Mason version requirement.
| -rw-r--r-- | devel/rt3/Makefile | 6 | ||||
| -rw-r--r-- | devel/rt3/distinfo | 3 | ||||
| -rw-r--r-- | devel/rt3/patches/patch-ab | 34 |
3 files changed, 39 insertions, 4 deletions
diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile index 67bf8864115..fe8ad801e12 100644 --- a/devel/rt3/Makefile +++ b/devel/rt3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2005/09/09 10:54:15 cube Exp $ +# $NetBSD: Makefile,v 1.11 2005/09/21 21:23:46 cube Exp $ DISTNAME= rt-3.2.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ @@ -39,7 +39,7 @@ DEPENDS+= p5-Module-Versions-Report-[0-9]*:../../devel/p5-Module-Versions-Report DEPENDS+= p5-Params-Validate>=0.02:../../devel/p5-Params-Validate DEPENDS+= p5-Cache-Cache>=1.02:../../devel/p5-Cache-Cache DEPENDS+= p5-Exception-Class>=1.14:../../devel/p5-Exception-Class -DEPENDS+= p5-HTML-Mason>=1.23:../../www/p5-HTML-Mason +DEPENDS+= p5-HTML-Mason>=1.31:../../www/p5-HTML-Mason DEPENDS+= p5-MLDBM>=2.01:../../databases/p5-MLDBM DEPENDS+= p5-FreezeThaw>=0.43:../../devel/p5-FreezeThaw DEPENDS+= p5-Storable>=2.08:../../devel/p5-Storable diff --git a/devel/rt3/distinfo b/devel/rt3/distinfo index cc068da27f5..42550eaa99a 100644 --- a/devel/rt3/distinfo +++ b/devel/rt3/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/03/24 17:04:12 cube Exp $ +$NetBSD: distinfo,v 1.5 2005/09/21 21:23:46 cube Exp $ SHA1 (rt-3.2.3.tar.gz) = 100cb67f5ef716c0d32421f7d153c3b7a7d86c7f RMD160 (rt-3.2.3.tar.gz) = 538bbe07bcff5fcc19fa0e435c304f716158d69b Size (rt-3.2.3.tar.gz) = 1272638 bytes SHA1 (patch-aa) = 4d29c290658144dcd7aa08d87649681dd2549b43 +SHA1 (patch-ab) = 7cb3cb06444f29b4a1a0fcc47abb250336acf0ab diff --git a/devel/rt3/patches/patch-ab b/devel/rt3/patches/patch-ab new file mode 100644 index 00000000000..ee6f03d11e0 --- /dev/null +++ b/devel/rt3/patches/patch-ab @@ -0,0 +1,34 @@ +$NetBSD: patch-ab,v 1.1 2005/09/21 21:23:46 cube Exp $ + +--- html/Elements/Callback.orig 2004-07-29 02:08:11.000000000 +0200 ++++ html/Elements/Callback +@@ -49,7 +49,7 @@ my (%cache, $check); + <%init> + # checks for inode change time for each callback directory + my $new_check = join( +- $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->resolver->comp_root_array ++ $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->comp_root_array + ) or return; + + $Page = $m->callers(1)->path unless ($Page); +@@ -64,8 +64,18 @@ else { + + if (!$callbacks) { + my $path = "/Callbacks/*$Page/$_CallbackName"; +- $callbacks = [ $m->interp->resolver->glob_path($path) ]; +- @$callbacks = grep !/^\.|~$/, @$callbacks; #skip backup files ++ ++ my @roots = map { $_->[1] } $m->interp->comp_root_array; ++ my %seen; ++ ++ for my $root (@roots) { ++ push @$callbacks, ++ # Skip backup files, files without a leading package name, ++ # and files we've already seen ++ grep { !/^\.|~$/ ++ and not $seen{$_}++ } ++ $m->interp->resolver->glob_path($path, $root); ++ } + + #skip files without a package + my $invalid_base = "/Callbacks/$Page/$_CallbackName"; |