From 87c6c51c2ae107dc2da4b4626990911624290280 Mon Sep 17 00:00:00 2001 From: gerald Date: Mon, 17 Apr 2006 10:36:35 +0000 Subject: Conflict with gcc-4.2.*, not this port in case we build Java. --- lang/gcc41/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lang') diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index 170ae8647aa..e768e1a2892 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -99,7 +99,7 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS= gcc-4.1.* +CONFLICTS= gcc-4.2.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} EXTRA_PATCHES= ${FILESDIR}/java-patch-hier # FIXME: we are currently getting weird build failures with libjava on -- cgit