5 files changed, 12 insertions, 45 deletions
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 91d267e9914..526ee6899b2 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2010/08/21 16:37:13 seb Exp $
+# $NetBSD: Makefile,v 1.68 2010/09/12 12:59:47 wiz Exp $
 
-DISTNAME=	Tk-804.028
-PKGNAME=	p5-Tk-804.028
-PKGREVISION=	6
+DISTNAME=	Tk-804.029
+PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5tk
 CATEGORIES=	x11 tk perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tk/}
diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo
index 88b1bf65bb1..d3b02708165 100644
--- a/x11/p5-Tk/distinfo
+++ b/x11/p5-Tk/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.16 2009/08/17 14:40:43 gson Exp $
+$NetBSD: distinfo,v 1.17 2010/09/12 12:59:47 wiz Exp $
 
-SHA1 (Tk-804.028.tar.gz) = 075c751f1388741aa313e002578d2e802668f2e8
-RMD160 (Tk-804.028.tar.gz) = 8db5d3376f2374429ef71c38ddd268a73bac437e
-Size (Tk-804.028.tar.gz) = 6927637 bytes
-SHA1 (patch-aa) = 59e0455edef3ea4cb3d2c3122971344ccceefdcb
+SHA1 (Tk-804.029.tar.gz) = 1076d736e43fdf416c664bde0e4c3d035d6903e3
+RMD160 (Tk-804.029.tar.gz) = 1feac57c5799c286a3e81258d3e7621b84b1cfc2
+Size (Tk-804.029.tar.gz) = 6924235 bytes
+SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b
 SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a
 SHA1 (patch-ac) = 95bcdd8906905c184511b9d68c6874564c437707
 SHA1 (patch-ad) = 63ebc6b66557e7ea36c9e3ee51366a0de43da699
 SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877
-SHA1 (patch-af) = 7d8de5532dd67680d6d3ad08f01fcb066805b45c
-SHA1 (patch-ag) = ac4dccefd04743db78ddecde51b23194da1a801f
 SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272
 SHA1 (patch-ai) = 37f3651c6491c5d2e3bec1e9649e7e05f45275a9
diff --git a/x11/p5-Tk/patches/patch-aa b/x11/p5-Tk/patches/patch-aa
index cd06d866c2c..58e1e9a5697 100644
--- a/x11/p5-Tk/patches/patch-aa
+++ b/x11/p5-Tk/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2005/12/12 18:04:47 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2010/09/12 12:59:47 wiz Exp $
 
---- Tk/MMutil.pm.orig	2004-03-27 14:55:55.000000000 +0000
+--- Tk/MMutil.pm.orig	2010-05-12 23:29:42.000000000 +0000
 +++ Tk/MMutil.pm
-@@ -306,10 +306,13 @@ sub const_config
-    }
+@@ -313,10 +313,13 @@ sub const_config
+ #   }
     $self->{'LDFLAGS'} =~ s/-flat_namespace//;
     $self->{'LDFLAGS'} =~ s/-undefined\s+suppress//;
 -  } elsif ($^O =~ /(openbsd)/i)
diff --git a/x11/p5-Tk/patches/patch-af b/x11/p5-Tk/patches/patch-af
deleted file mode 100644
index b58e9baeb99..00000000000
--- a/x11/p5-Tk/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/04/01 15:51:25 tonnerre Exp $
-
-Fix buffer overflow vulnerability derived from old code (CVE-2006-4484).
-
---- pTk/mTk/additions/imgGIF.c.orig	2003-12-23 18:00:44.000000000 +0100
-+++ pTk/mTk/additions/imgGIF.c
-@@ -776,7 +776,7 @@ ReadImage(interp, imagePtr, handle, len,
-     /*
-      *  Initialize the decoder
-      */
--    if (! ReadOK(handle,&initialCodeSize,1))  {
-+    if (! ReadOK(handle,&initialCodeSize,1) || initialCodeSize > MAX_LWZ_BITS)  {
- 	Tcl_AppendResult(interp, "error reading GIF image: ",
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;
diff --git a/x11/p5-Tk/patches/patch-ag b/x11/p5-Tk/patches/patch-ag
deleted file mode 100644
index 291f53b457e..00000000000
--- a/x11/p5-Tk/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/04/01 15:51:25 tonnerre Exp $
-
-Fix buffer overflow vulnerability derived from old code (CVE-2006-4484).
-
---- pTk/mTk/generic/tkImgGIF.c.orig	2004-02-29 11:20:28.000000000 +0100
-+++ pTk/mTk/generic/tkImgGIF.c
-@@ -826,7 +826,7 @@ ReadImage(interp, imagePtr, chan, len, r
-     /*
-      *  Initialize the decoder
-      */
--    if (! ReadOK(chan, &initialCodeSize, 1))  {
-+    if (! ReadOK(chan, &initialCodeSize, 1) || initialCodeSize > MAX_LWZ_BITS)  {
- 	Tcl_AppendResult(interp, "error reading GIF image: ",
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;