Wed Sep 28 19:31:10 2011 UTC ()
Fix setup of g95 as PKGSRC_FORTRAN for fortran77 packages.


(markd)
diff -r1.2 -r1.3 pkgsrc/mk/compiler/g95.mk
cvs diff -r1.2 -r1.3 pkgsrc/mk/compiler/g95.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/g95.mk 2010/07/30 07:58:59 1.2
+++ pkgsrc/mk/compiler/g95.mk 2011/09/28 19:31:09 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: g95.mk,v 1.2 2010/07/30 07:58:59 asau Exp $ 1# $NetBSD: g95.mk,v 1.3 2011/09/28 19:31:09 markd Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -63,27 +63,28 @@ _LANGUAGES.g95+= ${LANGUAGES.g95:M${_lan @@ -63,27 +63,28 @@ _LANGUAGES.g95+= ${LANGUAGES.g95:M${_lan
63_USE_G95= NO 63_USE_G95= NO
64.endif 64.endif
65 65
66.if !defined(_USE_G95) 66.if !defined(_USE_G95)
67_USE_G95= YES 67_USE_G95= YES
68.endif 68.endif
69 69
70.if !empty(_USE_G95:M[yY][eE][sS]) 70.if !empty(_USE_G95:M[yY][eE][sS])
71EVAL_PREFIX+= _G95BASE=g95 71EVAL_PREFIX+= _G95BASE=g95
72_G95BASE_DEFAULT= ${LOCALBASE} 72_G95BASE_DEFAULT= ${LOCALBASE}
73 73
74_G95_DIR= ${WRKDIR}/.g95 74_G95_DIR= ${WRKDIR}/.g95
75_G95_VARS= # empty 75_G95_VARS= # empty
76. if !empty(_LANGUAGES.g95:Mfortran) 76. if !empty(_LANGUAGES.g95:Mfortran) || \
 77 !empty(_LANGUAGES.g95:Mfortran77)
77PKG_FC?= ${FC} 78PKG_FC?= ${FC}
78_G95_VARS+= FC 79_G95_VARS+= FC
79_G95_FC:= ${_G95_DIR}/bin/${PKG_FC:T} 80_G95_FC:= ${_G95_DIR}/bin/${PKG_FC:T}
80_ALIASES.FC+= f77 g77 g95 81_ALIASES.FC+= f77 g77 g95
81FCPATH= ${_G95BASE}/bin/g95 82FCPATH= ${_G95BASE}/bin/g95
82PKG_FC:= ${_G95_FC} 83PKG_FC:= ${_G95_FC}
83. endif 84. endif
84 85
85# Prepend the path the to the compiler to the PATH 86# Prepend the path the to the compiler to the PATH
86. if !empty(_LANGUAGES.g95) 87. if !empty(_LANGUAGES.g95)
87PREPEND_PATH+= ${_G95_DIR}/bin 88PREPEND_PATH+= ${_G95_DIR}/bin
88. endif 89. endif
89 90