diff options
| author | joerg <joerg@pkgsrc.org> | 2005-09-21 14:49:08 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-09-21 14:49:08 +0000 |
| commit | ef4684ad155b52b815408a5811654327fb9fd79b (patch) | |
| tree | ad03d6b1f54fe814d7c5fd1ecb818d09c45e120e /x11/tk | |
| parent | 314097928b54d26fec2dde79003bbf2b2d8399f1 (diff) | |
| download | pkgsrc-ef4684ad155b52b815408a5811654327fb9fd79b.tar.gz | |
Ensure that errno really comes from errno.h and only define it as
extern, if it's not a macro. Teach configure about DragonFly.
OKed by maintainer.
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/distinfo | 5 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ab | 20 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ae | 18 |
3 files changed, 40 insertions, 3 deletions
diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 8c6753c9004..f54f9f0d364 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.22 2005/07/19 11:12:25 adam Exp $ +$NetBSD: distinfo,v 1.23 2005/09/21 14:49:08 joerg Exp $ SHA1 (tk8.4.11-src.tar.gz) = c05dec9163e6f75787aa2825122d424fc1a1edb6 RMD160 (tk8.4.11-src.tar.gz) = 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f Size (tk8.4.11-src.tar.gz) = 3236334 bytes SHA1 (patch-aa) = 5ddd25d23d4749acd251f7e06dde18bdf207da8f -SHA1 (patch-ab) = 3f085c38c5169a81930571436a8ac1848435205f +SHA1 (patch-ab) = 3f1cc305a65fb111e6dfe4df1290afb964026c67 SHA1 (patch-ac) = 5dc59a8e26c114a847c511defc7a3d7cc77655e8 SHA1 (patch-ad) = 51ba301ed6786791f0ef9ece73c4496231f1c031 +SHA1 (patch-ae) = 7946f60ee6ff944dfc89e1bc0dbe7be202bc46c7 diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index 0ff43af2dba..4bc6c270586 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.19 2005/07/19 11:12:25 adam Exp $ +$NetBSD: patch-ab,v 1.20 2005/09/21 14:49:08 joerg Exp $ --- configure.orig 2005-06-29 16:43:10.000000000 +0000 +++ configure @@ -51,6 +51,24 @@ $NetBSD: patch-ab,v 1.19 2005/07/19 11:12:25 adam Exp $ fi rm -f conftest* +@@ -2699,7 +2709,7 @@ rm -f conftest* + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots + ;; +- FreeBSD-*) ++ FreeBSD-*|DragonFly-*) + # FreeBSD 3.* and greater have ELF. + SHLIB_CFLAGS="-fPIC" + SHLIB_LD="ld -Bshareable -x" +@@ -3521,7 +3531,7 @@ fi + ;; + IRIX*) + ;; +- NetBSD-*|FreeBSD-*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) + ;; + Darwin-*) + ;; @@ -3539,16 +3549,16 @@ fi fi diff --git a/x11/tk/patches/patch-ae b/x11/tk/patches/patch-ae new file mode 100644 index 00000000000..4845c166273 --- /dev/null +++ b/x11/tk/patches/patch-ae @@ -0,0 +1,18 @@ +$NetBSD: patch-ae,v 1.1 2005/09/21 14:49:08 joerg Exp $ + +--- tkUnixPort.h.orig 2005-07-30 21:02:48.000000000 +0000 ++++ tkUnixPort.h +@@ -119,12 +119,7 @@ + #endif + #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; ++#include <errno.h> + + /* + * Define "NBBY" (number of bits per byte) if it's not already defined. |