diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2006-04-17 10:36:35 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2006-04-17 10:36:35 +0000 |
| commit | 3a1b96c6d2569874084b669f789be1b5e96bd24b (patch) | |
| tree | 7d83b6f5d393eb4a430add645faff97378b8fcb5 /lang/gcc41 | |
| parent | Update to 0.3401 (diff) | |
Conflict with gcc-4.2.*, not this port in case we build Java.
Diffstat (limited to 'lang/gcc41')
| -rw-r--r-- | lang/gcc41/Makefile | 2 |
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 |