aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2006-04-17 10:36:35 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2006-04-17 10:36:35 +0000
commit3a1b96c6d2569874084b669f789be1b5e96bd24b (patch)
tree7d83b6f5d393eb4a430add645faff97378b8fcb5 /lang
parente5366e56dd73acbadf900120c91a1c06d04b5ede (diff)
downloadports-3a1b96c6d2569874084b669f789be1b5e96bd24b.tar.gz
ports-3a1b96c6d2569874084b669f789be1b5e96bd24b.zip
Notes
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc41/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 170ae8647aa3..e768e1a2892a 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