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

Collapse All | Expand All

(-)math/suitesparse/Makefile (-16 / +19 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	suitesparse
4
PORTNAME=	suitesparse
5
PORTVERSION=	4.0.2
5
PORTVERSION=	4.4.6
6
PORTREVISION=	4
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=	maho@FreeBSD.org
Lines 46-51 Link Here
46
WRKSRC=${WRKDIR}/SuiteSparse
45
WRKSRC=${WRKDIR}/SuiteSparse
47
WRKSRC_SHARED=${WRKSRC}_shared
46
WRKSRC_SHARED=${WRKSRC}_shared
48
SVERSION=1
47
SVERSION=1
48
# random failures in multi-cpu build reported upstream
49
MAKE_JOBS_NUMBER=1
49
50
50
.if defined (WITH_METIS)
51
.if defined (WITH_METIS)
51
METIS=${LOCALBASE}/lib/libmetis.a
52
METIS=${LOCALBASE}/lib/libmetis.a
Lines 57-76 Link Here
57
58
58
post-patch:
59
post-patch:
59
	@${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \
60
	@${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \
60
	${REINPLACE_CMD} -e '\|^AR =|s|ar|${AR}|' \
61
	${REINPLACE_CMD} -i '' -E \
61
			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \
62
			-e '\|^[[:space:]]*AR =|s|ar|${AR}|' \
62
			-e '\|^CC =|d' \
63
			-e '\|^[[:space:]]*BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \
63
			-e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
64
			-e '\|^[[:space:]]*CC =|d' \
64
			-e '\|^CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
65
			-e '\|^[[:space:]]*CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
65
			-e '\|^CPLUSPLUS =|s|=.*|= ${CXX}|' \
66
			-e '\|^[[:space:]]*CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
66
			-e '\|^F77 =|d' \
67
			-e '\|^[[:space:]]*CPLUSPLUS =|s|=.*|= ${CXX}|' \
67
			-e '\|^F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
68
			-e '\|^[[:space:]]*F77 =|d' \
68
			-e '\|^LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACKLIB}|' \
69
			-e '\|^[[:space:]]*F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
69
			-e '\|^METIS =|s|=.*|= ${METIS}|' \
70
			-e '\|^[[:space:]]*LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACKLIB}|' \
70
			-e '\|^METIS_PATH =|s|=.*|= ${METIS_PATH}|' \
71
			-e '\|^[[:space:]]*METIS =|s|=.*|= ${METIS}|' \
72
			-e '\|^[[:space:]]*METIS_PATH =|s|=.*|= ${METIS_PATH}|' \
71
			-e 's|-I\$$(METIS_PATH)/Lib|-I${METIS_PATH}|' \
73
			-e 's|-I\$$(METIS_PATH)/Lib|-I${METIS_PATH}|' \
72
			-e '\|^RANLIB =|s|ranlib|${RANLIB}|' \
74
			-e '\|^[[:space:]]*RANLIB =|s|ranlib|${RANLIB}|' \
73
			-e '\|^SPQR_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
75
			-e '\|^[[:space:]]*SPQR_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
74
			-e 's|# MAKE = gmake|MAKE = gmake|g' \
76
			-e 's|# MAKE = gmake|MAKE = gmake|g' \
75
			-e 's|/usr/local|${LOCALBASE}|g'
77
			-e 's|/usr/local|${LOCALBASE}|g'
76
	@${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
78
	@${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
Lines 103-107 Link Here
103
		$${i%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib ; \
105
		$${i%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib ; \
104
		j=$${i##*/} ;  ${LN} -sf $${j%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/$${j%.a}.so ; \
106
		j=$${i##*/} ;  ${LN} -sf $${j%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/$${j%.a}.so ; \
105
	done
107
	done
108
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.1
106
109
107
.include <bsd.port.mk>
110
.include <bsd.port.mk>
(-)math/suitesparse/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (SuiteSparse-4.0.2.tar.gz) = 93b5928987fe010808b3fdff3e7edef42fb2d8cfd65b09dd6d4c41756acb0050
1
SHA256 (SuiteSparse-4.4.6.tar.gz) = 7f22509d87ada8506580d537efde79cf90e28e228355c18b8bf603aad1a2d7b6
2
SIZE (SuiteSparse-4.0.2.tar.gz) = 22421100
2
SIZE (SuiteSparse-4.4.6.tar.gz) = 25627898
(-)math/suitesparse/pkg-plist (-2 / +7 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-68 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
72
lib/libamd.a
68
lib/libamd.so
73
lib/libamd.so

Return to bug 205606