From 989899a61d62abcb99ecbe60793d7fdab6f66832 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw>
Date: Mon, 1 Jul 2002 02:23:16 +0000
Subject: Make Amaya build on NetBSD 1.4.

NetBSD 1.4 does not have wchar.h, but everything needed by Amaya is
defined in stdlib.h. So add a wchar.h test to configure, and protect
inclusion of wchar.h by HAVE_WCHAR_H.

Solves PR 12358.
---
 www/amaya/distinfo         |  6 ++++--
 www/amaya/patches/patch-aa | 16 ++++++++++++----
 www/amaya/patches/patch-ae | 15 +++++++++++++++
 www/amaya/patches/patch-af | 13 +++++++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 www/amaya/patches/patch-ae
 create mode 100644 www/amaya/patches/patch-af

(limited to 'www')

diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index d60f279ae88..b0ce9e11c47 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2001/08/09 19:03:18 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/07/01 02:23:16 kristerw Exp $
 
 SHA1 (amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b
 Size (amaya-src-5.1.tgz) = 4925073 bytes
-SHA1 (patch-aa) = aa7212f3424ac2593a9f38a6e2436ff781ba6fd0
+SHA1 (patch-aa) = 22dd34ab9dcd70220effb2fff690f70a5f1bbeb7
 SHA1 (patch-ab) = 6f5940d24e285dcdcaf4420cf25b6bc8f750ab28
 SHA1 (patch-ac) = e8740b482a7422fadadff451fb148beacd081838
 SHA1 (patch-ad) = 18a23b68f0f81d8767d17905cd762956b37e33b4
+SHA1 (patch-ae) = 5e1e356471bb26ca463e3f09f0447044d2aaac39
+SHA1 (patch-af) = 9f29ef449cd5112b771e4c248a881ec4b41d7a0f
diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index 0809985fb38..5911b4c8c7f 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,7 +1,15 @@
-$NetBSD: patch-aa,v 1.7 2001/08/09 19:03:19 jlam Exp $
-
---- ../configure.orig	Tue Jul  3 07:23:50 2001
-+++ ../configure
+$NetBSD: patch-aa,v 1.8 2002/07/01 02:23:17 kristerw Exp $
+--- ../configure.orig	Tue Jul  3 13:23:50 2001
++++ ../configure	Mon Jul  1 02:48:37 2002
+@@ -3049,7 +3049,7 @@
+ fi
+ 
+ 
+-for ac_hdr in stdio.h
++for ac_hdr in stdio.h wchar.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 @@ -6425,12 +6425,6 @@
  
  
diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae
new file mode 100644
index 00000000000..f433c8f3dc5
--- /dev/null
+++ b/www/amaya/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.5 2002/07/01 02:23:17 kristerw Exp $
+--- ../thotlib/include/ustring.h.orig	Mon Jul  1 02:49:43 2002
++++ ../thotlib/include/ustring.h	Mon Jul  1 02:55:09 2002
+@@ -5,7 +5,11 @@
+ #ifdef _WINDOWS
+ #include <windows.h>
+ #endif /* _WINDOWS */
++
++#include "config.h"
++#ifdef HAVE_WCHAR_H
+ #include <wchar.h>
++#endif /* HAVE_WCHAR_H */
+ 
+ #ifdef _WINDOWS
+ #define strncasecmp _strnicmp
diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af
new file mode 100644
index 00000000000..b0159b8d36e
--- /dev/null
+++ b/www/amaya/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 2002/07/01 02:23:17 kristerw Exp $
+--- ../config.h.in.orig	Mon Jul  1 02:52:16 2002
++++ ../config.h.in	Mon Jul  1 02:52:51 2002
+@@ -321,6 +321,9 @@
+ /* Define if you have the <unixlib.h> header file.  */
+ #undef HAVE_UNIXLIB_H
+ 
++/* Define if you have the <wchar.h> header file.  */
++#undef HAVE_WCHAR_H
++
+ /* Define if you have the dl library (-ldl).  */
+ #undef HAVE_LIBDL
+ 
-- 
cgit v1.2.3