Upgrade to 1.3.3.

7 files changed, 50 insertions, 14 deletions

diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index 6ea40c72eabd..7b01f7925a83 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ecs
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.3
 CATEGORIES=	science
 MASTER_SITES=	http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -30,6 +29,7 @@ CONFIGURE_ARGS=	--with-bft=${LOCALBASE}		\
 		--with-med=${LOCALBASE}		\
 		--with-metis=${LOCALBASE}
 CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
+USE_GMAKE=	yes
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
@@ -44,9 +44,10 @@ PLIST_SUB+=	NLS=""
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-NOPORTDOCS=	yes	# PDF not produced ATM
+#NOPORTDOCS=	yes	# PDF not produced ATM
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base	\
+		fig2dev:${PORTSDIR}/print/transfig
 PORTDOCS=	mi_ecs.pdf mu_ecs.pdf
 .endif
 
diff --git a/science/ecs/distinfo b/science/ecs/distinfo
index ebbff856d3e7..73be3c6f7ce0 100644
--- a/science/ecs/distinfo
+++ b/science/ecs/distinfo
@@ -1,3 +1,3 @@
-MD5 (ecs-132.tgz) = 45c2b164ab1b82aa9f7e776f8566594d
-SHA256 (ecs-132.tgz) = 85122081b2f670a990df14a3b40190e9a615add8c82110006ae3250476149867
-SIZE (ecs-132.tgz) = 1225995
+MD5 (ecs-133.tgz) = 0a80c156afb541115855f3aeb9f1d83d
+SHA256 (ecs-133.tgz) = 60c3519cc7b9fdd80f41844e3c5a04be88459493e6abd82ed960304822d1bf13
+SIZE (ecs-133.tgz) = 1263592
diff --git a/science/ecs/files/patch-doc_Makefile b/science/ecs/files/patch-doc_Makefile
new file mode 100644
index 000000000000..428bcf6e02ff
--- /dev/null
+++ b/science/ecs/files/patch-doc_Makefile
@@ -0,0 +1,20 @@
+--- doc/Makefile.orig	2006-04-24 13:52:56.000000000 +0200
++++ doc/Makefile	2009-01-24 23:33:10.000000000 +0100
+@@ -31,7 +31,7 @@
+ 
+ 
+ doc:
+-	@make pdf
++	@$(MAKE) pdf
+ 
+ 
+ pdf:
+@@ -57,7 +57,7 @@
+ 
+ 
+ install: 
+-	@\mv $(TEX)/*.pdf .
++	@\cp $(TEX)/*.pdf .
+ 
+ 
+ help info aide:
diff --git a/science/ecs/pkg-descr b/science/ecs/pkg-descr
index cc8026aee0dd..d97322ef9e5a 100644
--- a/science/ecs/pkg-descr
+++ b/science/ecs/pkg-descr
@@ -1,4 +1,4 @@
 ECS means "Enveloppe Code Saturne".
 This is the preprocessor used by the Code_Saturne and NEPTUNE_CDF codes.
 
-WWW: http://rd.edf.com/code_saturne/
+WWW: http://www.code-saturne.org/
diff --git a/science/ics/Makefile b/science/ics/Makefile
index 846f9db6bf76..f5b35d1e1c89 100644
--- a/science/ics/Makefile
+++ b/science/ics/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ics
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.3
 CATEGORIES=	science
 MASTER_SITES=	http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -23,15 +22,31 @@ RUN_DEPENDS=	${CS_HOME}/bin/info_cs:${PORTSDIR}/science/ncs	\
 NO_BUILD=	yes
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+REINPLACE_ARGS=	-i ""
 
 PATHCS=		${PREFIX}/Saturne
 CS_HOME=	${LOCALBASE}/Saturne/Noyau/ncs
 ICS_HOME=	${PATHCS}/Interface/ics
 PLIST_SUB=	ICS=Saturne/Interface/ics
 
+TB=		archive clean
+
+pre-configure:
+.for tb in ${TB}
+	${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/toolbin/${tb}
+.endfor
+
 do-install:
 	${MKDIR} ${ICS_HOME}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${ICS_HOME})
+.for sc in ics.py testSuite.py
+	${CHMOD} a+x ${WRKSRC}/${sc}
+	${INSTALL_SCRIPT} ${WRKSRC}/${sc} ${ICS_HOME}
+.endfor
+.for sc in ${TB:S|^|toolbin/|}
+	${CHMOD} a+x ${WRKSRC}/${sc}
+	${INSTALL_SCRIPT} ${WRKSRC}/${sc} ${ICS_HOME}/toolbin
+.endfor
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ICS_HOME}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${ICS_HOME}
 
diff --git a/science/ics/distinfo b/science/ics/distinfo
index cc9115bea0ee..11909d9b8c9a 100644
--- a/science/ics/distinfo
+++ b/science/ics/distinfo
@@ -1,3 +1,3 @@
-MD5 (ics-132.tgz) = bc67030639fe0ce7837c5e9d4be8f41f
-SHA256 (ics-132.tgz) = 00d3566d71ba842d21e86838967d0d16e2fb42629f0cacd509c8046fd7ee7779
-SIZE (ics-132.tgz) = 482697
+MD5 (ics-133.tgz) = bed8afc4046ac41385f21927c45193e1
+SHA256 (ics-133.tgz) = 5dd98ccfceb7e5481a3fde7f6c653af8dd5bdf068ed952ef370db3f23f19b862
+SIZE (ics-133.tgz) = 480714
diff --git a/science/ics/pkg-descr b/science/ics/pkg-descr
index 27be71b710a4..89d2f4a5992c 100644
--- a/science/ics/pkg-descr
+++ b/science/ics/pkg-descr
@@ -2,4 +2,4 @@ ICS stands for Interface Code Saturne.
 
 This is the Graphical User Interface of Code_Saturne.
 
-WWW: http://rd.edf.com/code_saturne/
+WWW: http://www.code-saturne.org/