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

Collapse All | Expand All

(-)cad/salome/Makefile (-2 / +2 lines)
Lines 17-23 Link Here
17
17
18
MAINTAINER=	devel@stasyan.com
18
MAINTAINER=	devel@stasyan.com
19
19
20
OPTIONS= \
20
OPTIONS=	\
21
		GEOM		"GEOM module" 								on  \
21
		GEOM		"GEOM module" 								on  \
22
		MED			"MED module" 								on  \
22
		MED			"MED module" 								on  \
23
		SMESH		"SMESH module (require MED & GEOM)" 		on  \
23
		SMESH		"SMESH module (require MED & GEOM)" 		on  \
Lines 28-34 Link Here
28
		RANDOMIZER	"Randomizer module" 						on  \
28
		RANDOMIZER	"Randomizer module" 						on  \
29
		SIERPINSKY	"Sierpinsky module" 						on  \
29
		SIERPINSKY	"Sierpinsky module" 						on  \
30
		CPPUNIT		"build with C++ unit testing framework" 	off \
30
		CPPUNIT		"build with C++ unit testing framework" 	off \
31
		MPI			"build with support parrallel calculation" 	off
31
		MPI			"build with support parallel calculation" 	off
32
32
33
RESOURCEDIR=	${DATADIR}/resources
33
RESOURCEDIR=	${DATADIR}/resources
34
34
(-)cad/salome/Makefile.ext (-38 / +80 lines)
Lines 4-16 Link Here
4
USE_GMAKE=	yes
4
USE_GMAKE=	yes
5
USE_LDCONFIG=	yes
5
USE_LDCONFIG=	yes
6
SAL_MODULE=	${PKGNAMESUFFIX:S/-//}
6
SAL_MODULE=	${PKGNAMESUFFIX:S/-//}
7
#.if ${SAL_MODULE} == "med" || ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "visu" || ${SAL_MODULE} == "sierpinsky" || ${SAL_MODULE} == "multipr"
8
.if !${SAL_MODULE} == "gui" 
9
USE_FORTRAN=yes
7
USE_FORTRAN=yes
10
USE_GCC=        4.4
8
USE_GCC=        4.4
11
.else
12
USE_GCC=        4.5
13
.endif
14
#SAL_MODULE_UPPER=	`${ECHO} ${SAL_MODULE} | ${AWK} '{ print(toupper($$1)); }'`
9
#SAL_MODULE_UPPER=	`${ECHO} ${SAL_MODULE} | ${AWK} '{ print(toupper($$1)); }'`
15
#SAL_MODULE_UPPER=	YACS
10
#SAL_MODULE_UPPER=	YACS
16
11
Lines 37-45 Link Here
37
CONFIGURE_ARGS+=	--prefix=${PREFIX}
32
CONFIGURE_ARGS+=	--prefix=${PREFIX}
38
CONFIGURE_ARGS+=	--enable-debug
33
CONFIGURE_ARGS+=	--enable-debug
39
CONFIGURE_ENV+=		MACHINE=${OPSYS:U}
34
CONFIGURE_ENV+=		MACHINE=${OPSYS:U}
40
#CXXFLAGS+=		-L${LOCALBASE}/lib -I/usr/include -I${LOCALBASE}/include -D__freebsd__ -DFREEBSD -DHAVE_IOSTREAM -DHAVE_LIMITS_H -DHAVE_IOMANIP -DMPICH_IGNORE_CXX_SEEK
41
CPPFLAGS+=		-L${LOCALBASE}/lib -I/usr/include -I${LOCALBASE}/include -D__freebsd__ -DFREEBSD -DHAVE_IOSTREAM -DHAVE_LIMITS_H -DHAVE_IOMANIP -DMPICH_IGNORE_CXX_SEEK
35
CPPFLAGS+=		-L${LOCALBASE}/lib -I/usr/include -I${LOCALBASE}/include -D__freebsd__ -DFREEBSD -DHAVE_IOSTREAM -DHAVE_LIMITS_H -DHAVE_IOMANIP -DMPICH_IGNORE_CXX_SEEK
42
CXXFLAGS+=		-ffriend-injection -fno-inline -fpermissive -L${LOCALBASE}/lib -L${LOCALBASE}/lib/salome
36
CXXFLAGS+=		-ffriend-injection -fno-inline -fpermissive -fPIC -L${LOCALBASE}/lib -L${LOCALBASE}/lib/salome
43
CONFIGURE_SCRIPT=	../configure
37
CONFIGURE_SCRIPT=	../configure
44
PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}/${SAL_MODULE_UPPER}_SRC_${RELEASENAME}
38
PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}/${SAL_MODULE_UPPER}_SRC_${RELEASENAME}
45
WRKSRC=			${PATCH_WRKSRC}
39
WRKSRC=			${PATCH_WRKSRC}
Lines 53-58 Link Here
53
.if !${SAL_MODULE} == "kernel"
47
.if !${SAL_MODULE} == "kernel"
54
.for D in ${${SAL_MODULE_UPPER}_DEPEND}
48
.for D in ${${SAL_MODULE_UPPER}_DEPEND}
55
    CONFIGURE_ENV+=	${D}_ROOT_DIR=${LOCALBASE}
