diff -ruNx CVS x11/p5-Tk/Makefile mystuff/x11/p5-Tk/Makefile
--- x11/p5-Tk/Makefile	Tue Nov 21 21:58:51 2006
+++ mystuff/x11/p5-Tk/Makefile	Sat Jun  2 15:15:38 2007
@@ -8,7 +8,7 @@
 MODULES=	cpan
 VERSION=	804.027
 DISTNAME=	Tk-${VERSION}
-PKGNAME-main=	p5-Tk-${VERSION}p1
+PKGNAME-main=	p5-Tk-${VERSION}p2
 PKGNAME-demo=	p5-Tk-demo-${VERSION}p0
 CATEGORIES=	x11 devel
 
diff -ruNx CVS x11/p5-Tk/patches/patch-Tk_ColorEditor_pm mystuff/x11/p5-Tk/patches/patch-Tk_ColorEditor_pm
--- x11/p5-Tk/patches/patch-Tk_ColorEditor_pm	Thu Jan  1 01:00:00 1970
+++ mystuff/x11/p5-Tk/patches/patch-Tk_ColorEditor_pm	Sat Jun  2 15:17:18 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Tk/ColorEditor.pm.orig	Sat Jun  2 15:16:35 2007
++++ Tk/ColorEditor.pm	Sat Jun  2 15:17:03 2007
+@@ -20,7 +20,7 @@ sub Populate
+                     split /\s+/, $Tk::Config::xlib;
+     foreach $i (@xlibpath,
+ 		'/usr/local/lib/X11/rgb.txt', '/usr/lib/X11/rgb.txt',
+-		'/usr/X11R6/lib/X11/rgb.txt',
++		'/usr/X11R6/share/X11/rgb.txt',
+                 '/usr/local/X11R5/lib/X11/rgb.txt', '/X11/R5/lib/X11/rgb.txt',
+                 '/X11/R4/lib/rgb/rgb.txt', '/usr/openwin/lib/X11/rgb.txt') {
+         local *FOO;