Fix build on SunOS.

8 files changed, 94 insertions, 1 deletions

diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index ad47cd36bb1..ea311cec3bc 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,7 +1,14 @@
-$NetBSD: distinfo,v 1.11 2009/10/06 00:54:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.12 2012/02/16 11:37:27 hans Exp $
 
 SHA1 (gnucap-2006-07-08.tar.gz) = dafdfa1f78ee37b247066ccac7a2e63f99a7d8f0
 RMD160 (gnucap-2006-07-08.tar.gz) = 8006dffd189095b81dbf7358caacea870bc054df
 Size (gnucap-2006-07-08.tar.gz) = 1546670 bytes
 SHA1 (patch-aa) = 60e6484c852adfba3b0bd11a9a5c691e4d228bd7
 SHA1 (patch-ab) = cdb1825722b18784ca54ae0c39183ff0790dc6d9
+SHA1 (patch-modelgen_ap.h) = 323081e63db5148da5706ea8a9470f2c8769467f
+SHA1 (patch-modelgen_io__.h) = 56aa956aa1e49889fea1ad59c2615e7c34f87b4c
+SHA1 (patch-src_ap.h) = a11af959b3e7637a5e49df1c2fc2672ded4dc5df
+SHA1 (patch-src_c__comand.h) = c00405e8f81398ab1bbaea171ee51f5cbcfe5328
+SHA1 (patch-src_declare.h) = a8cea1d2a6866b12a3aa0d91a5f86b14ca7030fa
+SHA1 (patch-src_io__.h) = 06120be26f562dae4ffd57ae784ed15dc298b93a
+SHA1 (patch-src_u__opt.h) = 628878fea102c6b95cbcc2f3ffcf9d9e8b071299
diff --git a/cad/gnucap/patches/patch-modelgen_ap.h b/cad/gnucap/patches/patch-modelgen_ap.h
new file mode 100644
index 00000000000..77de470c608
--- /dev/null
+++ b/cad/gnucap/patches/patch-modelgen_ap.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-modelgen_ap.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- modelgen/ap.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ modelgen/ap.h	2009-12-26 00:34:19.571364769 +0100
+@@ -39,6 +39,8 @@ const bool ONE_OF = false;
+ 
+ class CS_FILE {};
+ 
++#undef CS
++
+ class CS {
+ private:
+   char* _name;
diff --git a/cad/gnucap/patches/patch-modelgen_io__.h b/cad/gnucap/patches/patch-modelgen_io__.h
new file mode 100644
index 00000000000..9abdc6d45fe
--- /dev/null
+++ b/cad/gnucap/patches/patch-modelgen_io__.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-modelgen_io__.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- modelgen/io_.h.orig	2006-07-07 08:54:23.000000000 +0200
++++ modelgen/io_.h	2009-12-26 00:41:01.207595711 +0100
+@@ -25,6 +25,7 @@
+ #ifndef IO_H
+ #define IO_H
+ #include "l_lib.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ const int MAXHANDLE = CHAR_BIT*sizeof(int)-1;
diff --git a/cad/gnucap/patches/patch-src_ap.h b/cad/gnucap/patches/patch-src_ap.h
new file mode 100644
index 00000000000..796ca5a177a
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_ap.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ap.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/ap.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ src/ap.h	2009-12-26 00:34:39.235405370 +0100
+@@ -39,6 +39,8 @@ const bool ONE_OF = false;
+ 
+ class CS_FILE {};
+ 
++#undef CS
++
+ class CS {
+ private:
+   char* _name;
diff --git a/cad/gnucap/patches/patch-src_c__comand.h b/cad/gnucap/patches/patch-src_c__comand.h
new file mode 100644
index 00000000000..c6efa405bf0
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_c__comand.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_c__comand.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/c_comand.h.orig	2006-07-07 08:54:25.000000000 +0200
++++ src/c_comand.h	2009-12-26 00:47:55.258943358 +0100
+@@ -24,6 +24,7 @@
+ #ifndef C_COMAND_H
+ #define C_COMAND_H
+ #include "md.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ /*--------------------------------------------------------------------------*/
diff --git a/cad/gnucap/patches/patch-src_declare.h b/cad/gnucap/patches/patch-src_declare.h
new file mode 100644
index 00000000000..755e9765f37
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_declare.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_declare.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/declare.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ src/declare.h	2009-12-26 00:46:20.874454893 +0100
+@@ -25,6 +25,7 @@
+ #ifndef DECLARE_H
+ #define DECLARE_H
+ #include "md.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ class CARD;
diff --git a/cad/gnucap/patches/patch-src_io__.h b/cad/gnucap/patches/patch-src_io__.h
new file mode 100644
index 00000000000..db7a0642cae
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_io__.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_io__.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/io_.h.orig	2006-07-07 08:54:23.000000000 +0200
++++ src/io_.h	2009-12-26 00:41:47.984732101 +0100
+@@ -25,6 +25,7 @@
+ #ifndef IO_H
+ #define IO_H
+ #include "l_lib.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ const int MAXHANDLE = CHAR_BIT*sizeof(int)-1;
diff --git a/cad/gnucap/patches/patch-src_u__opt.h b/cad/gnucap/patches/patch-src_u__opt.h
new file mode 100644
index 00000000000..9b7f825a529
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_u__opt.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_u__opt.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/u_opt.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ src/u_opt.h	2009-12-26 00:42:53.851327432 +0100
+@@ -24,6 +24,7 @@
+ #ifndef U_OPT_H
+ #define U_OPT_H
+ #include "mode.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ /*--------------------------------------------------------------------------*/