Sun Jan 22 19:00:34 2012 UTC ()
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


(abs)
diff -r1.72 -r1.73 pkgsrc/x11/p5-Tk/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/p5-Tk/distinfo
diff -r1.2 -r0 pkgsrc/x11/p5-Tk/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/x11/p5-Tk/patches/patch-ac
diff -r1.3 -r1.4 pkgsrc/x11/p5-Tk/patches/patch-ad
diff -r1.1 -r0 pkgsrc/x11/p5-Tk/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/x11/p5-Tk/patches/patch-ah
diff -r1.1 -r1.2 pkgsrc/x11/p5-Tk/patches/patch-ai
diff -r1.1 -r1.2 pkgsrc/x11/p5-Tk/patches/patch-aj
cvs diff -r1.72 -r1.73 pkgsrc/x11/p5-Tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/Makefile 2011/08/14 07:20:53 1.72
+++ pkgsrc/x11/p5-Tk/Makefile 2012/01/22 19:00:34 1.73
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.72 2011/08/14 07:20:53 obache Exp $ 1# $NetBSD: Makefile,v 1.73 2012/01/22 19:00:34 abs Exp $
2 2
3DISTNAME= Tk-804.029 3DISTNAME= Tk-804.030
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5PKGREVISION= 2 
6SVR4_PKGNAME= p5tk 5SVR4_PKGNAME= p5tk
7CATEGORIES= x11 tk perl5 6CATEGORIES= x11 tk perl5
8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/} 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://cpan.uwinnipeg.ca/htdocs/Tk/Tk.html 10HOMEPAGE= http://cpan.uwinnipeg.ca/htdocs/Tk/Tk.html
12COMMENT= Perl5 interface to Tk 11COMMENT= Perl5 interface to Tk
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
16 15
17MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
18 17
@@ -24,20 +23,20 @@ PERL5_PACKLIST= auto/Tk/.packlist @@ -24,20 +23,20 @@ PERL5_PACKLIST= auto/Tk/.packlist
24MAKE_PARAMS= X11=${X11BASE} 23MAKE_PARAMS= X11=${X11BASE}
25 24
26REPLACE_PERL+= TextList/reindex.pl 25REPLACE_PERL+= TextList/reindex.pl
27REPLACE_PERL+= pTk/Tcl-pTk 26REPLACE_PERL+= pTk/Tcl-pTk
28REPLACE_PERL+= pTk/mkVFunc 27REPLACE_PERL+= pTk/mkVFunc
29REPLACE_PERL+= demos/widget 28REPLACE_PERL+= demos/widget
30 29
31SUBST_CLASSES+= prefix 30SUBST_CLASSES+= prefix
32SUBST_STAGE.prefix= post-patch 31SUBST_STAGE.prefix= post-patch
33SUBST_FILES.prefix= PNG/Makefile.PL 32SUBST_FILES.prefix= PNG/Makefile.PL
34SUBST_SED.prefix= -e 's,%%LOCALBASE%%,${LOCALBASE},g' 33SUBST_SED.prefix= -e 's,%%LOCALBASE%%,${LOCALBASE},g'
35 34
36pre-configure: 35pre-configure:
37 ${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} 36 ${FIND} ${WRKSRC} -name "*.orig" -type f -print0 | ${XARGS} -0 ${RM}
38 37
39.include "../../lang/perl5/module.mk" 38.include "../../lang/perl5/module.mk"
40.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
41.include "../../mk/jpeg.buildlink3.mk" 40.include "../../mk/jpeg.buildlink3.mk"
42.include "../../x11/libX11/buildlink3.mk" 41.include "../../x11/libX11/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/x11/p5-Tk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/distinfo 2011/09/21 14:08:28 1.18
+++ pkgsrc/x11/p5-Tk/distinfo 2012/01/22 19:00:34 1.19
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: distinfo,v 1.18 2011/09/21 14:08:28 joerg Exp $ 1$NetBSD: distinfo,v 1.19 2012/01/22 19:00:34 abs Exp $
2 2
3SHA1 (Tk-804.029.tar.gz) = 1076d736e43fdf416c664bde0e4c3d035d6903e3 3SHA1 (Tk-804.030.tar.gz) = f5a85cee56de9679e49260e6e80d6dc384e60a5e
4RMD160 (Tk-804.029.tar.gz) = 1feac57c5799c286a3e81258d3e7621b84b1cfc2 4RMD160 (Tk-804.030.tar.gz) = bf139ab03e9f07f7a184ea25dece9d8b1b6d10e0
5Size (Tk-804.029.tar.gz) = 6924235 bytes 5Size (Tk-804.030.tar.gz) = 6928048 bytes
6SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b 6SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b
7SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a 7SHA1 (patch-ac) = fffe0c46e44202fe0018146b4ba5e23f50168c04
8SHA1 (patch-ac) = 95bcdd8906905c184511b9d68c6874564c437707 8SHA1 (patch-ad) = 3ea2490f6d30436d72e3321ae50689c28bdb25cc
9SHA1 (patch-ad) = 63ebc6b66557e7ea36c9e3ee51366a0de43da699 9SHA1 (patch-ah) = e48711b341a285bd8055a6c487d0185695ece460
10SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877 10SHA1 (patch-ai) = f6ef20cb48f3ee08335a6410e873f3b5aa277b20
11SHA1 (patch-ah) = 9399bfd03b6cc215cc8f918ac8ae0348bf7f6272 11SHA1 (patch-aj) = ba3dfe1e7b7a19af1240b37186ab69d857d925f4
12SHA1 (patch-ai) = 37f3651c6491c5d2e3bec1e9649e7e05f45275a9 
13SHA1 (patch-aj) = ca4a4d0cf698ebe566e2206785472b5c6bd17319 
File Deleted: pkgsrc/x11/p5-Tk/patches/Attic/patch-ab
cvs diff -r1.2 -r1.3 pkgsrc/x11/p5-Tk/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/patches/patch-ac 2008/10/22 10:35:30 1.2
+++ pkgsrc/x11/p5-Tk/patches/patch-ac 2012/01/22 19:00:34 1.3
@@ -1,34 +1,39 @@ @@ -1,34 +1,39 @@
1$NetBSD: patch-ac,v 1.2 2008/10/22 10:35:30 markd Exp $ 1$NetBSD: patch-ac,v 1.3 2012/01/22 19:00:34 abs Exp $
2 2
3--- JPEG/Makefile.PL.orig 2007-05-06 06:38:15.000000000 +1200 3--- JPEG/Makefile.PL.orig 2010-05-31 19:58:38.000000000 +0000
4+++ JPEG/Makefile.PL 4+++ JPEG/Makefile.PL
5@@ -5,29 +5,11 @@ my $l = $Config::Config{'lib_ext'}; 5@@ -4,24 +4,24 @@ use Tk::Config ();
 6 use File::Copy;
 7 my $l = $Config::Config{'lib_ext'};
