diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-01-15 23:55:11 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-01-15 23:55:11 +0000 |
| commit | 04b41b2d650abcabeceb853c1596d740c78416a0 (patch) | |
| tree | 19029ef9c3a033b14a81fbb737ad6618ed7c9389 /math | |
| parent | update to 1.1 (diff) | |
Fix CONFLICT line.
Submitted by: thierry
Notes
Notes:
svn path=/head/; revision=182465
Diffstat (limited to 'math')
| -rw-r--r-- | math/suitesparse/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index 50913a9fb483..463595b832aa 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -32,7 +32,7 @@ BLAS= -L${LOCALBASE}/lib -lblas LAPACK= -L${LOCALBASE}/lib -llapack .endif -CONFLICTS= elmer-umfpack-4* +CONFLICTS= elmer-umfpack-4* umfpack-* .include <bsd.port.pre.mk> @@ -42,8 +42,6 @@ FPIC= -fPIC FPIC= -fpic .endif -CONFLICTS= umfpack-* - USE_LDCONFIG= yes USE_GMAKE= yes WANT_FORTRAN= yes #dummy but future use |