49
    CONFIGURE_ENV+=	${D}_ROOT_DIR=${LOCALBASE}
50
    AUTOTOOLS_ENV+=	${D}_ROOT_DIR=${LOCALBASE}
56
    CPPFLAGS+=		-L${LOCALBASE}/lib/salome
51
    CPPFLAGS+=		-L${LOCALBASE}/lib/salome
57
.endfor
52
.endfor
58
.endif
53
.endif
Lines 74-79 Link Here
74
.if ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "sierpinsky" || ${SAL_MODULE} == "multipr" || ${SAL_MODULE} == "visu"
69
.if ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "sierpinsky" || ${SAL_MODULE} == "multipr" || ${SAL_MODULE} == "visu"
75
BUILD_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
70
BUILD_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
76
RUN_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
71
RUN_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
72
AUTOTOOLS_ENV+= 	MED2HOME=${LOCALBASE}
77
.endif
73
.endif
78
74
79
#Depndency from GEOM module
75
#Depndency from GEOM module
Lines 95-106 Link Here
95
#Dependency from other ports
91
#Dependency from other ports
96
###########################################################################
92
###########################################################################
97
#Dependency from autotools
93
#Dependency from autotools
98
USE_AUTOTOOLS=	autoconf:262 automake:15 libtool:22
94
USE_AUTOTOOLS=	autoconf:262 automake:15 libtool:22 aclocal:19
95
.if ${SAL_MODULE} == "kernel"
96
    ACLOCAL_ARGS=	-I salome_adm/unix/config_files
97
.else
98
. if ${SAL_MODULE} == "yacs"
99
    ACLOCAL_ARGS=	-I adm/unix/config_files
100
    USE_AUTOTOOLS+=	autoheader:262
101
    AUTOHEADER_ARGS=	-I adm/unix/config_files
102
. else
103
    ACLOCAL_ARGS=	-I adm_local/unix/config_files -I ${LOCALBASE}/salome_adm/unix/config_files 
104
.	if ${SAL_MODULE} != "gui"
105
    ACLOCAL_ARGS+= -I ${LOCALBASE}/adm_local/unix/config_files
