>Number:         16289
>Category:       pkg
>Synopsis:       update patch for www/p5-Template-Toolkit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 10 08:55:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Hiramatsu Yoshifumi
>Release:        -current 1.5ZA
>Organization:
	
>Environment:
	<machine, os, target, libraries (multiple lines)>
System: NetBSD river.my.domain 1.5ZA NetBSD 1.5ZA (River) #1: Sat Feb 16 01:29:44 JST 2002     hiramatsu@river.my.domain:/usr/src/sys/arch/i386/compile/River i386
Architecture: i386
Machine: i386
>Description:
www/p5-Template-Toolkit has been updated to 2.06. 

Changes from 2.04
* Add 'valign' as an option to the html/cell template.
* Added the 'uri' filter for URI escaping text.
* Incorporated Doug's XS Stash.
* Modified Template::Plugins fetch() method to accept $factory as a code reference.
* 'orange' became valid colour.
* Added 'sorted' as a flag to the HTML plugin.
* Added get_all() and get() to the DBI iterator.

Also, attached patch fixes hard coded /usr/pkg.

>How-To-Repeat:
	
>Fix:
Apply this patch, and remove "patches" directory.

diff -bur p5-Template-Toolkit.orig/Makefile p5-Template-Toolkit/Makefile
--- p5-Template-Toolkit.orig/Makefile	Thu Mar 14 01:03:23 2002
+++ p5-Template-Toolkit/Makefile	Thu Mar 14 01:07:48 2002
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2001/10/18 15:20:51 veego Exp $
 #
 
-DISTNAME=	Template-Toolkit-2.04
+DISTNAME=	Template-Toolkit-2.06
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5tto
 CATEGORIES=	www perl5
@@ -30,6 +30,7 @@
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Template/.packlist
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+		 TT_PREFIX=${PREFIX}/share/tt2 TT_ACCEPT=y
 
 .include "../../mk/bsd.pkg.mk"
diff -bur p5-Template-Toolkit.orig/PLIST p5-Template-Toolkit/PLIST
--- p5-Template-Toolkit.orig/PLIST	Thu Mar 14 01:03:23 2002
+++ p5-Template-Toolkit/PLIST	Thu Mar 14 01:07:48 2002
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:17 zuntum Exp $
+@comment $NetBSD$
 share/tt2/docs/README
 share/tt2/docs/html/FAQ/FAQ.html
 share/tt2/docs/html/FAQ/index.html
@@ -70,10 +70,13 @@
 share/tt2/docs/html/Modules/Template/Service.html
 share/tt2/docs/html/Modules/Template/Stash.html
 share/tt2/docs/html/Modules/Template/Stash/Context.html
+share/tt2/docs/html/Modules/Template/Stash/XS.html
 share/tt2/docs/html/Modules/Template/Test.html
 share/tt2/docs/html/Modules/index.html
 share/tt2/docs/html/README
 share/tt2/docs/html/Release/Changes.html
+share/tt2/docs/html/Release/HACKING.html
+share/tt2/docs/html/Release/INSTALL.html
 share/tt2/docs/html/Release/README.html
 share/tt2/docs/html/Release/TODO.html
 share/tt2/docs/html/Release/index.html
@@ -165,9 +168,12 @@
 share/tt2/docs/src/Modules/Template/Service.html
 share/tt2/docs/src/Modules/Template/Stash.html
 share/tt2/docs/src/Modules/Template/Stash/Context.html
+share/tt2/docs/src/Modules/Template/Stash/XS.html
 share/tt2/docs/src/Modules/Template/Test.html
 share/tt2/docs/src/Modules/index.html
 share/tt2/docs/src/Release/Changes.html
+share/tt2/docs/src/Release/HACKING.html
+share/tt2/docs/src/Release/INSTALL.html
 share/tt2/docs/src/Release/README.html
 share/tt2/docs/src/Release/TODO.html
 share/tt2/docs/src/Release/index.html
