Implement "fortran77" as alias for "fortran".

6 files changed, 24 insertions, 19 deletions

diff --git a/mk/compiler.mk b/mk/compiler.mk
index b6235500650..1d65e7237a3 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.70 2009/07/08 21:17:16 markd Exp $
+# $NetBSD: compiler.mk,v 1.71 2010/07/30 07:58:58 asau Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -57,8 +57,8 @@
 # USE_LANGUAGES
 #	Lists the languages used in the source code of the package,
 #	and is used to determine the correct compilers to install.
-#	Valid values are: c, c99, c++, fortran, java, objc.  The
-#       default is "c".
+#	Valid values are: c, c99, c++, fortran, fortran77, java, objc.
+#	The default is "c".
 #
 # The following variables are defined, and available for testing in
 # package Makefiles:
@@ -206,7 +206,7 @@ PKG_CXX:=		${_FAIL_WRAPPER.CXX}
 ALL_ENV+=		CXXCPP=${CPP:Q} # to make some Autoconf scripts happy
 override-tools: ${_FAIL_WRAPPER.CXX}
 .endif
-.if empty(USE_LANGUAGES:Mfortran)
+.if empty(USE_LANGUAGES:Mfortran) && empty(USE_LANGUAGES:Mfortran77)
 PKG_FC:=		${_FAIL_WRAPPER.FC}
 override-tools: ${_FAIL_WRAPPER.FC}
 .endif
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
index 9f88d1715cc..1a17b84a597 100644
--- a/mk/compiler/f2c.mk
+++ b/mk/compiler/f2c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.14 2009/12/20 12:32:55 jmmv Exp $
+# $NetBSD: f2c.mk,v 1.15 2010/07/30 07:58:59 asau Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -44,7 +44,7 @@ COMPILER_F2C_MK=	defined
 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
 # requested by the package in USE_LANGUAGES.
 #
-LANGUAGES.f2c=	fortran
+LANGUAGES.f2c=	fortran fortran77
 _LANGUAGES.f2c=	# empty
 .for _lang_ in ${USE_LANGUAGES}
 _LANGUAGES.f2c+=	${LANGUAGES.f2c:M${_lang_}}
@@ -65,7 +65,7 @@ _F2CBASE_DEFAULT=	${LOCALBASE}
 
 _F2C_DIR=	${WRKDIR}/.f2c
 _F2C_VARS=	# empty
-.  if !empty(_LANGUAGES.f2c:Mfortran)
+.  if !empty(_LANGUAGES.f2c:Mfortran) || !empty(_LANGUAGES.f2c:Mfortran77)
 PKG_FC?=	${FC}
 _F2C_VARS+=	FC
 _F2C_FC:=	${_F2C_DIR}/bin/${PKG_FC:T}
diff --git a/mk/compiler/g95.mk b/mk/compiler/g95.mk
index 07add970167..388da5e926c 100644
--- a/mk/compiler/g95.mk
+++ b/mk/compiler/g95.mk
@@ -1,4 +1,4 @@
-# $NetBSD: g95.mk,v 1.1 2009/07/08 21:17:16 markd Exp $
+# $NetBSD: g95.mk,v 1.2 2010/07/30 07:58:59 asau Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,7 +54,7 @@ _USE_G95=	NO
 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
 # requested by the package in USE_LANGUAGES.
 #
-LANGUAGES.g95=	fortran
+LANGUAGES.g95=	fortran fortran77
 _LANGUAGES.g95=	# empty
 .for _lang_ in ${USE_LANGUAGES}
 _LANGUAGES.g95+=	${LANGUAGES.g95:M${_lang_}}
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 03577b3084b..4116aaa2a89 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.105 2010/05/06 10:21:17 adam Exp $
+# $NetBSD: gcc.mk,v 1.106 2010/07/30 07:58:59 asau Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -197,13 +197,13 @@ _NEED_GCC44=	yes
 # Assume by default that GCC will only provide a C compiler.
 LANGUAGES.gcc?=	c
 .if !empty(_NEED_GCC2:M[yY][eE][sS])
-LANGUAGES.gcc=	c c++ fortran objc
+LANGUAGES.gcc=	c c++ fortran fortran77 objc
 .elif !empty(_NEED_GCC3:M[yY][eE][sS])
-LANGUAGES.gcc=	c c++ fortran java objc
+LANGUAGES.gcc=	c c++ fortran fortran77 java objc
 .elif !empty(_NEED_GCC34:M[yY][eE][sS])
