5 files changed, 27 insertions, 37 deletions
diff --git a/lang/g95/Makefile b/lang/g95/Makefile
index 46155216905..7aef758120d 100644
--- a/lang/g95/Makefile
+++ b/lang/g95/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2012/10/02 20:11:39 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/02/04 20:31:44 markd Exp $
 
 DISTNAME=		g95_source
-VERSION=		0.92
-PKGREVISION=		1
+VERSION=		0.93
 PKGNAME=		g95-${VERSION}
 CATEGORIES=		lang
 EXTRACT_SUFX.g95_source=	.tgz
 DIST_SUBDIR=		${PKGNAME_NOREV}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX.g95_source}
 DISTFILES+=		gcc-core-4.0.3.tar.gz
-SITES.g95_source.tgz=	http://ftp.g95.org/v0.92/
+SITES.g95_source.tgz=	http://ftp.g95.org/v0.93/
 SITES.gcc-core-4.0.3.tar.gz= ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.0.3/
 
 MAINTAINER=		wennmach@NetBSD.org
diff --git a/lang/g95/distinfo b/lang/g95/distinfo
index 473c8b436f0..4415531175d 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2012/07/21 22:01:17 dholland Exp $
+$NetBSD: distinfo,v 1.11 2013/02/04 20:31:44 markd Exp $
 