@@ -438,6 +444,7 @@
 share/tt2/images/splash/aqua/diamond.gif
 share/tt2/images/splash/aqua/dot.gif
 share/tt2/images/splash/aqua/down.gif
+share/tt2/images/splash/aqua/horz.gif
 share/tt2/images/splash/aqua/left.gif
 share/tt2/images/splash/aqua/minus.gif
 share/tt2/images/splash/aqua/negbox.gif
@@ -461,6 +468,7 @@
 share/tt2/images/splash/black/diamond.gif
 share/tt2/images/splash/black/dot.gif
 share/tt2/images/splash/black/down.gif
+share/tt2/images/splash/black/horz.gif
 share/tt2/images/splash/black/left.gif
 share/tt2/images/splash/black/minus.gif
 share/tt2/images/splash/black/negbox.gif
@@ -484,6 +492,7 @@
 share/tt2/images/splash/blood/diamond.gif
 share/tt2/images/splash/blood/dot.gif
 share/tt2/images/splash/blood/down.gif
+share/tt2/images/splash/blood/horz.gif
 share/tt2/images/splash/blood/left.gif
 share/tt2/images/splash/blood/minus.gif
 share/tt2/images/splash/blood/negbox.gif
@@ -507,6 +516,7 @@
 share/tt2/images/splash/blue/diamond.gif
 share/tt2/images/splash/blue/dot.gif
 share/tt2/images/splash/blue/down.gif
+share/tt2/images/splash/blue/horz.gif
 share/tt2/images/splash/blue/left.gif
 share/tt2/images/splash/blue/minus.gif
 share/tt2/images/splash/blue/negbox.gif
@@ -530,6 +540,7 @@
 share/tt2/images/splash/blue25/diamond.gif
 share/tt2/images/splash/blue25/dot.gif
 share/tt2/images/splash/blue25/down.gif
+share/tt2/images/splash/blue25/horz.gif
 share/tt2/images/splash/blue25/left.gif
 share/tt2/images/splash/blue25/minus.gif
 share/tt2/images/splash/blue25/negbox.gif
@@ -553,6 +564,7 @@
 share/tt2/images/splash/blue50/diamond.gif
 share/tt2/images/splash/blue50/dot.gif
 share/tt2/images/splash/blue50/down.gif
+share/tt2/images/splash/blue50/horz.gif
 share/tt2/images/splash/blue50/left.gif
 share/tt2/images/splash/blue50/minus.gif
 share/tt2/images/splash/blue50/negbox.gif
@@ -576,6 +588,7 @@
 share/tt2/images/splash/blue75/diamond.gif
 share/tt2/images/splash/blue75/dot.gif
 share/tt2/images/splash/blue75/down.gif
+share/tt2/images/splash/blue75/horz.gif
 share/tt2/images/splash/blue75/left.gif
 share/tt2/images/splash/blue75/minus.gif
 share/tt2/images/splash/blue75/negbox.gif
@@ -599,6 +612,7 @@
 share/tt2/images/splash/bud/diamond.gif
 share/tt2/images/splash/bud/dot.gif
 share/tt2/images/splash/bud/down.gif
+share/tt2/images/splash/bud/horz.gif
 share/tt2/images/splash/bud/left.gif
 share/tt2/images/splash/bud/minus.gif
 share/tt2/images/splash/bud/negbox.gif
@@ -622,6 +636,7 @@
 share/tt2/images/splash/green/diamond.gif
 share/tt2/images/splash/green/dot.gif
 share/tt2/images/splash/green/down.gif
+share/tt2/images/splash/green/horz.gif
 share/tt2/images/splash/green/left.gif
 share/tt2/images/splash/green/minus.gif
 share/tt2/images/splash/green/negbox.gif
@@ -645,6 +660,7 @@
 share/tt2/images/splash/green25/diamond.gif
 share/tt2/images/splash/green25/dot.gif
 share/tt2/images/splash/green25/down.gif