106
.	endif
107
. endif
108
.endif
109
LIBTOOLFLAGS=--force --copy --automake 
110
AUTOMAKE_ARGS=--add-missing --copy --gnu
99
111
100
#Dependency from HDF5
112
#Dependency from HDF5
101
.if !${SAL_MODULE} == "randomizer" &&  !${SAL_MODULE} == "yacs" && !${SAL_MODULE} == "hello" && !${SAL_MODULE} == "pyhello"
113
.if !${SAL_MODULE} == "randomizer" &&  !${SAL_MODULE} == "yacs" && !${SAL_MODULE} == "hello" && !${SAL_MODULE} == "pyhello"
102
LIB_DEPENDS+=		hdf5.0:${PORTSDIR}/science/hdf5
114
LIB_DEPENDS+=		hdf5.0:${PORTSDIR}/science/hdf5
103
CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE} 
115
CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE} 
116
AUTOTOOLS_ENV+= 	HDF5HOME=${LOCALBASE}
104
.endif
117
.endif
105
118
106
#Dependency from Opencascade
119
#Dependency from Opencascade
Lines 108-113 Link Here
108
LIB_DEPENDS+=		TKernel.0:${PORTSDIR}/cad/opencascade
121
LIB_DEPENDS+=		TKernel.0:${PORTSDIR}/cad/opencascade
109
CASROOT=		${LOCALBASE}/OpenCAS/ros
122
CASROOT=		${LOCALBASE}/OpenCAS/ros
110
CONFIGURE_ENV+=		CASROOT=${CASROOT}
123
CONFIGURE_ENV+=		CASROOT=${CASROOT}
124
AUTOTOOLS_ENV+= 	CASROOT=${CASROOT}
111
#CXXFLAGS+=		-I${CASROOT}/inc
125
#CXXFLAGS+=		-I${CASROOT}/inc
112
.endif
126
.endif
113
127
Lines 141-146 Link Here
141
CONFIGURE_ENV+=		QTDIR=${LOCALBASE}
155
CONFIGURE_ENV+=		QTDIR=${LOCALBASE}
142
QTFLAGS+=		-I${LOCALBASE}/include/qt4 -L${LOCALBASE}/lib/qt4
156
QTFLAGS+=		-I${LOCALBASE}/include/qt4 -L${LOCALBASE}/lib/qt4
143
QT_COMPONENTS=		gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
157
QT_COMPONENTS=		gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
158
AUTOTOOLS_ENV+= 	QTDIR=${LOCALBASE}
144
.endif
159
.endif
145
160
146
#Dependency from qscintilla2
161
#Dependency from qscintilla2
Lines 153-159 Link Here
153
#Dependency from vtk
168
#Dependency from vtk
154
.if !${SAL_MODULE} == "kernel" && !${SAL_MODULE} == "randomizer"
169
.if !${SAL_MODULE} == "kernel" && !${SAL_MODULE} == "randomizer"
155
LIB_DEPENDS+=		vtkCommon.5:${PORTSDIR}/math/vtk5
170
LIB_DEPENDS+=		vtkCommon.5:${PORTSDIR}/math/vtk5
156
CONFIGURE_ENV+=		VTKHOME=${LOCALBASE}
171
CONFIGURE_ENV+=		VTKHOME=${LOCALBASE} VTKSUFFIX=-5.4
157
.endif
172
.endif
158
173
159
#Dependency from qwt5
174
#Dependency from qwt5
Lines 162-167 Link Here
162
#CONFIGURE_ENV+=		QWTHOME=${LOCALBASE}
177
#CONFIGURE_ENV+=		QWTHOME=${LOCALBASE}
163
CONFIGURE_ARGS+=	--with-qwt=${LOCALBASE}
178
CONFIGURE_ARGS+=	--with-qwt=${LOCALBASE}
164
CPPFLAGS+=		-I/${LOCALBASE}/include/qwt/
179
CPPFLAGS+=		-I/${LOCALBASE}/include/qwt/
180
AUTOTOOLS_ENV+= 	QWTHOME=${LOCALBASE}
165
.endif
181
.endif
166
182
167
#Dependency from omniORB & py-omniorb
183
#Dependency from omniORB & py-omniorb
Lines 169-174 Link Here
169
LIB_DEPENDS+=		omniORB4.1:${PORTSDIR}/devel/omniORB
185
LIB_DEPENDS+=		omniORB4.1:${PORTSDIR}/devel/omniORB
170
RUN_DEPENDS+=		${LOCALBASE}/include/omniORBpy.h:${PORTSDIR}/devel/py-omniorb
186
RUN_DEPENDS+=		${LOCALBASE}/include/omniORBpy.h:${PORTSDIR}/devel/py-omniorb
171
RUN_DEPENDS+=		notifd:${PORTSDIR}/devel/omniNotify
187
RUN_DEPENDS+=		notifd:${PORTSDIR}/devel/omniNotify
188
AUTOTOOLS_ENV+= 	OMNIORBDIR=${LOCALBASE}
172
.endif
189
.endif
173
190
174
#Dependency from sip
191
#Dependency from sip
Lines 209-216 Link Here
209
LIB_DEPENDS+=		argp.0:${PORTSDIR}/devel/argp-standalone
226
LIB_DEPENDS+=		argp.0:${PORTSDIR}/devel/argp-standalone
210
LIB_DEPENDS+=		expat.6:${PORTSDIR}/textproc/expat2
227
LIB_DEPENDS+=		expat.6:${PORTSDIR}/textproc/expat2
211
LDFLAGS+=		-largp 
228
LDFLAGS+=		-largp 
229
BUILD_DEPENDS+=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
212
.endif
230
.endif
213
231
232
RUN_DEPENDS+=		bash:${PORTSDIR}/shells/bash
233
214
#Don't strip binaries 
234
#Don't strip binaries 
215
.if ${SAL_MODULE} == "multipr"
235
.if ${SAL_MODULE} == "multipr"
216
STRIP=		
236
STRIP=		
Lines 228-237 Link Here
228
.endif
248
.endif
229
.endif
249
.endif
230
250
251
#optionally dependency from mpich2
231
.if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med"
252
.if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med"
232
.if defined(WITH_MPI)
253
.if defined(WITH_MPI)
233
BUILD_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
254
LIB_DEPENDS+=	mpich.1:${PORTSDIR}/net/mpich2
234
RUN_DEPENDS+=	${LOCALBASE}/mpich2/lib/libmpich.so:${PORTSDIR}/net/mpich2
235
CONFIGURE_ARGS+=	--with-mpich=${LOCALBASE}/mpich2 --with-mpi=${LOCALBASE}/mpich2
255
CONFIGURE_ARGS+=	--with-mpich=${LOCALBASE}/mpich2 --with-mpi=${LOCALBASE}/mpich2
236
PLIST_SUB+=     MPI=""
256
PLIST_SUB+=     MPI=""
237
.		else
257
.		else
Lines 247-256 Link Here
247
#MAKE_JOBS_SAFE=	yes
267
#MAKE_JOBS_SAFE=	yes
248
268
249
.if ${SAL_MODULE} == "kernel"
269
.if ${SAL_MODULE} == "kernel"
250
.		if ${PYTHON_REL} > 260
251
    post-patch:
