View | Details | Raw Unified | Return to bug 159917
Collapse All | Expand All

(-)Makefile (-8 / +25 lines)
Lines 30-37 Link Here
30
USE_GMAKE=	yes
30
USE_GMAKE=	yes
31
USE_LDCONFIG=	yes
31
USE_LDCONFIG=	yes
32
32
33
CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_LIBS}
33
CPPFLAGS+=	-I${LOCALBASE}/include
34
FFLAGS+=	-fPIC
34
LDFLAGS+=	-L${LOCALBASE}/lib
35
CONFIGURE_ARGS =	--with-gfortran
36
CONFIGURE_ENV=	ac_cv_search_pthread_join="${PTHREAD_LIBS}" \
37
	BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}" \
38
	LDFLAGS="${LDFLAGS}"
35
39
36
OPTIONS=	ATLAS "Use Atlas instead of Blas" OFF \
40
OPTIONS=	ATLAS "Use Atlas instead of Blas" OFF \
37
		FFTW "Use FFTW" ON \
41
		FFTW "Use FFTW" ON \
Lines 47-61 Link Here
47
.include <bsd.port.options.mk>
51
.include <bsd.port.options.mk>
48
52
49
.if defined(WITH_ATLAS)
53
.if defined(WITH_ATLAS)
50
CONFIGURE_ARGS+=	--with-atlas-library=${LOCALBASE}/lib
51
LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
54
LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
52
BLAS_LIBS=	-lalapack -lcblas -lf77blas -latlas
55
BLAS_LIBS=	-lf77blas -latlas
56
LAPACK_LIBS=	-lalapack -lcblas
53
.else
57
.else
54
LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
58
LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
55
LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
59
LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
56
BLAS_LIBS?=	-llapack -lblas
60
BLAS_LIBS?=	-lblas
61
LAPACK_LIBS?=	-llapack
57
.endif
62
.endif
58
MAKE_ENV+=	BLAS_LIBS="-L${LOCALBASE}/lib ${BLAS_LIBS}"
59
63
60
.if defined(WITHOUT_NLS)
64
.if defined(WITHOUT_NLS)
61
CONFIGURE_ARGS+=	--disable-build-localization
65
CONFIGURE_ARGS+=	--disable-build-localization
Lines 81-86 Link Here
81
			--without-hdf5 \
85
			--without-hdf5 \
82
			--without-xcos \
86
			--without-xcos \
83
			--disable-build-help
87
			--disable-build-help
88
CONFIGURE_ENV +=	JAVADOC="${TRUE}"
89
PLIST_SUB+=		WITHOUT_GUI=""
84
.else
90
.else
85
DISTFILES+=	${JGRAPHX_JAR}:jgraphx
91
DISTFILES+=	${JGRAPHX_JAR}:jgraphx
86
JGRAPHX_VERSION=	1.4.1.0
92
JGRAPHX_VERSION=	1.4.1.0
Lines 131-136 Link Here
131
CONFIGURE_ARGS+=	--with-jdk=${JAVA_HOME} \
137
CONFIGURE_ARGS+=	--with-jdk=${JAVA_HOME} \
132
			--with-docbook=${LOCALBASE}/share/xsl/docbook \
138
			--with-docbook=${LOCALBASE}/share/xsl/docbook \
133
			--enable-build-help
139
			--enable-build-help
140
PLIST_SUB+=		WITHOUT_GUI="@comment "
134
.endif
141
.endif
135
142
136
.if !defined(WITHOUT_HELP)
143
.if !defined(WITHOUT_HELP)
Lines 220-226 Link Here
220
		${WRKSRC}/bin/scilab-adv-cli ${WRKSRC}/bin/scilab-cli
227
		${WRKSRC}/bin/scilab-adv-cli ${WRKSRC}/bin/scilab-cli
221
	@${REINPLACE_CMD} -e 's|/usr/share/scilab|${DATADIR}|' ${WRKSRC}/desktop/scilab.desktop
228
	@${REINPLACE_CMD} -e 's|/usr/share/scilab|${DATADIR}|' ${WRKSRC}/desktop/scilab.desktop
222
	@${REINPLACE_CMD} -e 's|/usr/share/scilab-cli|${DATADIR}|' \
