The distfile of the current release of g95 was constantly changing,

therefore:
	- use DIST_SUBDIR
	- downgrade to the latest stable release 0.90, as also suggested
	  by the principal maintainer of g95, Andy Vaught

3 files changed, 21 insertions, 20 deletions

diff --git a/lang/g95/Makefile b/lang/g95/Makefile
index 3e485433229..ccfc4784790 100644
--- a/lang/g95/Makefile
+++ b/lang/g95/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2006/11/24 12:28:12 wennmach Exp $
+# $NetBSD: Makefile,v 1.3 2006/12/07 14:49:39 wennmach Exp $
 
 DISTNAME=		g95_source
-VERSION=		0.91
+VERSION=		0.90
 PKGNAME=		g95-${VERSION}
-PKGREVISION=		2
+#PKGREVISION=		1
 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/
+SITES.g95_source.tgz=	http://ftp.g95.org/v0.9/
 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 a05d263d601..70ab1a9094b 100644
--- a/lang/g95/distinfo
+++ b/lang/g95/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2006/11/24 12:28:12 wennmach Exp $
+$NetBSD: distinfo,v 1.3 2006/12/07 14:49:39 wennmach Exp $
 
-SHA1 (g95_source.tgz) = f28eaeab54c294f4f72398257026529aa17fbf34
-RMD160 (g95_source.tgz) = 1fd98506fc6102876b861fedd1de5a6cfb223821
-Size (g95_source.tgz) = 1315069 bytes
-SHA1 (gcc-core-4.0.3.tar.gz) = 2694281fa05ae0e39cd871fcc52745e35a2dfefc
-RMD160 (gcc-core-4.0.3.tar.gz) = fd960201a888537ad84e71b72b6b1170ad94eaa0
-Size (gcc-core-4.0.3.tar.gz) = 20137297 bytes
-SHA1 (patch-aa) = 4e2c95a34b940025c47ad7e5b9d22bb522674ec8
+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
diff --git a/lang/g95/patches/patch-aa b/lang/g95/patches/patch-aa
index 6a180d98431..49fa191129d 100644
--- a/lang/g95/patches/patch-aa
+++ b/lang/g95/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/11/21 13:44:17 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2006/12/07 14:49:39 wennmach Exp $
 
 Install documentation into the appropriate directory.
 
---- configure.orig	2006-11-21 09:24:55.000000000 +0100
-+++ configure	2006-11-21 09:32:41.000000000 +0100
+--- 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 EGREP ALLOCA 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 EGREP ALLOCA 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_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.
-@@ -3994,6 +3994,7 @@
+@@ -3856,6 +3856,7 @@
  echo "${ECHO_T}$gcc_version" >&6
  
     DEST_LIBDIR=$prefix/lib/gcc-lib/$host/$gcc_version
@@ -21,8 +21,8 @@ Install documentation into the appropriate directory.
     SAVE_DIR=`pwd`
     PREFIX=$prefix
  
-@@ -6356,6 +6357,7 @@
- s,@ALLOCA@,$ALLOCA,;t t
+@@ -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