Upgrade Code_Saturne to 2.0.

svn path=/head/; revision=300603
2012-07-07 15:15:56 +00:00 · 2012-07-07 15:15:56 +00:00 · fad6a6b2b8 · 2021-03-31 03:12:20 +00:00
commit fad6a6b2b8
parent 08fd80756a
19 changed files with 1031 additions and 1039 deletions
--- a/science/bft/Makefile
+++ b/science/bft/Makefile
@ -6,20 +6,24 @@
 #

 PORTNAME=	bft
-PORTVERSION=	1.0.8
+PORTVERSION=	1.1.5
 CATEGORIES=	science parallel
-MASTER_SITES=	http://research.edf.com/fichiers/fckeditor/Commun/Innovation/logiciels/
+MASTER_SITES=	http://research.edf.com/fichiers/fckeditor/Commun/Innovation/logiciels/code_saturne/Releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz

 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Saturne Base Functions and Types library

+LICENSE=	LGPL21
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

+USE_ZIP=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

+MAN1=		bft-config.1
+
 TESTSBIN=	bft_test bft_mem_usage_test bft_printf_test

 pre-configure:
--- a/science/bft/distinfo
+++ b/science/bft/distinfo
@ -1,2 +1,2 @@
-SHA256 (bft-108.tgz) = 97d1b253312aff787e3415eac08a48f6f79f51f466f6a65edcc6093797ac778c
-SIZE (bft-108.tgz) = 443412
+SHA256 (bft-115.zip) = 8af0134375140b7356c9b38ba2475fb57435a8cda5ace319ecc6c903e8d66e79
+SIZE (bft-115.zip) = 431032
--- a/science/bft/files/patch-tests_Makefile.in
+++ b/science/bft/files/patch-tests_Makefile.in
@ -0,0 +1,11 @@
+--- tests/Makefile.in.orig	2011-07-11 11:05:15.000000000 +0200
+++ tests/Makefile.in	2012-04-07 15:52:02.000000000 +0200
+@@ -261,7 +261,7 @@
+ bft_mem_usage_test_SOURCES = bft_mem_usage_test.c
+ bft_mem_test_SOURCES = bft_mem_test.c
+ bft_printf_test_SOURCES = bft_printf_test.c
+-all: all-am
+all: $(check_PROGRAMS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
--- a/science/bft/pkg-plist
+++ b/science/bft/pkg-plist
@ -5,7 +5,6 @@ include/bft_config_priv.h
 include/bft_error.h
 include/bft_file.h
 include/bft_fp_trap.h
-include/bft_intl.h
 include/bft_mem.h
 include/bft_mem_usage.h
 include/bft_printf.h
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@ -6,32 +6,43 @@
 #

 PORTNAME=	ecs
-PORTVERSION=	1.3.3
-PORTREVISION=	7
+PORTVERSION=	2.0.2
 CATEGORIES=	science
-MASTER_SITES=	http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
+MASTER_SITES=	http://research.edf.com/fichiers/fckeditor/Commun/Innovation/logiciels/code_saturne/Releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz

 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Saturne Preprocessor

-LIB_DEPENDS=	med.2:${PORTSDIR}/french/med		\
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	med.4:${PORTSDIR}/french/med		\
 		bft.1:${PORTSDIR}/science/bft		\
 		hdf5.7:${PORTSDIR}/science/hdf5-18	\
-		cgns.0:${PORTSDIR}/science/cgnslib
+		cgns.3:${PORTSDIR}/science/cgnslib

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

+USE_ZIP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bft=${LOCALBASE}		\
 		--with-hdf5=${LOCALBASE}	\
 		--with-cgns=${LOCALBASE}	\
 		--with-med=${LOCALBASE}		\
-		--with-metis=${LOCALBASE}
+		--with-metis=${LOCALBASE}	\
+		--with-metis-include=${LOCALBASE}/include/metis
 CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 USE_GMAKE=	yes

+.if defined(WITH_CCMIO)
+LIB_DEPENDS+=	adf.5:${PORTSDIR}/science/libccmio	\
+		ccmio.2:${PORTSDIR}/science/libccmio
+CONFIGURE_ARGS+=--with-adf=${LOCALBASE}		\
+		--with-ccm=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-adf --without-ccm
+.endif
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
@ -45,13 +56,14 @@ PLIST_SUB+=	NLS=""
 CONFIGURE_ARGS+=	--enable-debug
 .endif

-#NOPORTDOCS=	yes	# PDF not produced ATM
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base	\
 		fig2dev:${PORTSDIR}/print/transfig
-PORTDOCS=	mi_ecs.pdf mu_ecs.pdf
+PORTDOCS=	mi_ecs.pdf mt_ecs.pdf
 .endif

+MAN1=	cs_io_dump.1 cs_partition.1 cs_preprocess-config.1 cs_preprocess.1
+
 .include <bsd.port.pre.mk>

 .if exists(${LOCALBASE}/bin/partdmesh)
@ -62,6 +74,11 @@ LIB_DEPENDS+=	metis.1:${PORTSDIR}/math/metis
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmetis.a:${PORTSDIR}/math/metis-edf
 .endif

+.if ${ARCH} == "i386"
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch
+CONFIGURE_ARGS+=	--with-scotch=${LOCALBASE}
+.endif
+
 pre-configure:
 .if !defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e '/^SUBDIRS/s| po| po doc|' ${WRKSRC}/Makefile.in
--- a/science/ecs/distinfo
+++ b/science/ecs/distinfo
@ -1,2 +1,2 @@
-SHA256 (ecs-133.tgz) = 60c3519cc7b9fdd80f41844e3c5a04be88459493e6abd82ed960304822d1bf13
-SIZE (ecs-133.tgz) = 1263592
+SHA256 (ecs-202.zip) = 237712e1df2bb1a7a479407ebf325c5ebb89ccaf29d86e9f52f52907677f23a2
+SIZE (ecs-202.zip) = 1369458
--- a/science/ecs/pkg-plist
+++ b/science/ecs/pkg-plist
@ -1,4 +1,5 @@
-bin/ecs
-bin/ecs-config
-bin/perm_nopo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecs.mo
+bin/cs_preprocess-config
+bin/cs_preprocess
+bin/cs_partition
+bin/cs_io_dump
+%%NLS%%share/locale/fr/LC_MESSAGES/cs_preprocess.mo
--- a/science/fvm/Makefile
+++ b/science/fvm/Makefile
@ -6,23 +6,24 @@
 #

 PORTNAME=	fvm
-PORTVERSION=	0.12.0
-PORTREVISION=	5
+PORTVERSION=	0.15.3
 CATEGORIES=	science parallel
-MASTER_SITES=	http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
+MASTER_SITES=	http://research.edf.com/fichiers/fckeditor/Commun/Innovation/logiciels/code_saturne/Releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz

 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Saturne Finite Volume Mesh

-LIB_DEPENDS=	med.2:${PORTSDIR}/french/med		\
+LICENSE=	LGPL21
+
+LIB_DEPENDS=	med.4:${PORTSDIR}/french/med		\
 		bft.1:${PORTSDIR}/science/bft		\
 		hdf5.7:${PORTSDIR}/science/hdf5-18	\
-		cgns.0:${PORTSDIR}/science/cgnslib
+		cgns.3:${PORTSDIR}/science/cgnslib

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

+USE_ZIP=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bft=${LOCALBASE}	\
@ -49,6 +50,8 @@ CONFIGURE_ARGS+=	--with-mpi=${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-debug
 .endif

+MAN1=		fvm-config.1
+
 TESTSBIN=	fvm_file_test fvm_interface_test fvm_selector_postfix_test fvm_selector_test

 pre-configure:
--- a/science/fvm/distinfo
+++ b/science/fvm/distinfo
@ -1,2 +1,2 @@
-SHA256 (fvm-0120.tgz) = 92bd5210ce59684d71d75ae0a4f08fae947a03195f9dfe2617ed97535ccbdd2f
-SIZE (fvm-0120.tgz) = 721797
+SHA256 (fvm-0153.zip) = 7d367301126284f58556960811ed7c1c59e62ac7a1cfcd29e6551a560c3f4585
+SIZE (fvm-0153.zip) = 832286
--- a/science/fvm/files/patch-tests_Makefile.in
+++ b/science/fvm/files/patch-tests_Makefile.in
@ -0,0 +1,11 @@
+--- tests/Makefile.in.orig	2011-07-11 11:17:01.000000000 +0200
+++ tests/Makefile.in	2012-04-07 16:46:12.000000000 +0200
+@@ -300,7 +300,7 @@
+ @HAVE_MPI_TRUE@fvm_coupling_test_LDADD = $(top_builddir)/src/libfvm_coupl.la \
+ @HAVE_MPI_TRUE@                          @BFT_LIBS@ @MPI_LIBS@
+ 
+-all: all-am
+all: $(check_PROGRAMS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
--- a/science/fvm/pkg-plist
+++ b/science/fvm/pkg-plist
@ -9,6 +9,7 @@ include/fvm_group.h
 include/fvm_interface.h
 include/fvm_io_num.h
 include/fvm_locator.h
+include/fvm_neighborhood.h
 include/fvm_nodal.h
 include/fvm_nodal_append.h
 include/fvm_nodal_extract.h
@ -21,7 +22,9 @@ include/fvm_order.h
 include/fvm_parall.h
 include/fvm_part_to_block.h
 include/fvm_periodicity.h
+include/fvm_point_location.h
 include/fvm_selector.h
+include/fvm_trace.h
 include/fvm_triangulate.h
 include/fvm_writer.h
 lib/libfvm.a
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@ -6,28 +6,41 @@
 #

 PORTNAME=	ncs
-PORTVERSION=	1.3.3
-PORTREVISION=	9
+PORTVERSION=	2.0.4
 CATEGORIES=	science parallel
-MASTER_SITES=	http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
+MASTER_SITES=	http://research.edf.com/fichiers/fckeditor/Commun/Innovation/logiciels/code_saturne/Releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.tgz

 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Saturne Kernel

-LIB_DEPENDS=	fvm.0:${PORTSDIR}/science/fvm
-RUN_DEPENDS=	xmgrace:${PORTSDIR}/math/grace	\
-		ecs:${PORTSDIR}/science/ecs
+LICENSE=	GPLv2

+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4	\
+		cs_preprocess:${PORTSDIR}/science/ecs	\
+		pyrcc4:${PORTSDIR}/textproc/py-qt4-xml
+LIB_DEPENDS=	fvm.0:${PORTSDIR}/science/fvm	\
+		mei.0:${PORTSDIR}/science/mei
+RUN_DEPENDS=	xmgrace:${PORTSDIR}/math/grace	\
+		bash:${PORTSDIR}/shells/bash	\
+		xterm:${PORTSDIR}/x11/xterm	\
+		cs_preprocess:${PORTSDIR}/science/ecs
+
+USE_ZIP=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	libxml2
 USE_PYTHON=	yes
+USE_QT_VER=	4
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC=	${WRKSRC}/bin
-MAKE_ENV=	NOM_ARCH=${OPSYS} CS_HOME=${WRKSRC} CS_MPI_PATH=${MPI_HOME}/bin	\
-		PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM}			\
+CPPFLAGS+=	-I${LOCALBASE}/include/libxml2
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	MPI_LIBS="${MPI_LIBS}"
+MAKE_ENV=	NOM_ARCH=${OPSYS} CS_MPI_PATH=${MPI_HOME}/bin	\
+		PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM}	\
 		MPI_HOME=${MPI_HOME} MPI_LIBS="${MPI_LIBS}"
+USE_LDCONFIG=	yes

 USE_FORTRAN=	yes
 FORTRANLIBDIR=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``
@ -39,20 +52,14 @@ TERM=		vt100	# Force for pointyhat to override su
 TERM?=		vt100	# Default value needed for tput in jail or tinderbox
 .endif

-PATHCS=		${PREFIX}/Saturne
-CS_HOME=	${PATHCS}/Noyau/ncs
-ECS_HOME=	${PATHCS}/Enveloppe/ecs
-PLIST_SUB=	CS_HOME=Saturne/Noyau/ncs ECS_HOME=Saturne/Enveloppe/ecs
-
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
 SUB_DIRS=	data include src users
 BIN_SCRIPTS=	autovalid check_mesh compiler_version cree_sat cs.exe gracehst	\
 		grp info_cs lance_install rang_mpi.sh
 BIN_DATAS=	Makefile SaturneGUI autovalid.xml cs_profile lance lance.help	\
 		macros_FreeBSD.mk

+MAN1=		code_saturne.1 cs_solver.1
+
 .if defined(WITH_LAM)
 MPI_HOME=	${LOCALBASE}
 BUILD_DEPENDS+=	${MPI_HOME}/lib/liblam.a:${PORTSDIR}/net/lam
@ -73,7 +80,9 @@ MPI_LIBS=	-lmpich -lmpl ${PTHREAD_LIBS}
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	pdftex:${PORTSDIR}/print/teTeX-base	\
 		fig2dev:${PORTSDIR}/print/transfig
-DOCS=		AUTHORS COMPATIBILITY Changelog TODO
+ALL_TARGET=	all pdf
+INSTALL_TARGET=	install install-pdf
+DOCS=		AUTHORS COMPATIBILITY ChangeLog README
 .endif

 .include <bsd.port.pre.mk>
@ -104,75 +113,16 @@ pre-everything::
 	@${ECHO_MSG} "WITHOUT_BLAS or WITHOUT_ATLAS if you prefer."
 	@${ECHO_MSG}

-pre-patch:
-	${CP} -p ${WRKSRC}/bin/macros_Linux.mk ${WRKSRC}/bin/macros_FreeBSD.mk
-
-do-configure:
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|'	\
-		-e 's|%%FC%%|${FC}|'				\
-		-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|'	\
-		-e 's|%%MPI_HOME%%|${MPI_HOME}|'		\
-		-e 's|%%MPI_LIBS%%|${MPI_LIBS}|'		\
-		${BUILD_WRKSRC}/cs_profile
-.if defined(WITH_ATLAS)
-	${REINPLACE_CMD} -e 's|BLAS            =0|BLAS            =1|'			\
-		${BUILD_WRKSRC}/macros_FreeBSD.mk
-.endif
-.if !defined(WITHOUT_BLAS) && !defined(WITHOUT_ATLAS)
-	${REINPLACE_CMD} -e 's|BLAS_LDFLAGS    =|BLAS_LDFLAGS    =${BLAS_LIB}|'		\
-		-e 's|BLAS_INC        =|BLAS_INC        =-I${LOCALBASE}/include|'	\
-		${BUILD_WRKSRC}/macros_FreeBSD.mk
-.endif
-	${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${BUILD_WRKSRC}/lance_install
-
-do-build:
-	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./lance_install)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "===>  Build terminated."
-	@${ECHO_MSG}
-	(cd ${WRKSRC}/arch/${OPSYS}; ${FIND} . -name ".readme*" | ${XARGS}	\
-		${GREP} -B 10 '^Stop in ') || ${TRUE}
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "===>  Building documentation."
-	@${ECHO_MSG}
-	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./lance_install DOC)
-.endif
-
-do-install:
-	${FIND} ${WRKSRC}/arch/${OPSYS}/lib -name "libsaturne*" -exec	\
-		${INSTALL_DATA} {} ${PREFIX}/lib \;
-	${MKDIR} ${CS_HOME}/bin ${CS_HOME}/arch/${OPSYS}/bin	\
-		${CS_HOME}/arch/${OPSYS}/lib ${ECS_HOME}/bin
-	${LN} -sf ${PREFIX}/lib/libsaturne*.a ${CS_HOME}/arch/${OPSYS}/lib/
-.for sd in ${SUB_DIRS}
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} ${sd} ${CS_HOME})
-.endfor
-	${CHMOD} -R u+w ${CS_HOME}/users
-	(cd ${BUILD_WRKSRC}/ && ${COPYTREE_SHARE} Autovalidation ${CS_HOME}/bin/)
-	${INSTALL_SCRIPT} ${BIN_SCRIPTS:S|^|${BUILD_WRKSRC}/|} ${CS_HOME}/bin/
-	${INSTALL_DATA} ${BIN_DATAS:S|^|${BUILD_WRKSRC}/|} ${CS_HOME}/bin/
-	${CHMOD} u+w ${CS_HOME}/bin/lance
-	${LN} -sf ${LOCALBASE}/bin/ecs ${ECS_HOME}/bin/
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${CS_HOME}/bin/Autovalidation
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${CS_HOME}/bin/Autovalidation
-	${INSTALL_PROGRAM} ${WRKSRC}/arch/${OPSYS}/bin/cs13.exe	\
-		${CS_HOME}/arch/${OPSYS}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${CS_HOME}/doc/THEORY/ ${CS_HOME}/doc/USER/	\
-		${CS_HOME}/doc/TUTORIAL/
-	${INSTALL_DATA} ${WRKSRC}/doc/THEORY/theory.pdf ${CS_HOME}/doc/THEORY/
-	${INSTALL_DATA} ${WRKSRC}/doc/TUTORIAL/tutorial.pdf ${CS_HOME}/doc/TUTORIAL/
-	${INSTALL_DATA} ${WRKSRC}/doc/USER/user.pdf ${CS_HOME}/doc/USER/
-	${LN} -sf ${CS_HOME}/doc/THEORY/theory.pdf ${CS_HOME}/doc/TUTORIAL/tutorial.pdf	\
-		${CS_HOME}/doc/USER/user.pdf ${DOCSDIR}/
-	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-	${LN} -sf ${LOCALBASE}/share/doc/ecs/ ${ECS_HOME}/doc
-.endif
+pre-configure:
+	${REINPLACE_CMD} -e 's|/bin/bash| ${LOCALBASE}/bin/bash|' ${WRKSRC}/bin/runcase.in

 post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+.endif

 .include <bsd.port.post.mk>
