Fri May 31 20:13:24 2013 UTC ()
Changes Tk-804.031:
This is basically the same like Tk-804.030_502.


(adam)
diff -r1.80 -r1.81 pkgsrc/x11/p5-Tk/Makefile
diff -r1.19 -r1.20 pkgsrc/x11/p5-Tk/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/p5-Tk/patches/patch-ac
diff -r1.4 -r1.5 pkgsrc/x11/p5-Tk/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/x11/p5-Tk/patches/patch-ah
cvs diff -r1.80 -r1.81 pkgsrc/x11/p5-Tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/Makefile 2013/05/31 12:42:57 1.80
+++ pkgsrc/x11/p5-Tk/Makefile 2013/05/31 20:13:24 1.81
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1# $NetBSD: Makefile,v 1.80 2013/05/31 12:42:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.81 2013/05/31 20:13:24 adam Exp $
2 2
3DISTNAME= Tk-804.030 3DISTNAME= Tk-804.031
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5PKGREVISION= 4 
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_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
15 14
16MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
17 16
18BUILD_DEPENDS+= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser 17BUILD_DEPENDS+= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser
19 18
20USE_LANGUAGES= c 19USE_LANGUAGES= c
21PERL5_PACKLIST= auto/Tk/.packlist 20USE_TOOLS+= pkg-config
 21PERL5_PACKLIST= auto/Tk/.packlist
