- Unbreak Code_Saturne;

- Adapt to the new infrastructure.

Note: these ports should be upgraded - this is on my todo list.

2 files changed, 27 insertions, 27 deletions

diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index 1e77c9cccfba..cb6dd92335e7 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ecs
 PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	http://research.edf.com/fichiers/fckeditor/Commun/Innovation/logiciels/code_saturne/Releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -13,66 +13,62 @@ COMMENT=	Code_Saturne Preprocessor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	med.5:${PORTSDIR}/french/med		\
-		bft.1:${PORTSDIR}/science/bft		\
-		hdf5.7:${PORTSDIR}/science/hdf5-18	\
-		cgns.3:${PORTSDIR}/science/cgnslib
+LIB_DEPENDS=	libmed.so:${PORTSDIR}/french/med	\
+		libbft.so:${PORTSDIR}/science/bft	\
+		libhdf5.so.7:${PORTSDIR}/science/hdf5-18\
+		libcgns.so:${PORTSDIR}/science/cgnslib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		gmake zip
 GNU_CONFIGURE=	yes
+CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-bft=${LOCALBASE}		\
 		--with-hdf5=${LOCALBASE}	\
 		--with-cgns=${LOCALBASE}	\
 		--with-med=${LOCALBASE}		\
 		--with-metis=${LOCALBASE}	\
 		--with-metis-include=${LOCALBASE}/include/metis
-CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} CPPFLAGS="${CPPFLAGS}"	\
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITH_CCMIO)
-LIB_DEPENDS+=	adf.5:${PORTSDIR}/science/libccmio	\
-		ccmio.2:${PORTSDIR}/science/libccmio
+LIB_DEPENDS+=	libadf.so:${PORTSDIR}/science/libccmio	\
+		libccmio.so:${PORTSDIR}/science/libccmio
 CONFIGURE_ARGS+=--with-adf=${LOCALBASE}		\
 		--with-ccm=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-adf --without-ccm
 .endif
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NLS_USES=	gettext iconv
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+DOCS_USE=	TEX=tex:build
+DOCS_BUILD_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-USE_TEX=	tex:build
-BUILD_DEPENDS+=	fig2dev:${PORTSDIR}/print/transfig
 PORTDOCS=	mi_ecs.pdf mt_ecs.pdf
+MAKE_JOBS_UNSAFE=yes
 .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)
+.if exists(${LOCALBASE}/bin/graphchk)
 # The regular metis is present, so we cannot depend on metis-edf
-LIB_DEPENDS+=	metis.1:${PORTSDIR}/math/metis4
+LIB_DEPENDS+=	libmetis.so.1:${PORTSDIR}/math/metis4
 .else
 # Prefer metis-edf to avoid conflict with Code_Aster
-BUILD_DEPENDS+=	${LOCALBASE}/bin/onmetis.exe:${PORTSDIR}/math/metis-edf
+LIB_DEPENDS+=	libmetis.so.0:${PORTSDIR}/math/metis-edf
 .endif
 
 .if ${ARCH} == "i386"
@@ -87,8 +83,8 @@ pre-configure:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/science/ecs/pkg-plist b/science/ecs/pkg-plist
index d65322b5e807..6b122b67d80e 100644
--- a/science/ecs/pkg-plist
+++ b/science/ecs/pkg-plist
@@ -2,4 +2,8 @@ bin/cs_preprocess-config
 bin/cs_preprocess
 bin/cs_partition
 bin/cs_io_dump
+man/man1/cs_io_dump.1.gz
+man/man1/cs_partition.1.gz
+man/man1/cs_preprocess-config.1.gz
+man/man1/cs_preprocess.1.gz
 %%NLS%%share/locale/fr/LC_MESSAGES/cs_preprocess.mo