+share/tt2/images/splash/green25/horz.gif
 share/tt2/images/splash/green25/left.gif
 share/tt2/images/splash/green25/minus.gif
 share/tt2/images/splash/green25/negbox.gif
@@ -668,6 +684,7 @@
 share/tt2/images/splash/green50/diamond.gif
 share/tt2/images/splash/green50/dot.gif
 share/tt2/images/splash/green50/down.gif
+share/tt2/images/splash/green50/horz.gif
 share/tt2/images/splash/green50/left.gif
 share/tt2/images/splash/green50/minus.gif
 share/tt2/images/splash/green50/negbox.gif
@@ -691,6 +708,7 @@
 share/tt2/images/splash/green75/diamond.gif
 share/tt2/images/splash/green75/dot.gif
 share/tt2/images/splash/green75/down.gif
+share/tt2/images/splash/green75/horz.gif
 share/tt2/images/splash/green75/left.gif
 share/tt2/images/splash/green75/minus.gif
 share/tt2/images/splash/green75/negbox.gif
@@ -714,6 +732,7 @@
 share/tt2/images/splash/grey25/diamond.gif
 share/tt2/images/splash/grey25/dot.gif
 share/tt2/images/splash/grey25/down.gif
+share/tt2/images/splash/grey25/horz.gif
 share/tt2/images/splash/grey25/left.gif
 share/tt2/images/splash/grey25/minus.gif
 share/tt2/images/splash/grey25/negbox.gif
@@ -737,6 +756,7 @@
 share/tt2/images/splash/grey50/diamond.gif
 share/tt2/images/splash/grey50/dot.gif
 share/tt2/images/splash/grey50/down.gif
+share/tt2/images/splash/grey50/horz.gif
 share/tt2/images/splash/grey50/left.gif
 share/tt2/images/splash/grey50/minus.gif
 share/tt2/images/splash/grey50/negbox.gif
@@ -760,6 +780,7 @@
 share/tt2/images/splash/grey75/diamond.gif
 share/tt2/images/splash/grey75/dot.gif
 share/tt2/images/splash/grey75/down.gif
+share/tt2/images/splash/grey75/horz.gif
 share/tt2/images/splash/grey75/left.gif
 share/tt2/images/splash/grey75/minus.gif
 share/tt2/images/splash/grey75/negbox.gif
@@ -783,6 +804,7 @@
 share/tt2/images/splash/leaf/diamond.gif
 share/tt2/images/splash/leaf/dot.gif
 share/tt2/images/splash/leaf/down.gif
+share/tt2/images/splash/leaf/horz.gif
 share/tt2/images/splash/leaf/left.gif
 share/tt2/images/splash/leaf/minus.gif
 share/tt2/images/splash/leaf/negbox.gif
@@ -806,6 +828,7 @@
 share/tt2/images/splash/lilac/diamond.gif
 share/tt2/images/splash/lilac/dot.gif
 share/tt2/images/splash/lilac/down.gif
+share/tt2/images/splash/lilac/horz.gif
 share/tt2/images/splash/lilac/left.gif
 share/tt2/images/splash/lilac/minus.gif
 share/tt2/images/splash/lilac/negbox.gif
@@ -829,6 +852,7 @@
 share/tt2/images/splash/marine/diamond.gif
 share/tt2/images/splash/marine/dot.gif
 share/tt2/images/splash/marine/down.gif
+share/tt2/images/splash/marine/horz.gif
 share/tt2/images/splash/marine/left.gif
 share/tt2/images/splash/marine/minus.gif
 share/tt2/images/splash/marine/negbox.gif
@@ -852,6 +876,7 @@
 share/tt2/images/splash/mauve/diamond.gif
 share/tt2/images/splash/mauve/dot.gif
 share/tt2/images/splash/mauve/down.gif