22 22
23MAKE_PARAMS= X11=${X11BASE} 23MAKE_PARAMS= X11=${X11BASE}
24 24
25REPLACE_PERL+= TextList/reindex.pl 25REPLACE_PERL+= TextList/reindex.pl
26REPLACE_PERL+= pTk/Tcl-pTk 26REPLACE_PERL+= pTk/Tcl-pTk
27REPLACE_PERL+= pTk/mkVFunc 27REPLACE_PERL+= pTk/mkVFunc
28REPLACE_PERL+= demos/widget 28REPLACE_PERL+= demos/widget
29 29
30SUBST_CLASSES+= prefix 30SUBST_CLASSES+= prefix
31SUBST_STAGE.prefix= post-patch 31SUBST_STAGE.prefix= post-patch
32SUBST_FILES.prefix= PNG/Makefile.PL 32SUBST_FILES.prefix= PNG/Makefile.PL
33SUBST_SED.prefix= -e 's,%%LOCALBASE%%,${LOCALBASE},g' 33SUBST_SED.prefix= -e 's,%%LOCALBASE%%,${LOCALBASE},g'
34 34
35pre-configure: 35pre-configure:
36 ${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f 36 ${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
37 37
38.include "../../lang/perl5/module.mk" 38.include "../../lang/perl5/module.mk"
39.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
40.include "../../mk/jpeg.buildlink3.mk" 40.include "../../mk/jpeg.buildlink3.mk"
41.include "../../x11/libX11/buildlink3.mk" 41.include "../../x11/libX11/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/x11/p5-Tk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/distinfo 2012/01/22 19:00:34 1.19
+++ pkgsrc/x11/p5-Tk/distinfo 2013/05/31 20:13:24 1.20
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.19 2012/01/22 19:00:34 abs Exp $ 1$NetBSD: distinfo,v 1.20 2013/05/31 20:13:24 adam Exp $
2 2
3SHA1 (Tk-804.030.tar.gz) = f5a85cee56de9679e49260e6e80d6dc384e60a5e 3SHA1 (Tk-804.031.tar.gz) = f2e9db4f2ae7f45be04471cc738239c08be7aa48
4RMD160 (Tk-804.030.tar.gz) = bf139ab03e9f07f7a184ea25dece9d8b1b6d10e0 4RMD160 (Tk-804.031.tar.gz) = 442b13da904881406e9965468eab1c7b084523ce
5Size (Tk-804.030.tar.gz) = 6928048 bytes 5Size (Tk-804.031.tar.gz) = 6932339 bytes
6SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b 6SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b
7SHA1 (patch-ac) = fffe0c46e44202fe0018146b4ba5e23f50168c04 7SHA1 (patch-ac) = 8918f9a9dfd884ed8d7b76b0615e266ffa392a44
8SHA1 (patch-ad) = 3ea2490f6d30436d72e3321ae50689c28bdb25cc 8SHA1 (patch-ad) = b1a659fe92cdab86d8ff7b04937de9f0c25b080a
9SHA1 (patch-ah) = e48711b341a285bd8055a6c487d0185695ece460 9SHA1 (patch-ah) = 1b75be678e1bb31a182b3f9dcb9063bf4fc086a1
10SHA1 (patch-ai) = f6ef20cb48f3ee08335a6410e873f3b5aa277b20 10SHA1 (patch-ai) = f6ef20cb48f3ee08335a6410e873f3b5aa277b20
11SHA1 (patch-aj) = ba3dfe1e7b7a19af1240b37186ab69d857d925f4 11SHA1 (patch-aj) = ba3dfe1e7b7a19af1240b37186ab69d857d925f4
cvs diff -r1.3 -r1.4 pkgsrc/x11/p5-Tk/patches/patch-ac (expand / switch to unified diff)

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

--- pkgsrc/x11/p5-Tk/patches/patch-ad 2012/01/22 19:00:34 1.4
+++ pkgsrc/x11/p5-Tk/patches/patch-ad 2013/05/31 20:13:24 1.5
@@ -1,43 +1,38 @@ @@ -1,43 +1,38 @@
1$NetBSD: patch-ad,v 1.4 2012/01/22 19:00:34 abs Exp $ 1$NetBSD: patch-ad,v 1.5 2013/05/31 20:13:24 adam Exp $
2 2
3--- PNG/Makefile.PL.orig 2010-09-27 21:57:28.000000000 +0000 3--- PNG/Makefile.PL.orig 2013-05-21 13:25:13.000000000 +0000
4+++ PNG/Makefile.PL 4+++ PNG/Makefile.PL
5@@ -2,7 +2,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@@ -15,68 +14,15 @@ foreach my $file (qw(zlib/Makefile.PL li 13@@ -27,8 +26,6 @@ if ($? == 0) {
14 unlink($file); 14 $libpng_libs = '-lpng -lz -lm';
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",[$libpng_cflags],[$libpng_libs]))
19- { 19 {
20 Tk::MMutil::TkExtMakefile( 20 Tk::MMutil::TkExtMakefile(
21 NAME => 'Tk::PNG', 21 NAME => 'Tk::PNG',
22 VERSION_FROM => 'PNG.pm', 22@@ -40,55 +37,6 @@ if ($Tk::MMtry::VERSION ge '4.007' &&
23 XS_VERSION => $Tk::Config::VERSION, 23 LIBS => [$libpng_libs],
24 dist => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' }, 
25 OBJECT => '$(O_FILES)', 
26- INC => '-I/usr/local/include', 
27+ INC => '-I%%LOCALBASE%%/include', 
28 LIBS => ['-lpng -lz -lm'], 
29 ); 24 );
30- } 25 }
31-else 26-else
32- { 27- {
33- my $ok = 1; 28- my $ok = 1;
34- foreach my $file ("libpng/Makefile.PL","zlib/Makefile.PL") 29- foreach my $file ("libpng/Makefile.PL","zlib/Makefile.PL")
35- { 30- {
36- next unless -f $file; 31- next unless -f $file;
37- chmod(0666,$file); 32- chmod(0666,$file);
38- unlink($file); 33- unlink($file);
39- } 34- }
40- unless (copy("Makefile.libpng.maybe","libpng/Makefile.PL")) 35- unless (copy("Makefile.libpng.maybe","libpng/Makefile.PL"))
41- { 36- {
42- warn "Cannot copy Makefile.libpng.maybe => libpng/Makefile.PL ($!)"; 37- warn "Cannot copy Makefile.libpng.maybe => libpng/Makefile.PL ($!)";
43- $ok = 0; 38- $ok = 0;
cvs diff -r1.2 -r1.3 pkgsrc/x11/p5-Tk/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/x11/p5-Tk/patches/Attic/patch-ah 2012/01/22 19:00:34 1.2
+++ pkgsrc/x11/p5-Tk/patches/Attic/patch-ah 2013/05/31 20:13:24 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ah,v 1.2 2012/01/22 19:00:34 abs Exp $ 1$NetBSD: patch-ah,v 1.3 2013/05/31 20:13:24 adam Exp $
2 2
3--- myConfig.orig 2012-01-22 18:50:31.000000000 +0000 3--- myConfig.orig 2012-01-22 18:50:31.000000000 +0000
4+++ myConfig 4+++ myConfig
5@@ -336,7 +336,7 @@ if ($win_arch eq 'x') { 5@@ -346,7 +346,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 }