diff options
| author | gerald <gerald@FreeBSD.org> | 2006-09-03 03:03:08 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2006-09-03 03:03:08 +0800 |
| commit | 11204456a11f954f98a218c39e89c372fd0ede4c (patch) | |
| tree | 1d09c24349a37b2a8b2ae614bf533693ce37200d | |
| parent | 1f0166fe6e323076a699cade653247e104f89c09 (diff) | |
| download | freebsd-ports-gnome-11204456a11f954f98a218c39e89c372fd0ede4c.tar.gz freebsd-ports-gnome-11204456a11f954f98a218c39e89c372fd0ede4c.tar.zst freebsd-ports-gnome-11204456a11f954f98a218c39e89c372fd0ede4c.zip | |
lang/gfortran conflicts with lang/gcc41.
| -rw-r--r-- | lang/gcc41/Makefile | 2 | ||||
| -rw-r--r-- | lang/gfortran/Makefile | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index 55cb2059b8eb..e137fc8f36f8 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.2.* +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 diff --git a/lang/gfortran/Makefile b/lang/gfortran/Makefile index 5142a553ec34..93b342f20ced 100644 --- a/lang/gfortran/Makefile +++ b/lang/gfortran/Makefile @@ -7,10 +7,14 @@ # MASTERDIR= ${.CURDIR}/../gcc41 -PKGNAMESUFFIX= -withfortran WITH_FORTRAN= yes +PKGNAMESUFFIX= -withfortran + +MAINTAINER= gerald@FreeBSD.org DESCR= ${.CURDIR}/pkg-descr PKGMESSAGE= ${.CURDIR}/pkg-message +CONFLICTS= gcc-4.1.* + .include "${MASTERDIR}/Makefile" |