View | Details | Raw Unified | Return to bug 210579 | Differences between
and this patch

Collapse All | Expand All

(-)math/suitesparse/Makefile (-37 / +22 lines)
Lines 2-21 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	suitesparse
4
PORTNAME=	suitesparse
5
PORTVERSION=	4.0.2
5
PORTVERSION=	4.5.4
6
PORTREVISION=	7
7
CATEGORIES=	math
6
CATEGORIES=	math
8
MASTER_SITES=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
7
MASTER_SITES=	http://faculty.cse.tamu.edu/davis/SuiteSparse/
9
DISTNAME=	SuiteSparse-${PORTVERSION}
8
DISTNAME=	SuiteSparse-${PORTVERSION}
10
9
11
MAINTAINER=	maho@FreeBSD.org
10
MAINTAINER=	yuri@rawbw.com
12
COMMENT=	SuiteSparse is a set of packages for sparse matrices calculation
11
COMMENT=	SuiteSparse is a set of packages for sparse matrices calculation
13
12
14
LICENSE=	GPLv2 LGPL21
13
LICENSE=	GPLv2 LGPL21
15
LICENSE_COMB=	multi
14
LICENSE_COMB=	dual
16
15
17
USES=		fortran gmake
16
LIB_DEPENDS=	libmetis.so:math/metis \
17
		liblapack.so:math/lapack
18
18
19
USES=		compiler:openmp fortran gmake
20
19
OPTIONS_RADIO=	BLAS
21
OPTIONS_RADIO=	BLAS
20
OPTIONS_RADIO_BLAS=	OPENBLAS NETLIB ATLAS
22
OPTIONS_RADIO_BLAS=	OPENBLAS NETLIB ATLAS
21
OPTIONS_DEFAULT=	OPENBLAS
23
OPTIONS_DEFAULT=	OPENBLAS
Lines 24-39 Link Here
24
NETLIB_USES=	blaslapack:netlib
26
NETLIB_USES=	blaslapack:netlib
25
ATLAS_USES=	blaslapack:atlas
27
ATLAS_USES=	blaslapack:atlas
26
28
27
.if defined (WITH_METIS)
28
LIB_DEPENDS=	libmetis.so:math/metis4
29
30
RESTRICTED=	GPL and METIS licenses are contradictory
29
RESTRICTED=	GPL and METIS licenses are contradictory
31
.endif
30
CONFLICTS=	umfpack-[0-9]*
32
31
33
CONFLICTS=	umfpack-*
34
35
LDFLAGS+=	-L${LOCALBASE}/lib
36
37
.include <bsd.port.options.mk>
32
.include <bsd.port.options.mk>
38
33
39
.if ${ARCH} == "sparc64"
34
.if ${ARCH} == "sparc64"
Lines 45-63 Link Here
45
USE_LDCONFIG=	yes
40
USE_LDCONFIG=	yes
46
WRKSRC=${WRKDIR}/SuiteSparse
41
WRKSRC=${WRKDIR}/SuiteSparse
47
WRKSRC_SHARED=${WRKSRC}_shared
42
WRKSRC_SHARED=${WRKSRC}_shared
48
SVERSION=1
49
43
50
.if defined (WITH_METIS)
51
METIS=${LOCALBASE}/lib/libmetis.a
44
METIS=${LOCALBASE}/lib/libmetis.a
52
METIS_PATH=${LOCALBASE}/include/metis
45
METIS_PATH=${LOCALBASE}/include/metis
53
CHOLMOD_CONFIG=
46
CHOLMOD_CONFIG=
54
.else
47
CFLAGS+=-I${LOCALBASE}/include
55
CHOLMOD_CONFIG=		-DNPARTITION
48
CXXFLAGS+=-I${LOCALBASE}/include
56
.endif
49
MAKE_ARGS+=MY_METIS_LIB="-L${LOCALBASE}/lib -lmetis $(LDFLAGS)"
57
50
58
post-patch:
51
post-patch:
52
	@${RM} -r ${WRKSRC}/metis-5.1.0 ${WRKSRC}_shared/metis-5.1.0
