From 1fbfd40bb80485b923320f66ea472aa8c6b0e834 Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 13 Aug 2011 19:03:37 +0000 Subject: Don't try to redefine intptr_t. Should fix 32-bit build and PR 40198. --- www/amaya/distinfo | 3 ++- www/amaya/patches/patch-ad | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 www/amaya/patches/patch-ad (limited to 'www') diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 3d5753cb2e4..5e9c7c3d90e 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2011/07/02 22:19:29 dholland Exp $ +$NetBSD: distinfo,v 1.23 2011/08/13 19:03:37 dholland Exp $ SHA1 (amaya-fullsrc-11.3.1.tgz) = 7b180434a8271ecdeb3ae821997619bc3dcd2da4 RMD160 (amaya-fullsrc-11.3.1.tgz) = 12206de82551ed2eb548e3c778909bf0d9cafe43 @@ -6,6 +6,7 @@ Size (amaya-fullsrc-11.3.1.tgz) = 37240030 bytes SHA1 (patch-aa) = bd04e6ee2a23b18696dad50168da5b6f31bbb3a1 SHA1 (patch-ab) = d3280c6137eb1b37f62986a5bfe3fc8a23c4b24c SHA1 (patch-ac) = 3140206116c5dfdbf9257d754c1ea06966d8bd22 +SHA1 (patch-ad) = 1d53dc196395922585638592560373c27a1b0927 SHA1 (patch-ae) = 76fe53fc0d21d8e32c290bbdc87c2f74a3e9eba9 SHA1 (patch-ag) = b88c1bf59e479a2ed7ed5ce82459aee21e86e1c2 SHA1 (patch-ai) = 11bce2a566e426bc354b6d5fdb582d1f4c7dd6ff diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad new file mode 100644 index 00000000000..55a0c36144c --- /dev/null +++ b/www/amaya/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.12 2011/08/13 19:03:38 dholland Exp $ + +Amaya, being Special, thinks it can redefine standard library symbols... + +--- Amaya/thotlib/include/thot_sys.h~ 2007-09-05 13:16:46.000000000 +0000 ++++ Amaya/thotlib/include/thot_sys.h +@@ -251,10 +251,14 @@ and must be removed at the end of the de + #define NBSP 0xA0 + #define MAX_BYTES 6 + ++#ifdef HAVE_STDINT_H ++#include ++#else + /* we encourage using "long" to store pointer values, never use "int" ! */ + #if !defined(__intptr_t_defined) && !defined(_INTPTR_T_DEFINED) + #define __intptr_t_defined + typedef long intptr_t; + #endif ++#endif /* HAVE_STDINT_H */ + + #endif /* THOT_SYS_H */ -- cgit v1.2.3