3 files changed, 61 insertions, 34 deletions

diff --git a/cad/salome/Makefile b/cad/salome/Makefile
index 9d1c80fdafb0..4c6d0ce1c1fb 100644
--- a/cad/salome/Makefile
+++ b/cad/salome/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	salome
-PORTVERSION=	5.1.3
-PORTREVISION=	4
+PORTVERSION=	5.1.4
 CATEGORIES=	cad science
 MASTER_SITES=	http://www.stasyan.com/devel/distfiles/
-DISTNAME=	src5.1.3
+DISTNAME=	src5.1.4
 DIST_SUBDIR=	${PORTNAME}
 .if !defined(PKGNAMESUFFIX)
 EXTRACT_ONLY=	#none
@@ -21,20 +20,22 @@ OPTIONS=	\
 		GEOM		"GEOM module" 					on  \
 		MED		"MED module" 					on  \
 		SMESH		"SMESH module (require MED & GEOM)" 		on  \
+		NETGENPLUGIN	"Netgen-meser plugin"		 		on  \
 		VISU		"VISU module (require MED)" 			on  \
 		LIGHT		"LIGHT module" 					on  \
 		YACS		"Yacs module" 					on  \
 		MULTIPR		"Multipr module" 				on  \
 		RANDOMIZER	"Randomizer module" 				on  \
 		SIERPINSKY	"Sierpinsky module" 				on  \
-		CPPUNIT		"build with C++ unit testing framework" 	off \
-		MPI		"build with support parrallel calculation" 	off
+		JOBMAN		"Job manager module" 				on  \
+		MPI		"build with support parrallel calculation" 	on
 
-RESOURCEDIR=	${DATADIR}/resources
+RESOURCEDIR=	${PREFIX}/share/salome/resources
 
 SLAVEDIRS=	cad/salome-kernel cad/salome-gui cad/salome-geom cad/salome-light	\
 		cad/salome-yacs cad/salome-randomizer cad/salome-visu cad/salome-med	\
-		cad/salome-sierpinsky cad/salome-smesh cad/salome-multipr
+		cad/salome-sierpinsky cad/salome-smesh cad/salome-multipr cad/salome-jobmanager \
+		cad/salome-netgenplugin
 
 .include <bsd.port.options.mk>
 
@@ -72,9 +73,15 @@ RUN_DEPENDS+=	${RESOURCEDIR}/sierpinsky:${PORTSDIR}/cad/salome-sierpinsky
 .if defined(WITH_SMESH)
 RUN_DEPENDS+=	${RESOURCEDIR}/smesh:${PORTSDIR}/cad/salome-smesh
 .endif
+.if defined(WITH_NETGENPLUGIN)
+RUN_DEPENDS+=	${RESOURCEDIR}/netgenplugin:${PORTSDIR}/cad/salome-netgenplugin
+.endif
 .if defined(WITH_MULTIPR)
 RUN_DEPENDS+=	${RESOURCEDIR}/multipr:${PORTSDIR}/cad/salome-multipr
 .endif
+.if defined(WITH_JOBMAN)
+RUN_DEPENDS+=	${RESOURCEDIR}/jobmanager:${PORTSDIR}/cad/salome-jobmanager
+.endif
 
 SUB_LIST=	PREFIX=${PREFIX}
 SUB_FILES=	pkg-message runSalome.csh
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index 29206e35f07b..2fc355f999b3 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -22,16 +22,23 @@ GUI_DEPEND=			KERNEL QWT
 GEOM_DEPEND=		KERNEL GUI
 MED_DEPEND=			KERNEL GUI MED2
 SMESH_DEPEND=		KERNEL GUI MED GEOM
+NETGENPLUGIN_DEPEND=	KERNEL GUI MED GEOM MED SMESH NETGEN
 VISU_DEPEND=		KERNEL GUI MED
 LIGHT_DEPEND=		KERNEL GUI
 YACS_DEPEND=		KERNEL GUI
 RANDOMIZER_DEPEND=	KERNEL GUI
