diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/p5-Tk/Makefile | 6 | ||||
| -rw-r--r-- | x11/p5-Tk/distinfo | 4 | ||||
| -rw-r--r-- | x11/p5-Tk/patches/patch-ac | 34 | ||||
| -rw-r--r-- | x11/p5-Tk/patches/patch-ad | 81 |
4 files changed, 122 insertions, 3 deletions
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index a9695bac99e..a70254984a8 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.41 2004/12/20 11:31:14 grant Exp $ +# $NetBSD: Makefile,v 1.42 2004/12/25 14:00:09 wiz Exp $ # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp # DISTNAME= Tk-804.027 PKGNAME= p5-Tk-804.027 SVR4_PKGNAME= p5tk -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 tk perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/} @@ -25,4 +25,6 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Tk/.packlist MAKE_PARAMS= X11=${X11BASE} .include "../../lang/perl5/module.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo index 88d545fc9b8..7bf600e1a3b 100644 --- a/x11/p5-Tk/distinfo +++ b/x11/p5-Tk/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.8 2004/05/06 11:05:58 markd Exp $ +$NetBSD: distinfo,v 1.9 2004/12/25 14:00:09 wiz Exp $ SHA1 (Tk-804.027.tar.gz) = a691b6d38783810e3c3a3266bdcf8baba4aaf7dd Size (Tk-804.027.tar.gz) = 6011130 bytes SHA1 (patch-aa) = 50269dbd48f637791182e833cf620c1da0b9ddbf SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a +SHA1 (patch-ac) = ce3b99157ffd76eb7924321b09ca653a675aaeee +SHA1 (patch-ad) = 1237409d5a229c1e560e9a64547f647f094f1a8b diff --git a/x11/p5-Tk/patches/patch-ac b/x11/p5-Tk/patches/patch-ac new file mode 100644 index 00000000000..c607183e642 --- /dev/null +++ b/x11/p5-Tk/patches/patch-ac @@ -0,0 +1,34 @@ +$NetBSD: patch-ac,v 1.1 2004/12/25 14:00:10 wiz Exp $ + +--- JPEG/Makefile.PL.orig 2003-12-10 23:12:06.000000000 +0100 ++++ JPEG/Makefile.PL +@@ -5,29 +5,11 @@ 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'])) +- { + push(@args, LIBS => ['-ljpeg'], +- 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", +- 'INC' => '-Ijpeg'); +- copy("jpeg/Makefile.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 new file mode 100644 index 00000000000..d31a863b0f0 --- /dev/null +++ b/x11/p5-Tk/patches/patch-ad @@ -0,0 +1,81 @@ +$NetBSD: patch-ad,v 1.1 2004/12/25 14:00:10 wiz Exp $ + +--- PNG/Makefile.PL.orig 2004-12-25 04:02:48.000000000 +0100 ++++ PNG/Makefile.PL +@@ -1,7 +1,6 @@ + use strict; + use Tk::MMutil; + use Tk::Config (); +-use Tk::MMtry; + use File::Copy; + + my $l = $Config::Config{'lib_ext'}; +@@ -14,68 +13,14 @@ foreach my $file (qw(zlib/Makefile.PL li + unlink($file); + } + +-if ($Tk::MMtry::VERSION ge '4.007' && +- try_run("config/has_png.c",['-I/usr/local/include'],['-lpng -lz -lm'])) +- { + 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', + LIBS => ['-lpng -lz -lm'], + ); +- } +-else +- { +- my $ok = 1; +- foreach my $file ("libpng/Makefile.PL","zlib/Makefile.PL") +- { +- next unless -f $file; +- chmod(0666,$file); +- unlink($file); +- } +- unless (copy("libpng/Makefile.maybe","libpng/Makefile.PL")) +- { +- warn "Cannot copy libpng/Makefile.maybe => libpng/Makefile.PL ($!)"; +- $ok = 0; +- } +- unless (copy("zlib/Makefile.maybe","zlib/Makefile.PL")) +- { +- warn "Cannot copy zlib/Makefile.maybe => zlib/Makefile.PL ($!)"; +- $ok = 0; +- } +- if ($ok) +- { +- warn "Building libpng$l\n"; +- my $extlib = "libpng/libpng$l"; +- if ($cc eq 'cl') +- { +- $extlib .= " zlib/zlib$l"; +- $zlib = "zlib$l"; +- } +- else +- { +- $extlib .= " zlib/libz$l"; +- } +- 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 => '-Ilibpng -Izlib', +- MYEXTLIB => $extlib, +- LIBS => ['-lm'], +- ); +- } +- else +- { +- warn "Cannot build libpng$l\n"; +- ExtUtils::MakeMaker::WriteEmptyMakefile(); +- } +- } + + package MY; + |