- use $SUB_FILES to dynamically adjust pkg-message (1);

- upgrade Code_Aster to 10.1.0-4 (2).

PR:		ports/142516 (1)
Submitted by:	Sevan Janiyan <venture37 (at) geeklan.co.uk> (1)

french/aster/Makefile

@@ -7,9 +7,8 @@
 
 PORTNAME=		aster
 DISTVERSIONPREFIX=	full-src-
-DISTVERSION=		10.0.3-2
+DISTVERSION=		10.1.0-4
 DISTVERSIONSUFFIX=	.noarch
-PORTREVISION=	2
 CATEGORIES=		french cad
 MASTER_SITES=		http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
 
@@ -43,8 +42,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur	\
 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.2:${PORTSDIR}/french/med					\
-		f2c.2:${PORTSDIR}/lang/f2c
+		med.2:${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
@@ -55,13 +53,13 @@ HAS_CONFIGURE=	yes
 REINPLACE_ARGS=	-i ""
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-full-src-${PORTVERSION:R}
-PLIST_SUB=	ASTERDIR=${PORTNAME}/${vaster} TOOLDIR=${PORTNAME}/${vaster}/outils
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB=	ASTERDIR=${PORTNAME}/${vaster} TOOLDIR=${PORTNAME}/outils
 .if defined(WITHOUT_ASTK_CLI)
-PKGMESSIN=	pkg-message.sans-astk.in
+SUB_FILES=	pkg-message.sans-astk
 .else
-PKGMESSIN=	pkg-message.in
+SUB_FILES=	pkg-message
 .endif
+SUB_LIST=	tools_dir=${tools_dir}
 
 INTERACTIVE_SCRIPTS=	check_compilers.py setup.py
 
@@ -144,6 +142,7 @@ HOME_MPI=	${LOCALBASE}
 .endif
 
 USE_FORTRAN=	yes
+GCC_VER=	`${CC} -dumpversion`
 
 TK_VER?=	8.4
 SHORT_TK_VER=	${TK_VER:S/.//}
@@ -199,9 +198,10 @@ vaster=		STA${PORTVERSION:R:R}
 INST_DAT=	LICENSE.TERMS astest cata_ele.pickled catalo catapy	\
 		elements etude materiau
 INST_PY=	bibpyt commande
+INST_SH=	as_run parallel_cp
 DAT2FIX=	astout.export config.txt forma01a.export
 inst_dir=	${PREFIX}/${PORTNAME}/${vaster}
-tools_dir=	${inst_dir}/outils
+tools_dir=	${PREFIX}/${PORTNAME}/outils
 v_ifdef=	${OPSYS:U}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 tcl_dir=	${LOCALBASE}
@@ -220,13 +220,15 @@ ${WRKSRC}/instdir/${vaster}/elements:	build
 
 pre-everything::
 .if defined(WITH_MPI)
-	@${ECHO_MSG} "To build Code_Aster with MPI enabled, you nedd to run `mpd &'"
+	@${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run `mpd &'"
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' ${WRKSRC}/setup.cfg
 	${REINPLACE_CMD} -e 's|/opt/aster|${WRKSRC}/instdir|'		\
 		${WRKSRC}/setup.cfg
+	${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${WRKSRC}/instdir|'		\
+		${WRKSRC}/products.py
 	${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g" ${WRKSRC}/check_compilers.py
 .if defined(WITH_ATLAS)
 	${REINPLACE_CMD} -e "s|cfg\['BLASLIB'\]|cfg['BLASLIB'], cfg['ATLASLIB']|"	\
@@ -255,6 +257,7 @@ pre-configure:
 	${ECHO_CMD} "_install_crpcrs = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_aster_Linux = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_scotch  = False"			>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "OPT_ENV = 'verbose=True'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MUMPS)
@@ -264,11 +267,15 @@ pre-configure:
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
 . endif
 .endif
-	${ECHO_CMD} "LD='${CC}'"				>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "F90='${LOCALBASE}/bin/${FC}'"		>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "SYSLIB='-Xlinker -export-dynamic ${PTHREAD_LIBS} -lutil -lm -lz -L${FORTRANLIBDIR} -L${FORTRANLIBDIR2} -lgfortranbegin  -lgfortran'"	\
+	${ECHO_CMD} "CC='${CC}'"				>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "CXX='${CXX}'"				>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "CXXLIB = '-L${LOCALBASE}/lib/${CC} -lstdc++ -lsupc++'"	\
 		>> ${WRKSRC}/setup.cfg
-
+	${ECHO_CMD} "LD='${FC}'"				>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "F90='${LOCALBASE}/bin/${FC}'"		>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${PTHREAD_LIBS} -lutil -lm -lz -lgfortran ${PTHREAD_LIBS} -lz'"	\
+		>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "SYSLIB='${PTHREAD_LIBS} -lz'"		>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
 	${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'"			>> ${WRKSRC}/setup.cfg
 .else
@@ -285,6 +292,7 @@ pre-configure:
 	${ECHO_CMD} "LAPACKLIB='${LOCALBASE}/lib/liblapack.a'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "GZIP='/usr/bin/gzip'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'"	>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "TERMINAL='xterm'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "EDITOR='${WITH_ED}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS='-c ${FFLAGS} ${FLAGARCH} ${FFLAGARCH}'"	>> ${WRKSRC}/setup.cfg
@@ -323,43 +331,53 @@ do-configure:
 	@${ECHO_MSG} "------------ Fin debug ------------------"
 
 pre-build:
-	${MKDIR} ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf			\
-		${WRKSRC}/instdir/ASTK/ASTK_SERV/lib			\
-		${WRKSRC}/instdir/outils
-	${SED} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|'		\
-		< ${LOCALBASE}/aster/ASTK/ASTK_SERV/conf/config		\
-		> ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf/config
-	${CP} ${LOCALBASE}/aster/ASTK/ASTK_SERV/conf/aster_profile.sh	\
-		${WRKSRC}/instdir/ASTK/ASTK_SERV/conf
-	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin			\
-		${WRKSRC}/instdir/ASTK/ASTK_SERV
-	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/lib			\
-		${WRKSRC}/instdir/ASTK/ASTK_SERV/
+	${MKDIR} ${WRKSRC}/instdir/etc/codeaster
+	${CP} ${LOCALBASE}/aster/etc/codeaster/*		\
+		${WRKSRC}/instdir/etc/codeaster/
+	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
+		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
+		${WRKSRC}/instdir/
+	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|'	\
+		${WRKSRC}/instdir/bin/as_run
+.for sf in etc/codeaster/profile.sh asrun/installation.py
+	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${WRKSRC}/instdir|g'	\
+		-e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|g'	\
+		${WRKSRC}/instdir/${sf}
+.endfor
 
 do-build:
 	(cd ${BUILD_WRKSRC} &&	\
-		${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} install aster	\
+	${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} install aster	\
 		| tee ${BUILD_WRKSRC}/build.log)
-
-pre-install:
 	${CHMOD} go-x ${WRKSRC}/instdir/${vaster}/materiau/A42_REF_A.NOMI
 
-do-install:	${WRKSRC}/instdir/${vaster}/elements
-	${MKDIR} ${tools_dir} ${inst_dir}
+do-install:
+	${MKDIR} ${tools_dir} ${inst_dir} ${PREFIX}/${PORTNAME}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/instdir/${vaster}/asteru ${inst_dir}
 	${INSTALL_SCRIPT} ${WRKSRC}/instdir/${vaster}/asterd ${inst_dir} # Don't strip!
 	${INSTALL_SCRIPT} ${WRKSRC}/instdir/${vaster}/profile.sh ${inst_dir}
+	${ECHO_CMD} "" >> ${inst_dir}/profile.sh
 	${ECHO_CMD} "HDF5_DISABLE_VERSION_CHECK=1" >> ${inst_dir}/profile.sh
 .for FILE in ${DAT2FIX}
 	${SED} -e 's|${WRKSRC}/instdir/${vaster}|${inst_dir}|g'		\
-		-e 's|${WRKSRC}/instdir|${inst_dir}|g'			\
 		-e 's|${WRKSRC}/instdir/outils|${tools_dir}|g'		\
+		-e 's|${WRKSRC}/instdir|${inst_dir}|g'			\
+		-e 's|^F list|@F list|'					\
+		-e 's|^#F list|F list|'					\
+		-e 's|^@F list|#F list|'				\
 		-e 's|P mode astout|P mode interactif|'			\
 		-e 's|P mode forma01a|P mode interactif|'		\
+		-e 's|R resu_test ${inst_dir}|R resu_test /tmp|'	\
 	< ${WRKSRC}/instdir/${vaster}/${FILE} > ${inst_dir}/${FILE}
 .endfor
+	${LN} -sf ${inst_dir}/config.txt ${PREFIX}/${PORTNAME}/
 .for FILE in ${INST_DAT} ${INST_PY}
 	${CP} -R ${WRKSRC}/instdir/${vaster}/${FILE} ${inst_dir}
+.endfor
+.for FILE in ${INST_SH}
+	${SED} -e 's|${WRKSRC}/instdir|${PREFIX}/${PORTNAME}|'	\
+	< ${WRKSRC}/instdir/bin/${FILE} > ${PREFIX}/${PORTNAME}/bin/${FILE}
+	${CHMOD} a+x ${PREFIX}/${PORTNAME}/bin/${FILE}
 .endfor
 	${REINPLACE_CMD} -e 's|cat ./fort.15 ./ficode|cat ./ficode|'	\
 		${inst_dir}/bibpyt/Execution/E_SUPERV.py
@@ -391,11 +409,7 @@ post-install:
 	${LN} -fs ${LOCALBASE}/bin/gracebat ${tools_dir}/
 	${LN} -fs ${LOCALBASE}/bin/xmgrace ${tools_dir}/
 .endif
-	${LN} -fs ${LOCALBASE}/${PORTNAME}/ASTK/ASTK_SERV/conf/aster_profile.sh	\
-		${PREFIX}/${PORTNAME}/
 	@${ECHO_MSG}
-	@${SED} -e "s#%%tools_dir%%#${tools_dir}#"	\
-		${FILESDIR}/${PKGMESSIN} > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
@@ -405,7 +419,7 @@ regression-test:	install
 	(cd ${inst_dir};	\
 	HDF5_DISABLE_VERSION_CHECK=1	\
 	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run astout.export)
-	@${ECHO_MSG} "Check ${inst_dir}/astest/*.erre"
+	@${ECHO_MSG} "Check /tmp/resu_test/*.erre"
 .endif
 
 .include <bsd.port.post.mk>

french/aster/distinfo

@@ -1,3 +1,3 @@
-MD5 (aster-full-src-10.0.3-2.noarch.tar.gz) = d2609b01a26e1166a58ebcb5a5b46a32
-SHA256 (aster-full-src-10.0.3-2.noarch.tar.gz) = a30a0d7c46168b1c7cbff22a290527753337d89883ec53afff6a2ca8a32c49a3
-SIZE (aster-full-src-10.0.3-2.noarch.tar.gz) = 149739925
+MD5 (aster-full-src-10.1.0-4.noarch.tar.gz) = 49fe55a0a46491124c16965a2db59c5e
+SHA256 (aster-full-src-10.1.0-4.noarch.tar.gz) = c72f82abadb627925cbc5cbf9909f969e4c60f29325a62d78664eb03a860468a
+SIZE (aster-full-src-10.1.0-4.noarch.tar.gz) = 163690307

french/aster/files/patch-as_setup.py

@@ -1,17 +1,33 @@
---- as_setup.py.orig	2007-12-21 17:08:17.000000000 +0100
-+++ as_setup.py	2008-01-08 22:32:14.000000000 +0100
-@@ -397,6 +397,10 @@
-                traceback.print_exc()
-                self.exit_code=iret
-                raise SetupExtractError, _('error during extracting archive %s') % archive
-+            # Insert FreeBSD patches here
-+            self._print('Handle gfortran C-like pre-processor directives')
-+            os.rename(os.path.join(self.content, 'bibf90/utilitai/traceb.f'), os.path.join(self.content, 'bibf90/utilitai/traceb.F'))
-+            # End of FreeBSD patches
+--- as_setup.py.orig	2010-02-09 10:04:57.000000000 +0100
++++ as_setup.py	2010-02-20 15:49:39.000000000 +0100
+@@ -47,6 +47,8 @@
+ import imp
+ import shutil
+ import pprint
++import fileinput
++import string
+ from types import StringTypes
+ EnumTypes=(list, tuple)
  
+@@ -449,6 +451,17 @@
        if iextr_as:
-          iret=0
-@@ -1216,7 +1220,10 @@
+          self.Clean(to_delete=path)
+ 
++      # Insert FreeBSD patches here
++      file2patch = os.path.join(self.installdir, self.content, 'bibc/utilitai/mempid.c')
++      self._print('different /proc/pid/status => change ' + file2patch)
++      for ligne in fileinput.input(file2patch, inplace=1):
++         nl = 0
++         nl = string.find(ligne, 'ifdef _POSIX')
++         if nl > 0:
++            ligne =ligne.replace('ifdef _POSIX', 'ifndef __FreeBSD__')
++         sys.stdout.write(ligne)
++      # End of FreeBSD patches
++
+ #-------------------------------------------------------------------------------
+    def Configure(self, **kargs):
+       """Configuration of the product.
+@@ -1302,7 +1315,10 @@
        from socket import gethostname, gethostbyaddr
        if host==None:
           host = gethostname()

french/aster/files/patch-check_compilers.py

@@ -1,29 +1,6 @@
---- check_compilers.py.orig	2009-06-16 14:26:10.000000000 +0200
-+++ check_compilers.py	2009-06-19 23:08:19.000000000 +0200
-@@ -268,9 +268,9 @@
-          self._print('---------- ERROR MESSAGE ----------', os.linesep, errmsg)
-          self._print(blas_lapack['__error__'])
-          rep = should_continue()
--      # add to global (g2c/gfortran must be used by aster compiled with Intel)
-+      # add to global (f2c/gfortran must be used by aster compiled with Intel)
-       for k, v in self.cfg.items():
--         if    re.search('__LIBS_math_[0-9]+_g2c',      k) is not None \
-+         if    re.search('__LIBS_math_[0-9]+_f2c',      k) is not None \
-             or re.search('__LIBS_math_[0-9]+_gfortran', k) is not None:
-             self.cfg_add_global[k] = v
- 
-@@ -416,8 +416,8 @@
-       self.fcheck(self.fortran_supports_openmp, "F77 (%s) and F90 (%s) support '-fopenmp' option" \
-          % (self.cfg.get('F77', '?'), self.cfg.get('F90', '?')))
-       
--      # les blas/lapack en ont peut-etre besoin, on rend libg2c facultative si F77=gfortran
--      self.libs.append(('math', 'g2c', not self.is_F77_is_gfortran))
-+      # les blas/lapack en ont peut-etre besoin, on rend libf2c facultative si F77=gfortran
-+      self.libs.append(('math', 'f2c', not self.is_F77_is_gfortran))
-       self.find_libs(lib=self.libs[-1])
-       if self.cfg.get('F90') or self.is_F77_is_gfortran:
-          self.libs.append(('math', 'gfortran'))
-@@ -518,6 +518,16 @@
+--- check_compilers.py.orig	2010-02-09 10:04:59.000000000 +0100
++++ check_compilers.py	2010-02-16 19:48:18.000000000 +0100
+@@ -581,6 +581,16 @@
           else:                      # x86_64
              intel_arch   = 'intel64'
              mkl_src_name = 'mklvarsem64t.sh'

french/aster/files/patch-products.py

@@ -1,16 +1,16 @@
---- products.py.orig	2009-01-16 15:50:07.000000000 +0100
-+++ products.py	2009-01-19 22:34:19.000000000 +0100
-@@ -934,16 +934,19 @@
-            'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB', 'PYMODULES_PREFIX',
-            'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS',
-            'HOME_MED', 'HOME_HDF', 'HOME_CRPCRS',
+--- products.py.orig	2010-02-09 10:04:58.000000000 +0100
++++ products.py	2010-02-17 21:35:50.000000000 +0100
+@@ -900,16 +900,19 @@
+            'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB',
+            'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
+            'HOME_MED', 'HOME_HDF', 'HOME_CRPCRS', 'HOME_NUMERIC',
 -           'LD', 'CC', 'F77', 'F90', 'CXXLIB', 'OTHERLIB',],
 +           'LD', 'CC', 'F77', 'F90', 'LDFLAGS', 'SYSLIB',
 +           'CFLAGS', 'CFLAGS_DBG',
 +           'FFLAGS', 'FFLAGS_DBG',
 +           'F90FLAGS', 'F90FLAGS_DBG', 'CXXLIB', 'OTHERLIB',],
-       reqobj=['file:?HOME_ASTK?/ASTK_SERV/bin/as_run',
-               'file:?HOME_ASTK?/ASTK_SERV/conf/aster_profile.sh'],
+       reqobj=['file:?ASTER_ROOT?/bin/as_run',
+               'file:?ASTER_ROOT?/etc/codeaster/profile.sh'],
        set=['SYSLIB',
             'MEDLIB', 'HDFLIB', 'MATHLIB',
             'MUMPSLIB', 'ZMATLIB', 'SCOTCHLIB',
@@ -24,7 +24,7 @@
             'NOBUILD', ],
     )
     cfg['ENV_SH']   = cfg.get('ENV_SH', '')
-@@ -978,6 +981,19 @@
+@@ -945,6 +948,19 @@
        opt['FFLAGS']     = '-O2'
        zmat_platform='Linux'
        mpilibs.extend(['mpich'])
@@ -44,11 +44,29 @@
     elif cfg['IFDEF'] == 'LINUX64':
        opt['SYSLIB']     = '-Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm'
        opt['LDFLAGS']    = '-v'
-@@ -1059,12 +1075,15 @@
+@@ -1017,11 +1033,12 @@
+       cfg['MEDLIB']=''
+ 
+    # ----- libs c++ (for MED and ZMAT)
+-   if cfg['HOME_MED'] != '' or cfg['HOME_ZMAT'] != '':
+-      for lib in cxxlibs:
+-         ftools.findlib_and_set(cfg, 'CXXLIB', lib,
+-            [cfg['HOME_MED'], cfg['HOME_ZMAT']],
+-            err=False, append=True, maxdepth=max(ftools.maxdepth,10))
++   # CXXLIB already set for FreeBSD
++   #if cfg['HOME_MED'] != '' or cfg['HOME_ZMAT'] != '':
++   #   for lib in cxxlibs:
++   #      ftools.findlib_and_set(cfg, 'CXXLIB', lib,
++   #         [cfg['HOME_MED'], cfg['HOME_ZMAT']],
++   #         err=False, append=True, maxdepth=max(ftools.maxdepth,10))
+ 
     # ----- MUMPS
     if cfg['HOME_MUMPS'] != '':
-       cfg['DEFINED'] += ' _HAVE_MUMPS'
--      for lib in ('dmumps', 'zmumps', 'pord', 'mpiseq'):
+@@ -1030,12 +1047,15 @@
+       if not less_than_version(dict_prod['mumps'], '4.8.0'):
+          mumps_lib.extend(['smumps', 'cmumps', 'mumps_common'])
+       mumps_lib.extend(['pord', 'mpiseq'])
+-      for lib in mumps_lib:
 -         ftools.findlib_and_set(cfg, 'MUMPSLIB', lib,
 -            cfg['HOME_MUMPS'],
 -            err=False, append=True)
@@ -57,21 +75,12 @@
 +      if cfg['MUMPSLIB'] != '':
 +         opt['MUMPSLIB'] =  cfg['MUMPSLIB']
 +      else:
-+         for lib in ('dmumps', 'zmumps', 'pord', 'mpiseq'):
++         for lib in mumps_lib:
 +            ftools.findlib_and_set(cfg, 'MUMPSLIB', lib,
 +               cfg['HOME_MUMPS'],
 +               err=False, append=True)
 +            if lib == 'dmumps':
 +               ftools.CheckFromLastFound(cfg, 'HOME_MUMPS', 'lib')
+       if cfg['HOME_METIS'] != '':
+          cfg['MUMPSLIB'] += " -L%s/lib -lmetis" % cfg['HOME_METIS']
        opt['F90INCLUDE'] += ' -I%s' % os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION'],'bibf90',cfg['INCLUDE_MUMPS'])
-       if cfg['HOME_MPI'] != '':
-          cfg['DEFINED'] += ' _USE_MPI_MUMPS'
-@@ -1120,7 +1139,7 @@
-             cfg['HOME_SCOTCH'],
-             err=True, append=True)
-          if lib == 'common':
--            ftools.CheckFromLastFound(cfg, 'HOME_SCOTCH', 'bin')
-+            ftools.CheckFromLastFound(cfg, 'HOME_SCOTCH', 'lib')
-       ftools.find_and_set(cfg, 'CINCLUDE', 'scotchf.h',
-          cfg['HOME_SCOTCH'],
-          typ='inc', err=True, append=True)

french/aster/files/patch-setup.cfg

@@ -1,7 +1,16 @@
---- setup.cfg.orig	2008-12-23 18:01:02.000000000 +0100
-+++ setup.cfg	2009-01-04 17:53:09.000000000 +0100
-@@ -99,7 +99,7 @@
- MAXDEPTH=3  # 0: not recursive (this may be long with a high depth value)
+--- setup.cfg.orig	2010-02-09 10:04:59.000000000 +0100
++++ setup.cfg	2010-02-17 21:24:28.000000000 +0100
+@@ -56,7 +56,7 @@
+ # If a file or library is not found in these directories, you may try
+ # using 'locate' command. Default is not to use locate because it usually
+ # causes failure with inconsistent versions.
+-MAXDEPTH = 5
++MAXDEPTH = 1
+ USE_LOCATE = False
+ 
+ #-------------------------------------------------------------------------------
+@@ -100,7 +100,7 @@
+ #INCLUDEDIR=['/myprefix/include', ]
  
  # To search for shared libraries first
 -PREFER_SHARED_LIBS=False   # False/True
@@ -9,7 +18,7 @@
  
  
  #-------------------------------------------------------------------------------
-@@ -144,9 +144,9 @@
+@@ -140,9 +140,9 @@
  
  #-------------------------------------------------------------------------------
  # Interface between Code_Aster and Salome

french/aster/files/patch-setup.py

@@ -1,6 +1,6 @@
---- setup.py.orig	2008-12-23 18:01:02.000000000 +0100
-+++ setup.py	2009-01-04 17:54:20.000000000 +0100
-@@ -296,6 +296,14 @@
+--- ./setup.py.orig	2010-02-09 10:04:59.000000000 +0100
++++ ./setup.py	2010-02-11 23:32:34.000000000 +0100
+@@ -318,6 +318,14 @@
              cfg['ARCH'] = 'x86_64'
        else:
           cfg['IFDEF'] = 'LINUX'
@@ -15,7 +15,21 @@
     elif sys.platform[:4] == 'osf1':
        cfg['IFDEF']='TRU64'
     elif sys.platform == 'sunos5':
-@@ -509,6 +517,7 @@
+@@ -442,13 +450,6 @@
+    if not type(math_lib) in (list, tuple):
+       math_lib = [math_lib,]
+    sys_lib = []
+-   for glob_lib in ('pthread', 'z',):
+-      cfg['__tmp__'] = ''
+-      del cfg['__tmp__']
+-      ftools.findlib_and_set(cfg, '__tmp__', glob_lib, prefshared=True, err=False, silent=False)
+-      if cfg.get('__tmp__'):
+-         ftools.AddToCache('lib', glob_lib, cfg['__tmp__'])
+-         sys_lib.append(glob_lib)
+ 
+    # 1.4.2. ----- check for compilers
+    cfg_ini = cfg.copy()
+@@ -541,6 +542,7 @@
     # and modify command line of those which don't have a --display= option
     ListEdit=[
        ['nedit' , 'nedit',],