Upgrade to 7.1.

3 files changed, 46 insertions, 24 deletions

diff --git a/french/homard/Makefile b/french/homard/Makefile
index 5b13473d2666..bcf5cf88067a 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	homard
-PORTVERSION=	6.2
-PORTREVISION=	3
+PORTVERSION=	7.1
 CATEGORIES=	french cad linux python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${ARCH}
@@ -32,53 +31,51 @@ USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME:U}_V${PORTVERSION}.Linux
+WRKSRC=		${WRKDIR}/${PORTNAME:U}
 
 LHOMARDDIR?=	apps/${PORTNAME}
-ASTER_VER=	7.3
+ASTER_VER=	7.4
 vaster=		STA${ASTER_VER}
-ASTER_TOOLS=	${LOCALBASE}/aster/${vaster}/outils
+ASTER_TOOLS=	${LOCALBASE}/aster/outils
 HOMARDDIR=	${PREFIX}/${LHOMARDDIR}
 AHPY=		aster_homard_py
 AHPY5=		aster_homard_V5x_py
-HOMARDSCRIPT=	${WRKDIR}/${PORTNAME}_base
+AHPY6=		aster_homard_V6x_py
+HOMARDSCRIPT=	${WRKSRC}/${PORTNAME}_base
 # This name is requested to run aster's make test
 HOMARDPG=	${PORTNAME:U}_V${PORTVERSION}.out
+HOMARDWDIR=	${PORTNAME:U}_V${PORTVERSION}.Linux
 
 DOCS=		A_Lire.txt Readme.txt
 
 .include <bsd.port.pre.mk>
 
-unames!=	${UNAME} -s
 PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY}			\
-		AHPY5=${LHOMARDDIR}/${AHPY5} UNAMES=${unames} HOMARDPG=${HOMARDPG}	\
-		ASTER_TOOLS=${ASTER_TOOLS}
+		AHPY5=${LHOMARDDIR}/${AHPY5} AHPY6=${LHOMARDDIR}/${AHPY6}		\
+		UNAMES=${OPSYS} HOMARDPG=${HOMARDPG} ASTER_TOOLS=${ASTER_TOOLS}
 
-BRANDELF?=	/usr/bin/brandelf
-
-post-patch:
-	@${REINPLACE_CMD} -e "s#/home/homard/ASTER_HOMARD#${ASTER_TOOLS}#"	\
-		-e "s#/logiciels/HOMARD/HOMARD_PUBLIC#${PREFIX}/bin#"		\
-		-e "s#/local/edf-python-2.1.1/bin/python#${PYTHON_CMD}#"	\
+pre-configure:
+	@${REINPLACE_CMD} -e "s#/logiciels/HOMARD/HOMARD_PUBLIC#${PREFIX}/bin#"		\
+		-e "s#/local/edf-python-2.1.1/bin/python#${PYTHON_CMD}#"		\
 		${HOMARDSCRIPT}
 
 do-install:
 	@${MKDIR} ${HOMARDDIR}
-	@${MKDIR} ${PREFIX}/bin/${unames}
-	@${INSTALL_PROGRAM} ${WRKSRC}/${HOMARDPG} ${PREFIX}/bin/${unames}
-	@${BRANDELF} -t Linux ${PREFIX}/bin/${unames}/${HOMARDPG}
+	@${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}/${AHPY} ${HOMARDDIR}
-	@${CP} -R ${WRKSRC}/${AHPY5} ${HOMARDDIR}
+	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/${AHPY} ${HOMARDDIR}
+	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/${AHPY5} ${HOMARDDIR}
+	@${CP} -R ${WRKSRC}/${HOMARDWDIR}/${AHPY6} ${HOMARDDIR}
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HOMARDDIR}
 	@${LN} -fs ${HOMARDDIR}/homard ${ASTER_TOOLS}/
 	@${LN} -fs ${HOMARDDIR}/aster_homard_py ${ASTER_TOOLS}/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${DOCS}
-	@${INSTALL_DATA} ${WRKDIR}/${doc} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
diff --git a/french/homard/distinfo b/french/homard/distinfo
index d55211641f41..60a41ad69208 100644
--- a/french/homard/distinfo
+++ b/french/homard/distinfo
@@ -1,2 +1,2 @@
-MD5 (homard-6.2-1.i386.tar.gz) = 4dced6bc6912450d18bd55cf484fc46b
-SIZE (homard-6.2-1.i386.tar.gz) = 930612
+MD5 (homard-7.1-1.i386.tar.gz) = 5a51c67de2fa322d5acc75f509bda171
+SIZE (homard-7.1-1.i386.tar.gz) = 1294039
diff --git a/french/homard/pkg-plist b/french/homard/pkg-plist
index 663995d58583..ee472cd9a71c 100644
--- a/french/homard/pkg-plist
+++ b/french/homard/pkg-plist
@@ -56,11 +56,36 @@ bin/%%UNAMES%%/%%HOMARDPG%%
 %%AHPY5%%/aster_homard_utilitaires.py
 %%AHPY5%%/aster_homard_utilitaires.pyc
 %%AHPY5%%/aster_homard_utilitaires.pyo
+%%AHPY6%%/__init__.py
+%%AHPY6%%/__init__.pyc
+%%AHPY6%%/__init__.pyo
+%%AHPY6%%/aster_homard_1.py
+%%AHPY6%%/aster_homard_1.pyc
+%%AHPY6%%/aster_homard_1.pyo
+%%AHPY6%%/aster_homard_2.py
+%%AHPY6%%/aster_homard_2.pyc
+%%AHPY6%%/aster_homard_2.pyo
+%%AHPY6%%/aster_homard_3.py
+%%AHPY6%%/aster_homard_3.pyc
+%%AHPY6%%/aster_homard_3.pyo
+%%AHPY6%%/aster_homard_4.py
+%%AHPY6%%/aster_homard_4.pyc
+%%AHPY6%%/aster_homard_4.pyo
+%%AHPY6%%/aster_homard_5.py
+%%AHPY6%%/aster_homard_5.pyc
+%%AHPY6%%/aster_homard_5.pyo
+%%AHPY6%%/aster_homard_V6x.py
+%%AHPY6%%/aster_homard_V6x.pyc
+%%AHPY6%%/aster_homard_V6x.pyo
+%%AHPY6%%/aster_homard_utilitaires.py
+%%AHPY6%%/aster_homard_utilitaires.pyc
+%%AHPY6%%/aster_homard_utilitaires.pyo
 %%HOMARDDIR%%/homard
 %%PORTDOCS%%%%DOCSDIR%%/A_Lire.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme.txt
 @dirrm %%AHPY%%
 @dirrm %%AHPY5%%
+@dirrm %%AHPY6%%
 @dirrm %%HOMARDDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec ln -sf %%HOMARDDIR%%/aster_homard_py %%ASTER_TOOLS%%