diff options
| author | joerg <joerg@pkgsrc.org> | 2012-06-08 15:42:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-06-08 15:42:28 +0000 |
| commit | 60932acbe7c6e4c3e10c0bfa659beb9d2df3d605 (patch) | |
| tree | 5e81797f1059680a0a38ac73f337acc62a66f629 /lang/gcc34 | |
| parent | 11ddafbf3bdefd5068356f5982ec9bb3bd18cfec (diff) | |
| download | pkgsrc-60932acbe7c6e4c3e10c0bfa659beb9d2df3d605.tar.gz | |
Redo netbsd/ctype_base.h patch to not pollute the namespace as much with
sys/param.h.
Diffstat (limited to 'lang/gcc34')
| -rw-r--r-- | lang/gcc34/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc34/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc34/patches/patch-ac | 17 |
3 files changed, 8 insertions, 17 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; |