From 221d8cdb6a5759f53dcfbff3f0e5bfb89933b2b3 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 31 May 2013 20:13:24 +0000 Subject: Changes Tk-804.031: This is basically the same like Tk-804.030_502. --- x11/p5-Tk/Makefile | 20 ++++++++++---------- x11/p5-Tk/distinfo | 14 +++++++------- x11/p5-Tk/patches/patch-ac | 16 +++------------- x11/p5-Tk/patches/patch-ad | 25 ++++++++++--------------- x11/p5-Tk/patches/patch-ah | 4 ++-- 5 files changed, 32 insertions(+), 47 deletions(-) diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index d6fea4cbcbf..9544f4df27a 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2013/05/31 12:42:57 wiz Exp $ +# $NetBSD: Makefile,v 1.81 2013/05/31 20:13:24 adam Exp $ -DISTNAME= Tk-804.030 +DISTNAME= Tk-804.031 PKGNAME= p5-${DISTNAME} -PKGREVISION= 4 SVR4_PKGNAME= p5tk CATEGORIES= x11 tk perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/} @@ -17,17 +16,18 @@ MAKE_JOBS_SAFE= no BUILD_DEPENDS+= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser -USE_LANGUAGES= c -PERL5_PACKLIST= auto/Tk/.packlist +USE_LANGUAGES= c +USE_TOOLS+= pkg-config +PERL5_PACKLIST= auto/Tk/.packlist MAKE_PARAMS= X11=${X11BASE} -REPLACE_PERL+= TextList/reindex.pl -REPLACE_PERL+= pTk/Tcl-pTk -REPLACE_PERL+= pTk/mkVFunc -REPLACE_PERL+= demos/widget +REPLACE_PERL+= TextList/reindex.pl +REPLACE_PERL+= pTk/Tcl-pTk +REPLACE_PERL+= pTk/mkVFunc +REPLACE_PERL+= demos/widget -SUBST_CLASSES+= prefix +SUBST_CLASSES+= prefix SUBST_STAGE.prefix= post-patch SUBST_FILES.prefix= PNG/Makefile.PL SUBST_SED.prefix= -e 's,%%LOCALBASE%%,${LOCALBASE},g' diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo index d7a364d3c8f..a014deeb43e 100644 --- a/x11/p5-Tk/distinfo +++ b/x11/p5-Tk/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.19 2012/01/22 19:00:34 abs Exp $ +$NetBSD: distinfo,v 1.20 2013/05/31 20:13:24 adam Exp $ -SHA1 (Tk-804.030.tar.gz) = f5a85cee56de9679e49260e6e80d6dc384e60a5e -RMD160 (Tk-804.030.tar.gz) = bf139ab03e9f07f7a184ea25dece9d8b1b6d10e0 -Size (Tk-804.030.tar.gz) = 6928048 bytes +SHA1 (Tk-804.031.tar.gz) = f2e9db4f2ae7f45be04471cc738239c08be7aa48 +RMD160 (Tk-804.031.tar.gz) = 442b13da904881406e9965468eab1c7b084523ce +Size (Tk-804.031.tar.gz) = 6932339 bytes SHA1 (patch-aa) = 863ab22dcad8c20d8e84e840f11fa41964eb051b -SHA1 (patch-ac) = fffe0c46e44202fe0018146b4ba5e23f50168c04 -SHA1 (patch-ad) = 3ea2490f6d30436d72e3321ae50689c28bdb25cc -SHA1 (patch-ah) = e48711b341a285bd8055a6c487d0185695ece460 +SHA1 (patch-ac) = 8918f9a9dfd884ed8d7b76b0615e266ffa392a44 +SHA1 (patch-ad) = b1a659fe92cdab86d8ff7b04937de9f0c25b080a +SHA1 (patch-ah) = 1b75be678e1bb31a182b3f9dcb9063bf4fc086a1 SHA1 (patch-ai) = f6ef20cb48f3ee08335a6410e873f3b5aa277b20 SHA1 (patch-aj) = ba3dfe1e7b7a19af1240b37186ab69d857d925f4 diff --git a/x11/p5-Tk/patches/patch-ac b/x11/p5-Tk/patches/patch-ac index d6ab1d6b825..098fd17dd67 100644 --- a/x11/p5-Tk/patches/patch-ac +++ b/x11/p5-Tk/patches/patch-ac @@ -1,20 +1,17 @@ -$NetBSD: patch-ac,v 1.3 2012/01/22 19:00:34 abs Exp $ +$NetBSD: patch-ac,v 1.4 2013/05/31 20:13:24 adam Exp $ ---- JPEG/Makefile.PL.orig 2010-05-31 19:58:38.000000000 +0000 +--- JPEG/Makefile.PL.orig 2012-01-16 22:25:28.000000000 +0000 +++ JPEG/Makefile.PL -@@ -4,24 +4,24 @@ use Tk::Config (); +@@ -4,24 +4,14 @@ use Tk::Config (); use File::Copy; my $l = $Config::Config{'lib_ext'}; -use Tk::MMtry; -+# 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"; @@ -27,13 +24,6 @@ $NetBSD: patch-ac,v 1.3 2012/01/22 19:00:34 abs 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 2f92aced8c8..47f7ab5ffc5 100644 --- a/x11/p5-Tk/patches/patch-ad +++ b/x11/p5-Tk/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.4 2012/01/22 19:00:34 abs Exp $ +$NetBSD: patch-ad,v 1.5 2013/05/31 20:13:24 adam Exp $ ---- PNG/Makefile.PL.orig 2010-09-27 21:57:28.000000000 +0000 +--- PNG/Makefile.PL.orig 2013-05-21 13:25:13.000000000 +0000 +++ PNG/Makefile.PL @@ -2,7 +2,6 @@ use strict; @@ -10,24 +10,19 @@ $NetBSD: patch-ad,v 1.4 2012/01/22 19:00:34 abs Exp $ use File::Copy; my $l = $Config::Config{'lib_ext'}; -@@ -15,68 +14,15 @@ foreach my $file (qw(zlib/Makefile.PL li - unlink($file); - } +@@ -27,8 +26,6 @@ if ($? == 0) { + $libpng_libs = '-lpng -lz -lm'; + } -if ($Tk::MMtry::VERSION ge '4.007' && -- try_run("config/has_png.c",['-I/usr/local/include'],['-lpng -lz -lm'])) -- { +- try_run("config/has_png.c",[$libpng_cflags],[$libpng_libs])) + { Tk::MMutil::TkExtMakefile( NAME => 'Tk::PNG', - VERSION_FROM => 'PNG.pm', - XS_VERSION => $Tk::Config::VERSION, - dist => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' }, - OBJECT => '$(O_FILES)', -- INC => '-I/usr/local/include', -+ INC => '-I%%LOCALBASE%%/include', - LIBS => ['-lpng -lz -lm'], +@@ -40,55 +37,6 @@ if ($Tk::MMtry::VERSION ge '4.007' && + LIBS => [$libpng_libs], ); -- } + } -else - { - my $ok = 1; diff --git a/x11/p5-Tk/patches/patch-ah b/x11/p5-Tk/patches/patch-ah index 0b942fe2980..b7c8dfc939a 100644 --- a/x11/p5-Tk/patches/patch-ah +++ b/x11/p5-Tk/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.2 2012/01/22 19:00:34 abs Exp $ +$NetBSD: patch-ah,v 1.3 2013/05/31 20:13:24 adam Exp $ --- myConfig.orig 2012-01-22 18:50:31.000000000 +0000 +++ myConfig -@@ -336,7 +336,7 @@ if ($win_arch eq 'x') { +@@ -346,7 +346,7 @@ if ($win_arch eq 'x') { # # Prefer 64bit libraries on certain architectures # -- cgit v1.2.3