--- a/science/ncs/distinfo
+++ b/science/ncs/distinfo
@ -1,2 +1,2 @@
-SHA256 (ncs-133.tgz) = 7cec5ab535aca3eed8b8bb5e410a3f01db3ce40cfd3090a6727f7c048f8ee41f
-SIZE (ncs-133.tgz) = 12138504
+SHA256 (ncs-204.zip) = 2c46b5b08b6335a666fa4ab953e3026a71c8bcff4fb46322718e8d10a310d410
+SIZE (ncs-204.zip) = 11921542
--- a/science/ncs/files/patch-bin_Makefile
+++ b/science/ncs/files/patch-bin_Makefile
@ -1,10 +0,0 @@
--- 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:
- 	@make privtitre
-	@make privconfig
- 	@make privcompil
- 	@make privlink
- 	@make privfin
--- a/science/ncs/files/patch-bin_cs_profile
+++ b/science/ncs/files/patch-bin_cs_profile
@ -1,34 +0,0 @@
--- bin/cs_profile.orig	2008-11-13 19:49:48.000000000 +0100
-+++ bin/cs_profile	2009-01-25 10:23:09.000000000 +0100
-@@ -62,12 +62,16 @@
-   elif [ "$NOM_ARCH" = "Blue_Gene_P" ] ; then 
-     CS_ROOT=/gpfs/home/saturne
-   else
-    CS_ROOT=/home/saturne
-+    CS_ROOT=%%LOCALBASE%%/Saturne
-   fi
-  CS_HOME=${CS_ROOT}/Noyau/ncs-1.3.3
-  ECS_HOME=${CS_ROOT}/Enveloppe/ecs-1.3.3
-  CSGUI_HOME=${CS_ROOT}/Interface/ics-1.3.3
-  SYRCS_HOME=${CS_ROOT}/opt/syr_cs-2.1.1
-+  CS_HOME=${CS_ROOT}/Noyau/ncs
-+  ECS_HOME=${CS_ROOT}/Enveloppe/ecs
-+  CSGUI_HOME=${CS_ROOT}/Interface/ics
-+  SYRCS_HOME=${CS_ROOT}/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
- #
-   if [ "$NOM_ARCH" = "Linux" -a -d /home/prevalcs/HOMARD ] ; then
-     CSHOMARD_HOME=/home/prevalcs/HOMARD
-@@ -94,6 +98,8 @@
-   elif [ "$NOM_ARCH" = "Linux_Ch" ] ; then
-     CS_MPI_PATH=/usr/local/mpichgm-1.2.6.14b-64b/bin
-   else
-    CS_MPI_PATH=
-+    MPI_HOME=%%MPI_HOME%% ; export MPI_HOME
-+    MPI_LIBS=%%MPI_LIBS%% ; export MPI_LIBS
-+    CS_MPI_PATH=${MPI_HOME}/bin
-   fi
-   export CS_MPI_PATH
--- a/science/ncs/files/patch-bin_gracehst
+++ b/science/ncs/files/patch-bin_gracehst
@ -1,8 +0,0 @@
--- bin/gracehst.orig	2007-11-23 18:35:59.000000000 +0100
-+++ bin/gracehst	2007-12-30 22:02:36.000000000 +0100
-@@ -1,4 +1,4 @@
-#!/bin/ksh
-+#! /bin/sh
- #============================================================================
- #
- #                    Code_Saturne version 1.3
--- a/science/ncs/files/patch-bin_macros_FreeBSD.mk
+++ b/science/ncs/files/patch-bin_macros_FreeBSD.mk
@ -1,153 +0,0 @@
--- bin/macros_FreeBSD.mk.orig	2008-11-05 18:48:56.000000000 +0100
-+++ bin/macros_FreeBSD.mk	2009-01-25 10:37:09.000000000 +0100
-@@ -1,3 +1,4 @@
-+# $FreeBSD$
- #============================================================================
- #
- #                    Code_Saturne version 1.3
-@@ -29,13 +30,13 @@
- #
- #============================================================================
- #
-# Macros for Makefile under Linux x86
-#####################################
-+# Macros for Makefile under FreeBSD
-+###################################
- #
- # Macros for BFT
- #---------------
- 
-BFT_HOME        =/home/saturne/opt/bft-1.0.8/arch/Linux
-+BFT_HOME        =${LOCALBASE}
- 
- BFT_INC         =-I$(BFT_HOME)/include
- BFT_LDFLAGS     =-L$(BFT_HOME)/lib -lbft
-@@ -43,7 +44,7 @@
- # Macros for FVM
- #---------------
- 
-FVM_HOME        =/home/saturne/opt/fvm-0.12.0/arch/Linux
-+FVM_HOME        =${LOCALBASE}
- 
- FVM_INC         =-I$(FVM_HOME)/include
- FVM_LDFLAGS     =-L$(FVM_HOME)/lib -lfvm
-@@ -56,10 +57,9 @@
- MPE             =0
- MPE_COMM        =0
- 
-# For Open MPI on saturne
-MPI_HOME        =/home/saturne/opt/openmpi-1.2.6/arch/Linux
-+# For MPI on saturne
- MPI_INC         =-I$(MPI_HOME)/include
-MPI_LIB         =-pthread -L$(MPI_HOME)/lib -lmpi -lopen-rte -lopen-pal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl
-+MPI_LIB         =-L$(MPI_HOME)/lib ${MPI_LIBS} $(PTHREAD_LIBS)
- 
- # Macros for Sockets
- #-------------------
-@@ -75,20 +75,19 @@
- # XML support
- XML             =1
- 
-XML_HOME =
-+XML_HOME = ${LOCALBASE}
- 
-XML_INC  =-I/usr/include/libxml2
-XML_LIB  =-lxml2
-+XML_INC  =-I$(XML_HOME)/include/libxml2
-+XML_LIB  =-L$(XML_HOME)/lib -lxml2
- 
- # Macros for BLAS
- #----------------
- 
- # BLAS support
-BLAS            =1
-BLAS_HOME       =
-BLAS_INC        =-I/usr/include
-+BLAS            =0
-+BLAS_INC        =
- BLAS_CFLAGS     =-D_CS_HAVE_CBLAS
-BLAS_LDFLAGS    =-lcblas -latlas
-+BLAS_LDFLAGS    =
- 
- # Macros for gettext
- #-------------------
-@@ -110,19 +109,19 @@
- # C compiler
- #-----------
- 
-CCOMP                  = /home/saturne/opt/gcc-4.3.1/arch/Linux/bin/gcc
-+CCOMP                  = $(CC)
- 
- CCOMPFLAGSDEF          = -std=c99 -funsigned-char -pedantic -W -Wall -Wshadow \
-                          -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings \
-                          -Wstrict-prototypes -Wmissing-prototypes \
-                          -Wmissing-declarations -Wnested-externs -Wno-uninitialized
- 
-CCOMPFLAGS             = $(CCOMPFLAGSDEF) -O -Wno-unused
-CCOMPFLAGSOPTPART1     = $(CCOMPFLAGSDEF) -O2
-CCOMPFLAGSOPTPART2     = $(CCOMPFLAGSDEF) -O2
-CCOMPFLAGSOPTPART3     = $(CCOMPFLAGSDEF) -O0
-+CCOMPFLAGS             = $(CCOMPFLAGSDEF) $(CFLAGS) -Wno-unused
-+CCOMPFLAGSOPTPART1     = $(CCOMPFLAGSDEF) $(CFLAGS)
-+CCOMPFLAGSOPTPART2     = $(CCOMPFLAGSDEF) $(CFLAGS)
-+CCOMPFLAGSOPTPART3     = $(CCOMPFLAGSDEF) $(CFLAGS)
- CCOMPFLAGSLO           = $(CCOMPFLAGSDEF) -O0
-CCOMPFLAGSDBG          = $(CCOMPFLAGSDEF) -g3
-+CCOMPFLAGSDBG          = $(CCOMPFLAGSDEF) -g
- CCOMPFLAGSPROF         = -pg
- CCOMPFLAGSVERS         = -v
- 
-@@ -131,14 +130,14 @@
- #-----------------
- #  Profiling gprof : -pg -a
- 
-FTNCOMP                = /home/saturne/opt/gcc-4.3.1/arch/Linux/bin/gfortran
-+FTNCOMP                = $(FC)
- 
- FTNCOMPFLAGSDEF        = -I.
- 
-FTNCOMPFLAGS           = $(FTNCOMPFLAGSDEF) -O1
-FTNCOMPFLAGSOPTPART1   = $(FTNCOMPFLAGSDEF) -O2
-FTNCOMPFLAGSOPTPART2   = $(FTNCOMPFLAGSDEF) -O3
-FTNCOMPFLAGSOPTPART3   = $(FTNCOMPFLAGSDEF) -O0
-+FTNCOMPFLAGS           = $(FTNCOMPFLAGSDEF) $(FFLAGS)
-+FTNCOMPFLAGSOPTPART1   = $(FTNCOMPFLAGSDEF) $(FFLAGS)
-+FTNCOMPFLAGSOPTPART2   = $(FTNCOMPFLAGSDEF) $(FFLAGS)
-+FTNCOMPFLAGSOPTPART3   = $(FTNCOMPFLAGSDEF) $(FFLAGS)
- FTNCOMPFLAGSLO         = $(FTNCOMPFLAGSDEF) -O0
- FTNCOMPFLAGSDBG        = $(FTNCOMPFLAGSDEF) -g
- FTNCOMPFLAGSPROF       = -pg
-@@ -152,12 +151,12 @@
- # Linker
- 
- LDEDL           = $(FTNCOMP)
-LDEDLFLAGS      = -O
-LDEDLFLAGSLO    = -O0
-+LDEDLFLAGS      = $(LDFLAGS)
-+LDEDLFLAGSLO    = $(LDFLAGS)
- LDEDLFLAGSDBG   = -g
- LDEDLFLAGSPROF  = -pg
- LDEDLFLAGSVERS  = -v
-LDEDLRPATH      = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.3.1/arch/Linux/lib:
-+LDEDLRPATH      = -rdynamic -Wl,-rpath -Wl,${LOCALBASE}/lib:
- 
- 
- # Set preprocessor variables
-@@ -172,7 +171,7 @@
- 
- # Base libraries (always used)
- 
-LIBBASIC = $(BFT_LDFLAGS) $(FVM_LDFLAGS) -lm -lpthread
-+LIBBASIC = $(BFT_LDFLAGS) $(FVM_LDFLAGS) -lm $(PTHREAD_LIBS)
- 
- # Libraries in production mode
- 
-@@ -188,7 +187,7 @@
- 
- # Library in ElectricFence (malloc debugger) mode
- 
-LIBEF    =-L/home/saturne/opt/efence-2.1.14/arch/Linux/lib -lefence
-+LIBEF    =-L${LOCALBASE}/lib -lefence
- 
- # Optional lists of files to compile with specific options
- #---------------------------------------------------------
--- a/science/ncs/files/pkg-message.in
+++ b/science/ncs/files/pkg-message.in
@ -1,15 +0,0 @@
-===============================================================================
-The current version of Code_Saturne is located in the directory
-%%PREFIX%%/Saturne/Noyau/ncs
-
-In order to use Code Saturne, every user must add the following line in their
-file ".profile":
-
-. %%PREFIX%%/Saturne/Noyau/ncs/bin/cs_profile
-
-For more information refer to the Code_Saturne documentation, available through
-the "info_cs" command.
-
-The Graphical User Interface must be installed separately; it is available as
-a FreeBSD port: science/ics.
-===============================================================================
--- a/science/ncs/pkg-plist
+++ b/science/ncs/pkg-plist