Check for btowc(3) and do not use it if not present. Should fix problems

exposed by Hubert's bulk build in 1.6, where that function does not exist.

4 files changed, 49 insertions, 1 deletions

diff --git a/databases/gq/distinfo b/databases/gq/distinfo
index 0fde7986074..714d94b2e2b 100644
--- a/databases/gq/distinfo
+++ b/databases/gq/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/09/04 12:57:24 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2003/09/09 18:51:41 jmmv Exp $
 
 SHA1 (gq-0.6.0.tar.gz) = 23c0d839f83f69931b30c33f500ca8d697d651ed
 Size (gq-0.6.0.tar.gz) = 296812 bytes
+SHA1 (patch-aa) = 4cb231c738ad41aedb60a4dd22f6fb87b91deb27
+SHA1 (patch-ab) = d33da9a07f2fcf080de5bda02408c844a71f136e
+SHA1 (patch-ac) = b750774ac9292a7c466716fc46ad39cf5bfe1e5f
diff --git a/databases/gq/patches/patch-aa b/databases/gq/patches/patch-aa
new file mode 100644
index 00000000000..39c95a4348f
--- /dev/null
+++ b/databases/gq/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2003/09/09 18:51:42 jmmv Exp $
+
+--- config.h.in.orig	2002-06-19 00:21:52.000000000 +0200
++++ config.h.in
+@@ -107,6 +107,9 @@
+ /* Define if you have the iswspace function.  */
+ #undef HAVE_ISWSPACE
+ 
++/* Define if you have the btowc function.  */
++#undef HAVE_BTOWC
++
+ /* Define if you have the ldap_memfree function.  */
+ #undef HAVE_LDAP_MEMFREE
+ 
diff --git a/databases/gq/patches/patch-ab b/databases/gq/patches/patch-ab
new file mode 100644
index 00000000000..56d3e2e0852
--- /dev/null
+++ b/databases/gq/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/09/09 18:51:42 jmmv Exp $
+
+--- configure.orig	2002-07-05 08:51:55.000000000 +0200
++++ configure
+@@ -1965,7 +1965,7 @@ fi
+ fi
+ 
+ for ac_func in ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \
+-	       iswspace snprintf
++	       iswspace snprintf btowc
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:1972: checking for $ac_func" >&5
diff --git a/databases/gq/patches/patch-ac b/databases/gq/patches/patch-ac
new file mode 100644
index 00000000000..13aeb581d77
--- /dev/null
+++ b/databases/gq/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2003/09/09 18:51:44 jmmv Exp $
+
+--- src/filter.c.orig	2002-06-18 22:17:53.000000000 +0200
++++ src/filter.c
+@@ -941,11 +941,11 @@ char *unindent_filter(char *indented)
+ 	       break;
+ 	  default:
+ 	       /* caught spaces before -- this is testing for \n etc */
+-#if defined(HAVE_ISWSPACE)
++#if defined(HAVE_ISWSPACE) && defined(HAVE_BTOWC)
+ 	       if(!iswspace(btowc(c)))
+ #else
+                if(!isspace(c))
+-#endif /* HAVE_ISWSPACE */
++#endif /* HAVE_ISWSPACE && HAVE_BTOWC */
+ 		    unindented[f++] = c;
+ 	       break;
+ 	  }