Update to 804.028

Various bugfixes including fix building with perl 5.10.

4 files changed, 20 insertions, 21 deletions

diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 865956af726..36a96e101ba 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2008/10/19 19:19:24 he Exp $
+# $NetBSD: Makefile,v 1.60 2008/10/22 10:35:30 markd Exp $
 
-DISTNAME=	Tk-804.027
-PKGNAME=	p5-Tk-804.027
-PKGREVISION=	8
+DISTNAME=	Tk-804.028
+PKGNAME=	p5-Tk-804.028
 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 379c4f3e82b..905a90364f1 100644
--- a/x11/p5-Tk/distinfo
+++ b/x11/p5-Tk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.13 2008/04/02 13:36:44 tonnerre Exp $
+$NetBSD: distinfo,v 1.14 2008/10/22 10:35:30 markd Exp $
 
-SHA1 (Tk-804.027.tar.gz) = a691b6d38783810e3c3a3266bdcf8baba4aaf7dd
-RMD160 (Tk-804.027.tar.gz) = 8ef2086efa4d7818bd82cc6d36a4d60ca8654bc7
-Size (Tk-804.027.tar.gz) = 6011130 bytes
+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 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a
-SHA1 (patch-ac) = ce3b99157ffd76eb7924321b09ca653a675aaeee
-SHA1 (patch-ad) = 58095f5b6ca9f0123a057a5411fc546e22303a8f
+SHA1 (patch-ac) = 95bcdd8906905c184511b9d68c6874564c437707
+SHA1 (patch-ad) = 63ebc6b66557e7ea36c9e3ee51366a0de43da699
 SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877
 SHA1 (patch-af) = 7d8de5532dd67680d6d3ad08f01fcb066805b45c
 SHA1 (patch-ag) = ac4dccefd04743db78ddecde51b23194da1a801f
diff --git a/x11/p5-Tk/patches/patch-ac b/x11/p5-Tk/patches/patch-ac
index c607183e642..04f76c00a5b 100644
--- a/x11/p5-Tk/patches/patch-ac
+++ b/x11/p5-Tk/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2004/12/25 14:00:10 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2008/10/22 10:35:30 markd Exp $
 
---- JPEG/Makefile.PL.orig	2003-12-10 23:12:06.000000000 +0100
+--- JPEG/Makefile.PL.orig	2007-05-06 06:38:15.000000000 +1200
 +++ JPEG/Makefile.PL
 @@ -5,29 +5,11 @@ my $l = $Config::Config{'lib_ext'};
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1 2004/12/25 14:00:10 wiz Exp $
 - {
 -  push(@args, MYEXTLIB  => "jpeg/libjpeg$l",
 -              'INC'     => '-Ijpeg');
--  copy("jpeg/Makefile.maybe","jpeg/Makefile.PL");
+-  copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
 -  warn "Building jpeg/libjpeg$l\n";
 - }
  
diff --git a/x11/p5-Tk/patches/patch-ad b/x11/p5-Tk/patches/patch-ad
index 8fb32e98f48..4b6476f3f26 100644
--- a/x11/p5-Tk/patches/patch-ad
+++ b/x11/p5-Tk/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2005/12/12 18:04:47 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2008/10/22 10:35:30 markd Exp $
 
---- PNG/Makefile.PL.orig	2003-12-30 10:45:03.000000000 +0000
+--- PNG/Makefile.PL.orig	2007-05-06 06:38:35.000000000 +1200
 +++ PNG/Makefile.PL
 @@ -1,7 +1,6 @@
  use strict;
@@ -37,14 +37,14 @@ $NetBSD: patch-ad,v 1.2 2005/12/12 18:04:47 joerg Exp $
 -    chmod(0666,$file);
 -    unlink($file);
 -   }
--  unless (copy("libpng/Makefile.maybe","libpng/Makefile.PL"))
+-  unless (copy("Makefile.libpng.maybe","libpng/Makefile.PL"))
 -   {
--    warn "Cannot copy libpng/Makefile.maybe => libpng/Makefile.PL ($!)";
+-    warn "Cannot copy Makefile.libpng.maybe => libpng/Makefile.PL ($!)";
 -    $ok = 0;
 -   }
--  unless (copy("zlib/Makefile.maybe","zlib/Makefile.PL"))
+-  unless (copy("Makefile.zlib.maybe","zlib/Makefile.PL"))
 -   {
--    warn "Cannot copy zlib/Makefile.maybe => zlib/Makefile.PL ($!)";
+-    warn "Cannot copy Makefile.zlib.maybe => zlib/Makefile.PL ($!)";
 -    $ok = 0;
 -   }
 -  if ($ok)
@@ -78,5 +78,5 @@ $NetBSD: patch-ad,v 1.2 2005/12/12 18:04:47 joerg Exp $
 -    }
 - }
  
- package MY;
- 
+ sub MY::test_via_harness
+ {