 @@ -1,14 +1,14 @@
-# $NetBSD: gcc.mk,v 1.117 2012/04/16 05:00:44 sbd Exp $
+# $NetBSD: gcc.mk,v 1.118 2012/04/16 05:03:03 sbd Exp $
+#
 # This is the compiler definition for the GNU Compiler Collection.
+#
 # User-settable variables:
+#
 # USE_NATIVE_GCC
 #	When set to "yes", the native gcc is used, no matter which
 #	compiler version a package requires.
+#
 # USE_PKGSRC_GCC
 #	Force using the appropriate version of GCC from pkgsrc based on
 #	GCC_REQD instead of the native compiler.
+#
 @@ -75,47 +75,51 @@ _DEF_VARS.gcc=	\
 USE_NATIVE_GCC?=	no
 USE_PKGSRC_GCC?=	no
 GCC_REQD+=	2.8.0
 # gcc2 doesn't support c99 and amd64
 .if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64"
 GCC_REQD+=	3.0
 .endif
 # _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc
 # without the PKGREVISIONs.
+#
-_GCC_DIST_VERSION=	4.6.3
+.include "../../lang/gcc47/version.mk"
 _GCC_DIST_VERSION:=	${GCC_DIST_VERSION}
 # _GCC2_PATTERNS matches N s.t. N <= 2.95.3.
 _GCC2_PATTERNS=	[0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].*	\
 .9[0-4] 2.9[0-4].* 2.95 2.95.[0-3]
 # _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4.
 _GCC3_PATTERNS=	2.95.[4-9]* 2.95.[1-9][0-9]* 2.9[6-9] 2.9[6-9].*	\
 .[1-9][0-9][0-9]* 3.[0-3] 3.[0-3].*
 # _GCC34_PATTERNS matches N s.t. 3.4 <= N < 4.
 _GCC34_PATTERNS= 3.[4-9] 3.[4-9].* 3.[1-9][0-9]*
 # _GCC44_PATTERNS matches N s.t. 4.4 <= N < 4.5.
 _GCC44_PATTERNS= 4.4 4.4.*
 # _GCC45_PATTERNS matches N s.t. 4.5 <= N < 4.6.
 _GCC45_PATTERNS= 4.5 4.5.*
