5 files changed, 43 insertions, 51 deletions
diff --git a/lang/g95/Makefile b/lang/g95/Makefile
index 00f131e77f9..413ed9eadb9 100644
--- a/lang/g95/Makefile
+++ b/lang/g95/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2008/09/07 01:59:26 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2011/01/23 09:42:10 markd Exp $
 
 DISTNAME=		g95_source
-VERSION=		0.91
+VERSION=		0.92
 PKGNAME=		g95-${VERSION}
-PKGREVISION=		2
 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.91/
+SITES.g95_source.tgz=	http://ftp.g95.org/v0.92/
 SITES.gcc-core-4.0.3.tar.gz= ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.0.3/
 
 MAINTAINER=		wennmach@NetBSD.org
@@ -36,6 +35,9 @@ post-extract:
 	cd ${WRKSRC} && ${GTAR} -xzf libf95.a-${VERSION}.tar.gz
 
 pre-configure:
+	rm -f ${GCC_DIR}/config.sub ${GCC_DIR}/config.guess
+	ln -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${GCC_DIR}/config.sub
+	ln -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${GCC_DIR}/config.guess
 	cd ${GCC_G95_DIR} && ${GCC_CONFIGURE_SCRIPT} ${GCC_CONFIGURE_ARGS} && ${GMAKE}
 
 post-build:
diff --git a/lang/g95/PLIST.Linux b/lang/g95/PLIST.Linux
new file mode 100644
index 00000000000..a0ace0c9384
--- /dev/null
+++ b/lang/g95/PLIST.Linux
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2011/01/23 09:42:10 markd Exp $
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/crtbegin.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/crtbeginS.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/crtbeginT.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/crtend.o
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/crtendS.o
diff --git a/lang/g95/distinfo b/lang/g95/distinfo
index d3cf3cd9cdd..23f68d522cb 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2008/09/07 01:59:26 dholland Exp $
+$NetBSD: distinfo,v 1.7 2011/01/23 09:42:10 markd Exp $
 
-SHA1 (g95-0.91/g95_source.tgz) = aa58510c04e357439a4bf34c54d380e9079395d5
-RMD160 (g95-0.91/g95_source.tgz) = f0a8325c0e930d69d2def16eaa3c6c21dfd2b5a8
-Size (g95-0.91/g95_source.tgz) = 1298703 bytes
-SHA1 (g95-0.91/gcc-core-4.0.3.tar.gz) = 2694281fa05ae0e39cd871fcc52745e35a2dfefc
-RMD160 (g95-0.91/gcc-core-4.0.3.tar.gz) = fd960201a888537ad84e71b72b6b1170ad94eaa0
-Size (g95-0.91/gcc-core-4.0.3.tar.gz) = 20137297 bytes
-SHA1 (patch-ab) = c056926665736e2c2f724121e64d996961a789fe
+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 (patch-ab) = 98cf305aa29487539160736e057dc19313f34a76
+SHA1 (patch-ac) = b5567c0d6969f84d2518a581c6517691aa4f5e67
diff --git a/lang/g95/patches/patch-ab b/lang/g95/patches/patch-ab
index 860e7681eca..e6c6281d53d 100644
--- a/lang/g95/patches/patch-ab
+++ b/lang/g95/patches/patch-ab
@@ -1,46 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2008/09/07 01:59:26 dholland Exp $
+$NetBSD: patch-ab,v 1.5 2011/01/23 09:42:10 markd Exp $
 
---- Makefile.in.orig	2008-01-29 00:01:26.000000000 -0500
-+++ Makefile.in	2008-09-06 21:47:38.000000000 -0400
-@@ -1329,30 +1329,31 @@ clean-local:
- 	rm -f options.tmp options.c options.h version.c
- 
- install-exec-hook:
--	mv $(bindir)/g95$(EXEEXT) $(bindir)/$(host)-g95$(EXEEXT)
-+	mv ${DESTDIR}$(bindir)/g95$(EXEEXT) ${DESTDIR}$(bindir)/$(host)-g95$(EXEEXT)
- 
- install-data-hook:
--	-ln -sf f951$(EXEEXT) @DEST_LIBDIR@/cc1
-+	-ln -sf f951$(EXEEXT) ${DESTDIR}@DEST_LIBDIR@/cc1
- 	if test "`uname`" = "Darwin" ; then \
- 	  ar x /usr/lib/libgcc.a darwin-fpsave.o ; \
--	  ar rs @DEST_LIBDIR@/libgcc.a darwin-fpsave.o ; \
-+	  ar rs ${DESTDIR}@DEST_LIBDIR@/libgcc.a darwin-fpsave.o ; \
- 	  rm ./darwin-fpsave.o ; \
--	  ranlib @DEST_LIBDIR@/libgcc_eh.a ; \
--	  ranlib @DEST_LIBDIR@/libgcc.a ; \
-+	  ranlib ${DESTDIR}@DEST_LIBDIR@/libgcc_eh.a ; \
-+	  ranlib ${DESTDIR}@DEST_LIBDIR@/libgcc.a ; \
+--- Makefile.in.orig	2009-02-17 16:46:06.000000000 +0000
++++ Makefile.in
+@@ -1341,8 +1341,9 @@ install-data-hook:
+ 	  ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc_eh.a ; \
+ 	  ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc.a ; \
  	fi
--	cp INSTALL @DEST_LIBDIR@/../../../..
--	cp G95Manual.pdf @DEST_LIBDIR@/../../../..
+-	cp INSTALL $(DESTDIR)@DEST_LIBDIR@/../../../..
+-	cp G95Manual.pdf $(DESTDIR)@DEST_LIBDIR@/../../../..
 +	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 +	$(INSTALL_DATA) INSTALL $(DESTDIR)$(docdir)
 +	$(INSTALL_DATA) G95Manual.pdf $(DESTDIR)$(docdir)
  	if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_s.*`" ; then \
  	   (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_s.*) | \
--           (cd @DEST_LIBDIR@; tar xf -) ; \
-+           (cd ${DESTDIR}@DEST_LIBDIR@; tar xf -) ; \
- 	fi
- 	if test -n "`ls @GCC_DIR@/g95/gcc/libunwind.*`" ; then \
- 	   (cd @GCC_DIR@/g95/gcc; tar cf - libunwind.*) | \
--	   (cd @DEST_LIBDIR@; tar xf -) ; \
-+	   (cd ${DESTDIR}@DEST_LIBDIR@; tar xf -) ; \
- 	fi
- 	if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_eh.*`" ; then \
- 	   (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_eh.*) | \
--	   (cd @DEST_LIBDIR@; tar xf -) ; \
-+	   (cd ${DESTDIR}@DEST_LIBDIR@; tar xf -) ; \
- 	fi
- 
- ggc-page.o: ggc-page40.c ggc-page41.c
+            (cd $(DESTDIR)@DEST_LIBDIR@; tar xf -) ; \
diff --git a/lang/g95/patches/patch-ac b/lang/g95/patches/patch-ac
new file mode 100644
index 00000000000..4f8611064ed
--- /dev/null
+++ b/lang/g95/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2011/01/23 09:42:10 markd Exp $
+
+--- configure.orig	2011-01-18 12:06:11.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=" "
+