6  8
7 # use ExtUtils::MakeMaker '6.05'; 
8  
9-my @local_jpeg = ( 
10- 'INC' => '-Ijpeg', 
11- 'MYEXTLIB' => "jpeg/libjpeg$l", 
12-); 
13- 
14-use Tk::MMtry; 9-use Tk::MMtry;
15- 10+# use Tk::MMtry;
16-if ($Tk::MMtry::VERSION ge '4.007' && try_run("jpeg/has_jpeg.c",['-I/usr/local/include'],['-ljpeg'])) 11
17- { 12-if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
 13+# if ($Tk::MMtry::VERSION ge '4.007' && try_run("config/has_jpeg.c",['-I/usr/local/include'],['-ljpeg']))
 14 {
18 push(@args, LIBS => ['-ljpeg'], 15 push(@args, LIBS => ['-ljpeg'],
19- INC => '-I/usr/local/include', 16- INC => '-I/usr/local/include',
 17+ # INC => '-I/usr/local/include',
20 DEFINE => '-DHAVE_JPEGLIB_H', 18 DEFINE => '-DHAVE_JPEGLIB_H',
21 ); 19 );
22 warn "Using system's -ljpeg\n"; 20 warn "Using system's -ljpeg\n";
23 unlink("jpeg/Makefile.PL"); 21 unlink("jpeg/Makefile.PL");
24- } 22 }
25-else 23-else
26- { 24- {
27- push(@args, MYEXTLIB => "jpeg/libjpeg$l", 25- push(@args, MYEXTLIB => "jpeg/libjpeg$l",
28- 'INC' => '-Ijpeg'); 26- 'INC' => '-Ijpeg');
29- copy("Makefile.jpeg.maybe","jpeg/Makefile.PL"); 27- copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
30- warn "Building jpeg/libjpeg$l\n"; 28- warn "Building jpeg/libjpeg$l\n";
31- } 29- }
 30+# else
 31+# {
 32+# push(@args, MYEXTLIB => "jpeg/libjpeg$l",
 33+# 'INC' => '-Ijpeg');
 34+# copy("Makefile.jpeg.maybe","jpeg/Makefile.PL");
 35+# warn "Building jpeg/libjpeg$l\n";
 36+# }
