Move everything related to the WITH_JAVA_AWT knob into a single block

and make this a subset of the general Java-specific section.

Submitted by:	alepulver

7 files changed, 84 insertions, 98 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index dd905e8a54b..da5da363fe9 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -24,9 +24,6 @@ COMMENT?=	GNU Compiler Collection 4.3
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.endif
 
 SUFFIX=		43
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -36,9 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME=	gtk20 libartlgpl2
-.endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -46,10 +40,6 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502102
-CONFIGURE_ARGS+=	--disable-libgomp
-.endif
-
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
@@ -60,6 +50,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${OSVERSION} < 502102
+CONFIGURE_ARGS+=	--disable-libgomp
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
@@ -72,10 +66,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
-			--enable-gtk-cairo
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
@@ -131,6 +121,14 @@ PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME=	gtk20 libartlgpl2
+CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
+			--enable-gtk-cairo
+.endif
+
 .endif
 
 pre-everything::
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index dd905e8a54b..da5da363fe9 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -24,9 +24,6 @@ COMMENT?=	GNU Compiler Collection 4.3
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.endif
 
 SUFFIX=		43
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -36,9 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME=	gtk20 libartlgpl2
-.endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -46,10 +40,6 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502102
-CONFIGURE_ARGS+=	--disable-libgomp
-.endif
-
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
@@ -60,6 +50,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${OSVERSION} < 502102
+CONFIGURE_ARGS+=	--disable-libgomp
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
@@ -72,10 +66,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
-			--enable-gtk-cairo
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
@@ -131,6 +121,14 @@ PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME=	gtk20 libartlgpl2
+CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
+			--enable-gtk-cairo
+.endif
+
 .endif
 
 pre-everything::
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index dd905e8a54b..da5da363fe9 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -24,9 +24,6 @@ COMMENT?=	GNU Compiler Collection 4.3
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.endif
 
 SUFFIX=		43
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -36,9 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME=	gtk20 libartlgpl2
-.endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -46,10 +40,6 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502102
-CONFIGURE_ARGS+=	--disable-libgomp
-.endif
-
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
@@ -60,6 +50,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${OSVERSION} < 502102
+CONFIGURE_ARGS+=	--disable-libgomp
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
@@ -72,10 +66,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
-			--enable-gtk-cairo
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
@@ -131,6 +121,14 @@ PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME=	gtk20 libartlgpl2
+CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
+			--enable-gtk-cairo
+.endif
+
 .endif
 
 pre-everything::
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index dd905e8a54b..da5da363fe9 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -24,9 +24,6 @@ COMMENT?=	GNU Compiler Collection 4.3
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.endif
 
 SUFFIX=		43
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -36,9 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME=	gtk20 libartlgpl2
-.endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -46,10 +40,6 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502102
-CONFIGURE_ARGS+=	--disable-libgomp
-.endif
-
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
@@ -60,6 +50,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${OSVERSION} < 502102
+CONFIGURE_ARGS+=	--disable-libgomp
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
@@ -72,10 +66,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
-			--enable-gtk-cairo
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
@@ -131,6 +121,14 @@ PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME=	gtk20 libartlgpl2
+CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
+			--enable-gtk-cairo
+.endif
+
 .endif
 
 pre-everything::
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index dd905e8a54b..da5da363fe9 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -24,9 +24,6 @@ COMMENT?=	GNU Compiler Collection 4.3
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.endif
 
 SUFFIX=		43
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -36,9 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME=	gtk20 libartlgpl2
-.endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -46,10 +40,6 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502102
-CONFIGURE_ARGS+=	--disable-libgomp
-.endif
-
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
@@ -60,6 +50,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${OSVERSION} < 502102
+CONFIGURE_ARGS+=	--disable-libgomp
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
@@ -72,10 +66,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
-			--enable-gtk-cairo
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
@@ -131,6 +121,14 @@ PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME=	gtk20 libartlgpl2
+CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
+			--enable-gtk-cairo
+.endif
+
 .endif
 
 pre-everything::
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index dd905e8a54b..da5da363fe9 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -24,9 +24,6 @@ COMMENT?=	GNU Compiler Collection 4.3
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.endif
 
 SUFFIX=		43
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -36,9 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME=	gtk20 libartlgpl2
-.endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -46,10 +40,6 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502102
-CONFIGURE_ARGS+=	--disable-libgomp
-.endif
-
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
@@ -60,6 +50,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${OSVERSION} < 502102
+CONFIGURE_ARGS+=	--disable-libgomp
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
@@ -72,10 +66,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
-			--enable-gtk-cairo
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
@@ -131,6 +121,14 @@ PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME=	gtk20 libartlgpl2
+CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
+			--enable-gtk-cairo
+.endif
+
 .endif
 
 pre-everything::
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index dd905e8a54b..da5da363fe9 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -24,9 +24,6 @@ COMMENT?=	GNU Compiler Collection 4.3
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		mpfr.1:${PORTSDIR}/math/mpfr
-.if defined(WITH_JAVA_AWT)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-.endif
 
 SUFFIX=		43
 LATEST_LINK?=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -36,9 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
-.if defined(WITH_JAVA_AWT)
-USE_GNOME=	gtk20 libartlgpl2
-.endif
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -46,10 +40,6 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502102
-CONFIGURE_ARGS+=	--disable-libgomp
-.endif
-
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
@@ -60,6 +50,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+.if ${OSVERSION} < 502102
+CONFIGURE_ARGS+=	--disable-libgomp
+.endif
+
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
@@ -72,10 +66,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-.if defined(WITH_JAVA_AWT)
-CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
-			--enable-gtk-cairo
-.endif
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
@@ -131,6 +121,14 @@ PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
+
+.if defined(WITH_JAVA_AWT)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+USE_GNOME=	gtk20 libartlgpl2
+CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
+			--enable-gtk-cairo
+.endif
+
 .endif
 
 pre-everything::