Use better gfortran patch, from Kai-Uwe Eckhardt in PR 48512.

Bump PKGREVISION.

3 files changed, 14 insertions, 8 deletions

diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 52e76bc49b8..15cbbf5a3dc 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/10/21 20:26:19 adam Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/14 19:32:52 wiz Exp $
 
 GCC_PKGNAME=	gcc48
 .include	"version.mk"
@@ -8,6 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC48_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc48-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 80e3f5e6883..081fe4f12f5 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2013/10/24 19:25:43 martin Exp $
+$NetBSD: distinfo,v 1.12 2014/01/14 19:32:52 wiz Exp $
 
 SHA1 (gcc-4.8.2.tar.bz2) = 810fb70bd721e1d9f446b6503afe0a9088b62986
 RMD160 (gcc-4.8.2.tar.bz2) = a417e682baa20877c290f6dc7d3d03a0c3710371
@@ -17,7 +17,7 @@ SHA1 (patch-gcc_config_i386_dragonfly.h) = 0d3f785434c02beb9c4561fe59842a970e8f7
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = a4b670d0c54c410d38715b7a2a572a7048e3ec5e
-SHA1 (patch-gcc_fortran_f95-lang.c) = 06470dbee79f8c762675d3060a870b7dd9ba38f8
+SHA1 (patch-gcc_fortran_f95-lang.c) = 945aacf6b307f2120a4105c833b45a40feced68e
 SHA1 (patch-gcc_ggc-common.c) = fa577bc25260d7e6304f166686ba51c0b677d7f6
 SHA1 (patch-gcc_ginclude_stddef.h) = 50be7c9469ac58c79e10abda5e7cfef5f91dd249
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
diff --git a/lang/gcc48/patches/patch-gcc_fortran_f95-lang.c b/lang/gcc48/patches/patch-gcc_fortran_f95-lang.c
index db3881c3ba4..26ce5a67d32 100644
--- a/lang/gcc48/patches/patch-gcc_fortran_f95-lang.c
+++ b/lang/gcc48/patches/patch-gcc_fortran_f95-lang.c
@@ -1,24 +1,29 @@
-$NetBSD: patch-gcc_fortran_f95-lang.c,v 1.1 2013/04/01 21:06:17 wiz Exp $
+$NetBSD: patch-gcc_fortran_f95-lang.c,v 1.2 2014/01/14 19:32:52 wiz Exp $
 
 No NetBSD the 'cabs' and 'cabsf' functions are are __RENAME so that
 thay have '__c99_' prefixes.
 
---- gcc/fortran/f95-lang.c.orig	2012-01-17 14:34:37.000000000 +0000
+--- gcc/fortran/f95-lang.c.orig	2013-01-10 20:38:27.000000000 +0000
 +++ gcc/fortran/f95-lang.c
-@@ -819,10 +819,17 @@ gfc_init_builtin_functions (void)
+@@ -710,12 +710,21 @@ gfc_init_builtin_functions (void)
+   gfc_define_builtin ("__builtin_truncf", mfunc_float[0],
+ 		      BUILT_IN_TRUNCF, "truncf", ATTR_CONST_NOTHROW_LEAF_LIST);
  
-   gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble, 
- 		      BUILT_IN_CABSL, "cabsl", ATTR_CONST_NOTHROW_LEAF_LIST);
 +#if defined(__NetBSD__)
 +  gfc_define_builtin ("__builtin_cabs", func_cdouble_double, 
 +		     BUILT_IN_CABS, "__c99_cabs", ATTR_CONST_NOTHROW_LEAF_LIST);
 +  gfc_define_builtin ("__builtin_cabsf", func_cfloat_float, 
 +		     BUILT_IN_CABSF, "__c99_cabsf", ATTR_CONST_NOTHROW_LEAF_LIST);
+   gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble, 
+-		      BUILT_IN_CABSL, "cabsl", ATTR_CONST_NOTHROW_LEAF_LIST);
++		      BUILT_IN_CABSL, "__c99_cabsl", ATTR_CONST_NOTHROW_LEAF_LIST);
 +#else
    gfc_define_builtin ("__builtin_cabs", func_cdouble_double, 
  		      BUILT_IN_CABS, "cabs", ATTR_CONST_NOTHROW_LEAF_LIST);
    gfc_define_builtin ("__builtin_cabsf", func_cfloat_float, 
  		      BUILT_IN_CABSF, "cabsf", ATTR_CONST_NOTHROW_LEAF_LIST);
++  gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble, 
++		      BUILT_IN_CABSL, "cabsl", ATTR_CONST_NOTHROW_LEAF_LIST);
 +#endif
   
    gfc_define_builtin ("__builtin_copysignl", mfunc_longdouble[1],