Mon Dec 20 00:04:50 2010 UTC ()
Fix build on NetBSD-5.99.41 (_? -> _CTYPE_?) while hopefully not breaking
older releases.


(wiz)
diff -r1.20 -r1.21 pkgsrc/lang/gcc34/distinfo
diff -r0 -r1.1 pkgsrc/lang/gcc34/patches/patch-ac
cvs diff -r1.20 -r1.21 pkgsrc/lang/gcc34/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc34/Attic/distinfo 2010/05/04 20:46:31 1.20
+++ pkgsrc/lang/gcc34/Attic/distinfo 2010/12/20 00:04:50 1.21
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.20 2010/05/04 20:46:31 tez Exp $ 1$NetBSD: distinfo,v 1.21 2010/12/20 00:04:50 wiz Exp $
2 2
3SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b 3SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b
4RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442 4RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442
5Size (gcc-3.4.6.tar.bz2) = 28193401 bytes 5Size (gcc-3.4.6.tar.bz2) = 28193401 bytes
6SHA1 (patch-aa) = 40ba26c4af81ecc0effce3b7ac3c74bdfe4b56a6 6SHA1 (patch-aa) = 40ba26c4af81ecc0effce3b7ac3c74bdfe4b56a6
7SHA1 (patch-ab) = 50345471e99264104e136acd7c09da0a5275cb62 7SHA1 (patch-ab) = 50345471e99264104e136acd7c09da0a5275cb62
 8SHA1 (patch-ac) = 75620fe258114faaf8020bb073e7e840b23b1ccc
8SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192 9SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192
9SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee 10SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
10SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715 11SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
11SHA1 (patch-ah) = 3b3471f42e801f8588c1e0959d5cfa704ce16a3e 12SHA1 (patch-ah) = 3b3471f42e801f8588c1e0959d5cfa704ce16a3e
12SHA1 (patch-ai) = 78320fde6d073cb4bc87b281b83168f173344341 13SHA1 (patch-ai) = 78320fde6d073cb4bc87b281b83168f173344341
13SHA1 (patch-aj) = ea0bef88be9e823ed2acfa54a59f29016de8cc5e 14SHA1 (patch-aj) = ea0bef88be9e823ed2acfa54a59f29016de8cc5e
14SHA1 (patch-ak) = 1188e98e65fce3b968f9a2c211ffe315644d87d5 15SHA1 (patch-ak) = 1188e98e65fce3b968f9a2c211ffe315644d87d5
15SHA1 (patch-al) = 3368a43981499dd46b2caa111eae19a0549d7499 16SHA1 (patch-al) = 3368a43981499dd46b2caa111eae19a0549d7499
16SHA1 (patch-am) = 5a27d8f6a289f9b110a4bdc640547e43b799f08c 17SHA1 (patch-am) = 5a27d8f6a289f9b110a4bdc640547e43b799f08c
17SHA1 (patch-at) = f74c2cd4919c59c0591e5aac7fdf8bb20fb87b96 18SHA1 (patch-at) = f74c2cd4919c59c0591e5aac7fdf8bb20fb87b96
18SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6 19SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6
19SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0 20SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0
20SHA1 (patch-ca) = e04ff912406505abd015789f288ef09a7e1ae386 21SHA1 (patch-ca) = e04ff912406505abd015789f288ef09a7e1ae386
File Added: pkgsrc/lang/gcc34/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2010/12/20 00:04:50 wiz Exp $

--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2002-06-24 05:50:58.000000000 +0000
+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
@@ -36,6 +36,18 @@
 //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
 // See www.netbsd.org for details of access.
   
+#include <sys/param.h>
+#if __NetBSD_Version__ < 599004100
+#define _U _CTYPE_U
+#define _L _CTYPE_L
+#define _N _CTYPE_N
+#define _X _CTYPE_X
+#define _S _CTYPE_S
+#define _P _CTYPE_P
+#define _B _CTYPE_B
+#define _C _CTYPE_C
+#endif
+
   struct ctype_base
   {
     // Non-standard typedefs.
@@ -44,15 +56,15 @@
     // NB: Offsets into ctype<char>::_M_table force a particular size
     // on the mask type. Because of this, we don't use an enum.
     typedef unsigned char      	mask;
-    static const mask upper    	= _U;
-    static const mask lower 	= _L;
-    static const mask alpha 	= _U | _L;
-    static const mask digit 	= _N;
-    static const mask xdigit 	= _N | _X;
-    static const mask space 	= _S;
-    static const mask print 	= _P | _U | _L | _N | _B;
-    static const mask graph 	= _P | _U | _L | _N;
-    static const mask cntrl 	= _C;
-    static const mask punct 	= _P;
-    static const mask alnum 	= _U | _L | _N;
+    static const mask upper    	= _CTYPE_U;
+    static const mask lower 	= _CTYPE_L;
+    static const mask alpha 	= _CTYPE_U | _CTYPE_L;
+    static const mask digit 	= _CTYPE_N;
+    static const mask xdigit 	= _CTYPE_N | _CTYPE_X;
+    static const mask space 	= _CTYPE_S;
+    static const mask print 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
+    static const mask graph 	= _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
+    static const mask cntrl 	= _CTYPE_C;
+    static const mask punct 	= _CTYPE_P;
+    static const mask alnum 	= _CTYPE_U | _CTYPE_L | _CTYPE_N;
   };