+JOBMANAGER_DEPEND=	KERNEL GUI
 SIERPINSKY_DEPEND=	KERNEL GUI VISU MED RANDOMIZER
 FILTER_DEPEND=		KERNEL GUI MED
 MULTIPR_DEPEND=		KERNEL GUI MED MED2 HDF5 CAS QT OMNIORB
 
 
-RELEASENAME=	5.1.3
+.if !${SAL_MODULE} == "jobmanager"
+RELEASENAME=	5.1.4
+.else
+RELEASENAME=	0.1
+.endif
+
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--enable-debug
@@ -82,6 +89,13 @@ BUILD_DEPENDS+=		${RESOURCEDIR}/geom:${PORTSDIR}/cad/salome-geom
 RUN_DEPENDS+=		${RESOURCEDIR}/geom:${PORTSDIR}/cad/salome-geom
 .endif
 
+#Depndency from SMESH module
+.if ${SAL_MODULE} == "netgenplugin"
+BUILD_DEPENDS+=		${RESOURCEDIR}/smesh:${PORTSDIR}/cad/salome-smesh
+RUN_DEPENDS+=		${RESOURCEDIR}/smesh:${PORTSDIR}/cad/salome-smesh
+.endif
+
+
 #Dependency for SIERPINSKY
 .if ${SAL_MODULE} == "sierpinsky"
 BUILD_DEPENDS+=		${RESOURCEDIR}/visu:${PORTSDIR}/cad/salome-visu \
@@ -103,19 +117,24 @@ USE_AUTOTOOLS=	autoconf automake libtool aclocal
     USE_AUTOTOOLS+=	autoheader
     AUTOHEADER_ARGS=	-I adm/unix/config_files
 . else
-    ACLOCAL_ARGS=	-I adm_local/unix/config_files -I ${LOCALBASE}/salome_adm/unix/config_files 
-.	if ${SAL_MODULE} != "gui"
+.	if ${SAL_MODULE} != "jobmanager"
+    ACLOCAL_ARGS=	-I adm_local/unix/config_files -I ${LOCALBASE}/salome_adm/unix/config_files
+.	else
+    ACLOCAL_ARGS=	-I m4
+    AUTOHEADER_ARGS+=	-I m4
+.	endif
+.	if ${SAL_MODULE} != "gui" && ${SAL_MODULE} != "jobmanager"
     ACLOCAL_ARGS+= -I ${LOCALBASE}/adm_local/unix/config_files
 .	endif
 . endif
 .endif
-LIBTOOLFLAGS=--force --copy --automake 
+LIBTOOLFLAGS=--force --copy --automake
 AUTOMAKE_ARGS=--add-missing --copy --gnu
 
 #Dependency from HDF5
 .if !${SAL_MODULE} == "randomizer" &&  !${SAL_MODULE} == "yacs" && !${SAL_MODULE} == "hello" && !${SAL_MODULE} == "pyhello"
 LIB_DEPENDS+=		hdf5.0:${PORTSDIR}/science/hdf5
-CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE} 
+CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE}
 AUTOTOOLS_ENV+= 	HDF5HOME=${LOCALBASE}
 .endif
 
@@ -134,7 +153,7 @@ BUILD_DEPENDS+=		swig:${PORTSDIR}/devel/swig13
 .endif
 
 #Dependency from libxml2
-.if ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med" || ${SAL_MODULE} == "yacs" 
+.if ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med" || ${SAL_MODULE} == "yacs"
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include/libxml2
 CONFIGURE_ENV+=	LIBXML_DIR=${LOCALBASE}
@@ -172,10 +191,17 @@ CONFIGURE_ARGS+=	--with-vtk=${LOCALBASE}
 #CONFIGURE_ENV+=		VTKHOME=${LOCALBASE}
 .endif
 
+#Dependency from cad/netgen
+.if ${SAL_MODULE} == "netgenplugin"
+LIB_DEPENDS+=		nglib.1:${PORTSDIR}/cad/netgen
+CONFIGURE_ENV+=		NETGENHOME=${LOCALBASE}
+AUTOTOOLS_ENV+=		NETGENHOME=${LOCALBASE}
+.endif
+
+
 #Dependency from qwt5
 .if ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "component" || ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "visu" || ${SAL_MODULE} == "filter"
 LIB_DEPENDS+=		qwt.5:${PORTSDIR}/x11-toolkits/qwt5