-LANGUAGES.gcc=	c c++ fortran objc
+LANGUAGES.gcc=	c c++ fortran fortran77 objc
 .elif !empty(_NEED_GCC44:M[yY][eE][sS])
-LANGUAGES.gcc=	c c++ fortran java objc
+LANGUAGES.gcc=	c c++ fortran fortran77 java objc
 .endif
 _LANGUAGES.gcc=		# empty
 .for _lang_ in ${USE_LANGUAGES}
@@ -238,6 +238,7 @@ _GCC_PKGSRCDIR=		../../lang/gcc
 _GCC_DEPENDENCY=	gcc>=${_GCC_REQD}:../../lang/gcc
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
+        !empty(_LANGUAGES.gcc:Mfortran77) || \
         !empty(_LANGUAGES.gcc:Mobjc)
 _USE_GCC_SHLIB?=	yes
 .    endif
@@ -269,6 +270,7 @@ _GCC_PKGSRCDIR=		../../lang/gcc34
 _GCC_DEPENDENCY=	gcc34>=${_GCC_REQD}:../../lang/gcc34
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
+        !empty(_LANGUAGES.gcc:Mfortran77) || \
         !empty(_LANGUAGES.gcc:Mobjc)
 _USE_GCC_SHLIB?=	yes
 .    endif
@@ -287,6 +289,7 @@ _GCC_PKGSRCDIR=		../../lang/gcc44
 _GCC_DEPENDENCY=	gcc44>=${_GCC_REQD}:../../lang/gcc44
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
+        !empty(_LANGUAGES.gcc:Mfortran77) || \
         !empty(_LANGUAGES.gcc:Mobjc)
 _USE_GCC_SHLIB?=	yes
 .    endif
@@ -308,7 +311,7 @@ _USE_GCC_SHLIB?=	yes
 _IGNORE_GCC3F77=	yes
 MAKEFLAGS+=		_IGNORE_GCC3F77=yes
 .  endif
-.  if !defined(_IGNORE_GCC3F77) && !empty(_LANGUAGES.gcc:Mfortran)
+.  if !defined(_IGNORE_GCC3F77) && (!empty(_LANGUAGES.gcc:Mfortran) || !empty(_LANGUAGES.gcc:Mfortran77))
 _GCC_PKGSRCDIR+=	../../lang/gcc3-f77
 _GCC_DEPENDENCY+=	gcc3-f77>=${_GCC_REQD}:../../lang/gcc3-f77
 _USE_GCC_SHLIB?=	yes
diff --git a/mk/compiler/pcc.mk b/mk/compiler/pcc.mk
index 3d60e514b79..1a814b526f8 100644
--- a/mk/compiler/pcc.mk
+++ b/mk/compiler/pcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pcc.mk,v 1.1 2007/09/18 01:51:10 reed Exp $
+# $NetBSD: pcc.mk,v 1.2 2010/07/30 07:58:59 asau Exp $
 #
 # This is the compiler definition for the PCC compiler.
 #
@@ -26,11 +26,12 @@ _COMPILER_TYPE.c++ =	CXX
 _COMPILER_TYPE.fortran=	FC
 
 # PCC-specific definitions
-_COMPILER_LANGS=	c c++ fortran
+_COMPILER_LANGS=	c c++ fortran fortran77
 _COMPILER_NAME.c=	pcc
 # TODO:
 _COMPILER_NAME.c++ =	CC
 _COMPILER_NAME.fortran=	f77
+_COMPILER_NAME.fortran77=	f77
 
 # LANGUAGES.<compiler> is the list of supported languages by the
 # compiler.
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index 15aa584f31e..a4d370dcbb7 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.46 2009/10/25 17:15:44 sno Exp $
+# $NetBSD: sunpro.mk,v 1.47 2010/07/30 07:58:59 asau Exp $
 #
 # This is the compiler definition for the SUNWspro C compiler.
 #
@@ -24,10 +24,11 @@ _COMPILER_TYPE.c++ =	CXX
 _COMPILER_TYPE.fortran=	FC
 
 # sunpro-specific definitions
-_COMPILER_LANGS=	c c++ fortran
+_COMPILER_LANGS=	c c++ fortran fortran77
 _COMPILER_NAME.c=	cc
 _COMPILER_NAME.c++ =	CC
 _COMPILER_NAME.fortran=	f77
+_COMPILER_NAME.fortran77=	f77
 
 # LANGUAGES.<compiler> is the list of supported languages by the
 # compiler.