32  37
33 Tk::MMutil::TkExtMakefile(@args, 38 Tk::MMutil::TkExtMakefile(@args,
34 'NAME' => 'Tk::JPEG', 39 'NAME' => 'Tk::JPEG',
cvs diff -r1.3 -r1.4 pkgsrc/x11/p5-Tk/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/patches/patch-ad 2008/10/22 10:35:30 1.3
+++ pkgsrc/x11/p5-Tk/patches/patch-ad 2012/01/22 19:00:34 1.4
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-ad,v 1.3 2008/10/22 10:35:30 markd Exp $ 1$NetBSD: patch-ad,v 1.4 2012/01/22 19:00:34 abs Exp $
2 2
3--- PNG/Makefile.PL.orig 2007-05-06 06:38:35.000000000 +1200 3--- PNG/Makefile.PL.orig 2010-09-27 21:57:28.000000000 +0000
4+++ PNG/Makefile.PL 4+++ PNG/Makefile.PL
5@@ -1,7 +1,6 @@ 5@@ -2,7 +2,6 @@
6 use strict; 6 use strict;
7 use Tk::MMutil; 7 use Tk::MMutil;
8 use Tk::Config (); 8 use Tk::Config ();
9-use Tk::MMtry; 9-use Tk::MMtry;
10 use File::Copy; 10 use File::Copy;
11  11
12 my $l = $Config::Config{'lib_ext'}; 12 my $l = $Config::Config{'lib_ext'};
13@@ -14,68 +13,15 @@ foreach my $file (qw(zlib/Makefile.PL li 13@@ -15,68 +14,15 @@ foreach my $file (qw(zlib/Makefile.PL li
14 unlink($file); 14 unlink($file);
15 } 15 }
16  16
17-if ($Tk::MMtry::VERSION ge '4.007' && 17-if ($Tk::MMtry::VERSION ge '4.007' &&
18- try_run("config/has_png.c",['-I/usr/local/include'],['-lpng -lz -lm'])) 18- try_run("config/has_png.c",['-I/usr/local/include'],['-lpng -lz -lm']))
19- { 19- {
20 Tk::MMutil::TkExtMakefile( 20 Tk::MMutil::TkExtMakefile(
21 NAME => 'Tk::PNG', 21 NAME => 'Tk::PNG',
22 VERSION_FROM => 'PNG.pm', 22 VERSION_FROM => 'PNG.pm',
23 XS_VERSION => $Tk::Config::VERSION, 23 XS_VERSION => $Tk::Config::VERSION,
24 dist => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' }, 24 dist => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
25 OBJECT => '$(O_FILES)', 25 OBJECT => '$(O_FILES)',
26- INC => '-I/usr/local/include', 26- INC => '-I/usr/local/include',
File Deleted: pkgsrc/x11/p5-Tk/patches/Attic/patch-ae
cvs diff -r1.1 -r1.2 pkgsrc/x11/p5-Tk/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/patches/Attic/patch-ah 2009/03/20 17:32:06 1.1
+++ pkgsrc/x11/p5-Tk/patches/Attic/patch-ah 2012/01/22 19:00:34 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ah,v 1.1 2009/03/20 17:32:06 hasso Exp $ 1$NetBSD: patch-ah,v 1.2 2012/01/22 19:00:34 abs Exp $
2 2
3--- myConfig.orig 2009-03-20 18:58:54 +0200 3--- myConfig.orig 2012-01-22 18:50:31.000000000 +0000
4+++ myConfig 2009-03-20 18:59:41 +0200 4+++ myConfig
5@@ -321,7 +321,7 @@ if ($win_arch eq 'x') { 5@@ -336,7 +336,7 @@ if ($win_arch eq 'x') {
6 # 6 #
7 # Prefer 64bit libraries on certain architectures 7 # Prefer 64bit libraries on certain architectures
8 # 8 #
9- unless (defined $xlib and $Config{'archname'} =~ m/x86_64/) 9- unless (defined $xlib and $Config{'archname'} =~ m/x86_64/)
10+ if (!defined $xlib and $Config{'archname'} =~ m/x86_64/) 10+ if (!defined $xlib and $Config{'archname'} =~ m/x86_64/)
11 { 11 {
12 $xlib = &lX11(0, chooseX11(</usr/X11*/lib64>)); 12 $xlib = &lX11(0, chooseX11(</usr/X11*/lib64>));
13 } 13 }
cvs diff -r1.1 -r1.2 pkgsrc/x11/p5-Tk/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/patches/patch-ai 2009/08/17 14:40:43 1.1
+++ pkgsrc/x11/p5-Tk/patches/patch-ai 2012/01/22 19:00:34 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ai,v 1.1 2009/08/17 14:40:43 gson Exp $ 1$NetBSD: patch-ai,v 1.2 2012/01/22 19:00:34 abs Exp $
2 2
3--- pTk/mTk/generic/tkBind.c.orig 2009-08-17 12:41:17.000000000 +0300 3--- pTk/mTk/generic/tkBind.c.orig 2010-05-29 09:56:11.000000000 +0000
4+++ pTk/mTk/generic/tkBind.c 4+++ pTk/mTk/generic/tkBind.c
5@@ -585,6 +585,9 @@ char *eventTypeName[TK_LASTEVENT] = { 5@@ -585,6 +585,9 @@ char *eventTypeName[TK_LASTEVENT] = {
6 "ColormapNotify", 6 "ColormapNotify",
7 "ClientMessage", 7 "ClientMessage",
8 "MappingNotify", 8 "MappingNotify",
9+#ifdef GenericEvent 9+#ifdef GenericEvent
10+ "GenericEvent", /* Introduced in xproto-7.0.13 */ 10+ "GenericEvent", /* Introduced in xproto-7.0.13 */
11+#endif  11+#endif
12 "VirtualEvent", 12 "VirtualEvent",
13 "Activate", 13 "Activate",
14 "Deactivate" 14 "Deactivate"
15@@ -629,6 +632,9 @@ static int flagArray[TK_LASTEVENT] = { 15@@ -629,6 +632,9 @@ static int flagArray[TK_LASTEVENT] = {
16 /* ColormapNotify */ COLORMAP, 16 /* ColormapNotify */ COLORMAP,
cvs diff -r1.1 -r1.2 pkgsrc/x11/p5-Tk/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/patches/patch-aj 2011/09/21 14:08:29 1.1
+++ pkgsrc/x11/p5-Tk/patches/patch-aj 2012/01/22 19:00:34 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-aj,v 1.1 2011/09/21 14:08:29 joerg Exp $ 1$NetBSD: patch-aj,v 1.2 2012/01/22 19:00:34 abs Exp $
2 2
3X11R7 uses a different include guard. 3X11R7 uses a different include guard.
4 4
5--- pTk/Xlib.h.orig 2011-09-21 13:58:35.000000000 +0000 5--- pTk/Xlib.h.orig 2011-06-13 12:16:52.000000000 +0000
6+++ pTk/Xlib.h 6+++ pTk/Xlib.h
7@@ -1,5 +1,8 @@ 7@@ -1,5 +1,8 @@
8 #ifndef _XLIB 8 #ifndef _XLIB
9 #define _XLIB 9 #define _XLIB
10+#if defined(_X11_XLIB_H_) && !defined(_XLIB_H_) 10+#if defined(_X11_XLIB_H_) && !defined(_XLIB_H_)
11+#define _XLIB_H_ 11+#define _XLIB_H_
12+#endif 12+#endif
13 #ifndef _XLIB_H_ 13 #ifndef _XLIB_H_
 14 #ifndef _X11_XLIB_H_
14 extern XFontStruct *XLoadQueryFont _ANSI_ARGS_((Display *, const char *)); 15 extern XFontStruct *XLoadQueryFont _ANSI_ARGS_((Display *, const char *));
15 extern XModifierKeymap *XGetModifierMapping _ANSI_ARGS_((Display *));