Updated x11/p5-Tk to 804.030

Tk-804.030 release (2011-10-20)
------------------

This is basically the same like Tk-804.029_502.

Tk-804.029_502 release (2011-10-17)
----------------------

Fixes
 RT #71718: windres call needs the --use-temp-file on some Windows systems

 RT #70429: show correct file name if image loading failed. Also
 systematically searched and fixed other bad uses of Tcl_AppendResult.

 RT #70423: provide inuse method for Tk::Image

 Fixed a possible segfault when using canvas' select clear method.

Tk-804.029_501 release (2011-10-14)
----------------------

Fixes
 Use standard libpng configure for all amd64 and x86_64 variants.

 Support gridRemove method.
 https://rt.cpan.org/Ticket/Display.html?id=65900

Tk-804.029_500 release (2011-06-13)
----------------------

Fixes
 Fixed compilation with newer X11 version (conflicting types for
 'XKeycodeToKeysym')
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613188

 Use standard libpng configure for some 64 bit variants of OpenBSD,
 amd64-freebsd, x86_64-linux, MacOSX 10.6.4 and newer.

 Fixed Strawberry 64bit builds.

 Changed handling of "underscore" character.
 https://rt.cpan.org/Ticket/Display.html?id=66205

 Tk::ProgressBar::configure calls now go through ConfigChanged
 https://rt.cpan.org/Ticket/Display.html?id=63775

 Fixed Tk::FBox::ResolveFile with defaultextension when directory
 contains dots
 https://rt.cpan.org/Ticket/Display.html?id=55146

New features
 BalloonInfo for HList
 Implementation by Christoph Lambrecht, documentation by
 Slaven Rezic
 https://rt.cpan.org/Ticket/Display.html?id=55887

 Perl/Tk is now available at github.

 Improved "all widgets at a glance" demo.

Tests
 Another attempt on skipping tests if no DISPLAY is available.

 Converted fork.t and progbar.t to Test::More

Documentation
 Fixed SYNOPSIS section in Tk::Text Pod

9 files changed, 44 insertions, 73 deletions

diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 9c5787b634a..1ab12f32e3d 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2011/08/14 07:20:53 obache Exp $
+# $NetBSD: Makefile,v 1.73 2012/01/22 19:00:34 abs Exp $
 
-DISTNAME=	Tk-804.029
+DISTNAME=	Tk-804.030
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
 SVR4_PKGNAME=	p5tk
 CATEGORIES=	x11 tk perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tk/}
@@ -34,7 +33,7 @@ SUBST_FILES.prefix=	PNG/Makefile.PL
 SUBST_SED.prefix=	-e 's,%%LOCALBASE%%,${LOCALBASE},g'
 
 pre-configure:
-	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+	${FIND} ${WRKSRC} -name "*.orig" -type f -print0 | ${XARGS} -0 ${RM}
 
 .include "../../lang/perl5/module.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo
index ee5c8808e34..d7a364d3c8f 100644
--- a/x11/p5-Tk/distinfo
+++ b/x11/p5-Tk/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.18 2011/09/21 14:08:28 joerg Exp $
+$NetBSD: distinfo,v 1.19 2012/01/22 19:00:34 abs Exp $
 
-SHA1 (Tk-804.029.tar.gz) = 1076d736e43fdf416c664bde0e4c3d035d6903e3
-RMD160 (Tk-804.029.tar.gz) = 1feac57c5799c286a3e81258d3e7621b84b1cfc2
-Size (Tk-804.029.tar.gz) = 6924235 bytes
+SHA1 (Tk-804.030.tar.gz) = f5a85cee56de9679e49260e6e80d6dc384e60a5e
+RMD160 (Tk-804.030.tar.gz) = bf139ab03e9f07f7a184ea25dece9d8b1b6d10e0
+Size (Tk-804.030.tar.gz) = 6928048 bytes
 SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b
-SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a
-SHA1 (patch-ac) = 95bcdd8906905c184511b9d68c6874564c437707
-SHA1 (patch-ad) = 63ebc6b66557e7ea36c9e3ee51366a0de43da699
-SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877
-SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272
-SHA1 (patch-ai) = 37f3651c6491c5d2e3bec1e9649e7e05f45275a9
-SHA1 (patch-aj) = ca4a4d0cf698ebe566e2206785472b5c6bd17319
+SHA1 (patch-ac) = fffe0c46e44202fe0018146b4ba5e23f50168c04
+SHA1 (patch-ad) = 3ea2490f6d30436d72e3321ae50689c28bdb25cc
+SHA1 (patch-ah) = e48711b341a285bd8055a6c487d0185695ece460
+SHA1 (patch-ai) = f6ef20cb48f3ee08335a6410e873f3b5aa277b20
+SHA1 (patch-aj) = ba3dfe1e7b7a19af1240b37186ab69d857d925f4
diff --git a/x11/p5-Tk/patches/patch-ab b/x11/p5-Tk/patches/patch-ab
deleted file mode 100644
index 7005d923d25..00000000000
--- a/x11/p5-Tk/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/03/22 12:27:19 wiz Exp $
-
---- myConfig.orig	Sat Feb 28 17:59:28 2004
-+++ myConfig
-@@ -160,7 +160,7 @@ sub lX11
-        if (-r $lib)
-         {
-          print "Using -L$_ to find $lib\n";
--         return "-L$_"
-+         return "-L$_ -Wl,-R$_"
-         }
-       }
-     }
diff --git a/x11/p5-Tk/patches/patch-ac b/x11/p5-Tk/patches/patch-ac
index 04f76c00a5b..d6ab1d6b825 100644
--- a/x11/p5-Tk/patches/patch-ac
+++ b/x11/p5-Tk/patches/patch-ac
@@ -1,27 +1,25 @@
-$NetBSD: patch-ac,v 1.2 2008/10/22 10:35:30 markd Exp $
+$NetBSD: patch-ac,v 1.3 2012/01/22 19:00:34 abs Exp $
 
---- JPEG/Makefile.PL.orig	2007-05-06 06:38:15.000000000 +1200
+--- JPEG/Makefile.PL.orig	2010-05-31 19:58:38.000000000 +0000
 +++ JPEG/Makefile.PL
-@@ -5,29 +5,11 @@ my $l = $Config::Config{'lib_ext'};
+@@ -4,24 +4,24 @@ use Tk::Config ();
+ use File::Copy;
+ my $l = $Config::Config{'lib_ext'};
  
- # use ExtUtils::MakeMaker '6.05';
- 
--my @local_jpeg = (
--    'INC'          => '-Ijpeg',
--    'MYEXTLIB'     => "jpeg/libjpeg$l",
--);
--
 -use Tk::MMtry;
