Redo netbsd/ctype_base.h patch to not pollute the namespace as much with

sys/param.h.

14 files changed, 74 insertions, 54 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index a6d9d3d2714..98c1929c52b 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.53 2012/04/25 18:40:27 hans Exp $
+# $NetBSD: Makefile,v 1.54 2012/06/08 15:42:28 joerg Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
 PKGNAME=	gcc34-${GCC_VERSION}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index c87cf135555..cda105e35e6 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.23 2012/04/08 20:45:15 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2012/06/08 15:42:28 joerg Exp $
 
 SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b
 RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442
 Size (gcc-3.4.6.tar.bz2) = 28193401 bytes
 SHA1 (patch-aa) = 40ba26c4af81ecc0effce3b7ac3c74bdfe4b56a6
 SHA1 (patch-ab) = 50345471e99264104e136acd7c09da0a5275cb62
-SHA1 (patch-ac) = 522c6faf5f70dc959c77f24fff75aca9cfacdd13
+SHA1 (patch-ac) = 3366f3f779771a9b0aad013ce23a257f11d9ae70
 SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192
 SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
 SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
diff --git a/lang/gcc34/patches/patch-ac b/lang/gcc34/patches/patch-ac
index 5f287c70d84..779478f8d54 100644
--- a/lang/gcc34/patches/patch-ac
+++ b/lang/gcc34/patches/patch-ac
@@ -1,25 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2010/12/23 15:25:16 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2012/06/08 15:42:28 joerg Exp $
 
 --- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2002-06-24 07:50:58.000000000 +0200
 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-@@ -36,6 +36,8 @@
