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

Collapse All | Expand All

(-)math/R/Makefile (-24 / +37 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME?=	R
4
PORTNAME?=	R
5
PORTVERSION=	3.3.0
5
PORTVERSION=	3.3.0
6
PORTREVISION=   1
6
CATEGORIES=	math lang
7
CATEGORIES=	math lang
7
MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
8
MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
8
		ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
9
		ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
Lines 34-42 Link Here
34
			SED="${LOCALBASE}/bin/gsed" \
35
			SED="${LOCALBASE}/bin/gsed" \
35
			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
36
			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
36
37
37
OPTIONS_DEFINE=		MISSING DOCS
38
OPTIONS_DEFINE=		MISSING DOCS LTO OPENMP LONGDOUBLE
39
38
40
39
MISSING_DESC=		use libmissing rather than libquadmath
41
MISSING_DESC=		use libmissing rather than libquadmath
42
LTO_DESC=               Try to produce faster code through LTO
43
LONGDOUBLE_DESC=	Enable use of long double data type
44
LTO_CONFIGURE_ENABLE=   lto
45
OPENMP_CONFIGURE_ENABLE= openmp
46
LONGDOUBLE_CONFIGURE_ENABLE= long-double
47
48
OPTIONS_SINGLE=         BLAS
49
OPTIONS_SINGLE_BLAS= 	RBLAS ATLAS OPENBLAS NETLIB
50
OPTIONS_DEFAULT=     	OPENBLAS
51
52
RBLAS_DESC=          	Use internal blas implementation
53
54
OPENBLAS_USES=  	blaslapack:openblas
55
NETLIB_USES=    	blaslapack:netlib
56
ATLAS_USES=     	blaslapack:atlas
57
RBLAS_CONFIGURE_ON= 	--without-blas --without-lapack
58
RBLAS_CONFIGURE_OFF= 	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
59
                        --with-lapack="${LAPACKLIB}"
60
61
OPTIONS_SUB=            RBLAS
40
62
41
.if defined(LIBRMATH_SLAVEPORT)
63
.if defined(LIBRMATH_SLAVEPORT)
42
BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
64
BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
Lines 57-65 Link Here
57
CPPFLAGS+=		-I${LOCALBASE}/include
79
CPPFLAGS+=		-I${LOCALBASE}/include
58
LDFLAGS+=		-L${LOCALBASE}/lib
80
LDFLAGS+=		-L${LOCALBASE}/lib
59
81
60
OPTIONS_DEFINE+=	ATLAS ICU PCRE_PORT THREADS
82
OPTIONS_DEFINE+=	ICU PCRE_PORT THREADS
61
83
62
ATLAS_DESC=		Use ATLAS instead of BLAS/LAPACK
63
ICU_DESC=		Use ICU for collation in multibyte locales
84
ICU_DESC=		Use ICU for collation in multibyte locales
64
PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
85
PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
65
86
Lines 85-92 Link Here
85
TCLTK_DESC=		tcltk package
106
TCLTK_DESC=		tcltk package
86
X11_DESC=		X11() graphics device
107
X11_DESC=		X11() graphics device
87
108
88
OPTIONS_DEFAULT+=	GHOSTSCRIPT INFO_MANUALS JPEG LIBR PANGOCAIRO PNG \
109
OPTIONS_DEFAULT+=       GHOSTSCRIPT INFO_MANUALS JPEG LTO OPENMP \
89
			TCLTK TIFF X11
110
			PANGOCAIRO PNG TCLTK TIFF X11
90
111
91
OPTIONS_DEFAULT_armv6+=		MISSING
112
OPTIONS_DEFAULT_armv6+=		MISSING
92
OPTIONS_DEFAULT_powerpc+=	MISSING
113
OPTIONS_DEFAULT_powerpc+=	MISSING
Lines 144-163 Link Here
144
.endif
165
.endif
145
166
146
.if !defined(LIBRMATH_SLAVEPORT)
167
.if !defined(LIBRMATH_SLAVEPORT)
147
.if ${PORT_OPTIONS:MATLAS}
148
LIB_DEPENDS+=		libatlas.so:math/atlas
149
BLAS?=			${LIBM} -lf77blas
150
LAPACK?=		${LIBM} -lalapack -lcblas
151
.else
152
BLAS?=			no
153
LAPACK?=		no
154
.endif
155
CONFIGURE_ARGS+=	--with-blas="${BLAS}" --with-lapack="${LAPACK}"
156
.if ${BLAS} == "no" || ${LAPACK} == "no"
157
PLIST_SUB+=		LAPACK=""
158
.else
159
PLIST_SUB+=		LAPACK="@comment "
160
.endif
161
168
162
.if ${PORT_OPTIONS:MICU}
169
.if ${PORT_OPTIONS:MICU}
163
LIB_DEPENDS+=		libicui18n.so:devel/icu
170
LIB_DEPENDS+=		libicui18n.so:devel/icu
Lines 218-224 Link Here
218
225
219
.if ${PORT_OPTIONS:MPANGOCAIRO}
226
.if ${PORT_OPTIONS:MPANGOCAIRO}
220
USES+=			pkgconfig
227
USES+=			pkgconfig
221
USE_GNOME+=		pango
228
USE_GNOME+=		pango cairo
222
PLIST_SUB+=		PANGOCAIRO=""
229
PLIST_SUB+=		PANGOCAIRO=""
223
.else
230
.else
224
CONFIGURE_ARGS+=	--without-cairo
231
CONFIGURE_ARGS+=	--without-cairo
Lines 252-258 Link Here
252
259
253
.if ${PORT_OPTIONS:MX11}
260
.if ${PORT_OPTIONS:MX11}
254
CONFIGURE_ARGS+=	--with-x
261
CONFIGURE_ARGS+=	--with-x
255
USE_XORG=		x11 xmu xt
262
USE_XORG=		ice sm x11 xext xmu xscrnsaver xt
256
PLIST_SUB+=		X11=""
263
PLIST_SUB+=		X11=""
257
.else
264
.else
258
CONFIGURE_ARGS+=	--without-x
265
CONFIGURE_ARGS+=	--without-x
Lines 290-296 Link Here
290
.if !${PORT_OPTIONS:MMISSING}
297
.if !${PORT_OPTIONS:MMISSING}
291
.if ${OSVERSION} < 1000016
298
.if ${OSVERSION} < 1000016
292
	@${REINPLACE_CMD} -e 's/# define EXP expl/# define EXP(x) (long double)expq((__float128)(x))/' \
299
	@${REINPLACE_CMD} -e 's/# define EXP expl/# define EXP(x) (long double)expq((__float128)(x))/' \
293
		${WRKSRC}/src/nmath/pnchisq.c
300
		${WRKSRC}/src/nmath/pnchisq.c\
301
		${WRKSRC}/src/nmath/pgamma.c
302
	@${REINPLACE_CMD} -e 's/# define LOG logl/# define LOG(x) (long double)logq((__float128)(x))/' \
303
		${WRKSRC}/src/nmath/pnchisq.c\
304
		${WRKSRC}/src/nmath/pgamma.c
305
294
.endif
306
.endif
295
.if ${OSVERSION} < 1000034
307
.if ${OSVERSION} < 1000034
296
	@${REINPLACE_CMD} -Ee 's/(log)(1p)?l\(/(long double)\1\2q((__float128)/' \
308
	@${REINPLACE_CMD} -Ee 's/(log)(1p)?l\(/(long double)\1\2q((__float128)/' \
Lines 369-376 Link Here
369
381
370
post-install:
382
post-install:
371
.for L in R Rblas Rlapack
383
.for L in R Rblas Rlapack
372
	@(cd ${STAGEDIR}${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \
384
	@if [ -d ${STAGEDIR}${PREFIX}/lib/R/lib ] ; then \
373
	${LN} -sf lib${L}.so lib${L}.so.${${L:tu}_SOVERSION} ; fi)
385
	cd ${STAGEDIR}${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \
386
	${LN} -sf lib${L}.so lib${L}.so.${${L:tu}_SOVERSION} ; fi; fi
374
.endfor
387
.endfor
375
.if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS}
388
.if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS}
376
	@(cd ${WRKSRC}/doc/manual; \
389
	@(cd ${WRKSRC}/doc/manual; \
(-)math/R/pkg-plist (-4 / +4 lines)
Lines 99-108 Link Here
99
lib/R/include/Rmath.h
99
lib/R/include/Rmath.h
100
lib/R/include/Rversion.h
100
lib/R/include/Rversion.h
101
lib/R/include/S.h
101
lib/R/include/S.h
102
%%LAPACK%%lib/R/lib/libRblas.so
102
%%RBLAS%%lib/R/lib/libRblas.so
103
%%LAPACK%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
103
%%RBLAS%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
104
%%LAPACK%%lib/R/lib/libRlapack.so
104
%%RBLAS%%lib/R/lib/libRlapack.so
105
%%LAPACK%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
105
%%RBLAS%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
106
%%LIBR%%lib/R/lib/libR.so
106
%%LIBR%%lib/R/lib/libR.so
107
%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
107
%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
108
lib/R/library/KernSmooth/DESCRIPTION
108
lib/R/library/KernSmooth/DESCRIPTION

Return to bug 207425