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

Collapse All | Expand All

(-)math/R.new/Makefile (-19 / +22 lines)
Lines 33-41 Link Here
33
			SED="${LOCALBASE}/bin/gsed" \
33
			SED="${LOCALBASE}/bin/gsed" \
34
			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
34
			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
35
35
36
OPTIONS_DEFINE=		MISSING DOCS
36
OPTIONS_DEFINE=		MISSING DOCS LTO OPENMP
37
37
38
MISSING_DESC=		use libmissing rather than libquadmath
38
MISSING_DESC=		use libmissing rather than libquadmath
39
LTO_DESC=               Try to produce faster code through LTO
40
LTO_CONFIGURE_ENABLE=   lto
41
OPENMP_CONFIGURE_ENABLE= openmp
42
43
OPTIONS_SINGLE=         BLAS
44
OPTIONS_SINGLE_BLAS= 	RBLAS ATLAS OPENBLAS NETLIB
45
OPTIONS_DEFAULT=     	OPENBLAS
46
47
RBLAS_DESC=          	Use internal blas implementation (slow!)
48
49
OPENBLAS_USES=  	blaslapack:openblas
50
NETLIB_USES=    	blaslapack:netlib
51
ATLAS_USES=     	blaslapack:atlas
52
RBLAS_CONFIGURE_ON= 	--without-blas --without-lapack
53
RBLAS_CONFIGURE_OFF= 	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
54
                        --with-lapack="${LAPACKLIB}"
55
56
OPTIONS_SUB=            RBLAS
39
57
40
.if defined(LIBRMATH_SLAVEPORT)
58
.if defined(LIBRMATH_SLAVEPORT)
41
BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
59
BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
Lines 56-64 Link Here
56
CPPFLAGS+=		-I${LOCALBASE}/include
74
CPPFLAGS+=		-I${LOCALBASE}/include
57
LDFLAGS+=		-L${LOCALBASE}/lib
75
LDFLAGS+=		-L${LOCALBASE}/lib
58
76
59
OPTIONS_DEFINE+=	ATLAS ICU PCRE_PORT THREADS
77
OPTIONS_DEFINE+=	ICU PCRE_PORT THREADS
60
78
61
ATLAS_DESC=		Use ATLAS instead of BLAS/LAPACK
62
ICU_DESC=		Use ICU for collation in multibyte locales
79
ICU_DESC=		Use ICU for collation in multibyte locales
63
PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
80
PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
64
81
Lines 84-91 Link Here
84
TCLTK_DESC=		tcltk package
101
TCLTK_DESC=		tcltk package
85
X11_DESC=		X11() graphics device
102
X11_DESC=		X11() graphics device
86
103
87
OPTIONS_DEFAULT+=	GHOSTSCRIPT INFO_MANUALS JPEG LIBR PANGOCAIRO PNG \
104
OPTIONS_DEFAULT+=       GHOSTSCRIPT INFO_MANUALS JPEG LIBR LTO OPENMP \
88
			TCLTK TIFF X11
105
			PANGOCAIRO PNG TCLTK TIFF X11
89
106
90
OPTIONS_DEFAULT_armv6+=		MISSING
107
OPTIONS_DEFAULT_armv6+=		MISSING
91
OPTIONS_DEFAULT_powerpc+=	MISSING
108
OPTIONS_DEFAULT_powerpc+=	MISSING
Lines 143-162 Link Here
143
.endif
160
.endif
144
161
145
.if !defined(LIBRMATH_SLAVEPORT)
162
.if !defined(LIBRMATH_SLAVEPORT)
146
.if ${PORT_OPTIONS:MATLAS}
147
LIB_DEPENDS+=		libatlas.so:${PORTSDIR}/math/atlas
148
BLAS?=			${LIBM} -lf77blas
149
LAPACK?=		${LIBM} -lalapack -lcblas
150
.else
151
BLAS?=			no
152
LAPACK?=		no
153
.endif
154
CONFIGURE_ARGS+=	--with-blas="${BLAS}" --with-lapack="${LAPACK}"
155
.if ${BLAS} == "no" || ${LAPACK} == "no"
156
PLIST_SUB+=		LAPACK=""
157
.else
158
PLIST_SUB+=		LAPACK="@comment "
159
.endif
160
163
161
.if ${PORT_OPTIONS:MICU}
164
.if ${PORT_OPTIONS:MICU}
162
LIB_DEPENDS+=		libicui18n.so:${PORTSDIR}/devel/icu
165
LIB_DEPENDS+=		libicui18n.so:${PORTSDIR}/devel/icu
(-)math/R.new/pkg-plist (-4 / +4 lines)
Lines 100-109 Link Here
100
lib/R/include/Rmath.h
100
lib/R/include/Rmath.h
101
lib/R/include/Rversion.h
101
lib/R/include/Rversion.h
102
lib/R/include/S.h
102
lib/R/include/S.h
103
%%LAPACK%%lib/R/lib/libRblas.so
103
%%RBLAS%%lib/R/lib/libRblas.so
104
%%LAPACK%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
104
%%RBLAS%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
105
%%LAPACK%%lib/R/lib/libRlapack.so
105
%%RBLAS%%lib/R/lib/libRlapack.so
106
%%LAPACK%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
106
%%RBLAS%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
107
%%LIBR%%lib/R/lib/libR.so
107
%%LIBR%%lib/R/lib/libR.so
108
%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
108
%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
109
lib/R/library/KernSmooth/DESCRIPTION
109
lib/R/library/KernSmooth/DESCRIPTION

Return to bug 207425