pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2004Q4]: pkgsrc/x11/p5-Tk Pullup ticket 297 - requested by Lub...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f984802c4b4c
branches: pkgsrc-2004Q4
changeset: 485914:f984802c4b4c
user: snj <snj%pkgsrc.org@localhost>
date: Sat Feb 19 21:47:14 2005 +0000
description:
Pullup ticket 297 - requested by Lubomir Sedlacik
security fix for p5-Tk
Revisions pulled up:
- pkgsrc/x11/p5-Tk/Makefile 1.42
- pkgsrc/x11/p5-Tk/distinfo 1.9
- pkgsrc/x11/p5-Tk/patches/patch-ac 1.1
- pkgsrc/x11/p5-Tk/patches/patch-ad 1.1
- pkgsrc/x11/p5-Tk/buildlink3.mk 1.2
Module Name: pkgsrc
Committed By: wiz
Date: Sat Dec 25 14:00:10 UTC 2004
Modified Files:
pkgsrc/x11/p5-Tk: Makefile distinfo
Added Files:
pkgsrc/x11/p5-Tk/patches: patch-ac patch-ad
Log Message:
Update to 804.027nb2: use png and jpeg packages instead of copies
coming with the source. Patch from Michael van Elst in PR 28770.
---
Module Name: pkgsrc
Committed By: wiz
Date: Sat Dec 25 14:02:30 UTC 2004
Modified Files:
pkgsrc/x11/p5-Tk: buildlink3.mk
Log Message:
Recommend 804.027nb2 because of security problems in earlier versions.
diffstat:
x11/p5-Tk/Makefile | 6 ++-
x11/p5-Tk/buildlink3.mk | 3 +-
x11/p5-Tk/distinfo | 4 +-
x11/p5-Tk/patches/patch-ac | 34 +++++++++++++++++++
x11/p5-Tk/patches/patch-ad | 81 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 124 insertions(+), 4 deletions(-)
diffs (177 lines):
diff -r 410ad6c2d080 -r f984802c4b4c x11/p5-Tk/Makefile
--- a/x11/p5-Tk/Makefile Sat Feb 19 21:38:26 2005 +0000
+++ b/x11/p5-Tk/Makefile Sat Feb 19 21:47:14 2005 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.41 2004/12/20 11:31:14 grant Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2005/02/19 21:47:14 snj 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 @@
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 -r 410ad6c2d080 -r f984802c4b4c x11/p5-Tk/buildlink3.mk
--- a/x11/p5-Tk/buildlink3.mk Sat Feb 19 21:38:26 2005 +0000
+++ b/x11/p5-Tk/buildlink3.mk Sat Feb 19 21:47:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/14 13:59:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.1.6.1 2005/02/19 21:47:14 snj Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
P5_TK_BUILDLINK3_MK:= ${P5_TK_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@
.if !empty(P5_TK_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.p5-Tk+= p5-Tk>=804.027
+BUILDLINK_RECOMMENDED.p5-Tk+= p5-Tk>=804.027nb2
BUILDLINK_PKGSRCDIR.p5-Tk?= ../../x11/p5-Tk
BUILDLINK_CONTENTS_FILTER.p5-Tk= \
${EGREP} '(include.*/|\.def$$|\.m$$|\.t$$|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$)'
diff -r 410ad6c2d080 -r f984802c4b4c x11/p5-Tk/distinfo
--- a/x11/p5-Tk/distinfo Sat Feb 19 21:38:26 2005 +0000
+++ b/x11/p5-Tk/distinfo Sat Feb 19 21:47:14 2005 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2004/05/06 11:05:58 markd Exp $
+$NetBSD: distinfo,v 1.8.6.1 2005/02/19 21:47:14 snj 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 -r 410ad6c2d080 -r f984802c4b4c x11/p5-Tk/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/p5-Tk/patches/patch-ac Sat Feb 19 21:47:14 2005 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.1.2.2 2005/02/19 21:47:14 snj 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 -r 410ad6c2d080 -r f984802c4b4c x11/p5-Tk/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/p5-Tk/patches/patch-ad Sat Feb 19 21:47:14 2005 +0000
@@ -0,0 +1,81 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/02/19 21:47:14 snj 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;
+
Home |
Main Index |
Thread Index |
Old Index