270
    post-patch:
271
.		if ${PYTHON_REL} > 260
252
	${REINPLACE_CMD} 's|fromlist=None)|fromlist=None, level=-1)|g' ${WRKSRC}/src/KERNEL_PY/import_hook.py
272
	${REINPLACE_CMD} 's|fromlist=None)|fromlist=None, level=-1)|g' ${WRKSRC}/src/KERNEL_PY/import_hook.py
253
.		endif
273
.		endif
274
	${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|g' ${WRKSRC}/bin/appli_clean.sh ${WRKSRC}/bin/runSalome
275
.endif
276
277
.if ${SAL_MODULE} == "gui"
278
    post-patch:
279
	${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|g' ${WRKSRC}/bin/runLightSalome.sh
280
.endif
281
282
.if ${SAL_MODULE} == "yacs"
283
    post-patch:
284
	${CP} ${WRKSRC}/configure.in.base  ${WRKSRC}/configure.in
254
.endif
285
.endif
255
286
256
.if ${SAL_MODULE} == "kernel"
287
.if ${SAL_MODULE} == "kernel"
Lines 260-291 Link Here
260
	${REINPLACE_CMD} 's|__rpc_xdr|XDR|g' ${WRKSRC}/src/Communication/rpc/xdr.h
291
	${REINPLACE_CMD} 's|__rpc_xdr|XDR|g' ${WRKSRC}/src/Communication/rpc/xdr.h
261
.endif
292
.endif
262
293
294
MMDEPENDS=${SAL_MODULE_UPPER}_DEPEND
295
AUTOTOOLS_ENV+=	${SAL_MODULE_UPPER}_ROOT_DIR=${PREFIX}
296
297
.for D in ${MMDEPENDS}
298
    AUTOTOOLS_ENV+=${D}_ROOT_DIR=${LOCALBASE}
299
.endfor
300
301
run-autotools-aclocal:
302
	echo "Start of aclocal"
303
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
304
		${ACLOCAL_ARGS})
305
	echo "End of aclocal"
306
307
run-autotools-autoconf:
308
	echo "Start of autoconf"
309
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
310
		${AUTOCONF_ARGS})
311
	echo "End of autotools"
312
313
run-autotools-automake:
314
	echo "Start of automake"
315
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
316
		${AUTOMAKE_ARGS})
317
	echo "End of automake"
318
319
.if ${SAL_MODULE} == "yacs"
320
run-autotools-autoheader:
321
	echo "Start of autoheader"
322
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
323
		${AUTOHEADER_ARGS})
324
	echo "End of autoheader"
325
.endif
326
327
patch-autotools:
328
	@(cd ${PATCH_WRKSRC}; ${LIBTOOLIZE} --force;)
263
329
264
    pre-configure:
330
pre-configure:
265
#	SAL_MODULE_UPPER=`${ECHO} ${SAL_MODULE} | ${AWK} '{ print(toupper($1)); }'`; \
331
	${MKDIR} ${BUILD_WRKSRC}
266
	MMDEPENDS="${${SAL_MODULE_UPPER}_DEPEND}"; \
267
	for D in $${MMDEPENDS}; do \
268
	      export "$$D"_ROOT_DIR=${LOCALBASE}; \
269
		if test "$$D"="MED2"; then \
270
		    export MED2HOME=${LOCALBASE}; \
271
		fi; \
272
		if test "$$D"="QWT"; then \
273
		    export QWTHOME=${LOCALBASE}; \
274
		fi; \
275
		if test "$$D"="HDF5HOME"; then \
276
		    export HDF5HOME=${LOCALBASE}; \
277
		fi; \
278
		if test "$$D"="CASROOT"; then \
279
		    export CASROOT=${CASROOT}; \
280
		fi; \
281
		if test "$$D"="QT"; then \
282
		    export QTDIR=${LOCALBASE}; \
283
		fi; \
284
		if test "$$D"="OMNIORB"; then \
285
		    export OMNIORBDIR=${LOCALBASE}; \
286
		fi; \
287
		echo "$$D"_ROOT_DIR; \
288
	done; \
289
	MACHINE=${OPSYS:U}; export MACHINE;  set ${SAL_MODULE_UPPER}_ROOT_DIR ${PREFIX};  export ${SAL_MODULE_UPPER}_ROOT_DIR; cd ${WRKSRC}; ${MKDIR} ${BUILD_WRKSRC}; ${SH} ./build_configure
290
332
291
.include <bsd.port.post.mk>
333
.include <bsd.port.post.mk>

Return to bug 143878