Upgrade to 8.5-1.

1 files changed, 22 insertions, 20 deletions

diff --git a/french/homard/Makefile b/french/homard/Makefile
index 25f348c33547..b5d85b93c29e 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	homard
-DISTVERSION=	8.2-1
+DISTVERSION=	8.5-1
 CATEGORIES=	french cad linux python
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}		\
+		http://www.code-aster.org/FICHIERS/
+MASTER_SITE_SUBDIR=	thierry
 DISTNAME=	${PORTNAME}-${DISTVERSION}.${ARCH}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,11 +19,9 @@ COMMENT=	A refinement and de-refinement mesh tool
 BUILD_DEPENDS=	${LOCALBASE}/aster/${vaster}/asteru:${PORTSDIR}/french/aster
 RUN_DEPENDS=	${LOCALBASE}/aster/${vaster}/asteru:${PORTSDIR}/french/aster
 
-RESTRICTED=	Toute personne chargeant le logiciel HOMARD s'engage à ne\
-		l'utiliser qu'en couplage avec le logiciel Code_Aster. Pour\
-		tout autre usage, un droit de licence est nécessaire.\
-		Contacter les administrateurs de HOMARD à l'adresse :\
-		<homard@edf.fr>.
+RESTRICTED=	The free downloading of HOMARD software is only allowed for coupling\
+		with Code_Aster. For any other use, a license agreement is requested.\
+		Please contact HOMARD project: <homard@edf.fr>.
 
 ONLY_FOR_ARCHS=	i386
 
@@ -30,24 +30,25 @@ USE_PYTHON=	yes
 REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME:U}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 LHOMARDDIR?=	apps/${PORTNAME}
-ASTER_VER=	8.3
+ASTER_VER=	9.0
 vaster=		STA${ASTER_VER}
 ASTER_TOOLS=	${LOCALBASE}/aster/${vaster}/outils
 HOMARDDIR=	${PREFIX}/${LHOMARDDIR}
 AHPY=		aster_homard_py
 AHPY5=		aster_homard_v5x_py
 AHPY6=		aster_homard_v6x_py
-HOMARDSCRIPT=	${WRKSRC}/${PORTNAME}_base
+HOMARDSCRIPT=	${PORTNAME}_base
 # This name is requested to run aster's make test
 HOMARDPG=	${PORTNAME:U}_V${PORTVERSION:R}.out
-HOMARDWDIR=	${PORTNAME:U}_V${PORTVERSION:R}.Linux
+HOMARDWDIR=	${PORTNAME:U}
 
-DOCS=		A_Lire.txt Readme.txt
+DIR2RM=		sfr_mix_2d_zzzz121d_d1 qua_2d_24x36_d2 mix_qua_tri_d1_equ		\
+		med_3d_tet_tri_d2_man med_3d_cube_d2 med_2d_carre_d1 med_2d_6xtri_d2
 
-.include <bsd.port.pre.mk>
+DOCS=		A_Lire.txt Readme.txt
 
 PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY}			\
 		AHPY5=${LHOMARDDIR}/${AHPY5} AHPY6=${LHOMARDDIR}/${AHPY6}		\
@@ -55,17 +56,17 @@ PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY}			\
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s#/logiciels/HOMARD/HOMARD_PUBLIC#${PREFIX}/bin#"		\
-		${HOMARDSCRIPT}
+		${WRKSRC}/${HOMARDWDIR}/${HOMARDSCRIPT}
 
 do-install:
 	@${MKDIR} ${HOMARDDIR}
 	@${MKDIR} ${PREFIX}/bin/${OPSYS}
 	@${INSTALL_PROGRAM} ${WRKSRC}/${HOMARDWDIR}/${HOMARDPG} ${PREFIX}/bin/${OPSYS}
 	@${BRANDELF} -t Linux ${PREFIX}/bin/${OPSYS}/${HOMARDPG}
-	@${INSTALL_SCRIPT} ${HOMARDSCRIPT} ${HOMARDDIR}/${PORTNAME}
-	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/${AHPY} ${HOMARDDIR}
-	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/${AHPY5} ${HOMARDDIR}
-	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/${AHPY6} ${HOMARDDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/${HOMARDWDIR}/${HOMARDSCRIPT} ${HOMARDDIR}/${PORTNAME}
+	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/ASTER_HOMARD/${AHPY} ${HOMARDDIR}
+	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/ASTER_HOMARD/${AHPY5} ${HOMARDDIR}
+	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/ASTER_HOMARD/${AHPY6} ${HOMARDDIR}
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
 	@${LN} -fs ${HOMARDDIR}/homard ${ASTER_TOOLS}/
@@ -75,9 +76,10 @@ do-install:
 .for doc in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
-	@${CP} -R ${WRKSRC}/Intranet ${DOCSDIR}
+	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/Intranet ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/CAS_TESTS/* ${EXAMPLESDIR}
+	@${TOUCH} ${DIR2RM:S|^|${EXAMPLESDIR}/|:S|$|/resultats/.keepme|}
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
@@ -86,4 +88,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>