+share/tt2/images/splash/mauve/horz.gif
 share/tt2/images/splash/mauve/left.gif
 share/tt2/images/splash/mauve/minus.gif
 share/tt2/images/splash/mauve/negbox.gif
@@ -875,6 +900,7 @@
 share/tt2/images/splash/mint/diamond.gif
 share/tt2/images/splash/mint/dot.gif
 share/tt2/images/splash/mint/down.gif
+share/tt2/images/splash/mint/horz.gif
 share/tt2/images/splash/mint/left.gif
 share/tt2/images/splash/mint/minus.gif
 share/tt2/images/splash/mint/negbox.gif
@@ -898,6 +924,7 @@
 share/tt2/images/splash/navy/diamond.gif
 share/tt2/images/splash/navy/dot.gif
 share/tt2/images/splash/navy/down.gif
+share/tt2/images/splash/navy/horz.gif
 share/tt2/images/splash/navy/left.gif
 share/tt2/images/splash/navy/minus.gif
 share/tt2/images/splash/navy/negbox.gif
@@ -913,6 +940,30 @@
 share/tt2/images/splash/navy/tr.gif
 share/tt2/images/splash/navy/trhair.gif
 share/tt2/images/splash/navy/up.gif
+share/tt2/images/splash/orange/bl.gif
+share/tt2/images/splash/orange/blhair.gif
+share/tt2/images/splash/orange/box.gif
+share/tt2/images/splash/orange/br.gif
+share/tt2/images/splash/orange/brhair.gif
+share/tt2/images/splash/orange/diamond.gif
+share/tt2/images/splash/orange/dot.gif
+share/tt2/images/splash/orange/down.gif
+share/tt2/images/splash/orange/horz.gif
+share/tt2/images/splash/orange/left.gif
+share/tt2/images/splash/orange/minus.gif
+share/tt2/images/splash/orange/negbox.gif
+share/tt2/images/splash/orange/plus.gif
+share/tt2/images/splash/orange/posbox.gif
+share/tt2/images/splash/orange/right.gif
+share/tt2/images/splash/orange/ring.gif
+share/tt2/images/splash/orange/ringdot.gif
+share/tt2/images/splash/orange/single.gif
+share/tt2/images/splash/orange/square.gif
+share/tt2/images/splash/orange/tl.gif
+share/tt2/images/splash/orange/tlhair.gif
+share/tt2/images/splash/orange/tr.gif
+share/tt2/images/splash/orange/trhair.gif
+share/tt2/images/splash/orange/up.gif
 share/tt2/images/splash/purple/bl.gif
 share/tt2/images/splash/purple/blhair.gif
 share/tt2/images/splash/purple/box.gif
@@ -921,6 +972,7 @@
 share/tt2/images/splash/purple/diamond.gif
 share/tt2/images/splash/purple/dot.gif
 share/tt2/images/splash/purple/down.gif
+share/tt2/images/splash/purple/horz.gif
 share/tt2/images/splash/purple/left.gif
 share/tt2/images/splash/purple/minus.gif
 share/tt2/images/splash/purple/negbox.gif
@@ -944,6 +996,7 @@
 share/tt2/images/splash/red/diamond.gif
 share/tt2/images/splash/red/dot.gif
 share/tt2/images/splash/red/down.gif
+share/tt2/images/splash/red/horz.gif
 share/tt2/images/splash/red/left.gif
 share/tt2/images/splash/red/minus.gif
 share/tt2/images/splash/red/negbox.gif
@@ -967,6 +1020,7 @@
 share/tt2/images/splash/red25/diamond.gif
 share/tt2/images/splash/red25/dot.gif
 share/tt2/images/splash/red25/down.gif
+share/tt2/images/splash/red25/horz.gif
 share/tt2/images/splash/red25/left.gif
 share/tt2/images/splash/red25/minus.gif
 share/tt2/images/splash/red25/negbox.gif
@@ -990,6 +1044,7 @@
 share/tt2/images/splash/red50/diamond.gif
 share/tt2/images/splash/red50/dot.gif
 share/tt2/images/splash/red50/down.gif