-SHA1 (g95-0.92/g95_source.tgz) = e6320fc80d8e388aad1fdbde53b2414353692b76
-RMD160 (g95-0.92/g95_source.tgz) = ac00c4cdd6dc0b90ef865040ff338b7f2d9296d1
-Size (g95-0.92/g95_source.tgz) = 1352877 bytes
-SHA1 (g95-0.92/gcc-core-4.0.3.tar.gz) = 2694281fa05ae0e39cd871fcc52745e35a2dfefc
-RMD160 (g95-0.92/gcc-core-4.0.3.tar.gz) = fd960201a888537ad84e71b72b6b1170ad94eaa0
-Size (g95-0.92/gcc-core-4.0.3.tar.gz) = 20137297 bytes
+SHA1 (g95-0.93/g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
+RMD160 (g95-0.93/g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
+Size (g95-0.93/g95_source.tgz) = 1355198 bytes
+SHA1 (g95-0.93/gcc-core-4.0.3.tar.gz) = 2694281fa05ae0e39cd871fcc52745e35a2dfefc
+RMD160 (g95-0.93/gcc-core-4.0.3.tar.gz) = fd960201a888537ad84e71b72b6b1170ad94eaa0
+Size (g95-0.93/gcc-core-4.0.3.tar.gz) = 20137297 bytes
 SHA1 (patch-.._gcc-4.0.3_gcc_config.gcc) = f93cca19dbb3544a1259960a3ab092fd72038125
 SHA1 (patch-.._gcc-4.0.3_gcc_config_dragonfly-spec.h) = 2fac90d3b4b2113e4713497fbcf3a3999dde2045
 SHA1 (patch-.._gcc-4.0.3_gcc_config_dragonfly.h) = 12707232e61b664f3b1a9943cbb3a49e61e94fa9
@@ -15,6 +15,6 @@ SHA1 (patch-.._gcc-4.0.3_gcc_config_t-dragonfly) = 9636163ffd359b2a0dbb0a7fec2ca
 SHA1 (patch-.._gcc-4.0.3_gcc_config_t-dragonfly-thread) = a7181b3061e32d3edd38c09eed34232a75de83cf
 SHA1 (patch-.._gcc-4.0.3_gcc_ginclude_stddef.h) = 5e18b132d36ca02dcfed0569297e7ad6b1eada26
 SHA1 (patch-ab) = 7275d8df3ba1621f3d496c386df999295f36f974
-SHA1 (patch-ac) = cc6811bb7ef29d9388a40851c403f8768b6f9e48
-SHA1 (patch-libf95.a-0.92_configure) = d17fc9fa66228489cfa5e49c23d4cfd32a91bfae
-SHA1 (patch-libf95.a-0.92_io_atof.c) = cd45d03e68573fdadb8c9a217e7dc1eab0db8314
+SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8
+SHA1 (patch-libf95.a-0.92_configure) = e23998692b410acaabaf24f591b659d2b229bcca
+SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d
diff --git a/lang/g95/patches/patch-ac b/lang/g95/patches/patch-ac
index de5b7c6aa98..3dc12c3c8a5 100644
--- a/lang/g95/patches/patch-ac
+++ b/lang/g95/patches/patch-ac
@@ -1,21 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2012/05/08 02:59:16 sbd Exp $
+$NetBSD: patch-ac,v 1.3 2013/02/04 20:31:44 markd Exp $
 
 Use $host_alias in the gcc-libdir path so it matches ${MACHINE_GNU_PLATFORM}
 
---- configure.orig	2008-08-20 01:05:52.000000000 +0000
+--- configure.orig	2010-04-22 04:07:13.000000000 +0000
 +++ configure
-@@ -4669,7 +4669,7 @@ target_version=0
- 
- if test "x$with_gcc_dir" != x -a -d "$with_gcc_dir"; then
-    CFLAGS="$CFLAGS -DIN_GCC"
--   CPPFLAGS="-I- -I$with_gcc_dir/gcc -I$with_gcc_dir/include -I$with_gcc_dir/gcc/config -I$with_gcc_dir/libcpp/include -I$with_gcc_dir/g95/gcc $CPPFLAGS"
-+   CPPFLAGS="-I$with_gcc_dir/gcc -I$with_gcc_dir/include -I$with_gcc_dir/gcc/config -I$with_gcc_dir/libcpp/include -I$with_gcc_dir/g95/gcc $CPPFLAGS"
- 
-    DEFAULT_INCLUDES=" "
- 
-@@ -4876,7 +4876,7 @@ _ACEOF
-    { echo "$as_me:$LINENO: result: $gcc_version" >&5
- echo "${ECHO_T}$gcc_version" >&6; }
+@@ -4647,7 +4647,7 @@ _ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_version" >&5
+ $as_echo "$gcc_version" >&6; }
  
 -   DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version
 +   DEST_LIBDIR=$prefix/lib/gcc-lib/$host_alias/$gcc_version
diff --git a/lang/g95/patches/patch-libf95.a-0.92_configure b/lang/g95/patches/patch-libf95.a-0.92_configure
index 564806aa430..dfb88f1ee01 100644
--- a/lang/g95/patches/patch-libf95.a-0.92_configure
+++ b/lang/g95/patches/patch-libf95.a-0.92_configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-libf95.a-0.92_configure,v 1.1 2012/05/08 03:14:25 sbd Exp $
+$NetBSD: patch-libf95.a-0.92_configure,v 1.2 2013/02/04 20:31:44 markd Exp $
 
 Use $host_alias in the gcc-libdir path so it matches ${MACHINE_GNU_PLATFORM}
 
---- libf95.a-0.92/configure.orig	2008-09-17 04:06:15.000000000 +0000
-+++ libf95.a-0.92/configure
-@@ -7470,7 +7470,7 @@ fi
- { echo "$as_me:$LINENO: result: $gcc_version" >&5
- echo "${ECHO_T}$gcc_version" >&6; }
+--- libf95.a-0.93/configure.orig	2010-04-15 05:26:01.000000000 +0000
++++ libf95.a-0.93/configure
+@@ -6273,7 +6273,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_version" >&5
+ $as_echo "$gcc_version" >&6; }
  
 -DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version
 +DEST_LIBDIR=$prefix/lib/gcc-lib/$host_alias/$gcc_version
diff --git a/lang/g95/patches/patch-libf95.a-0.92_io_atof.c b/lang/g95/patches/patch-libf95.a-0.92_io_atof.c
index 6b9534560cd..7d6dad8610a 100644
--- a/lang/g95/patches/patch-libf95.a-0.92_io_atof.c
+++ b/lang/g95/patches/patch-libf95.a-0.92_io_atof.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-libf95.a-0.92_io_atof.c,v 1.1 2012/07/21 22:01:18 dholland Exp $
+$NetBSD: patch-libf95.a-0.92_io_atof.c,v 1.2 2013/02/04 20:31:44 markd Exp $
 
 Needs stdlib.h on netbsd to get alloca() declaration.
 
---- libf95.a-0.92/io/atof.c~	2009-04-22 17:44:56.000000000 +0000
-+++ libf95.a-0.92/io/atof.c
+--- libf95.a-0.93/io/atof.c~	2009-04-22 17:44:56.000000000 +0000
++++ libf95.a-0.93/io/atof.c
 @@ -2,6 +2,7 @@