-#CONFIGURE_ENV+=		QWTHOME=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-qwt=${LOCALBASE}
 CPPFLAGS+=		-I/${LOCALBASE}/include/qwt/
 AUTOTOOLS_ENV+= 	QWTHOME=${LOCALBASE}
@@ -234,30 +260,30 @@ LIB_DEPENDS+=		gd.4:${PORTSDIR}/graphics/gd
 LIB_DEPENDS+=		argp.0:${PORTSDIR}/devel/argp-standalone
 LIB_DEPENDS+=		expat.6:${PORTSDIR}/textproc/expat2
 LIB_DEPENDS+=		gvc.5:${PORTSDIR}/graphics/graphviz
-LDFLAGS+=		-largp 
+LDFLAGS+=		-largp
 .endif
 
-#Don't strip binaries 
+#Don't strip binaries
 .if ${SAL_MODULE} == "multipr"
-STRIP=		
+STRIP=
 .endif
 
-#optionally dependency from cppunit
+#turn off cppunit support
 .if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "yacs" ||  ${SAL_MODULE} == "med"
-.if defined(WITH_CPPUNIT)
-CONFIGURE_ARGS+=	--with-cppunit=${LOCALBASE} --with-cppunit_inc=${LOCALBASE}/include/cppunit
-BUILD_DEPENDS+=		cppunit-config:${PORTSDIR}/devel/cppunit
-PLIST_SUB+=     CPPUNIT=""
-.		else
+#.if defined(WITH_CPPUNIT)
+#CONFIGURE_ARGS+=	--with-cppunit=${LOCALBASE} --with-cppunit_inc=${LOCALBASE}/include/cppunit
+#BUILD_DEPENDS+=		cppunit-config:${PORTSDIR}/devel/cppunit
+#PLIST_SUB+=     CPPUNIT=""
+#.		else
 CONFIGURE_ARGS+=	--with-cppunit=no
 PLIST_SUB+=     CPPUNIT="@comment "
-.endif
+#.endif
 .endif
 
 #optionally dependency from mpich2
 .if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med"
 .if defined(WITH_MPI)
-LIB_DEPENDS+=	mpich.1:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	mpich.2:${PORTSDIR}/net/mpich2
 CONFIGURE_ARGS+=	--with-mpich=${LOCALBASE}/mpich2 --with-mpi=${LOCALBASE}/mpich2
 PLIST_SUB+=     MPI=""
 .		else
@@ -290,11 +316,6 @@ CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" CXXFLAGS="${QSCIFLAGS} ${QTFLAGS} ${CXXFLA
 	${CP} ${WRKSRC}/configure.in.base  ${WRKSRC}/configure.in
 .endif
 
-.if ${SAL_MODULE} == "med"
-    post-install:
-	${MV} ${PREFIX}/include/salome/Node.hxx ${PREFIX}/include/salome/MEDNode.hxx
-.endif
-
 
 .if ${SAL_MODULE} == "kernel"
     pre-patch:
@@ -328,7 +349,7 @@ run-autotools-automake:
 		${AUTOMAKE_ARGS})
 	echo "End of automake"
 
-.if ${SAL_MODULE} == "yacs"
+.if ${SAL_MODULE} == "yacs" || ${SAL_MODULE} == "jobmanager"
 run-autotools-autoheader:
 	echo "Start of autoheader"
 	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
diff --git a/cad/salome/distinfo b/cad/salome/distinfo
index 01f42435a057..0fa162aa2a39 100644
--- a/cad/salome/distinfo
+++ b/cad/salome/distinfo
@@ -1,3 +1,2 @@
-MD5 (salome/src5.1.3.tar.gz) = 8564d0a7ef94d4d6d4b4c82ade84b1b0
-SHA256 (salome/src5.1.3.tar.gz) = 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
-SIZE (salome/src5.1.3.tar.gz) = 106470135
+SHA256 (salome/src5.1.4.tar.gz) = dd59384ad4fbbbe49c72e946eed9e0f6144a01c799efab62033113a3db46eeae
+SIZE (salome/src5.1.4.tar.gz) = 120063320