+share/tt2/images/splash/red50/horz.gif
 share/tt2/images/splash/red50/left.gif
 share/tt2/images/splash/red50/minus.gif
 share/tt2/images/splash/red50/negbox.gif
@@ -1013,6 +1068,7 @@
 share/tt2/images/splash/red75/diamond.gif
 share/tt2/images/splash/red75/dot.gif
 share/tt2/images/splash/red75/down.gif
+share/tt2/images/splash/red75/horz.gif
 share/tt2/images/splash/red75/left.gif
 share/tt2/images/splash/red75/minus.gif
 share/tt2/images/splash/red75/negbox.gif
@@ -1036,6 +1092,7 @@
 share/tt2/images/splash/rose/diamond.gif
 share/tt2/images/splash/rose/dot.gif
 share/tt2/images/splash/rose/down.gif
+share/tt2/images/splash/rose/horz.gif
 share/tt2/images/splash/rose/left.gif
 share/tt2/images/splash/rose/minus.gif
 share/tt2/images/splash/rose/negbox.gif
@@ -1059,6 +1116,7 @@
 share/tt2/images/splash/scarlet/diamond.gif
 share/tt2/images/splash/scarlet/dot.gif
 share/tt2/images/splash/scarlet/down.gif
+share/tt2/images/splash/scarlet/horz.gif
 share/tt2/images/splash/scarlet/left.gif
 share/tt2/images/splash/scarlet/minus.gif
 share/tt2/images/splash/scarlet/negbox.gif
@@ -1082,6 +1140,7 @@
 share/tt2/images/splash/sky/diamond.gif
 share/tt2/images/splash/sky/dot.gif
 share/tt2/images/splash/sky/down.gif
+share/tt2/images/splash/sky/horz.gif
 share/tt2/images/splash/sky/left.gif
 share/tt2/images/splash/sky/minus.gif
 share/tt2/images/splash/sky/negbox.gif
@@ -1105,6 +1164,7 @@
 share/tt2/images/splash/white/diamond.gif
 share/tt2/images/splash/white/dot.gif
 share/tt2/images/splash/white/down.gif
+share/tt2/images/splash/white/horz.gif
 share/tt2/images/splash/white/left.gif
 share/tt2/images/splash/white/minus.gif
 share/tt2/images/splash/white/negbox.gif
@@ -1221,6 +1281,7 @@
 @dirrm share/tt2/images/splash/red25
 @dirrm share/tt2/images/splash/red
 @dirrm share/tt2/images/splash/purple
+@dirrm share/tt2/images/splash/orange
 @dirrm share/tt2/images/splash/navy
 @dirrm share/tt2/images/splash/mint
 @dirrm share/tt2/images/splash/mauve
diff -bur p5-Template-Toolkit.orig/distinfo p5-Template-Toolkit/distinfo
--- p5-Template-Toolkit.orig/distinfo	Thu Mar 14 01:03:23 2002
+++ p5-Template-Toolkit/distinfo	Thu Mar 14 01:07:48 2002
@@ -1,5 +1,4 @@
 $NetBSD: distinfo,v 1.1.1.1 2001/07/02 18:08:25 nra Exp $
 
-SHA1 (Template-Toolkit-2.04.tar.gz) = 24baf396e3dd512337349c9ed09393625e69c30f
-Size (Template-Toolkit-2.04.tar.gz) = 695530 bytes
-SHA1 (patch-aa) = db71c18672b040d06ab59d233092f9003ed01b0a
+SHA1 (Template-Toolkit-2.06.tar.gz) = 8ce5805058061cc1d9dda2b0abdc8d4d975d3d03
+Size (Template-Toolkit-2.06.tar.gz) = 735633 bytes
Only in p5-Template-Toolkit.orig: patches
>Release-Note:
>Audit-Trail:
>Unformatted: