[pkgsrc/trunk]: pkgsrc/wm/enlightenment Fix build on NetBSD 1.6 which does no...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f0bb9c93f21
branches:  trunk
changeset: 465065:9f0bb9c93f21
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Dec 20 05:29:55 2003 +0000

description:
Fix build on NetBSD 1.6 which does not have wctype_t type.
Patch provided and tested by Soren Jacobsen. This also closes PR
pkg/23799.

diffstat:

 wm/enlightenment/distinfo         |   3 +-
 wm/enlightenment/patches/patch-aa |  58 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletions(-)

diffs (72 lines):

diff -r bf01ebef2692 -r 9f0bb9c93f21 wm/enlightenment/distinfo
--- a/wm/enlightenment/distinfo Sat Dec 20 05:20:42 2003 +0000
+++ b/wm/enlightenment/distinfo Sat Dec 20 05:29:55 2003 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/12/18 05:31:34 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2003/12/20 05:29:55 xtraeme Exp $
 
 SHA1 (enlightenment-0.16.6.tar.gz) = 971cbed022b5162c1f7034758c91549fa1a9227f
 Size (enlightenment-0.16.6.tar.gz) = 11924484 bytes
+SHA1 (patch-aa) = c64318bba6fbdfb616a32a5952207599ce46ffa0
diff -r bf01ebef2692 -r 9f0bb9c93f21 wm/enlightenment/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/enlightenment/patches/patch-aa Sat Dec 20 05:29:55 2003 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.4 2003/12/20 05:29:55 xtraeme Exp $
+
+--- dox/file.c.orig    Wed Nov  5 08:42:17 2003
++++ dox/file.c Fri Dec 19 20:56:04 2003
+@@ -26,6 +26,11 @@
+ # include <wctype.h>
+ #endif
+ 
++#include <sys/param.h>
++#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106210000)
++typedef unsigned int wctype_t;
++#endif
++
+ #ifdef __EMX__
+ #define chdir _chdir2
+ #define getcwd        _getcwd2
+@@ -618,7 +623,7 @@
+    int                 cnt, i;
+    char               *start, *finish, *ss, *w;
+ 
+-   int                 wcflg, mbflg;
++   int                 mbflg;
+    struct              char_class {
+      char               *name;
+      wctype_t            wt;
+@@ -654,6 +659,7 @@
+      }
+ 
+    /*  Check multibyte character class is available or not */
++/*
+    wcflg = 0;
+    for ( cc = char_class_tbl; cc->name != NULL; cc++ )
+      {
+@@ -661,7 +667,7 @@
+       if ( cc->wt != (wctype_t)0 )
+         wcflg = 1;
+      }
+-
++*/
+    cnt = 0;
+    i = 0;
+    start = NULL;
+@@ -679,6 +685,7 @@
+       if ( len < 0 )          { i++; continue; }
+ 
+       /*  Check multibyte character class */
++/*
+       if ( wcflg )
+         {
+            wchar_t             wc;
+@@ -700,6 +707,7 @@
+              }
+         }
+       else
++*/
+         mbflg = len;
+ 
+       if ((cnt == num) && (