10 files changed, 80 insertions, 20 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 544b78565bed..e4e3d62eb9aa 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -22,11 +22,16 @@ DISTFILES=	\
 .if defined(WITH_FORTRAN)
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
+
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 4.0
 
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 
+.if defined(WITH_FORTRAN)
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+.endif
+
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -61,6 +66,9 @@ CONFIGURE_ARGS=	--disable-nls \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
+.if defined(WITH_FORTRAN)
+CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
+.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+=	--enable-shared
@@ -99,8 +107,6 @@ PLIST_SUB+=	LIBJAVA=""
 .endif
 
 .if defined(WITH_FORTRAN)
-LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 MAN1+=	gfortran${SUFFIX}.1
 INFO+=	gfortran
 PLIST_SUB+=	FORTRAN=""