Upgrade to 7.4.0.

Remark: 7.4.0 is BROKEN on FreeBSD-4.x.

french/aster/Makefile

@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	aster
-PORTVERSION=	7.3.0
-CATEGORIES=	french cad python tk84
+PORTVERSION=	7.4.0
+CATEGORIES=	french cad python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-8
+DISTNAME=	${PORTNAME}-full-src-${PORTVERSION}-3
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -22,9 +22,9 @@ COMMENT=	Analyse des structures et thermo-m
 # - FFLAGS: fortan compiler's flags (-O2 by default);
 # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
 #			zsh (default), bash or ksh;
+# - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit);
 # - WITH_BLAS: don't link with atlas, but with blas;
 #			(blas is slower, but lighter)
-# - WITHOUT_ASTK: don't use the GUI;
 # - WITHOUT_ASTK_CLI: won't use the GUI from this machine;
 # - WITHOUT_EFICAS: don't install ASter Command FIle Editor;
 # - WITHOUT_GMSH: don't install GMSH (a mesh generator);
@@ -34,30 +34,27 @@ COMMENT=	Analyse des structures et thermo-m
 #
 #-----------------------------------------------------------------------
 
-PATCH_DEPENDS=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER}		\
-		wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
-BUILD_DEPENDS=	${opt_hdf}:${PORTSDIR}/science/hdf5				\
-		${opt_med}:${PORTSDIR}/french/med				\
+BUILD_DEPENDS+=	${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur	\
 		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}		\
 		${PYNUMERIC}
