6 files changed, 49 insertions, 173 deletions

diff --git a/science/ncs/files/patch-bin_Makefile b/science/ncs/files/patch-bin_Makefile
index 7b2134b7182c..b97e80d45ccf 100644
--- a/science/ncs/files/patch-bin_Makefile
+++ b/science/ncs/files/patch-bin_Makefile
@@ -1,5 +1,5 @@
---- bin/Makefile.orig	2007-11-23 18:35:59.000000000 +0100
-+++ bin/Makefile	2007-12-30 21:52:12.000000000 +0100
+--- bin/Makefile.orig	2008-02-18 19:51:37.000000000 +0100
++++ bin/Makefile	2008-04-29 23:19:31.000000000 +0200
 @@ -174,7 +174,6 @@
  
  link:
@@ -8,39 +8,3 @@
  	@make privcompil
  	@make privlink
  	@make privfin
-@@ -846,7 +845,7 @@
- 	           echo "$(BO)or in one of its sub-directories$(NO)" ;\
- 	           echo ;\
- 	           tput init ;\
--	           exit -1 ;\
-+	           exit 1 ;\
- 	      fi ;\
- 	 fi ;\
- 	 dirprec=`dirname $${dirprec}` ;\
-@@ -858,7 +857,7 @@
- 	      echo "$(BO) You must be in the general directory: $(DIR_CS)$(NO)" ;\
- 	      echo ;\
- 	      tput init ;\
--	      exit -1 ;\
-+	      exit 1 ;\
- 	 fi ;\
- 	 if   [ ! "$${modtrav}" = "$${module}" ] ;\
- 	 then echo ;\
-@@ -867,7 +866,7 @@
- 	      echo "$(BO)You must be in directory: $${module}$(NO)" ;\
- 	      echo ;\
- 	      tput init ;\
--	      exit -1 ;\
-+	      exit 1 ;\
- 	 fi ;\
- 	 if   [ ! "$${opttrav}" = "$(MYOPT)" ] ;\
- 	 then echo ;\
-@@ -881,7 +880,7 @@
- 	      fi ;\
- 	      echo ;\
- 	      tput init ;\
--	      exit -1 ;\
-+	      exit 1 ;\
- 	 fi ;\
- 	 if [ "$${modtrav}" = "BASE" ] ;\
- 	 then INC_CS="toto" ;\
diff --git a/science/ncs/files/patch-bin_compiler_version b/science/ncs/files/patch-bin_compiler_version
deleted file mode 100644
index 101492b8fa40..000000000000
--- a/science/ncs/files/patch-bin_compiler_version
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./bin/compiler_version.orig	Thu Mar  1 12:23:39 2007
-+++ ./bin/compiler_version	Sun May  6 22:49:29 2007
-@@ -132,8 +132,8 @@
- #     sur hp, par exemple f90 +version n'en cree pas)
- 
-  echo ' '                                       >> ${compillog}
-- if [ -f cs12.exe ] ; then 
--   ./cs12.exe                                   >> ${compillog} 2>&1
-+ if [ -f cs13.exe ] ; then 
-+   ./cs13.exe                                   >> ${compillog} 2>&1
-  else
-    echo ' Pas d executable test FORTRAN '       >> ${compillog} 
-  fi
-@@ -181,8 +181,8 @@
- #   Execution 
- 
-  echo ' '                                       >> ${compillog}
-- if [ -f cs12.exe ] ; then 
--   ./cs12.exe                                   >> ${compillog} 2>&1
-+ if [ -f cs13.exe ] ; then 
-+   ./cs13.exe                                   >> ${compillog} 2>&1
-  echo ' '                                       >> ${compillog}
-  else
-    echo ' Pas d executable test C '             >> ${compillog} 
diff --git a/science/ncs/files/patch-bin_cree_sat b/science/ncs/files/patch-bin_cree_sat
deleted file mode 100644
index 80c11a68fc8d..000000000000
--- a/science/ncs/files/patch-bin_cree_sat
+++ /dev/null
@@ -1,37 +0,0 @@
---- bin/cree_sat.orig	Thu Mar  1 12:23:39 2007
-+++ bin/cree_sat	Mon May  7 23:56:27 2007
-@@ -156,12 +156,12 @@
-   thch=THCH
-   mkdir ${CAS}/DATA/$thch
-   for var in dp_C3P dp_C3PSJ dp_ELE dp_FCP ; do
--    cp $CS_HOME/data/thch/$var $CAS/DATA/$thch/.
-+    cp -f $CS_HOME/data/thch/$var $CAS/DATA/$thch/.
-   done
- 
-   gui=SaturneGUI
-   if [ "$IHM" = "ihm" ] ; then
--    cp $SCRIPT_HOME/$gui ${CAS}/DATA/.
-+    cp -f $SCRIPT_HOME/$gui ${CAS}/DATA/.
-     sed "s/NOMCSGUIHOME/$CSGUIHOMEBCKSLH/g"  $CAS/DATA/$gui  >cas.tmp
-     mv -f cas.tmp $CAS/DATA/$gui
-     chmod +x $CAS/DATA/$gui
-@@ -169,7 +169,7 @@
- 
- # recopie des src  utilisateur et masquage des repertoires CVS
-   users=USERS
--  cp -r $CS_HOME/users $CAS/FORT/$users
-+  cp -Rf $CS_HOME/users $CAS/FORT/$users
-   listedircvs=`find $CAS/FORT/$users -name CVS -print`
-   for dir in $listedircvs ; do
-     mv $dir `dirname ${dir}`/.CVS
-@@ -178,8 +178,8 @@
- # sur cluster, le nom est limite a 15 caracteres
-   NOMETCAS=`echo ${etude}${cas}|cut -c1-15`
- 
--  cp $SCRIPT_HOME/lance         $CAS/SCRIPTS
--  cp $SCRIPT_HOME/lance.help    $CAS/SCRIPTS
-+  cp -f $SCRIPT_HOME/lance         $CAS/SCRIPTS
-+  cp -f $SCRIPT_HOME/lance.help    $CAS/SCRIPTS
-   FICREPBASECASBKSLH=$CAS/SCRIPTS/.repbasecasbkslh
-   echo $REPBASECAS | sed -e "s/\//\\\\\//g" > $FICREPBASECASBKSLH
-   REPBASECASBCKSLH=`cat $FICREPBASECASBKSLH`
diff --git a/science/ncs/files/patch-bin_cs_profile b/science/ncs/files/patch-bin_cs_profile
index d7980373f4ac..99a0e095730d 100644
--- a/science/ncs/files/patch-bin_cs_profile
+++ b/science/ncs/files/patch-bin_cs_profile
@@ -1,51 +1,34 @@
---- bin/cs_profile.orig	2007-11-23 18:35:59.000000000 +0100
-+++ bin/cs_profile	2007-12-30 22:01:54.000000000 +0100
-@@ -58,18 +58,33 @@
+--- bin/cs_profile.orig	2008-04-23 11:32:09.000000000 +0200
++++ bin/cs_profile	2008-04-29 23:35:23.000000000 +0200
+@@ -37,12 +37,17 @@
  
