pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/p5-Tk Fix errno and linkage on DragonFly. Fix depe...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c788c74e0b9a
branches: trunk
changeset: 504517:c788c74e0b9a
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Dec 12 18:04:47 2005 +0000
description:
Fix errno and linkage on DragonFly. Fix dependency detection problem
on DragonFly, it needs to pickup png.h correctly.
diffstat:
x11/p5-Tk/Makefile | 7 ++++++-
x11/p5-Tk/distinfo | 7 ++++---
x11/p5-Tk/patches/patch-aa | 12 +++++++++---
x11/p5-Tk/patches/patch-ad | 7 ++++---
x11/p5-Tk/patches/patch-ae | 18 ++++++++++++++++++
5 files changed, 41 insertions(+), 10 deletions(-)
diffs (114 lines):
diff -r 0b07b554944a -r c788c74e0b9a x11/p5-Tk/Makefile
--- a/x11/p5-Tk/Makefile Mon Dec 12 17:57:29 2005 +0000
+++ b/x11/p5-Tk/Makefile Mon Dec 12 18:04:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2005/12/12 18:04:47 joerg Exp $
DISTNAME= Tk-804.027
PKGNAME= p5-Tk-804.027
@@ -19,6 +19,11 @@
MAKE_PARAMS= X11=${X11BASE}
+SUBST_CLASSES+= prefix
+SUBST_STAGE.prefix= post-patch
+SUBST_FILES.prefix= PNG/Makefile.PL
+SUBST_SED.prefix= -e 's,%%LOCALBASE%%,${LOCALBASE},g'
+
.include "../../lang/perl5/module.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff -r 0b07b554944a -r c788c74e0b9a x11/p5-Tk/distinfo
--- a/x11/p5-Tk/distinfo Mon Dec 12 17:57:29 2005 +0000
+++ b/x11/p5-Tk/distinfo Mon Dec 12 18:04:47 2005 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 17:36:18 wiz Exp $
+$NetBSD: distinfo,v 1.11 2005/12/12 18:04:47 joerg Exp $
SHA1 (Tk-804.027.tar.gz) = a691b6d38783810e3c3a3266bdcf8baba4aaf7dd
RMD160 (Tk-804.027.tar.gz) = 8ef2086efa4d7818bd82cc6d36a4d60ca8654bc7
Size (Tk-804.027.tar.gz) = 6011130 bytes
-SHA1 (patch-aa) = 50269dbd48f637791182e833cf620c1da0b9ddbf
+SHA1 (patch-aa) = 59e0455edef3ea4cb3d2c3122971344ccceefdcb
SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a
SHA1 (patch-ac) = ce3b99157ffd76eb7924321b09ca653a675aaeee
-SHA1 (patch-ad) = 1237409d5a229c1e560e9a64547f647f094f1a8b
+SHA1 (patch-ad) = 58095f5b6ca9f0123a057a5411fc546e22303a8f
+SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877
diff -r 0b07b554944a -r c788c74e0b9a x11/p5-Tk/patches/patch-aa
--- a/x11/p5-Tk/patches/patch-aa Mon Dec 12 17:57:29 2005 +0000
+++ b/x11/p5-Tk/patches/patch-aa Mon Dec 12 18:04:47 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/03/22 12:27:19 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/12 18:04:47 joerg Exp $
---- Tk/MMutil.pm.orig Wed Dec 10 20:49:23 2003
+--- Tk/MMutil.pm.orig 2004-03-27 14:55:55.000000000 +0000
+++ Tk/MMutil.pm
-@@ -301,7 +301,7 @@ sub const_config
+@@ -306,10 +306,13 @@ sub const_config
}
$self->{'LDFLAGS'} =~ s/-flat_namespace//;
$self->{'LDFLAGS'} =~ s/-undefined\s+suppress//;
@@ -11,3 +11,9 @@
{
# -Bforcearchive is bad news for Tk - we don't want all of libpTk.a in all .so-s.
$self->{'LDDLFLAGS'} =~ s/-Bforcearchive\s*//g;
++ } elsif ($^O =~ /(.*dragonfly)/i) {
++ # -Bforcearchive is bad news for Tk - we don't want all of libpTk.a in all .so-s.
++ $self->{'LDDLFLAGS'} =~ s/-Bforcearchive\s*//g;
+ }
+ return $self->MM::const_config;
+ }
diff -r 0b07b554944a -r c788c74e0b9a x11/p5-Tk/patches/patch-ad
--- a/x11/p5-Tk/patches/patch-ad Mon Dec 12 17:57:29 2005 +0000
+++ b/x11/p5-Tk/patches/patch-ad Mon Dec 12 18:04:47 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2004/12/25 14:00:10 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2005/12/12 18:04:47 joerg Exp $
---- PNG/Makefile.PL.orig 2004-12-25 04:02:48.000000000 +0100
+--- PNG/Makefile.PL.orig 2003-12-30 10:45:03.000000000 +0000
+++ PNG/Makefile.PL
@@ -1,7 +1,6 @@
use strict;
@@ -10,7 +10,7 @@
use File::Copy;
my $l = $Config::Config{'lib_ext'};
-@@ -14,68 +13,14 @@ foreach my $file (qw(zlib/Makefile.PL li
+@@ -14,68 +13,15 @@ foreach my $file (qw(zlib/Makefile.PL li
unlink($file);
}
@@ -24,6 +24,7 @@
dist => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
OBJECT => '$(O_FILES)',
- INC => '-I/usr/local/include',
++ INC => '-I%%LOCALBASE%%/include',
LIBS => ['-lpng -lz -lm'],
);
- }
diff -r 0b07b554944a -r c788c74e0b9a x11/p5-Tk/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/p5-Tk/patches/patch-ae Mon Dec 12 18:04:47 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2005/12/12 18:04:47 joerg Exp $
+
+--- pTk/mTk/unix/tkUnixPort.h.orig 2005-12-12 15:53:24.000000000 +0000
++++ pTk/mTk/unix/tkUnixPort.h
+@@ -134,13 +134,6 @@
+ #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
+
+ /*
+- * Not all systems declare the errno variable in errno.h. so this
+- * file does it explicitly.
+- */
+-
+-extern int errno;
+-
+-/*
+ * Define "NBBY" (number of bits per byte) if it's not already defined.
+ */
+
Home |
Main Index |
Thread Index |
Old Index