-LIB_DEPENDS=	tcl${SHORT_TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER}	\
-		tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot	\
-		${LOCALBASE}/bin/onmetis.exe:${PORTSDIR}/math/metis-edf
+LIB_DEPENDS+=	tcl${SHORT_TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER}	\
+		tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}	\
+		hdf5.0:${PORTSDIR}/science/hdf5					\
+		med.1:${PORTSDIR}/french/med
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot	\
+		${LOCALBASE}/bin/onmetis.exe:${PORTSDIR}/math/metis-edf		\
+		${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur
 
-EXTRACT_CMD=	${TAR}
-EXTRACT_BEFORE_ARGS=	-xf
-EXTRACT_AFTER_ARGS=	# empty
-USE_GCC=	3.2
+#USE_GCC=	3.4	# Helps on 4.x, but not sufficient.
 USE_PYTHON=	yes
+HAS_CONFIGURE=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-EXTDIR=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
-WRKSRC=		${EXTDIR}/${vaster}
-PLIST_SUB=	ASTERDIR=${PORTNAME}/${vaster}
+WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
+PLIST_SUB=	ASTERDIR=${PORTNAME}/${vaster} TOOLDIR=${PORTNAME}/outils
 PKGMESSAGE=	${WRKDIR}/pkg-message
-.if defined(WITHOUT_ASTK) || defined(WITHOUT_ASTK_CLI)
+.if defined(WITHOUT_ASTK_CLI)
 PKGMESSIN=	pkg-message.sans-astk.in
 .else
 PKGMESSIN=	pkg-message.in
@@ -65,8 +62,8 @@ PKGMESSIN=	pkg-message.in
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-BROKEN=		"Does not install on amd64"
+.if ${OSVERSION} < 500000
+BROKEN=	"Does not compile on FreeBSD-4.x, and cannot be patched easily."
 .endif
 
 .if defined(WITH_BLAS)
@@ -74,15 +71,12 @@ LIB_DEPENDS+=	blas.1:${PORTSDIR}/math/blas
 .else
 LIB_DEPENDS+=	f77blas.1:${PORTSDIR}/math/atlas
 .endif
-.if !defined(WITHOUT_ASTK)
-RUN_DEPENDS+=	${LOCALBASE}/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur
 .if !defined(WITHOUT_ASTK_CLI)
-RUN_DEPENDS+=	${LOCALBASE}/ASTK/ASTK_CLIENT:${PORTSDIR}/cad/astk-client
+RUN_DEPENDS+=	${ASTKDIR}:${PORTSDIR}/cad/astk-client
 PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
-.endif
 .if !defined(WITHOUT_EFICAS)
 RUN_DEPENDS+=	${LOCALBASE}/apps/eficas:${PORTSDIR}/french/eficas
 PLIST_SUB+=	EFICAS=""
@@ -112,11 +106,9 @@ FFLAGS?=	-O2
 
 TK_VER?=	8.4
 SHORT_TK_VER=	${TK_VER:S/.//}
-TKCONFIG=	${LOCALBASE}/lib/tk${TK_VER}/tkConfig.sh
 
 TCL_VER?=	${TK_VER}
 SHORT_TCL_VER=	${TCL_VER:S/.//}
-TCLCONFIG=	${LOCALBASE}/lib/tcl${TK_VER}/tclConfig.sh
 
 .if defined(WITH_ZSH)
 SHIA=		zsh
@@ -139,109 +131,122 @@ SHIADEP=	bash2
 SHIADEP=	${SHIA}
 .endif
 
+.if !defined(WITH_ED)
+. if exists(${X11BASE}/bin/nedit)
+WITH_ED=	nedit
+RUN_DEPENDS+=	${X11BASE}/bin/nedit:${PORTSDIR}/editors/nedit
+. elif exists(${LOCALBASE}/bin/gvim)
+WITH_ED=	gvim
+RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
+. elif exists(${LOCALBASE}/bin/emacs)
+WITH_ED=	emacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs
+. elif exists(${LOCALBASE}/bin/xemacs)
+WITH_ED=	xemacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/xemacs:${PORTSDIR}/editors/xemacs
+. else
+WITH_ED=	xedit
+RUN_DEPENDS+=	${X11BASE}/bin/xedit:${X_CLIENTS_PORT}
+. endif
+.endif
+
 vaster=		STA${PORTVERSION:S/.0//}
-MK_FILES=	make_aster make_cata make_etude make_exec make_lib make_test
-INST_DAT=	astest bibpyt cata_ele.pickled catalo catapy commande	\
-		config.txt elements etude materiau tcl
-python_path=	${PYTHON_LIBDIR}:${PYTHON_LIBDIR}/lib-dynload:${PYTHON_SITELIBDIR}:${PYTHON_SITELIBDIR}/Numeric
+INST_DAT=	GPL.txt LICENSE.TERMS astest cata_ele.pickled catalo catapy	\
+		elements etude materiau
+INST_PY=	bibpyt commande
+DAT2FIX=	astout.export config.txt forma01a.export
 inst_dir=	${PREFIX}/${PORTNAME}/${vaster}
-tools_dir=	${inst_dir}/outils
-unames!=	${UNAME} -s
-v_ifdef=	${unames:U}
+tools_dir=	${PREFIX}/${PORTNAME}/outils
+v_ifdef=	${OPSYS:U}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 tcl_dir=	${LOCALBASE}
-tcl_bin=	tclsh${TK_VER}
-python_dir=	${PYTHONBASE}/bin
 hdf_dir=	${LOCALBASE}
-opt_hdf=	${hdf_dir}/lib/libhdf5.a
-opt_med=	${LOCALBASE}/lib/libmed.a
 .if defined(WITH_BLAS)
 lib_blas=	-lblas
 .else
 lib_blas=	-lf77blas -latlas
 .endif
-home_ar!=	${DIRNAME} `${WHICH} ${AR}`
-gzip!=		${DIRNAME} `${WHICH} ${GZIP_CMD}`
-LASTKDIR?=	ASTK/ASTK_CLIENT
+LASTKDIR?=	${PORTNAME}/ASTK/ASTK_CLIENT
 ASTKDIR=	${LOCALBASE}/${LASTKDIR}
 
-post-extract:
-	@(cd ${EXTDIR} && \
-	${TAR} xfz ${EXTDIR}/${PORTNAME}.tar.gz)
+pre-configure:
+	@${REINPLACE_CMD} -e 's|/opt/aster|${WRKSRC}/instdir|'		\
+		-e 's|/usr/bin/gcc|${CC}|;s|/usr/bin/g77|${F77}|'	\
+		${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_hdf5 = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_med = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_tcl = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_tk  = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_Pmw = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_Numeric = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_gmsh = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_homard = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_eficas = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_astk = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_metis = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "_install_crpcrs = False"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "HOME_HDF='${hdf_dir}'"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "HOME_MED='${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "HOME_TCL_TK='${tcl_dir}'"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "BLASLIB='${lib_blas}'"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "GZIP='/usr/bin/gzip'"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'"	>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "EDITOR='${WITH_ED}'"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -DP_LINUX'"		>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "FFLAGS_DBG='-c -g -O -DP_LINUX'"		>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} -DP_LINUX'"	\
+		>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} -DP_LINUX'"	\
+		>> ${WRKSRC}/setup.cfg
+	@${ECHO_CMD} "SYSLIBS='-Xlinker -export-dynamic ${PTHREAD_LIBS} -lutil -lm -lz -lg2c'"	\
+		>> ${WRKSRC}/setup.cfg
 
-post-patch:
-.for mk_file in ${MK_FILES}
-	@${REINPLACE_CMD} -e "s#HOME_CODE_ASTER#${WRKSRC}#g"			\
-	-e "s#IFDEF#${v_ifdef}#"						\
-	-e "s#HOME_XTERM#${X11BASE}/bin#"					\
-	-e "s#REP_TOOLS#${tools_dir}#" ${WRKSRC}/tcl/${mk_file}
-.endfor
-	@${REINPLACE_CMD} -e "s#HOME_CODE_ASTER#${WRKSRC}#g"			\
-	-e "s#HOME_TCL_TK#${tcl_dir}#g"						\
-	-e "s#TCL_BIN#${tcl_bin}#g"						\
-	-e "s#TCL_TK_VERSION#${TK_VER}#g"					\
-	-e "s#HOME_PYTHON#${python_dir}#g"					\
-	-e "s#/bin/sh#${SHELL_INSTALL_ASTER}#g"					\
-	-e "s#%%PYTHONPATH%%#${python_path}#"					\
-	${WRKSRC}/tcl/run_aster
-	@${CHMOD} 755 ${WRKSRC}/tcl/run_aster
-.if !exists(${WRKSRC}/tcl/conf/${v_ifdef}/config.txt)
-	@${MKDIR} ${WRKSRC}/tcl/conf/${v_ifdef}
-	@${CP} ${FILESDIR}/config.txt ${WRKSRC}/tcl/conf/${v_ifdef}
-.endif
-	@${GREP} TCL_LIB_SPEC ${TCLCONFIG} |					\
-		${SED} -e "s#TCL_LIB_SPEC='##;s#\$${TCL_DBGX}'##"		\
-		> ${WRKDIR}/tcl_lib_spec
-	@${GREP} TK_LIB_SPEC ${TKCONFIG} |					\
-		${SED} -e "s#TK_LIB_SPEC='##;s#'##" > ${WRKDIR}/tk_lib_spec
-	@${REINPLACE_CMD} -e "s#OPT_HDF#${opt_hdf}#"				\
-	-e "s#HDF_DIR#${hdf_dir}#"						\
-	-e "s#OPT_MED#${opt_med}#"						\
-	-e "s#OPT_TCL#`${CAT} ${WRKDIR}/tcl_lib_spec`#"				\
-	-e "s#OPT_TK#`${CAT} ${WRKDIR}/tk_lib_spec`#"				\
-	-e "s#OPT_X11#-L${X11BASE}/lib -lX11#"					\
-	-e "s#OPT_BLAS#${lib_blas}#"						\
-	-e "s#HOME_AR#${home_ar}#"						\
-	-e "s#%%F77%%#${F77}#"							\
-	-e "s#%%CC%%#${CC}#"							\
-	-e "s#CFLAGS#${CFLAGS} ${PTHREAD_CFLAGS}#"				\
-	-e "s#FFLAGS#${FFLAGS}#"						\
-	-e "s#HOME_GZIP#${gzip}#"						\
-	-e "s#HOME_PYTHON#${PYTHONBASE}#"					\
-	-e "s#PYTHON_BIN#${PYTHON_VERSION}#"					\
-	-e "s#PYTHON_VERSION#${_PYTHON_VERSION}#g"				\
-	-e "s#PTHREAD#${PTHREAD_LIBS}#"						\
-		${WRKSRC}/tcl/conf/${v_ifdef}/config.txt
-	@${MV} ${WRKSRC}/tcl/conf/${v_ifdef}/config.txt ${WRKSRC}
-	@${RM} ${WRKSRC}/tcl/run_aster.orig
-	@${RM} -rf ${WRKSRC}/tcl/conf
-	@${RM} -rf ${WRKSRC}/bibpyt/Utilitai
-	@${REINPLACE_CMD} -e "s#\$$(HOME)#${LOCALBASE}/apps#"			\
-		${WRKSRC}/bibpyt/Execution/E_SUPERV.py
-	@${REINPLACE_CMD} -e "s#%%inst_dir%%#${inst_dir}#"			\
-		${WRKSRC}/bibc/utilitai/asterm.c
+do-configure:
+	(cd ${CONFIGURE_WRKSRC} && ${PYTHON_CMD} setup.py test		\
+		| tee ${CONFIGURE_LOG})
+
+pre-build:
+	${MKDIR} ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf
+	${SED} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|'	\
+		< ${LOCALBASE}/aster/ASTK/ASTK_SERV/conf/config		\
+		> ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf/config
+	${LN} -sf ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin			\
+		${WRKSRC}/instdir/ASTK/ASTK_SERV
+	${LN} -sf ${LOCALBASE}/aster/ASTK/ASTK_SERV/lib			\
+		${WRKSRC}/instdir/ASTK/ASTK_SERV
 
 do-build:
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bibpyt
-	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bibpyt
-	(cd ${WRKSRC}/tcl&& ${SETENV} PYTHONPATH=${python_path} \
-		./run_aster make_aster)
+	(cd ${BUILD_WRKSRC} && ${PYTHON_CMD} setup.py install		\
+		| tee ${BUILD_WRKSRC}/build.log)
+
+pre-install:
+	${CHMOD} go-x ${WRKSRC}/instdir/${vaster}/materiau/A42_REF_A.NOMI
 
 do-install:
-.for mk_file in ${MK_FILES} run_aster ../config.txt
-	${REINPLACE_CMD} -e "s#${WRKSRC}#${inst_dir}#g" ${WRKSRC}/tcl/${mk_file}
+	${MKDIR} ${tools_dir} ${inst_dir}
+	${INSTALL_PROGRAM} ${WRKSRC}/instdir/${vaster}/asteru.exe ${inst_dir}
+	${INSTALL_SCRIPT} ${WRKSRC}/instdir/${vaster}/asterd.exe ${inst_dir} # Don't strip!
+.for FILE in ${DAT2FIX}
+	${SED} -e 's|${WRKSRC}/instdir/${vaster}|${inst_dir}|g'		\
+		-e 's|${WRKSRC}/instdir/outils|${tools_dir}|g'		\
+	< ${WRKSRC}/instdir/${vaster}/${FILE} > ${inst_dir}/${FILE}
 .endfor
-	${MKDIR} ${tools_dir}
-.for FILE in ${INST_DAT}
-	${CP} -R ${WRKSRC}/${FILE} ${inst_dir}
+.for FILE in ${INST_DAT} ${INST_PY}
+	${CP} -R ${WRKSRC}/instdir/${vaster}/${FILE} ${inst_dir}
+.endfor
+	${REINPLACE_CMD} -e 's|cat ./fort.15 ./ficode|cat ./ficode|'	\
+		${inst_dir}/bibpyt/Execution/E_SUPERV.py
+.for FILE in ${INST_PY}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/${FILE}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/${FILE}
 .endfor
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${inst_dir}
-	${INSTALL_PROGRAM} ${WRKSRC}/asteru.exe ${inst_dir}
-	${INSTALL_SCRIPT} ${WRKSRC}/tcl/run_aster ${inst_dir}/tcl
 
 post-install:
 	@${TOUCH} ${inst_dir}/etude/forma01a.17
+	${LN} -fs ${LOCALBASE}/bin/kmetis ${tools_dir}/
 	${LN} -fs ${LOCALBASE}/bin/onmetis ${tools_dir}/
+	${LN} -fs ${LOCALBASE}/bin/pmetis ${tools_dir}/
 	${LN} -fs ${LOCALBASE}/bin/gnuplot ${tools_dir}/
 .if !defined(WITHOUT_ASTK) && !defined(WITHOUT_ASTK_CLI)
 	${LN} -fs ${ASTKDIR}/bin/astk ${tools_dir}/
@@ -254,20 +259,22 @@ post-install:
 	${LN} -fs ${LOCALBASE}/bin/gmsh ${tools_dir}/
 .endif
 .if !defined(WITHOUT_GRACE)
+	${LN} -fs ${X11BASE}/bin/gracebat ${tools_dir}/
 	${LN} -fs ${X11BASE}/bin/xmgrace ${tools_dir}/
 .endif
 	@${ECHO_MSG}
-	@${SED} -e "s#%%inst_dir%%#${inst_dir}#"	\
+	@${SED} -e "s#%%tools_dir%%#${tools_dir}#"	\
 		${FILESDIR}/${PKGMESSIN} > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .if defined(MAINTAINER_MODE)
 test:	install
-	(cd ${inst_dir}/tcl;	\
-	./run_aster make_etude)
-	(cd ${inst_dir}/tcl;	\
-	./run_aster make_test)
+	(cd ${inst_dir};	\
+	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run forma01a.export)
+	@${ECHO_CMD} Note: homard must be installed to run some steps succesfully.
+	(cd ${inst_dir};	\
+	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run astout.export)
 .endif
 
 .include <bsd.port.post.mk>

french/aster/distinfo

@@ -1,2 +1,2 @@
-MD5 (aster-src-7.3.0-8.tar) = 7e23ef1a94bf6f93c155454b5feb5ef6
-SIZE (aster-src-7.3.0-8.tar) = 18841600
+MD5 (aster-full-src-7.4.0-3.tar) = 0d756794a176f2e1b92412382373a629
+SIZE (aster-full-src-7.4.0-3.tar) = 87232678

french/aster/files/config.txt

@@ -1,70 +0,0 @@
-# Configuration file
-# $FreeBSD$
-#
-# Fields are separated by a "|" (the space is significative)
-#
-# Keywords :
-#  "LIB "      : archiver
-#	"BIBL "     : librairies linked with Code_Aster (with options -L/-l eventually)
-#  "INCL "     : C include C for compilation
-#  "PYTHON "   : Python binary
-#  "LINK "     : loader command
-#  "OPTL "     : loader options
-#  "CC "       : C compiler command
-#  "OPTC_D "   : C compiler options using DEBUG mode
-#  "OPTC_O "   : C compiler options using NODEBUG mode
-#  "F77 "      : Fortran compiler command
-#  "OPTF_D "   : Fortran compiler options using DEBUG mode
-#  "OPTF_O "   : Fortran compiler options using NODEBUG mode
-#  "G77_AGLA " : used configuration management of EDF version
-#  "SUPERV "   : Python modules imported from Aster
-#  "ARGPYT "   : supervisor
-#  "ARGEXE "   : arguments passed to exec
-#
-LIB | ar | ? | HOME_AR/ar -rv
-#
-BIBL | python | 2.1 | HOME_PYTHON/lib/pythonPYTHON_VERSION/config/libpythonPYTHON_VERSION.a
-BIBL | fpe    | ?   |  
-BIBL | med    | 2.1 | OPT_MED
-BIBL | hdf    | 5.1 | OPT_HDF
-BIBL | blas   | ?   | OPT_BLAS
-BIBL | tcl    | 8.4 | OPT_TCL
-BIBL | tk     | 8.4 | OPT_TK
-BIBL | X11    | ?   | OPT_X11
-BIBL | sys    | ?   | -Xlinker -export-dynamic PTHREAD -lutil -lm -lz -lg2c
-#
-INCL | python | 2.3 | -IHOME_PYTHON/include/pythonPYTHON_VERSION -IHDF_DIR/include
-#
-PYTHON | python | 2.3 | HOME_PYTHON/bin/PYTHON_BIN
-#
-LINK | link | ? | %%CC%% -v
-#
-OPTL | f90    | ?   | -v  
-#
-CC | cc | ? | %%CC%%
-#
-OPTC_D | cc   | ?   | -c -g -DP_LINUX
-OPTC_O | cc   | ?   | -c CFLAGS -DP_LINUX
-#
-F77 | f77 | ? | %%F77%%
-#
-OPTF_D | f90  | ?   | -c -g
-OPTF_O | f90  | ?   | -c FFLAGS
-#
-G77_AGLA | g77  | ?   | %%F77%%
-#
-SUPERV | exec | 03-2002 | Accas
-SUPERV | exec | 03-2002 | Build
-SUPERV | exec | 03-2002 | Execution
-SUPERV | exec | 03-2002 | Macro
-SUPERV | exec | 03-2002 | Noyau
-SUPERV | exec | 03-2002 | Stanley
-SUPERV | exec | 03-2002 | Utilitai
-SUPERV | exec | 03-2002 | Validation
-#
-ARGPYT | exec | 03-2002 | Execution/E_SUPERV.py
-ARGEXE | exec | 03-2002 | -eficas_path ./Eficas
-#
-GZIP | tool | ? | HOME_GZIP/gzip
-CRP  | tool | ? | HOME_CRP/crp_aster.sh 
-CRS  | tool | ? | HOME_CRS/crs.sh

french/aster/files/patch-bibc::utilitai::asterm.c

@@ -1,26 +0,0 @@
---- 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/"

french/aster/files/patch-bibc::utilitai::memjob.c

@@ -1,14 +0,0 @@
---- bibc/utilitai/memjob.c.orig	Wed Apr 23 11:41:04 2003
-+++ bibc/utilitai/memjob.c	Tue Jul  1 22:37:31 2003
-@@ -20,9 +20,9 @@
- extern char g_memory[];
- #include <string.h>
- #include <stdio.h>
--#if defined SOLARIS || IRIX || P_LINUX || TRU64 || SOLARIS64 
--#include <sys/resource.h>
-+#if defined SOLARIS || IRIX || P_LINUX || TRU64 || SOLARIS64
- #include <sys/time.h>
-+#include <sys/resource.h>
-    long memjob_(void)
- #elif defined HPUX
- #include <sys/resource.h>

french/aster/files/patch-bibpyt::Execution::E_SUPERV.py

@@ -1,29 +0,0 @@
---- bibpyt/Execution/E_SUPERV.py.orig	Wed Oct 22 07:17:43 2003
-+++ bibpyt/Execution/E_SUPERV.py	Sat Nov 15 14:22:56 2003
-@@ -192,7 +192,7 @@
-       if j.par_lot == 'NON':
-          print "FIN EXECUTION"
-          if j.fico!=None :
--            os.system('cat ./fort.15 ./ficode >> ./fort.15')
-+            os.system('cat ./ficode >> ./fort.15')
-          return ier
- 
-       # Verification de la validite du jeu de commande
-@@ -272,7 +272,7 @@
-             return 1   
-       except EOFError:
-          if j.fico!=None :
--            os.system('cat ./fort.15 ./ficode >> ./fort.15')
-+            os.system('cat ./ficode >> ./fort.15')
-          return 0
-       except :
-          self.MESSAGE("ERREUR INOPINEE - INTERRUPTION")
-@@ -296,7 +296,7 @@
-             print ">> JDC.py : FIN RAPPORT"
- 
-          if j.fico!=None :
--            os.system('cat ./fort.15 ./ficode >> ./fort.15')
-+            os.system('cat ./ficode >> ./fort.15')
- 
-          return ier
- 

french/aster/files/patch-setup.cfg

@@ -0,0 +1,11 @@
+--- setup.cfg.orig	Wed Jan  5 13:43:56 2005
++++ setup.cfg	Sun Jan 16 14:45:27 2005
+@@ -16,7 +16,7 @@
+ # C and Fortran compilers and linker for Code_Aster
+ CC='/usr/bin/gcc'
+ F77='/usr/bin/g77'
+-LD='/usr/bin/g77'
++LD='/usr/bin/gcc'
+ 
+ # Uncomment (remove first # character) the two following lines
+ # to skip tcl/tk installation

french/aster/files/patch-setup.py

@@ -0,0 +1,11 @@
+--- setup.py.orig	Mon Jan  3 16:40:16 2005
++++ setup.py	Sat Jan  8 16:37:54 2005
+@@ -247,6 +247,8 @@
+ # 1.3.2. ----- convert uname value to Code_Aster terminology...
+ if sys.platform == 'linux2':
+    cfg['IFDEF']='P_LINUX'
++elif sys.platform[:7] == 'freebsd':
++   cfg['IFDEF']='FREEBSD'
+ elif sys.platform[:4] == 'osf1':
+    cfg['IFDEF']='TRU64'
+ elif sys.platform == 'sunos5':

french/aster/files/patch-tcl::run_aster

@@ -1,20 +0,0 @@
---- tcl/run_aster.orig	Wed Nov 19 11:48:05 2003
-+++ tcl/run_aster	Mon Dec  1 22:56:03 2003
-@@ -5,6 +5,8 @@
- TCLSH=HOME_TCL_TK/bin/TCL_BIN
- REPTCL=HOME_CODE_ASTER/tcl
- PYTHONHOME=HOME_PYTHON
-+PYTHONPATH=%%PYTHONPATH%%
-+HDF5_DISABLE_VERSION_CHECK=1
- 
- # lancement de run_aster
- # usage : run_aster [-p ncpu] fichier_parametre
-@@ -32,6 +34,8 @@
- fi
- 
- export PYTHONHOME
-+export PYTHONPATH
-+export HDF5_DISABLE_VERSION_CHECK
- 
- OMP_NUM_THREADS=$ncpu
- export OMP_NUM_THREADS

french/aster/files/pkg-message.in

@@ -1,17 +1,13 @@
-run_aster a été installé dans le répertoire %%inst_dir%%/tcl.
-
 Pour lancer Code_Aster via ASTK, entrez :
-%%inst_dir%%/outils/astk
+%%tools_dir%%/astk
 
 Sur plate-forme i386, nous vous suggérons d'installer les ports french/gibi
 et french/homard, deux outils de maillage additionnels.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-run_aster has been installed in the directory %%inst_dir%%/tcl.
+To run Code_Aster through ASTK, type:
+%%tools_dir%%/astk
 
 On i386 platform, we suggest you install the ports french/gibi and
 french/homard, two additional meshing tools.
-
-To run Code_Aster through ASTK, type:
-%%inst_dir%%/outils/astk

french/aster/files/pkg-message.sans-astk.in

@@ -1,19 +1,15 @@
-run_aster a été installé dans le répertoire %%inst_dir%%/tcl.
-
 Après avoir installé Code_Aster, vous devriez installer ASTK
 [cad/astk-serveur et cad/astk-client].
-ASTK est une interface graphique qui lance Code_Aster à partir de run_aster.
+ASTK est une interface graphique qui lance Code_Aster.
 
 Sur plate-forme i386, nous vous suggérons d'installer les ports french/gibi
 et french/homard, deux outils de maillage additionnels.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-run_aster has been installed in the directory %%inst_dir%%/tcl.
+After Code_Aster installation you could install ASTK
+[cad/astk-serveur and cad/astk-client].
+ASTK is a graphic interface to run Code_Aster.
 
 On i386 platform, we suggest you install the ports french/gibi and
 french/homard, two additional meshing tools.
-
-After Code_Aster installation you could install ASTK
-[cad/astk-serveur and cad/astk-client].
-ASTK is a graphic interface to run Code_Aster using run_aster.