--
--if ($Tk::MMtry::VERSION ge '4.007' && try_run("jpeg/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
-- {
++# use Tk::MMtry;
+ 
+-if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
++# if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
+  {
    push(@args, LIBS => ['-ljpeg'],
 -              INC  => '-I/usr/local/include',
++              # INC  => '-I/usr/local/include',
                DEFINE => '-DHAVE_JPEGLIB_H',
        );
    warn "Using system's -ljpeg\n";
    unlink("jpeg/Makefile.PL");
-- }
+  }
 -else
 - {
 -  push(@args, MYEXTLIB  => "jpeg/libjpeg$l",
@@ -29,6 +27,13 @@ $NetBSD: patch-ac,v 1.2 2008/10/22 10:35:30 markd Exp $
 -  copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
 -  warn "Building jpeg/libjpeg$l\n";
 - }
++# else
++#  {
++#   push(@args, MYEXTLIB  => "jpeg/libjpeg$l",
++#               'INC'     => '-Ijpeg');
++#   copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
++#   warn "Building jpeg/libjpeg$l\n";
++#  }
  
  Tk::MMutil::TkExtMakefile(@args,
      'NAME'         => 'Tk::JPEG',
diff --git a/x11/p5-Tk/patches/patch-ad b/x11/p5-Tk/patches/patch-ad
index 4b6476f3f26..2f92aced8c8 100644
--- a/x11/p5-Tk/patches/patch-ad
+++ b/x11/p5-Tk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2008/10/22 10:35:30 markd Exp $
+$NetBSD: patch-ad,v 1.4 2012/01/22 19:00:34 abs Exp $
 
---- PNG/Makefile.PL.orig	2007-05-06 06:38:35.000000000 +1200
+--- PNG/Makefile.PL.orig	2010-09-27 21:57:28.000000000 +0000
 +++ PNG/Makefile.PL
-@@ -1,7 +1,6 @@
+@@ -2,7 +2,6 @@
  use strict;
  use Tk::MMutil;
  use Tk::Config ();
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.3 2008/10/22 10:35:30 markd Exp $
  use File::Copy;
  
  my $l = $Config::Config{'lib_ext'};
-@@ -14,68 +13,15 @@ foreach my $file (qw(zlib/Makefile.PL li
+@@ -15,68 +14,15 @@ foreach my $file (qw(zlib/Makefile.PL li
    unlink($file);
   }
  
diff --git a/x11/p5-Tk/patches/patch-ae b/x11/p5-Tk/patches/patch-ae
deleted file mode 100644
index db56c2f1056..00000000000
--- a/x11/p5-Tk/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/12 18:04:47 joerg Exp $
-
---- pTk/mTk/unix/tkUnixPort.h.orig	2005-12-12 15:53:24.000000000 +0000
-+++ pTk/mTk/unix/tkUnixPort.h
-@@ -134,13 +134,6 @@
- #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
- 
- /*
-- * Not all systems declare the errno variable in errno.h. so this
-- * file does it explicitly.
-- */
--
--extern int errno;
--
--/*
-  * Define "NBBY" (number of bits per byte) if it's not already defined.
-  */
- 
diff --git a/x11/p5-Tk/patches/patch-ah b/x11/p5-Tk/patches/patch-ah
index 7bb6cd5a731..0b942fe2980 100644
--- a/x11/p5-Tk/patches/patch-ah
+++ b/x11/p5-Tk/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2009/03/20 17:32:06 hasso Exp $
+$NetBSD: patch-ah,v 1.2 2012/01/22 19:00:34 abs Exp $
 
---- myConfig.orig	2009-03-20 18:58:54 +0200
-+++ myConfig	2009-03-20 18:59:41 +0200
-@@ -321,7 +321,7 @@ if ($win_arch eq 'x') {
+--- myConfig.orig	2012-01-22 18:50:31.000000000 +0000
++++ myConfig
+@@ -336,7 +336,7 @@ if ($win_arch eq 'x') {
    #
    # Prefer 64bit libraries on certain architectures
    #
diff --git a/x11/p5-Tk/patches/patch-ai b/x11/p5-Tk/patches/patch-ai
index fedc16818d8..eeb377c0f42 100644
--- a/x11/p5-Tk/patches/patch-ai
+++ b/x11/p5-Tk/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2009/08/17 14:40:43 gson Exp $
+$NetBSD: patch-ai,v 1.2 2012/01/22 19:00:34 abs Exp $
 
---- pTk/mTk/generic/tkBind.c.orig	2009-08-17 12:41:17.000000000 +0300
+--- pTk/mTk/generic/tkBind.c.orig	2010-05-29 09:56:11.000000000 +0000
 +++ pTk/mTk/generic/tkBind.c
 @@ -585,6 +585,9 @@ char *eventTypeName[TK_LASTEVENT] = {
     "ColormapNotify",
diff --git a/x11/p5-Tk/patches/patch-aj b/x11/p5-Tk/patches/patch-aj
index f7f8a70e725..1f504a7e406 100644
--- a/x11/p5-Tk/patches/patch-aj
+++ b/x11/p5-Tk/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2011/09/21 14:08:29 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2012/01/22 19:00:34 abs Exp $
 
 X11R7 uses a different include guard.
 
---- pTk/Xlib.h.orig	2011-09-21 13:58:35.000000000 +0000
+--- pTk/Xlib.h.orig	2011-06-13 12:16:52.000000000 +0000
 +++ pTk/Xlib.h
 @@ -1,5 +1,8 @@
  #ifndef _XLIB
@@ -11,5 +11,5 @@ X11R7 uses a different include guard.
 +#define _XLIB_H_
 +#endif
  #ifndef _XLIB_H_
+ #ifndef _X11_XLIB_H_
  extern XFontStruct *XLoadQueryFont  _ANSI_ARGS_((Display *, const char *));
- extern XModifierKeymap *XGetModifierMapping  _ANSI_ARGS_((Display *));