-   if [ "$NOM_ARCH" = "OSF1" -o "$NOM_ARCH" = "Linux_CCRT" -o "$NOM_ARCH" = "Linux_IA64" ] ; then 
-     PATHCS=/home/saturne/Saturne
-+  elif [ "$NOM_ARCH" = "FreeBSD" ] ; then
-+    PATHCS=%%LOCALBASE%%/Saturne
-   elif [ "$NOM_ARCH" = "Blue_Gene_L" ] ; then 
-     PATHCS=/gpfs2/home/saturne
-   else
-     PATHCS=/home/saturne
-   fi
--  CS_HOME=${PATHCS}/Noyau/ncs-1.3.1
--  ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.1
--  CSGUI_HOME=${PATHCS}/Interface/ics-1.3.1
--  SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.1
-+  if [ "$NOM_ARCH" = "FreeBSD" ] ; then
-+    CS_HOME=${PATHCS}/Noyau/ncs
-+    ECS_HOME=${PATHCS}/Enveloppe/ecs
-+    CSGUI_HOME=${PATHCS}/Interface/ics
-+    SYRCS_HOME=${PATHCS}/opt/syr_cs
-+#   Variables specifiques a passer au Makefile FreeBSD par lance
-+    LOCALBASE=%%LOCALBASE%% ; export LOCALBASE
-+    FC=%%FC%% ; export FC
-+    PTHREAD_LIBS=%%PTHREAD_LIBS%% ; export PTHREAD_LIBS
-+  else
-+    CS_HOME=${PATHCS}/Noyau/ncs-1.3.1
-+    ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.1
-+    CSGUI_HOME=${PATHCS}/Interface/ics-1.3.l
-+    SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.1
-+  fi
+ # Versions Code_saturne
+ 
+-  PATHCS=/home/saturne
++  PATHCS=%%LOCALBASE%%/Saturne
++
++  CS_HOME=${PATHCS}/Noyau/ncs
++  ECS_HOME=${PATHCS}/Enveloppe/ecs
++  CSGUI_HOME=${PATHCS}/Interface/ics
++  SYRCS_HOME=${PATHCS}/opt/syr_cs
++# Variables specifiques a passer au Makefile FreeBSD par lance
++  LOCALBASE=%%LOCALBASE%% ; export LOCALBASE
++  FC=%%FC%% ; export FC
++  PTHREAD_LIBS=%%PTHREAD_LIBS%% ; export PTHREAD_LIBS
+ 
+-  CS_HOME=${PATHCS}/Noyau/ncs-1.3.2
+-  ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.2
+-  CSGUI_HOME=${PATHCS}/Interface/ics-1.3.2
+-  SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.2
  #
