diff options
author | maho <maho@FreeBSD.org> | 2007-01-16 10:12:37 +0800 |
---|---|---|
committer | maho <maho@FreeBSD.org> | 2007-01-16 10:12:37 +0800 |
commit | a2551b04bc2af6a52a6695eccd899e848300bb4f (patch) | |
tree | 7417d99a040fd49cdafebb0237e8b2978f52526b /math | |
parent | 1e66ac1d2dd716512f5255f16482df983b0b4cd2 (diff) | |
download | freebsd-ports-gnome-a2551b04bc2af6a52a6695eccd899e848300bb4f.tar.gz freebsd-ports-gnome-a2551b04bc2af6a52a6695eccd899e848300bb4f.tar.zst freebsd-ports-gnome-a2551b04bc2af6a52a6695eccd899e848300bb4f.zip |
Remove CONFLICT line by installing in a slightly different name.
Diffstat (limited to 'math')
-rw-r--r-- | math/elmer-umfpack/Makefile | 10 | ||||
-rw-r--r-- | math/elmer-umfpack/pkg-plist | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/math/elmer-umfpack/Makefile b/math/elmer-umfpack/Makefile index b1216def04bb..4e04710d1a91 100644 --- a/math/elmer-umfpack/Makefile +++ b/math/elmer-umfpack/Makefile @@ -7,6 +7,7 @@ PORTNAME= umfpack PORTVERSION= 4.4 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= math MASTER_SITES= ftp://ftp.funet.fi/pub/sci/physics/elmer/ @@ -15,8 +16,6 @@ PKGNAMEPREFIX= elmer- MAINTAINER= ports@FreeBSD.org COMMENT= UMFPACK library used by ELMER FEM package -CONFLICTS= umfpack-[0-9].[0-9]* suitesparse-[0-9].[0-9]* - WANT_FORTRAN=yes #dummy but future use BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 FC= gfortran42 @@ -34,4 +33,11 @@ CFLAGS+= -DGETRUSAGE CFLAGS+= -fPIC .endif +do-install: + ${INSTALL_DATA} ${WRKSRC}/src/amd/include/amd.h ${PREFIX}/include/amd_elmer.h + ${INSTALL_DATA} ${WRKSRC}/src/umfpack/include/umfpack.h ${PREFIX}/include/umfpack_elmer.h + ${INSTALL_DATA} ${WRKSRC}/src/amd/libamd.a ${PREFIX}/lib/libamd_elmer.a + ${INSTALL_DATA} ${WRKSRC}/src/amd/libamdf77.a ${PREFIX}/lib/libamdf77_elmer.a + ${INSTALL_DATA} ${WRKSRC}/src/umfpack/libumfpack.a ${PREFIX}/lib/libumfpack_elmer.a + .include <bsd.port.post.mk> diff --git a/math/elmer-umfpack/pkg-plist b/math/elmer-umfpack/pkg-plist index 8203578a7668..f23d8c4309de 100644 --- a/math/elmer-umfpack/pkg-plist +++ b/math/elmer-umfpack/pkg-plist @@ -1,5 +1,5 @@ -include/amd.h -include/umfpack.h -lib/libamd.a -lib/libamdf77.a -lib/libumfpack.a +include/amd_elmer.h +include/umfpack_elmer.h +lib/libamd_elmer.a +lib/libamdf77_elmer.a +lib/libumfpack_elmer.a |