diff options
| author | bf <bf@FreeBSD.org> | 2012-06-09 12:55:58 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2012-06-09 12:55:58 +0800 |
| commit | c37c774eb255e4154d6263f06609eb5a9dff0c41 (patch) | |
| tree | a1e6c0c9b6c48b8e646f7a4264009eca7f635ad7 /math | |
| parent | 9c4a97e9bf2474d46140c4b1e862c5464ccf06c1 (diff) | |
| download | freebsd-ports-gnome-c37c774eb255e4154d6263f06609eb5a9dff0c41.tar.gz freebsd-ports-gnome-c37c774eb255e4154d6263f06609eb5a9dff0c41.tar.zst freebsd-ports-gnome-c37c774eb255e4154d6263f06609eb5a9dff0c41.zip | |
add some CONFLICTS [1]; minor clean-up
Reported by: S.-M. Silber [1]
Diffstat (limited to 'math')
| -rw-r--r-- | math/atlas-devel/Makefile | 2 | ||||
| -rw-r--r-- | math/atlas/Makefile | 2 | ||||
| -rw-r--r-- | math/glpk/Makefile | 5 | ||||
| -rw-r--r-- | math/testu01/Makefile | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile index b9b46f32db7a..23996880a9fb 100644 --- a/math/atlas-devel/Makefile +++ b/math/atlas-devel/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/ATLAS USE_LDCONFIG= yes -CONFLICTS= atlas-[0-9]* +CONFLICTS= atlas-[0-9]* cblas-[0-9]* .include <bsd.port.pre.mk> diff --git a/math/atlas/Makefile b/math/atlas/Makefile index 3cc770cbd33a..ec5e8eb0703e 100644 --- a/math/atlas/Makefile +++ b/math/atlas/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/math/lapack:checksum USE_BZIP2= yes USE_FORTRAN= yes -CONFLICTS= atlas-devel-[0-9]* +CONFLICTS= atlas-devel-[0-9]* cblas-[0-9]* MANUAL_PACKAGE_BUILD= Optimizes for the local machine. OPTIONS= ARCHDEF "Use a specified architectural default" off \ diff --git a/math/glpk/Makefile b/math/glpk/Makefile index 51f40cf375a0..0dfbb2220f77 100644 --- a/math/glpk/Makefile +++ b/math/glpk/Makefile @@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= glpk MAINTAINER= bf@FreeBSD.org COMMENT= A GNU Linear Programming Kit -LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp - LICENSE= GPLv3 +LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp + OPTIONS= IODBC "Enable MathProg iodbc support" Off \ MYSQL "Enable MathProg mysql support" Off @@ -28,6 +28,7 @@ CFLAGS+= -trigraphs CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-gmp +CONFLICTS= goblin-[0-9]* .include <bsd.port.pre.mk> diff --git a/math/testu01/Makefile b/math/testu01/Makefile index f20a23f492f5..e95e52f5ab5b 100644 --- a/math/testu01/Makefile +++ b/math/testu01/Makefile @@ -29,6 +29,7 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes CFLAGS+= -fPIC PLIST_SUB= PORTNAME="${PORTNAME}" +CONFLICTS= emboss-[0-9]* post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure |