Update g95 to version 0.91 (current stable version).

OKed wennmach.

Changes are 2 years worth of development.

4 files changed, 18 insertions, 68 deletions

diff --git a/lang/g95/Makefile b/lang/g95/Makefile
index ccfc4784790..559b37b334f 100644
--- a/lang/g95/Makefile
+++ b/lang/g95/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/12/07 14:49:39 wennmach Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/04 21:24:48 markd Exp $
 
 DISTNAME=		g95_source
-VERSION=		0.90
+VERSION=		0.91
 PKGNAME=		g95-${VERSION}
 #PKGREVISION=		1
 CATEGORIES=		lang
@@ -9,7 +9,7 @@ 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.9/
+SITES.g95_source.tgz=	http://ftp.g95.org/v0.91/
 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 70ab1a9094b..676bc2429ed 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/12/07 14:49:39 wennmach Exp $
+$NetBSD: distinfo,v 1.4 2008/04/04 21:24:48 markd Exp $
 
-SHA1 (g95-0.90/g95_source.tgz) = 1f8d30fd39f8f23a71030802405e23abcc8a00b4
-RMD160 (g95-0.90/g95_source.tgz) = f4441a37a45875a6d9e9c9348d71a1911ef79e55
-Size (g95-0.90/g95_source.tgz) = 1285600 bytes
-SHA1 (g95-0.90/gcc-core-4.0.3.tar.gz) = 2694281fa05ae0e39cd871fcc52745e35a2dfefc
-RMD160 (g95-0.90/gcc-core-4.0.3.tar.gz) = fd960201a888537ad84e71b72b6b1170ad94eaa0
-Size (g95-0.90/gcc-core-4.0.3.tar.gz) = 20137297 bytes
-SHA1 (patch-aa) = 9e19de5fa95fae96c722d090aa48ab1a20a2813a
-SHA1 (patch-ab) = 304c526fb94b000b05adf9ce7bbe7a073dc0c6fa
+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) = 539b75f816c68afaad7f740ef1bd451647dba032
diff --git a/lang/g95/patches/patch-aa b/lang/g95/patches/patch-aa
deleted file mode 100644
index 49fa191129d..00000000000
--- a/lang/g95/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/12/07 14:49:39 wennmach Exp $
-
-Install documentation into the appropriate directory.
-
---- configure.orig	2006-07-11 19:19:47.000000000 +0200
-+++ configure	2006-12-07 15:02:15.000000000 +0100
-@@ -308,7 +308,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os ALLOCA EGREP GCC_DIR DEST_LIBDIR PREFIX EXTRA_OPTS PARTS LDADD0 GCC_TRUE GCC_FALSE GCC41_TRUE GCC41_FALSE TARGET_SYSTEM_ROOT DEFAULT_TARGET_VERSION DEFAULT_TARGET_MACHINE G95_SPEC G95_CFLAGS COMMON_LDFLAGS G95_WORD LINK_SPEC STARTFILE_PREFIX_2 LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os ALLOCA EGREP GCC_DIR DEST_LIBDIR DEST_DOCDIR PREFIX EXTRA_OPTS PARTS LDADD0 GCC_TRUE GCC_FALSE GCC41_TRUE GCC41_FALSE TARGET_SYSTEM_ROOT DEFAULT_TARGET_VERSION DEFAULT_TARGET_MACHINE G95_SPEC G95_CFLAGS COMMON_LDFLAGS G95_WORD LINK_SPEC STARTFILE_PREFIX_2 LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -3856,6 +3856,7 @@
- echo "${ECHO_T}$gcc_version" >&6
- 
-    DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version
-+   DEST_DOCDIR=$prefix/share/doc/g95
-    SAVE_DIR=`pwd`
-    PREFIX=$prefix
- 
-@@ -6200,6 +6201,7 @@
- s,@EGREP@,$EGREP,;t t
- s,@GCC_DIR@,$GCC_DIR,;t t
- s,@DEST_LIBDIR@,$DEST_LIBDIR,;t t
-+s,@DEST_DOCDIR@,$DEST_DOCDIR,;t t
- s,@PREFIX@,$PREFIX,;t t
- s,@EXTRA_OPTS@,$EXTRA_OPTS,;t t
- s,@PARTS@,$PARTS,;t t
diff --git a/lang/g95/patches/patch-ab b/lang/g95/patches/patch-ab
index 0d96a540e11..2f7caf13639 100644
--- a/lang/g95/patches/patch-ab
+++ b/lang/g95/patches/patch-ab
@@ -1,34 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/11/21 13:44:18 wennmach Exp $
+$NetBSD: patch-ab,v 1.2 2008/04/04 21:24:49 markd Exp $
 
-Install documentation into the appropriate directory.
-
---- Makefile.in.orig	2006-11-09 17:41:39.000000000 +0100
-+++ Makefile.in	2006-11-21 11:04:19.000000000 +0100
-@@ -57,6 +57,7 @@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- DEST_LIBDIR = @DEST_LIBDIR@
-+DEST_DOCDIR = @DEST_DOCDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
-@@ -399,7 +400,7 @@
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir) @DEST_DOCDIR@
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -2760,8 +2761,8 @@
+--- Makefile.in.orig	2008-01-29 18:01:26.000000000 +1300
++++ Makefile.in
+@@ -1340,8 +1340,9 @@ install-data-hook:
  	  ranlib @DEST_LIBDIR@/libgcc_eh.a ; \
  	  ranlib @DEST_LIBDIR@/libgcc.a ; \
  	fi
 -	cp INSTALL @DEST_LIBDIR@/../../../..
 -	cp G95Manual.pdf @DEST_LIBDIR@/../../../..
-+	$(INSTALL_DATA) INSTALL @DEST_DOCDIR@
-+	$(INSTALL_DATA) G95Manual.pdf @DEST_DOCDIR@
++	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 -) ; \