- //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
- // See www.netbsd.org for details of access.
-   
-+#include <sys/param.h>
-+
-   struct ctype_base
-   {
-     // Non-standard typedefs.
-@@ -44,6 +46,7 @@
+@@ -44,6 +44,7 @@
      // 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;
-+#if __NetBSD_Version__ < 599004100
++#if !defined(_CTYPE_U)
      static const mask upper    	= _U;
      static const mask lower 	= _L;
      static const mask alpha 	= _U | _L;
-@@ -55,4 +58,17 @@
+@@ -55,4 +56,17 @@
      static const mask cntrl 	= _C;
      static const mask punct 	= _P;
      static const mask alnum 	= _U | _L | _N;
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index dba1ea08bd1..467f177c01d 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2012/04/13 11:01:32 hans Exp $
+# $NetBSD: Makefile,v 1.36 2012/06/08 15:42:28 joerg Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc44-${GCC_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index ff24a2f6a4e..5a332102f33 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2012/05/03 12:20:18 hans Exp $
+$NetBSD: distinfo,v 1.15 2012/06/08 15:42:28 joerg Exp $
 
 SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75
 RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a
@@ -8,7 +8,7 @@ SHA1 (patch-ad) = 96722d5af63a955e3d9c934b1249e5e8a1173a8c
 SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621
 SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b
 SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7
-SHA1 (patch-aj) = cde99b36f7f7dcf220ef4451108ad1ff7410a6a6
+SHA1 (patch-aj) = efc6e550f2a7b5e0181a9e2fb97b4cb94c6eb2da
 SHA1 (patch-ak) = 08da661b8b19fdd9fa086f67b185266c1d378658
 SHA1 (patch-al) = 462059744f7f057f13d6c472d0aff9d012546082
 SHA1 (patch-am) = fcfabcec9e6d0b8e9ada348dc65e8ddb890f96ca
diff --git a/lang/gcc44/patches/patch-aj b/lang/gcc44/patches/patch-aj
index 09eb78211ea..1576950cde6 100644
--- a/lang/gcc44/patches/patch-aj
+++ b/lang/gcc44/patches/patch-aj
@@ -1,21 +1,12 @@
-$NetBSD: patch-aj,v 1.2 2011/05/14 18:00:24 wiz Exp $
+$NetBSD: patch-aj,v 1.3 2012/06/08 15:42:29 joerg Exp $
 
 --- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2009-04-09 23:23:07.000000000 +0000
 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-@@ -30,6 +30,8 @@
- // Full details can be found from the CVS files at:
- //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
- // See www.netbsd.org for details of access.
-+
-+#include <sys/param.h>
-   
- _GLIBCXX_BEGIN_NAMESPACE(std)
- 
-@@ -42,6 +44,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
+@@ -42,6 +42,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
      // 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;
-+#if __NetBSD_Version__ >= 599004100
++#if defined(_CTYPE_U)
 +    static const mask upper    	= _CTYPE_U;
 +    static const mask lower 	= _CTYPE_L;
 +    static const mask alpha 	= _CTYPE_U | _CTYPE_L;
@@ -31,7 +22,7 @@ $NetBSD: patch-aj,v 1.2 2011/05/14 18:00:24 wiz Exp $
      static const mask upper    	= _U;
      static const mask lower 	= _L;
      static const mask alpha 	= _U | _L;
-@@ -53,6 +68,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
+@@ -53,6 +66,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
      static const mask cntrl 	= _C;
      static const mask punct 	= _P;
      static const mask alnum 	= _U | _L | _N;
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index fe67876451f..3da2ab50aef 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2012/06/02 11:55:50 cheusov Exp $
+# $NetBSD: Makefile,v 1.10 2012/06/08 15:42:29 joerg Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc45-${GCC_VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 6ce0378a486..791c3d8be74 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/05/03 12:20:19 hans Exp $
+$NetBSD: distinfo,v 1.6 2012/06/08 15:42:29 joerg Exp $
 
 SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b
 RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247
@@ -10,5 +10,5 @@ SHA1 (patch-ad) = b72c93d8477a567363616717e20eef1b33e7d307
 SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989
 SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b
 SHA1 (patch-ah) = a963394b0434b82494b7510d4b2705f77acfb668
-SHA1 (patch-aj) = 7935c4c44b3942097129fdda2336de1ea0c83215
+SHA1 (patch-aj) = e07b71a5fc5e3835d10eaad33fc722d040bcc379
 SHA1 (patch-ak) = 3d8a859ba436a4b204bb99f59cd5331d695aa811
diff --git a/lang/gcc45/patches/patch-aj b/lang/gcc45/patches/patch-aj
index 46040c37433..60f5247ca31 100644
--- a/lang/gcc45/patches/patch-aj
+++ b/lang/gcc45/patches/patch-aj
@@ -1,24 +1,16 @@
-$NetBSD: patch-aj,v 1.1.1.1 2011/05/14 20:19:47 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2012/06/08 15:42:29 joerg Exp $
 
 --- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2011-02-23 18:48:42.000000000 +0100
 +++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-@@ -30,6 +30,7 @@
- // Full details can be found from the CVS files at:
- //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
- // See www.netbsd.org for details of access.
-+#include <sys/param.h>
-   
- _GLIBCXX_BEGIN_NAMESPACE(std)
- 
-@@ -42,6 +43,7 @@
+@@ -42,6 +42,7 @@
      // 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;
-+#if __NetBSD_Version__ < 599004100
++#if !defined(_CTYPE_U)
      static const mask upper    	= _U;
      static const mask lower 	= _L;
      static const mask alpha 	= _U | _L;
-@@ -53,6 +55,19 @@
+@@ -53,6 +54,19 @@
      static const mask cntrl 	= _C;
      static const mask punct 	= _P;
      static const mask alnum 	= _U | _L | _N;
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 00484d113d4..72cc566af7f 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/04/13 11:02:47 hans Exp $
+# $NetBSD: Makefile,v 1.19 2012/06/08 15:42:29 joerg Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc46-${GCC_VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 566d6c9efc3..b2709aed6c9 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2012/05/03 12:20:19 hans Exp $
+$NetBSD: distinfo,v 1.11 2012/06/08 15:42:29 joerg Exp $
 
 SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f
 RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269
@@ -12,3 +12,4 @@ SHA1 (patch-ag) = 1753d08075de8527d8f14afc3df4afeacb10d507
 SHA1 (patch-ah) = 8df9292331e68a69481aaabc894f285199a7eb05
 SHA1 (patch-ak) = 377d6ab5d454f0af2709680dd656f0449228aca9
 SHA1 (patch-al) = 20d16fba8c1b9e578c9df6523397e29a94409990
+SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 10bc7a2bad0367c3e13c71606beca429029d098a
diff --git a/lang/gcc46/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h b/lang/gcc46/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
new file mode 100644
index 00000000000..4e073b5cd18
--- /dev/null
+++ b/lang/gcc46/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h,v 1.1 2012/06/08 15:42:29 joerg Exp $
+
+--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2011-01-30 22:39:36.000000000 +0000
++++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
+@@ -31,8 +31,6 @@
+ //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
+ // See www.netbsd.org for details of access.
+   
+-#include <sys/param.h>
+-
+ namespace std _GLIBCXX_VISIBILITY(default)
+ {
+ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+@@ -47,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+     // on the mask type. Because of this, we don't use an enum.
+     typedef unsigned char      	mask;
+ 
+-#if __NetBSD_Version__ < 599004100
++#if !defined(_CTYPE_U)
+     static const mask upper    	= _U;
+     static const mask lower 	= _L;
+     static const mask alpha 	= _U | _L;
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 630294bf317..f3913bb98b8 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/04/16 04:27:18 sbd Exp $
+# $NetBSD: Makefile,v 1.2 2012/06/08 15:42:29 joerg Exp $
 
 GCC_PKGNAME=		gcc47
 .include		"version.mk"
 
 DISTNAME=		gcc-${GCC_DIST_VERSION}
 PKGNAME=		${GCC_PKGNAME}-${GCC_DIST_VERSION}
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/gcc47/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h b/lang/gcc47/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
new file mode 100644
index 00000000000..f6965e5e911
--- /dev/null
+++ b/lang/gcc47/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h,v 1.1 2012/06/08 15:42:29 joerg Exp $
+
+--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2012-06-05 12:36:50.000000000 +0000
++++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
+@@ -30,8 +30,6 @@
+ // Full details can be found from the CVS files at:
+ //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
+ // See www.netbsd.org for details of access.
+-  
+-#include <sys/param.h>
+ 
+ namespace std _GLIBCXX_VISIBILITY(default)
+ {
+@@ -47,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+     // on the mask type. Because of this, we don't use an enum.
+     typedef unsigned char      	mask;
+ 
+-#if __NetBSD_Version__ < 599004100
++#if !defined(_CTYPE_U)
+     static const mask upper    	= _U;
+     static const mask lower 	= _L;
+     static const mask alpha 	= _U | _L;