Upgrade to version 2.0.7.

Note: this is not the latest. Now there is no separate release for ncs
and the sources are distributed as code_saturne-x.y.z. Next upgrades in
preparation!

5 files changed, 26 insertions, 27 deletions

diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 07ced4d809d7..4836ad6aa75e 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	ncs
-PORTVERSION=	2.0.4
-PORTREVISION=	11
+PORTVERSION=	2.0.7
 CATEGORIES=	science parallel
-MASTER_SITES=	http://research.edf.com/fichiers/fckeditor/Commun/Innovation/logiciels/code_saturne/Releases/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+MASTER_SITES=	http://code-saturne.org/releases/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Code_Saturne Kernel
@@ -23,9 +21,8 @@ RUN_DEPENDS=	xmgrace:${PORTSDIR}/math/grace	\
 		xterm:${PORTSDIR}/x11/xterm	\
 		cs_preprocess:${PORTSDIR}/science/ecs
 
-USES=		fortran gettext gmake iconv libtool shebangfix zip
+USES=		fortran gettext gmake iconv libtool python shebangfix
 USE_GNOME=	libxml2
-USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SHEBANG_FILES=	bin/runcase.in
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
@@ -36,12 +33,14 @@ 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
-NEED_ROOT=	yes
 
 FORTRANLIBDIR=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``
 FORTRANLIBDIR2=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=		DOCS EXAMPLES BATCH
+BATCH_DESC=		Use Torque to submit batches
+BATCH_CONFIGURE_WITH=	batch=PBS
+BATCH_LIB_DEPENDS=	libtorque.so:${PORTSDIR}/sysutils/torque
 
 .include <bsd.port.options.mk>
 
diff --git a/science/ncs/distinfo b/science/ncs/distinfo
index 97f03442656f..91fccc6a9b79 100644
--- a/science/ncs/distinfo
+++ b/science/ncs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncs-204.zip) = 2c46b5b08b6335a666fa4ab953e3026a71c8bcff4fb46322718e8d10a310d410
-SIZE (ncs-204.zip) = 11921542
+SHA256 (ncs-2.0.7.tar.gz) = 94a6ffa57d10ed9b84175a2aad19ac87595c92bacfccb11b709ba541ded76966
+SIZE (ncs-2.0.7.tar.gz) = 10864037
diff --git a/science/ncs/files/patch-config_cs_auto_flags.sh b/science/ncs/files/patch-config_cs_auto_flags.sh
new file mode 100644
index 000000000000..c3a00b58c7b1
--- /dev/null
+++ b/science/ncs/files/patch-config_cs_auto_flags.sh
@@ -0,0 +1,11 @@
+--- config/cs_auto_flags.sh.orig	2012-08-08 00:11:29.000000000 +0200
++++ config/cs_auto_flags.sh	2014-09-14 14:45:51.000000000 +0200
+@@ -214,8 +214,6 @@
+     gcc-3*|gcc-4.[01234]*)
+       ;;
+     *)
+-      cflags_default_opt="$cflags_default_opt -fexcess-precision=fast"
+-      cflags_default_hot="$cflags_default_hot -fexcess-precision=fast"
+       ;;
+   esac
+ 
diff --git a/science/ncs/files/patch-configure b/science/ncs/files/patch-configure
index c2eb025061eb..1f518f391255 100644
--- a/science/ncs/files/patch-configure
+++ b/science/ncs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-12-20 14:07:17.000000000 +0100
-+++ configure	2012-09-07 21:23:33.000000000 +0200
-@@ -20626,7 +20626,7 @@
+--- configure.orig	2013-04-16 15:44:44.000000000 +0200
++++ configure	2014-09-14 14:20:18.000000000 +0200
+@@ -21736,7 +21736,7 @@
    PYTHON_EXE=none
  fi
  
@@ -9,7 +9,7 @@
     cs_python="/usr/bin/env python"
     # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
-@@ -20961,7 +20961,7 @@
+@@ -22073,7 +22073,7 @@
  fi
  
  # Test for PyQt4
@@ -18,12 +18,3 @@
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyQt4 version >= 4.3" >&5
  $as_echo_n "checking for PyQt4 version >= 4.3... " >&6; }
-@@ -20993,7 +20993,7 @@
- fi
- 
- # Test for PyQt4 developper tools
--if test "x$have_gui" == "xyes" ; then
-+if test "x$have_gui" = "xyes" ; then
- 
-   if test "x${PYQT4_EXE}" == "xnone" ; then
- 
diff --git a/science/ncs/pkg-plist b/science/ncs/pkg-plist
index 392c5b86052a..a76e4218d14c 100644
--- a/science/ncs/pkg-plist
+++ b/science/ncs/pkg-plist
@@ -180,9 +180,6 @@ include/vortex.h
 %%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningModel.py
 %%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningModel.pyc
 %%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningModel.pyo
-%%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningPBSJobManagementDialogForm.py
-%%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningPBSJobManagementDialogForm.pyc
-%%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningPBSJobManagementDialogForm.pyo
 %%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningUserFilesDialogForm.py
 %%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningUserFilesDialogForm.pyc
 %%PYTHON_SITELIBDIR%%/ncs/Pages/BatchRunningUserFilesDialogForm.pyo
@@ -752,7 +749,8 @@ man/man1/cs_solver.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/COMPATIBILITY
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/developper.pdf
+%%PORTDOCS%%%%DOCSDIR%%/developer.pdf
+%%PORTDOCS%%%%DOCSDIR%%/howto.pdf
 %%PORTDOCS%%%%DOCSDIR%%/install.pdf
 %%PORTDOCS%%%%DOCSDIR%%/refcard.pdf
 %%PORTDOCS%%%%DOCSDIR%%/theory.pdf