229
	@${REINPLACE_CMD} -e 's|/usr/share/scilab-cli|${DATADIR}|' \
223
		${WRKSRC}/desktop/scilab-adv-cli.desktop ${WRKSRC}/desktop/scilab-cli.desktop 
230
		${WRKSRC}/desktop/scilab-adv-cli.desktop ${WRKSRC}/desktop/scilab-cli.desktop
231
.else
232
	@${REINPLACE_CMD} -e '/^check-local:/,/^$$/s/scilab-adv-cli/scilab-cli/g' \
233
		${WRKSRC}/Makefile.in
224
.endif
234
.endif
225
235
226
pre-install:
236
pre-install:
Lines 231-237 Link Here
231
.endif
241
.endif
232
242
233
post-install:
243
post-install:
234
	@# Remove empty dirs in DATDIR/modules - they will be removed by the
244
	@# Remove empty dirs in DATADIR/modules - they will be removed by the
235
	@# toolbox uninstaller otherwise if 3rd party toolboxes are used
245
	@# toolbox uninstaller otherwise if 3rd party toolboxes are used
236
	@${FIND} ${DATADIR}/modules -type d -empty -delete
246
	@${FIND} ${DATADIR}/modules -type d -empty -delete
237
	@# plist for include/scilab
247
	@# plist for include/scilab
Lines 252-256 Link Here
252
		-not -path ${DATADIR}/.atoms\* -not -path ${DATADIR} | \
262
		-not -path ${DATADIR}/.atoms\* -not -path ${DATADIR} | \
253
		${SORT} -r | ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
263
		${SORT} -r | ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
254
	@${ECHO_CMD} "@unexec rmdir %D/share/scilab 2>/dev/null || true" >> ${TMPPLIST}
264
	@${ECHO_CMD} "@unexec rmdir %D/share/scilab 2>/dev/null || true" >> ${TMPPLIST}
265
.if defined(WITHOUT_GUI)
266
	@${TOUCH} ${DATADIR}/contrib/xcos_toolbox_skeleton/images/h5/.keep_me
267
.endif
268
269
check test: build
270
	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \
271
		${MAKE_ARGS} check
255
272
256
.include <bsd.port.mk>
273
.include <bsd.port.mk>
(-)pkg-plist (+1 lines)
Lines 81-86 Link Here
81
%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/en_US/tbx_sum.xml
81
%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/en_US/tbx_sum.xml
82
%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/fr_FR/build_help.sce
82
%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/fr_FR/build_help.sce
83
%%DATADIR%%/contrib/xcos_toolbox_skeleton/images/gif/TBX_SUM_c.gif
83
%%DATADIR%%/contrib/xcos_toolbox_skeleton/images/gif/TBX_SUM_c.gif
84
%%WITHOUT_GUI%%%%DATADIR%%/contrib/xcos_toolbox_skeleton/images/h5/.keep_me
84
%%DATADIR%%/contrib/xcos_toolbox_skeleton/images/svg/TBX_SUM_c.svg
85
%%DATADIR%%/contrib/xcos_toolbox_skeleton/images/svg/TBX_SUM_c.svg
85
%%DATADIR%%/contrib/xcos_toolbox_skeleton/license.txt
86
%%DATADIR%%/contrib/xcos_toolbox_skeleton/license.txt
86
%%DATADIR%%/contrib/xcos_toolbox_skeleton/macros/buildmacros.sce
87
%%DATADIR%%/contrib/xcos_toolbox_skeleton/macros/buildmacros.sce
(-)files/patch-modules__arnoldi__Makefile.in (+11 lines)
Added Link Here
1
--- modules/arnoldi/Makefile.in.orig	2011-07-20 04:15:42.000000000 -0400
2
+++ modules/arnoldi/Makefile.in	2011-08-09 09:52:07.000000000 -0400
3
@@ -489,7 +489,7 @@
4
 
5
 libsciarnoldi_la_FFLAGS = -I$(srcdir)/src/arpack/
6
 pkglib_LTLIBRARIES = libsciarnoldi.la
7
-libsciarnoldi_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LAPACK_LIBS)
8
+libsciarnoldi_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LAPACK_LIBS) $(BLAS_LIBS)
9
 libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
10
 
11
 # For the code check (splint)

Return to bug 159917