Update to the latest version being tested on i386-6-exp on pointyhat.

4 files changed, 422 insertions, 0 deletions

diff --git a/devel/portmk/Mk/bsd.gcc.mk b/devel/portmk/Mk/bsd.gcc.mk
new file mode 100644
index 000000000000..93f103404497
--- /dev/null
+++ b/devel/portmk/Mk/bsd.gcc.mk
@@ -0,0 +1,185 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.gcc.mk - Support for smarter USE_GCC usage.
+#
+# Created by: Edwin Groothuis <edwin@freebsd.org>
+#
+# For port developers:
+# If your port needs a specific version of GCC, you can easily specify
+# that with the "USE_GCC=" statement. If you need a certain minimal version,
+# but don't care if about the upperversion, just the + sign behind
+# the version.
+#
+# For example:
+#	USE_GCC=	3.3		# port requires GCC 3.3 to build with.
+#	USE_GCC=	3.4+	# port requires GCC 3.4 or later to build with.
+#
+# If you are wondering what your port exactly does, use "make test-gcc"
+# to see some debugging.
+#
+# $FreeBSD: /tmp/pcvs/ports/devel/portmk/Mk/Attic/bsd.gcc.mk,v 1.6 2006-09-20 08:01:59 linimon Exp $
+#
+
+GCC_Include_MAINTAINER=		portmgr@FreeBSD.org
+
+#
+# All GCC versions supported by the ports framework.
+# Please keep them in ascending order.
+#
+GCCVERSIONS=	020702 020801 029500 030200 030301 030402 040000 040100 040200
+
+#
+# Versions of GCC shipped.
+# The first field if the OSVERSION in which it appeared in the base system.
+# The second field is the OSVERSION in which it disappeared from
+# the base system.
+# The third field is the version as USE_GCC would use.
+#
+GCCVERSION_020702=	000000 000000 2.7
+GCCVERSION_020801=	000000 400012 2.8
+GCCVERSION_029500=	400012 500035 2.95
+GCCVERSION_030200=	500039 501103 3.2
+GCCVERSION_030301=	501103 502126 3.3
+GCCVERSION_030402=	502126 999999 3.4
+GCCVERSION_040000=	999999 999999 4.0
+GCCVERSION_040100=	999999 999999 4.1
+GCCVERSION_040200=	999999 999999 4.2
+
+#
+# No configurable parts below this.
+#
+
+#
+# See if we can use a later version
+#
+_USE_GCC:=	${USE_GCC:S/+//}
+.if ${USE_GCC} != ${_USE_GCC}
+_GCC_ORLATER:=	true
+.endif
+
+#
+# Extract the fields from GCCVERSION_ and check if USE_GCC points to a valid
+# version.
+#
+.for v in ${GCCVERSIONS}
+. for j in ${GCCVERSION_${v}}
+.  if !defined(_GCCVERSION_${v}_L)
+_GCCVERSION_${v}_L=	${j}
+.  elif !defined(_GCCVERSION_${v}_R)
+_GCCVERSION_${v}_R=	${j}
+.  elif !defined(_GCCVERSION_${v}_V)
+_GCCVERSION_${v}_V=	${j}
+.   if ${_USE_GCC}==${j}
+_GCCVERSION_OKAY=	true;
+.   endif
+.  endif
+. endfor
+.endfor
+
+.if !defined(_GCCVERSION_OKAY)
+IGNORE=	Unknown version of GCC specified (USE_GCC=${USE_GCC})
+.endif
+
+#
+# Determine current GCCVERSION
+#
+.for v in ${GCCVERSIONS}
+. if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//})
+_GCC_FOUND${v}=	port
+. endif
+. if ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R}
+_GCCVERSION:=		${v}
+_GCC_FOUND${v}:=	base
+. endif
+.endfor
+.if !defined(_GCCVERSION)
+IGNORE=		Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION})
+.endif
+
+#
+# If the GCC package defined in USE_GCC does not exist, but a later
+# version is allowed (for example 3.4+), see if there is a later.
+# First check if the base installed version is good enough, otherwise
+# get the first available version.
+#
+.if defined(_GCC_ORLATER)
+. for v in ${GCCVERSIONS}
+.  if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
+_GCC_MIN1:=	true
+.  endif
+.  if defined(_GCC_MIN1) && defined(_GCC_FOUND${v}) && ${_GCC_FOUND${v}}=="base" && !defined(_GCC_FOUND)
+_GCC_FOUND:=	${_GCCVERSION_${v}_V}
+.  endif
+. endfor
+. for v in ${GCCVERSIONS}
+.  if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
+_GCC_MIN2:=	true
+.  endif
+.  if defined(_GCC_MIN2) && defined(_GCC_FOUND${v}) && !defined(_GCC_FOUND)
+_GCC_FOUND:=	${_GCCVERSION_${v}_V}
+.  endif
+. endfor
+.endif
+.if defined(_GCC_FOUND)
+_USE_GCC:=${_GCC_FOUND}
+.endif
+
+#
+# Determine if the installed OS already has this GCCVERSION, and if not
+# then set BUILD_DEPENDS, CC, CXX, F77, and FC.
+#
+.for v in ${GCCVERSIONS}
+. if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
+.  if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R}
+# If Fortran support is requested, regardless of the value of USE_GCC
+# we need to use lang/gfortran, which is based on lang/gcc41 right now.
+.   if defined(WITH_FORTRAN)
+V:=			41
+_GCC_BUILD_DEPENDS:=	gfortran
+_GCC_PORT_DEPENDS:=	gfortran${V}
+.else
+V:=			${_GCCVERSION_${v}_V:S/.//}
+_GCC_BUILD_DEPENDS:=	gcc${V}
+_GCC_PORT_DEPENDS:=	gcc${V}
+.   endif
+CC:=			gcc${V}
+CXX:=			g++${V}
+# Up to GCC 4.0, we had g77, g77-33, g77-34, and the like.  Starting
+# with GCC 4.0, we have gfortran, gfortran40, gfortran41, and the like.
+.   if ${_USE_GCC} < 4.0
+F77:=			g77-${V}
+FC:=			${F77}
+.   else
+FC:=			gfortran${V}
+F77:=			${FC}
+.   endif
+.  endif
+. endif
+.endfor
+.undef V
+
+.if defined(_GCC_BUILD_DEPENDS)
+BUILD_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS}
+.endif
+
+MAKE_ENV+=	CC="${CC}" CXX="${CXX}" F77="${F77}" FC="${FC}"
+
+test-gcc:
+	@echo USE_GCC=${USE_GCC}
+.if defined(_GCC_ORLATER)
+	@echo Port can use later versions.
+.else
+	@echo Port cannot use later versions.
+.endif
+	@echo WITH_FORTRAN=${WITH_FORTRAN}
+.for v in ${GCCVERSIONS}
+	@echo -n "GCC version: ${_GCCVERSION_${v}_V} "
+.if defined(_GCC_FOUND${v})
+	@echo -n "(${_GCC_FOUND${v}}) "
+.endif
+	@echo "- OSVERSION from ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R}"
+#	@echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V}
+.endfor
+	@echo Using GCC version ${_USE_GCC}
+	@echo CC:${CC} - CXX:${CXX} - F77:${F77} - FC:${FC} - BUILD_DEPENDS:${BUILD_DEPENDS}
diff --git a/devel/portmk/Mk/bsd.port.options.mk b/devel/portmk/Mk/bsd.port.options.mk
new file mode 100644
index 000000000000..d36f9cd142c2
--- /dev/null
+++ b/devel/portmk/Mk/bsd.port.options.mk
@@ -0,0 +1,26 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.port.options.mk - Allow OPTIONS to determine dependencies
+#
+# usage:
+#
+#	.include "bsd.port.pre.mk"
+#	<deal with user options>
+#	.include "bsd.port.options.mk"
+#	<other work, including adjusting dependencies>
+#	.include "bsd.port.post.mk"
+#
+# Created by: Shaun Amott <shaun@inerd.com>
+#
+# $FreeBSD$
+#
+
+OPTIONS_Include_MAINTAINER=		portmgr@FreeBSD.org
+
+USEOPTIONSMK=	yes
+INOPTIONSMK=	yes
+
+.include "bsd.port.mk"
+
+.undef INOPTIONSMK
diff --git a/ports-mgmt/portmk/Mk/bsd.gcc.mk b/ports-mgmt/portmk/Mk/bsd.gcc.mk
new file mode 100644
index 000000000000..01669d0a75f2
--- /dev/null
+++ b/ports-mgmt/portmk/Mk/bsd.gcc.mk
@@ -0,0 +1,185 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.gcc.mk - Support for smarter USE_GCC usage.
+#
+# Created by: Edwin Groothuis <edwin@freebsd.org>
+#
+# For port developers:
+# If your port needs a specific version of GCC, you can easily specify
+# that with the "USE_GCC=" statement. If you need a certain minimal version,
+# but don't care if about the upperversion, just the + sign behind
+# the version.
+#
+# For example:
+#	USE_GCC=	3.3		# port requires GCC 3.3 to build with.
+#	USE_GCC=	3.4+	# port requires GCC 3.4 or later to build with.
+#
+# If you are wondering what your port exactly does, use "make test-gcc"
+# to see some debugging.
+#
+# $FreeBSD: /tmp/pcvs/ports/ports-mgmt/portmk/Mk/Attic/bsd.gcc.mk,v 1.6 2006-09-20 08:01:59 linimon Exp $
+#
+
+GCC_Include_MAINTAINER=		portmgr@FreeBSD.org
+
+#
+# All GCC versions supported by the ports framework.
+# Please keep them in ascending order.
+#
+GCCVERSIONS=	020702 020801 029500 030200 030301 030402 040000 040100 040200
+
+#
+# Versions of GCC shipped.
+# The first field if the OSVERSION in which it appeared in the base system.
+# The second field is the OSVERSION in which it disappeared from
+# the base system.
+# The third field is the version as USE_GCC would use.
+#
+GCCVERSION_020702=	000000 000000 2.7
+GCCVERSION_020801=	000000 400012 2.8
+GCCVERSION_029500=	400012 500035 2.95
+GCCVERSION_030200=	500039 501103 3.2
+GCCVERSION_030301=	501103 502126 3.3
+GCCVERSION_030402=	502126 999999 3.4
+GCCVERSION_040000=	999999 999999 4.0
+GCCVERSION_040100=	999999 999999 4.1
+GCCVERSION_040200=	999999 999999 4.2
+
+#
+# No configurable parts below this.
+#
+
+#
+# See if we can use a later version
+#
+_USE_GCC:=	${USE_GCC:S/+//}
+.if ${USE_GCC} != ${_USE_GCC}
+_GCC_ORLATER:=	true
+.endif
+
+#
+# Extract the fields from GCCVERSION_ and check if USE_GCC points to a valid
+# version.
+#
+.for v in ${GCCVERSIONS}
+. for j in ${GCCVERSION_${v}}
+.  if !defined(_GCCVERSION_${v}_L)
+_GCCVERSION_${v}_L=	${j}
+.  elif !defined(_GCCVERSION_${v}_R)
+_GCCVERSION_${v}_R=	${j}
+.  elif !defined(_GCCVERSION_${v}_V)
+_GCCVERSION_${v}_V=	${j}
+.   if ${_USE_GCC}==${j}
+_GCCVERSION_OKAY=	true;
+.   endif
+.  endif
+. endfor
+.endfor
+
+.if !defined(_GCCVERSION_OKAY)
+IGNORE=	Unknown version of GCC specified (USE_GCC=${USE_GCC})
+.endif
+
+#
+# Determine current GCCVERSION
+#
+.for v in ${GCCVERSIONS}
+. if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//})
+_GCC_FOUND${v}=	port
+. endif
+. if ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R}
+_GCCVERSION:=		${v}
+_GCC_FOUND${v}:=	base
+. endif
+.endfor
+.if !defined(_GCCVERSION)
+IGNORE=		Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION})
+.endif
+
+#
+# If the GCC package defined in USE_GCC does not exist, but a later
+# version is allowed (for example 3.4+), see if there is a later.
+# First check if the base installed version is good enough, otherwise
+# get the first available version.
+#
+.if defined(_GCC_ORLATER)
+. for v in ${GCCVERSIONS}
+.  if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
+_GCC_MIN1:=	true
+.  endif
+.  if defined(_GCC_MIN1) && defined(_GCC_FOUND${v}) && ${_GCC_FOUND${v}}=="base" && !defined(_GCC_FOUND)
+_GCC_FOUND:=	${_GCCVERSION_${v}_V}
+.  endif
+. endfor
+. for v in ${GCCVERSIONS}
+.  if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
+_GCC_MIN2:=	true
+.  endif
+.  if defined(_GCC_MIN2) && defined(_GCC_FOUND${v}) && !defined(_GCC_FOUND)
+_GCC_FOUND:=	${_GCCVERSION_${v}_V}
+.  endif
+. endfor
+.endif
+.if defined(_GCC_FOUND)
+_USE_GCC:=${_GCC_FOUND}
+.endif
+
+#
+# Determine if the installed OS already has this GCCVERSION, and if not
+# then set BUILD_DEPENDS, CC, CXX, F77, and FC.
+#
+.for v in ${GCCVERSIONS}
+. if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
+.  if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R}
+# If Fortran support is requested, regardless of the value of USE_GCC
+# we need to use lang/gfortran, which is based on lang/gcc41 right now.
+.   if defined(WITH_FORTRAN)
+V:=			41
+_GCC_BUILD_DEPENDS:=	gfortran
+_GCC_PORT_DEPENDS:=	gfortran${V}
+.else
+V:=			${_GCCVERSION_${v}_V:S/.//}
+_GCC_BUILD_DEPENDS:=	gcc${V}
+_GCC_PORT_DEPENDS:=	gcc${V}
+.   endif
+CC:=			gcc${V}
+CXX:=			g++${V}
+# Up to GCC 4.0, we had g77, g77-33, g77-34, and the like.  Starting
+# with GCC 4.0, we have gfortran, gfortran40, gfortran41, and the like.
+.   if ${_USE_GCC} < 4.0
+F77:=			g77-${V}
+FC:=			${F77}
+.   else
+FC:=			gfortran${V}
+F77:=			${FC}
+.   endif
+.  endif
+. endif
+.endfor
+.undef V
+
+.if defined(_GCC_BUILD_DEPENDS)
+BUILD_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS}
+.endif
+
+MAKE_ENV+=	CC="${CC}" CXX="${CXX}" F77="${F77}" FC="${FC}"
+
+test-gcc:
+	@echo USE_GCC=${USE_GCC}
+.if defined(_GCC_ORLATER)
+	@echo Port can use later versions.
+.else
+	@echo Port cannot use later versions.
+.endif
+	@echo WITH_FORTRAN=${WITH_FORTRAN}
+.for v in ${GCCVERSIONS}
+	@echo -n "GCC version: ${_GCCVERSION_${v}_V} "
+.if defined(_GCC_FOUND${v})
+	@echo -n "(${_GCC_FOUND${v}}) "
+.endif
+	@echo "- OSVERSION from ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R}"
+#	@echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V}
+.endfor
+	@echo Using GCC version ${_USE_GCC}
+	@echo CC:${CC} - CXX:${CXX} - F77:${F77} - FC:${FC} - BUILD_DEPENDS:${BUILD_DEPENDS}
diff --git a/ports-mgmt/portmk/Mk/bsd.port.options.mk b/ports-mgmt/portmk/Mk/bsd.port.options.mk
new file mode 100644
index 000000000000..d36f9cd142c2
--- /dev/null
+++ b/ports-mgmt/portmk/Mk/bsd.port.options.mk
@@ -0,0 +1,26 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# bsd.port.options.mk - Allow OPTIONS to determine dependencies
+#
+# usage:
+#
+#	.include "bsd.port.pre.mk"
+#	<deal with user options>
+#	.include "bsd.port.options.mk"
+#	<other work, including adjusting dependencies>
+#	.include "bsd.port.post.mk"
+#
+# Created by: Shaun Amott <shaun@inerd.com>
+#
+# $FreeBSD$
+#
+
+OPTIONS_Include_MAINTAINER=		portmgr@FreeBSD.org
+
+USEOPTIONSMK=	yes
+INOPTIONSMK=	yes
+
+.include "bsd.port.mk"
+
+.undef INOPTIONSMK