Attachment #34010 for bug #55431

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

Lines 19-26 Link Here

(-)french/aster/Makefile (-16 / +26 lines)
19	# You may define these options:	19	# You may define these options:
20	#	20	#
21	# - F77: don't use the default fortran compiler;	21	# - F77: don't use the default fortran compiler;
		22	# - FFLAGS: fortan compiler's flags (-O2 by default);
22	# - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among	23	# - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
23	# zsh (default), bash or ksh;	24	# zsh (default), bash or ksh;
		25	# - WITH_BLAS: don't link with atlas, but with blas;
		26	# (blas is slower, but lighter)
24	# - WITHOUT_ASTK: don't use the GUI;	27	# - WITHOUT_ASTK: don't use the GUI;
25	# - WITHOUT_ASTK_CLI: won't use the GUI from this machine;	28	# - WITHOUT_ASTK_CLI: won't use the GUI from this machine;
26	# - WITHOUT_EFICAS: don't install ASter Command FIle Editor;	29	# - WITHOUT_EFICAS: don't install ASter Command FIle Editor;
Lines 36-42 Link Here
36		39
37	PATCH_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER} \	40	PATCH_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER} \
38	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}	41	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
39	LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas
40	BUILD_DEPENDS= ${opt_hdf}:${PORTSDIR}/graphics/hdf5 \	42	BUILD_DEPENDS= ${opt_hdf}:${PORTSDIR}/graphics/hdf5 \
41	${opt_med}:${PORTSDIR}/french/med \	43	${opt_med}:${PORTSDIR}/french/med \
42	${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}	44	${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
Lines 62-67 Link Here
62	BROKEN= Does not build on systems prior 5.x - work in progress...	64	BROKEN= Does not build on systems prior 5.x - work in progress...
63	.endif	65	.endif
64		66
		67	.if defined(WITH_BLAS)
		68	LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas
		69	.else
		70	LIB_DEPENDS= f77blas.1:${PORTSDIR}/math/atlas
		71	.endif
65	.if !defined(WITHOUT_ASTK)	72	.if !defined(WITHOUT_ASTK)
66	RUN_DEPENDS+= ${LOCALBASE}/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur	73	RUN_DEPENDS+= ${LOCALBASE}/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur
67	.if !defined(WITHOUT_ASTK_CLI)	74	.if !defined(WITHOUT_ASTK_CLI)
Lines 100-105 Link Here
100	.endif	107	.endif
101		108
102	F77?= f77	109	F77?= f77
		110	FFLAGS?= -O2
103		111
104	TK_VER?= 8.3	112	TK_VER?= 8.3
105	SHORT_TK_VER= ${TK_VER:S/.//}	113	SHORT_TK_VER= ${TK_VER:S/.//}
Lines 135-142 Link Here
135	INST_DAT= astest bibpyt cata_ele.pickled catalo catapy commande \	143	INST_DAT= astest bibpyt cata_ele.pickled catalo catapy commande \
136	config.txt elements etude materiau tcl	144	config.txt elements etude materiau tcl
137	python_path= ${PYTHON_LIBDIR}:${PYTHON_LIBDIR}/lib-dynload:${PYTHON_SITELIBDIR}:${PYTHON_SITELIBDIR}/Numeric	145	python_path= ${PYTHON_LIBDIR}:${PYTHON_LIBDIR}/lib-dynload:${PYTHON_SITELIBDIR}:${PYTHON_SITELIBDIR}/Numeric
138	#nm!= ${WHICH} nm
139	#nmD= ${nm} -D
140	inst_dir= ${PREFIX}/${PORTNAME}/${vaster}	146	inst_dir= ${PREFIX}/${PORTNAME}/${vaster}
141	tools_dir= ${inst_dir}/outils	147	tools_dir= ${inst_dir}/outils
142	unames!= ${UNAME} -s	148	unames!= ${UNAME} -s
Lines 147-156 Link Here
147	python_dir= ${PYTHONBASE}/bin	153	python_dir= ${PYTHONBASE}/bin
148	opt_hdf= ${LOCALBASE}/lib/libhdf5.a	154	opt_hdf= ${LOCALBASE}/lib/libhdf5.a
149	opt_med= ${LOCALBASE}/lib/libmed.a	155	opt_med= ${LOCALBASE}/lib/libmed.a
		156	.if defined(WITH_BLAS)
150	lib_blas= -lblas	157	lib_blas= -lblas
		158	.else
		159	lib_blas= -lf77blas -latlas
		160	.endif
151	home_ar!= dirname `${WHICH} ${AR}`	161	home_ar!= dirname `${WHICH} ${AR}`
152	#home_f77!= dirname `${WHICH} ${F77}`
153	#home_cc!= dirname `${WHICH} ${CC}`
154	gzip!= dirname `${WHICH} ${GZIP_CMD}`	162	gzip!= dirname `${WHICH} ${GZIP_CMD}`
155	LASTKDIR?= ASTK/ASTK_CLIENT	163	LASTKDIR?= ASTK/ASTK_CLIENT
156	ASTKDIR= ${LOCALBASE}/${LASTKDIR}	164	ASTKDIR= ${LOCALBASE}/${LASTKDIR}
Lines 188-207 Link Here
188	${SED} -e "s#TK_LIB_SPEC='##;s#'##" > ${WRKDIR}/tk_lib_spec	196	${SED} -e "s#TK_LIB_SPEC='##;s#'##" > ${WRKDIR}/tk_lib_spec
189	@${REINPLACE_CMD} -e "s#OPT_HDF#${opt_hdf}#" \	197	@${REINPLACE_CMD} -e "s#OPT_HDF#${opt_hdf}#" \
190	-e "s#OPT_MED#${opt_med}#" \	198	-e "s#OPT_MED#${opt_med}#" \
191	-e "s#OPT_TCL#`${CAT} ${WRKDIR}/tcl_lib_spec`#g" \	199	-e "s#OPT_TCL#`${CAT} ${WRKDIR}/tcl_lib_spec`#" \
192	-e "s#OPT_TK#`${CAT} ${WRKDIR}/tk_lib_spec`#g" \	200	-e "s#OPT_TK#`${CAT} ${WRKDIR}/tk_lib_spec`#" \
193	-e "s#OPT_X11#-L${X11BASE}/lib -lX11#" \	201	-e "s#OPT_X11#-L${X11BASE}/lib -lX11#" \
194	-e "s#OPT_BLAS#${lib_blas}#" \	202	-e "s#OPT_BLAS#${lib_blas}#" \
195	-e "s#HOME_AR#${home_ar}#g" \	203	-e "s#HOME_AR#${home_ar}#" \
196	-e "s#%%F77%%#${F77}#g" \	204	-e "s#%%F77%%#${F77}#" \
197	-e "s#HOME_F90#${home_f77}#g" \	205	-e "s#%%CC%%#${CC}#" \
198	-e "s#%%CC%%#${CC}#g" \	206	-e "s#CFLAGS#${CFLAGS} ${PTHREAD_CFLAGS}#" \
199	-e "s#CFLAGS#${CFLAGS} ${PTHREAD_CFLAGS}#g" \	207	-e "s#FFLAGS#${FFLAGS}#" \
200	-e "s#HOME_GZIP#${gzip}#g" \	208	-e "s#HOME_GZIP#${gzip}#" \
201	-e "s#HOME_PYTHON#${PYTHONBASE}#g" \	209	-e "s#HOME_PYTHON#${PYTHONBASE}#" \
202	-e "s#PYTHON_BIN#${PYTHON_VERSION}#g" \	210	-e "s#PYTHON_BIN#${PYTHON_VERSION}#" \
203	-e "s#PYTHON_VERSION#${_PYTHON_VERSION}#g" \	211	-e "s#PYTHON_VERSION#${_PYTHON_VERSION}#g" \
204	-e "s#PTHREAD#${PTHREAD_LIBS}#g" \	212	-e "s#PTHREAD#${PTHREAD_LIBS}#" \
205	${WRKSRC}/tcl/conf/${v_ifdef}/config.txt	213	${WRKSRC}/tcl/conf/${v_ifdef}/config.txt
206	@${MV} ${WRKSRC}/tcl/conf/${v_ifdef}/config.txt ${WRKSRC}	214	@${MV} ${WRKSRC}/tcl/conf/${v_ifdef}/config.txt ${WRKSRC}
207	@${RM} ${WRKSRC}/tcl/run_aster.orig	215	@${RM} ${WRKSRC}/tcl/run_aster.orig
Lines 209-214 Link Here
209	@${RM} -rf ${WRKSRC}/bibpyt/Utilitai	217	@${RM} -rf ${WRKSRC}/bibpyt/Utilitai
210	@${REINPLACE_CMD} -e "s#\$$(HOME)#${LOCALBASE}/apps#" \	218	@${REINPLACE_CMD} -e "s#\$$(HOME)#${LOCALBASE}/apps#" \
211	${WRKSRC}/bibpyt/Execution/E_SUPERV.py	219	${WRKSRC}/bibpyt/Execution/E_SUPERV.py
		220	@${REINPLACE_CMD} -e "s#%%inst_dir%%#${inst_dir}#" \
		221	${WRKSRC}/bibc/utilitai/asterm.c
212		222
213	do-build:	223	do-build:
214	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bibpyt	224	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bibpyt

Lines 49-55 Link Here

(-)french/aster/files/config.txt (-1 / +1 lines)
49	F77 \| f77 \| ? \| %%F77%%	49	F77 \| f77 \| ? \| %%F77%%
50	#	50	#
51	OPTF_D \| f90 \| ? \| -c -g	51	OPTF_D \| f90 \| ? \| -c -g
52	OPTF_O \| f90 \| ? \| -c -O2	52	OPTF_O \| f90 \| ? \| -c FFLAGS
53	#	53	#
54	G77_AGLA \| g77 \| ? \| %%F77%%	54	G77_AGLA \| g77 \| ? \| %%F77%%
55	#	55	#




--- bibc/utilitai/asterm.c.orig	Wed Apr 23 11:41:04 2003
+++ bibc/utilitai/asterm.c	Thu Aug  7 21:14:44 2003
@@ -271,7 +271,12 @@
 #define REP_SPY "/aster/stat/"
 #define LREP  12
 #elif defined SOLARIS || HPUX || IRIX || P_LINUX || TRU64 || SOLARIS64 
+#if defined(__FreeBSD__)
+/* Note: spycod does not exist any more, but... */
+#define REP_SPY "/var/aster/stat/"
+#else
 #define REP_SPY "/export/docaster/asa/aster/stat/"
+#endif
 #define LREP  32
 #elif defined PPRO_NT
 #define REP_SPY " "
@@ -300,6 +305,10 @@
 #define REP_MAT "/aster/materiau/"
 #define REP_OUT "/aster/outils/"
 #define REP_DON "/aster/donnees/"
+#elif defined __FreeBSD__
+#define REP_MAT "%%inst_dir%%/materiau/"
+#define REP_OUT "%%inst_dir%%/outils/"
+#define REP_DON "/var/aster/donnees/"
 #elif defined SOLARIS || HPUX || P_LINUX 
 #define REP_MAT "/logiciels/aster/materiau/"
 #define REP_OUT "/logiciels/aster/outils/"

Return to bug 55431

Line 0 Link Here

(-)french/aster/files/patch-bibc::utilitai::asterm.c (+26 lines)
	1	--- bibc/utilitai/asterm.c.orig Wed Apr 23 11:41:04 2003
	2	+++ bibc/utilitai/asterm.c Thu Aug 7 21:14:44 2003
	3	@@ -271,7 +271,12 @@
	4	#define REP_SPY "/aster/stat/"
	5	#define LREP 12
	6	#elif defined SOLARIS \|\| HPUX \|\| IRIX \|\| P_LINUX \|\| TRU64 \|\| SOLARIS64
	7	+#if defined(__FreeBSD__)
	8	+/* Note: spycod does not exist any more, but... */
	9	+#define REP_SPY "/var/aster/stat/"
	10	+#else
	11	#define REP_SPY "/export/docaster/asa/aster/stat/"
	12	+#endif
	13	#define LREP 32
	14	#elif defined PPRO_NT
	15	#define REP_SPY " "
	16	@@ -300,6 +305,10 @@
	17	#define REP_MAT "/aster/materiau/"
	18	#define REP_OUT "/aster/outils/"
	19	#define REP_DON "/aster/donnees/"
	20	+#elif defined __FreeBSD__
	21	+#define REP_MAT "%%inst_dir%%/materiau/"
	22	+#define REP_OUT "%%inst_dir%%/outils/"
	23	+#define REP_DON "/var/aster/donnees/"
	24	#elif defined SOLARIS \|\| HPUX \|\| P_LINUX
	25	#define REP_MAT "/logiciels/aster/materiau/"
	26	#define REP_OUT "/logiciels/aster/outils/"