-# _GCC46_PATTERNS matches N s.t. 4.6 <= N.
+# _GCC46_PATTERNS matches N s.t. 4.6 <= N < 4.7.
-_GCC46_PATTERNS= 4.[6-9] 4.[6-9].* 4.[1-9][0-9]* [4-9]*
+_GCC46_PATTERNS= 4.6 4.6.*
 # _GCC46_PATTERNS matches N s.t. 4.7 <= N.
 _GCC47_PATTERNS= 4.[7-9] 4.[7-9].* 4.[1-9][0-9]* [4-9]*
 # _CC is the full path to the compiler named by ${CC} if it can be found.
 .if !defined(_CC)
 _CC:=	${CC:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
 .  for _dir_ in ${PATH:C/\:/ /g}
 .    if empty(_CC:M/*)
 .      if exists(${_dir_}/${CC:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//})
 _CC:=	${_dir_}/${CC:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
 .      endif
 .    endif
 .  endfor
 MAKEFLAGS+=	_CC=${_CC:Q}
 .endif
 @@ -214,46 +218,54 @@ _NEED_GCC44=	yes
 .endfor
 _NEED_GCC45?=	no
 .for _pattern_ in ${_GCC45_PATTERNS}
 .  if !empty(_GCC_REQD:M${_pattern_})
 _NEED_GCC45=	yes
 .  endif
 .endfor
 _NEED_GCC46?=	no
 .for _pattern_ in ${_GCC46_PATTERNS}
 .  if !empty(_GCC_REQD:M${_pattern_})
 _NEED_GCC46=	yes
 .  endif
 .endfor
 .for _pattern_ in ${_GCC47_PATTERNS}
 .  if !empty(_GCC_REQD:M${_pattern_})
 _NEED_GCC47=	yes
 .  endif
 .endfor
 .if !empty(_NEED_GCC2:M[nN][oO]) && !empty(_NEED_GCC3:M[nN][oO]) && \
     !empty(_NEED_GCC34:M[nN][oO]) && !empty(_NEED_GCC44:M[nN][oO]) && \
-    !empty(_NEED_GCC45:M[nN][oO]) && !empty(_NEED_GCC46:M[nN][oO])
+    !empty(_NEED_GCC45:M[nN][oO]) && !empty(_NEED_GCC46:M[nN][oO]) && \
-_NEED_GCC46=	yes
+    !empty(_NEED_GCC47:M[nN][oO])
 _NEED_GCC47=	yes
 .endif
 # 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 fortran77 objc
 .elif !empty(_NEED_GCC3:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 java objc
 .elif !empty(_NEED_GCC34:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 objc
 .elif !empty(_NEED_GCC44:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 java objc
 .elif !empty(_NEED_GCC45:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 java objc
 .elif !empty(_NEED_GCC46:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 java objc
 .elif !empty(_NEED_GCC47:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 go java objc obj-c++
 .endif
 _LANGUAGES.gcc=		# empty
 .for _lang_ in ${USE_LANGUAGES}
 _LANGUAGES.gcc+=	${LANGUAGES.gcc:M${_lang_}}
 .endfor
 .if !empty(USE_LANGUAGES:Mc99)
 _WRAP_EXTRA_ARGS.CC+=	-std=gnu99
 .endif
 # GCC has this annoying behaviour where it advocates in a multi-line
 # banner the use of "#include" over "#import" when including headers.
 # This generates a huge number of warnings when building practically all
 @@ -362,26 +374,47 @@ _GCC_PKGBASE=		gcc46
 _IGNORE_GCC=		yes
 MAKEFLAGS+=		_IGNORE_GCC=yes
 .  endif
 .  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
 _GCC_PKGSRCDIR=		../../lang/gcc46
 _GCC_DEPENDENCY=	gcc46>=${_GCC_REQD}:../../lang/gcc46
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
         !empty(_LANGUAGES.gcc:Mfortran77) || \
         !empty(_LANGUAGES.gcc:Mobjc)
 _USE_GCC_SHLIB?=	yes
 .    endif
 .  endif
 .elif !empty(_NEED_GCC47:M[yY][eE][sS])
+#
 # We require gcc-4.7.x in the lang/gcc47 directory.
+#
 _GCC_PKGBASE=		gcc47
 .  if !empty(PKGPATH:Mlang/gcc47)
 _IGNORE_GCC=		yes
 MAKEFLAGS+=		_IGNORE_GCC=yes
 .  endif
 .  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
 _GCC_PKGSRCDIR=		../../lang/gcc47
 _GCC_DEPENDENCY=	gcc47>=${_GCC_REQD}:../../lang/gcc47
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
         !empty(_LANGUAGES.gcc:Mfortran77) || \
         !empty(_LANGUAGES.gcc:Mgo) || \
         !empty(_LANGUAGES.gcc:Mobjc) || \
         !empty(_LANGUAGES.gcc:Mobj-c++)
 _USE_GCC_SHLIB?=	yes
 .    endif
 .  endif
 .endif
 _GCC_DEPENDS=		${_GCC_PKGBASE}>=${_GCC_REQD}
 .if !empty(_NEED_GCC3:M[yY][eE][sS])
 .  if !empty(PKGPATH:Mlang/gcc3-c++)
 _IGNORE_GCC3CXX=	yes
 MAKEFLAGS+=		_IGNORE_GCC3CXX=yes
 .  endif
 .  if !defined(_IGNORE_GCC3CXX) && !empty(_LANGUAGES.gcc:Mc++)
 _GCC_PKGSRCDIR+=	../../lang/gcc3-c++
 _GCC_DEPENDENCY+=	gcc3-c++>=${_GCC_REQD}:../../lang/gcc3-c++
 _USE_GCC_SHLIB?=	yes
 .  endif