-   if [ "$NOM_ARCH" = "Linux" -a -d /home/prevalcs/HOMARD ] ; then
-     CSHOMARD_HOME=/home/prevalcs/HOMARD
-+  elif [ "$NOM_ARCH" = "FreeBSD" ] ; then
-+    CSHOMARD_HOME=%%LOCALBASE%%/apps/homard
-   else
-     CSHOMARD_HOME=
-   fi
-@@ -93,6 +108,10 @@
-     CS_MPI_PATH=/home/saturne/opt/openmpi-1.2.4/arch/Linux/bin
-   elif [ "$NOM_ARCH" = "Linux_Ch" ] ; then
-     CS_MPI_PATH=/usr/local/mpichgm-1.2.6.14b-64b/bin
-+  elif [ "$NOM_ARCH" = "FreeBSD" ] ; then
-+    MPI_HOME=%%MPI_HOME%% ; export MPI_HOME
-+    MPI_LIBS=%%MPI_LIBS%% ; export MPI_LIBS
-+    CS_MPI_PATH=${MPI_HOME}/bin
-   else
-     CS_MPI_PATH=
-   fi
+ # Path 
+   PATH=$CS_HOME/bin:$ECS_HOME/bin:$PATH
+@@ -52,5 +57,7 @@
+   export PATH
+ 
+ # Chemins et librairies pour MPI
+-  CS_MPI_PATH=/home/saturne/opt/openmpi-1.2.6/arch/Linux/bin
++  MPI_HOME=%%MPI_HOME%% ; export MPI_HOME
++  MPI_LIBS=%%MPI_LIBS%% ; export MPI_LIBS
++  CS_MPI_PATH=${MPI_HOME}/bin
+   export CS_MPI_PATH
diff --git a/science/ncs/files/patch-bin_grp b/science/ncs/files/patch-bin_grp
deleted file mode 100644
index 85371f4f3dc0..000000000000
--- a/science/ncs/files/patch-bin_grp
+++ /dev/null
@@ -1,8 +0,0 @@
---- bin/grp.orig	Thu Mar  1 12:23:39 2007
-+++ bin/grp	Mon May  7 14:08:44 2007
-@@ -1,4 +1,4 @@
--#!/bin/ksh
-+#!/bin/sh
- #============================================================================
- #
- #                    Code_Saturne version 1.3
diff --git a/science/ncs/files/patch-bin_macros_FreeBSD.mk b/science/ncs/files/patch-bin_macros_FreeBSD.mk
index 4d68b702989c..c1e715046819 100644
--- a/science/ncs/files/patch-bin_macros_FreeBSD.mk
+++ b/science/ncs/files/patch-bin_macros_FreeBSD.mk
@@ -1,5 +1,5 @@
---- bin/macros_FreeBSD.mk.orig	2007-11-23 18:35:59.000000000 +0100
-+++ bin/macros_FreeBSD.mk	2007-12-30 22:19:04.000000000 +0100
+--- bin/macros_FreeBSD.mk.orig	2008-04-23 11:32:13.000000000 +0200
++++ bin/macros_FreeBSD.mk	2008-04-29 23:49:19.000000000 +0200
 @@ -1,3 +1,4 @@
 +# $FreeBSD$
  #============================================================================
