diff options
Diffstat (limited to 'x11/p5-Tk/patches')
-rw-r--r-- | x11/p5-Tk/patches/patch-ac | 16 | ||||
-rw-r--r-- | x11/p5-Tk/patches/patch-ad | 25 | ||||
-rw-r--r-- | x11/p5-Tk/patches/patch-ah | 4 |
3 files changed, 15 insertions, 30 deletions
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 # |