59
	@${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \
53
	@${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \
60
	${REINPLACE_CMD} -e '\|^AR =|s|ar|${AR}|' \
54
	${REINPLACE_CMD} -i '' \
55
			-e '\|^AR =|s|ar|${AR}|' \
61
			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \
56
			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \
62
			-e '\|^CC =|d' \
57
			-e '\|^CC =|d' \
63
			-e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
58
			-e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
Lines 79-107 Link Here
79
74
80
do-build:
75
do-build:
81
	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \
76
	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \
82
		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
77
		LD_LIBRARY_PATH=${WRKDIR}/SuiteSparse/lib ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
83
	@cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \
78
	@cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \
84
		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
79
		LD_LIBRARY_PATH=${WRKDIR}/SuiteSparse/lib ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
85
80
86
post-build:
87
	@for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
88
		j=$${i##*/} ; ${LD} -Bshareable -o $${i%.a}.so.${SVERSION} -x \
89
		-soname $${j%.a}.so.${SVERSION} --whole-archive $${i} ; \
90
	done
91
92
do-install:
81
do-install:
93
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/suitesparse
82
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/suitesparse
94
	@${LN} -sf ${PREFIX}/include/suitesparse ${STAGEDIR}${PREFIX}/include/ufsparse
83
	@${LN} -sf ${PREFIX}/include/suitesparse ${STAGEDIR}${PREFIX}/include/ufsparse
95
.for d in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU SPQR UMFPACK
84
.for d in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU SPQR UMFPACK
96
	@${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${STAGEDIR}${PREFIX}/include/suitesparse
85
	${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${STAGEDIR}${PREFIX}/include/suitesparse
97
.endfor
86
.endfor
98
	@${INSTALL_DATA} ${WRKSRC}/SuiteSparse_config/SuiteSparse_config.h ${STAGEDIR}${PREFIX}/include/suitesparse
87
	${INSTALL_DATA} ${WRKSRC}/SuiteSparse_config/SuiteSparse_config.h ${STAGEDIR}${PREFIX}/include/suitesparse
99
	@${INSTALL_DATA} ${WRKSRC}/UMFPACK/Source/umf_config.h ${STAGEDIR}${PREFIX}/include/suitesparse
88
	${INSTALL_DATA} ${WRKSRC}/UMFPACK/Source/umf_config.h ${STAGEDIR}${PREFIX}/include/suitesparse
100
	@${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${STAGEDIR}${PREFIX}/include/suitesparse
89
	${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${STAGEDIR}${PREFIX}/include/suitesparse
101
	@for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
90
	${INSTALL_DATA} ${WRKSRC_SHARED}/lib/*.so* ${STAGEDIR}${PREFIX}/lib/
102
		${INSTALL_DATA} ${WRKSRC}/$${i##${WRKSRC_SHARED}/} \
103
		$${i%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib ; \
104
		j=$${i##*/} ;  ${LN} -sf $${j%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/$${j%.a}.so ; \
105
	done
106
91
107
.include <bsd.port.mk>
92
.include <bsd.port.mk>
(-)math/suitesparse/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (SuiteSparse-4.0.2.tar.gz) = 93b5928987fe010808b3fdff3e7edef42fb2d8cfd65b09dd6d4c41756acb0050
1
TIMESTAMP = 1498313954
2
SIZE (SuiteSparse-4.0.2.tar.gz) = 22421100
2
SHA256 (SuiteSparse-4.5.4.tar.gz) = 698b5c455645bb1ad29a185f0d52025f3bd7cb7261e182c8878b0eb60567a714
3
SIZE (SuiteSparse-4.5.4.tar.gz) = 30309663
(-)math/suitesparse/pkg-descr (-1 / +1 lines)
Lines 12-15 Link Here
12
    * CSparse: a concise sparse matrix package
12
    * CSparse: a concise sparse matrix package
13
    * CXSparse: and extended version of CSparse
13
    * CXSparse: and extended version of CSparse
14
14
15
WWW: http://www.cise.ufl.edu/research/sparse/SuiteSparse/
15
WWW: http://faculty.cse.tamu.edu/davis/suitesparse.html
(-)math/suitesparse/pkg-plist (-32 / +31 lines)
Lines 1-7 Link Here
1
include/suitesparse/SuiteSparse_config.h
2
include/suitesparse/SuiteSparseQR.hpp
1
include/suitesparse/SuiteSparseQR.hpp
3
include/suitesparse/SuiteSparseQR_C.h
2
include/suitesparse/SuiteSparseQR_C.h
4
include/suitesparse/SuiteSparseQR_definitions.h
3
include/suitesparse/SuiteSparseQR_definitions.h
4
include/suitesparse/SuiteSparse_config.h
5
include/suitesparse/amd.h
5
include/suitesparse/amd.h
6
include/suitesparse/amd_internal.h
6
include/suitesparse/amd_internal.h
7
include/suitesparse/btf.h
7
include/suitesparse/btf.h
Lines 11-21 Link Here
11
include/suitesparse/ccolamd.h
11
include/suitesparse/ccolamd.h
12
include/suitesparse/cholmod.h
12
include/suitesparse/cholmod.h
13
include/suitesparse/cholmod_blas.h
13
include/suitesparse/cholmod_blas.h
14
include/suitesparse/cholmod_camd.h
14
include/suitesparse/cholmod_check.h
15
include/suitesparse/cholmod_check.h
15
include/suitesparse/cholmod_cholesky.h
16
include/suitesparse/cholmod_cholesky.h
16
include/suitesparse/cholmod_complexity.h
17
include/suitesparse/cholmod_complexity.h
17
include/suitesparse/cholmod_config.h
18
include/suitesparse/cholmod_config.h
18
include/suitesparse/cholmod_core.h
19
include/suitesparse/cholmod_core.h
20
include/suitesparse/cholmod_function.h
21
include/suitesparse/cholmod_gpu.h
22
include/suitesparse/cholmod_gpu_kernels.h
19
include/suitesparse/cholmod_internal.h
23
include/suitesparse/cholmod_internal.h
20
include/suitesparse/cholmod_io64.h
24
include/suitesparse/cholmod_io64.h
21
include/suitesparse/cholmod_matrixops.h
25
include/suitesparse/cholmod_matrixops.h
Lines 29-34 Link Here
29
include/suitesparse/klu_internal.h
33
include/suitesparse/klu_internal.h
30
include/suitesparse/klu_version.h
34
include/suitesparse/klu_version.h
31
include/suitesparse/spqr.hpp
35
include/suitesparse/spqr.hpp
36
include/suitesparse/spqrgpu.hpp
37
include/suitesparse/umf_config.h
32
include/suitesparse/umfpack.h
38
include/suitesparse/umfpack.h
33
include/suitesparse/umfpack_col_to_triplet.h
39
include/suitesparse/umfpack_col_to_triplet.h
34
include/suitesparse/umfpack_defaults.h
40
include/suitesparse/umfpack_defaults.h
Lines 62-111 Link Here
62
include/suitesparse/umfpack_transpose.h
68
include/suitesparse/umfpack_transpose.h
63
include/suitesparse/umfpack_triplet_to_col.h
69
include/suitesparse/umfpack_triplet_to_col.h
64
include/suitesparse/umfpack_wsolve.h
70
include/suitesparse/umfpack_wsolve.h
65
include/suitesparse/umf_config.h
66
include/ufsparse
71
include/ufsparse
67
lib/libamd.a
68
lib/libamd.so
72
lib/libamd.so
69
lib/libamd.so.1
73
lib/libamd.so.2
70
lib/libbtf.a
74
lib/libamd.so.2.4.6
71
lib/libbtf.so
75
lib/libbtf.so
72
lib/libbtf.so.1
76
lib/libbtf.so.1
73
lib/libcamd.a
77
lib/libbtf.so.1.2.6
74
lib/libcamd.so
78
lib/libcamd.so
75
lib/libcamd.so.1
79
lib/libcamd.so.2
76
lib/libccolamd.a
80
lib/libcamd.so.2.4.6
77
lib/libccolamd.so
81
lib/libccolamd.so
78
lib/libccolamd.so.1
82
lib/libccolamd.so.2
79
lib/libcerbla.a
83
lib/libccolamd.so.2.9.6
80
lib/libcerbla.so
81
lib/libcerbla.so.1
82
lib/libcholmod.a
83
lib/libcholmod.so
84
lib/libcholmod.so
84
lib/libcholmod.so.1
85
lib/libcholmod.so.3
85
lib/libcolamd.a
86
lib/libcholmod.so.3.0.11
86
lib/libcolamd.so
87
lib/libcolamd.so
87
lib/libcolamd.so.1
88
lib/libcolamd.so.2
88
lib/libcsparse.a
89
lib/libcolamd.so.2.9.6
89
lib/libcsparse.so
90
lib/libcsparse.so.1
91
lib/libcxsparse.a
92
lib/libcxsparse.so
90
lib/libcxsparse.so
93
lib/libcxsparse.so.1
91
lib/libcxsparse.so.3
94
lib/libklu.a
92
lib/libcxsparse.so.3.1.9
95
lib/libklu.so
93
lib/libklu.so
96
lib/libklu.so.1
94
lib/libklu.so.1
97
lib/libldl.a
95
lib/libklu.so.1.3.8
98
lib/libldl.so
96
lib/libldl.so
99
lib/libldl.so.1
97
lib/libldl.so.2
100
lib/librbio.a
98
lib/libldl.so.2.2.6
101
lib/librbio.so
99
lib/librbio.so
102
lib/librbio.so.1
100
lib/librbio.so.2
103
lib/libspqr.a
101
lib/librbio.so.2.2.6
104
lib/libspqr.so
102
lib/libspqr.so
105
lib/libspqr.so.1
103
lib/libspqr.so.2
106
lib/libsuitesparseconfig.a
104
lib/libspqr.so.2.0.8
107
lib/libsuitesparseconfig.so
105
lib/libsuitesparseconfig.so
108
lib/libsuitesparseconfig.so.1
106
lib/libsuitesparseconfig.so.4
109
lib/libumfpack.a
107
lib/libsuitesparseconfig.so.4.5.4
110
lib/libumfpack.so
108
lib/libumfpack.so
111
lib/libumfpack.so.1
109
lib/libumfpack.so.5
110
lib/libumfpack.so.5.7.6

Return to bug 210579