@@ -17,7 +17,7 @@
  # Macro pour BFT
  #---------------
  
--BFT_HOME        =/home/saturne/opt/bft-1.0.5/arch/Linux
+-BFT_HOME        =/home/saturne/opt/bft-1.0.6/arch/Linux
 +BFT_HOME        =${LOCALBASE}
  
  BFT_INC         =-I$(BFT_HOME)/include
@@ -26,7 +26,7 @@
  # Macro pour FVM
  #---------------
  
--FVM_HOME        =/home/saturne/opt/fvm-0.9.0/arch/Linux
+-FVM_HOME        =/home/saturne/opt/fvm-0.10.0/arch/Linux
 +FVM_HOME        =${LOCALBASE}
  
  FVM_INC         =-I$(FVM_HOME)/include
@@ -36,7 +36,7 @@
  MPE_COMM        =0
  
 -# Pour Open MPI sur saturne
--MPI_HOME        =/home/saturne/opt/openmpi-1.2.4/arch/Linux
+-MPI_HOME        =/home/saturne/opt/openmpi-1.2.5/arch/Linux
 -MPI_INC         =-isystem$(MPI_HOME)/include
 -MPI_LIB         =-pthread -L$(MPI_HOME)/lib -lmpi -lopen-rte -lopen-pal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl
 +# Pour MPI sur saturne
@@ -45,18 +45,16 @@
  
  # Macro pour Sockets
  #-------------------
-@@ -75,20 +75,19 @@
+@@ -75,7 +75,7 @@
  # Option XML
  XML             =1
  
--XML_HOME = /home/saturne/opt/libxml2-2.6.19
-+XML_HOME =${LOCALBASE}
+-XML_HOME = /usr
++XML_HOME = ${LOCALBASE}
  
  XML_INC  =-I$(XML_HOME)/include/libxml2
--XML_LIB  =-L$(XML_HOME)/arch/Linux/lib -lxml2
-+XML_LIB  =-L$(XML_HOME)/lib -lxml2
- 
- # Macro pour BLAS
+ XML_LIB  =-L$(XML_HOME)/lib -lxml2
+@@ -84,11 +84,10 @@
  #----------------
  
  # Option BLAS
@@ -75,7 +73,7 @@
  # Compilateur C
  #--------------
  
--CCOMP                  = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gcc
+-CCOMP                  = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gcc
 +CCOMP                  = $(CC)
  
  CCOMPFLAGSDEF          = -std=c99 -funsigned-char -pedantic -W -Wall -Wshadow \
@@ -106,14 +104,14 @@
  #--------------------
  #  Profiling gprof : -pg -a
  
--FTNCOMP                = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gfortran
+-FTNCOMP                = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gfortran
 +FTNCOMP                = $(FC)
  
  FTNCOMPFLAGSDEF        = -I.
  
 -FTNCOMPFLAGS           = $(FTNCOMPFLAGSDEF) -O1
 -FTNCOMPFLAGSOPTPART1   = $(FTNCOMPFLAGSDEF) -O2
--FTNCOMPFLAGSOPTPART2   = $(FTNCOMPFLAGSDEF) -O6
+-FTNCOMPFLAGSOPTPART2   = $(FTNCOMPFLAGSDEF) -O3
 -FTNCOMPFLAGSOPTPART3   = $(FTNCOMPFLAGSDEF) -O0
 +FTNCOMPFLAGS           = $(FTNCOMPFLAGSDEF) $(FFLAGS)
 +FTNCOMPFLAGSOPTPART1   = $(FTNCOMPFLAGSDEF) $(FFLAGS)
@@ -126,7 +124,7 @@
  
  # Linker
  
--LDEDL           = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gfortran
+-LDEDL           = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gfortran
 -LDEDLFLAGS      = -O
 -LDEDLFLAGSLO    = -O0
 +LDEDL           = $(FC)
@@ -135,7 +133,7 @@
  LDEDLFLAGSDBG   = -g
  LDEDLFLAGSPROF  = -pg
  LDEDLFLAGSVERS  = -v
--LDEDLRPATH      = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.2.2/arch/Linux/lib:
+-LDEDLRPATH      = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.2.3/arch/Linux/lib:
 +LDEDLRPATH      = -rdynamic -Wl,-rpath -Wl,