10 files changed, 26 insertions, 35 deletions

diff --git a/french/aster/Makefile b/french/aster/Makefile
index 364ef492a9a8..f595160ffc97 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	aster
 PORTVERSION=	7.2.0
 CATEGORIES=	french cad python tk84
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/code_aster/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2.src
+MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}-2
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -52,7 +52,8 @@ USE_PYTHON=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/${vaster}
+EXTDIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-2.src
+WRKSRC=		${EXTDIR}/${vaster}
 PLIST_SUB=	ASTERDIR=${PORTNAME}/${vaster}
 .if defined(WITHOUT_ASTK) || defined(WITHOUT_ASTK_CLI)
 PKGMESSAGE=	${PKGDIR}/pkg-message.sans-astk
@@ -157,8 +158,8 @@ LASTKDIR?=	ASTK/ASTK_CLIENT
 ASTKDIR=	${LOCALBASE}/${LASTKDIR}
 
 post-extract:
-	@(cd ${WRKDIR}/${DISTNAME} && \
-	${TAR} xfz ${WRKDIR}/${DISTNAME}/${PORTNAME}.tar.gz)
+	@(cd ${EXTDIR} && \
+	${TAR} xfz ${EXTDIR}/${PORTNAME}.tar.gz)
 
 post-patch:
 .for mk_file in ${MK_FILES}
diff --git a/french/aster/distinfo b/french/aster/distinfo
index cc4651bf25c0..fb2b49948cea 100644
--- a/french/aster/distinfo
+++ b/french/aster/distinfo
@@ -1 +1 @@
-MD5 (aster-7.2.0-2.src.tar) = 3c7163dffba0fa70c6b136480c05712e
+MD5 (aster-src-7.2.0-2.tar) = 3c7163dffba0fa70c6b136480c05712e
diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 9028fd669269..bc88816985cf 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	Eficas
-PORTVERSION=	1.5
+PORTNAME=	eficas
+PORTVERSION=	1.5.3
 CATEGORIES=	french cad python
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/eficas/
-DISTNAME=	${PORTNAME}V${PORTVERSION:C/\./_/}b3AsterSTA7
+MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASter Command FIle Editor
@@ -27,6 +27,8 @@ USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
+WRKSRC=		${WRKDIR}/EficasV1_5b3AsterSTA7
+
 LEFICASDIR?=	apps/${PORTNAME}
 EFICASDIR=	${PREFIX}/${LEFICASDIR}
 PLIST_SUB=	EFICASDIR=${LEFICASDIR}
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
index 25dc04457d36..76dbfc8d6fab 100644
--- a/french/eficas/distinfo
+++ b/french/eficas/distinfo
@@ -1 +1 @@
-MD5 (EficasV1_5b3AsterSTA7.tar.gz) = e110284f10050c932abf27f9bf56ab01
+MD5 (eficas-1.5.3-1.tar.gz) = e110284f10050c932abf27f9bf56ab01
diff --git a/french/gibi/Makefile b/french/gibi/Makefile
index 13f4ed231d86..61c1fdf5e057 100644
--- a/french/gibi/Makefile
+++ b/french/gibi/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	gibi
 PORTVERSION=	2000
 CATEGORIES=	french cad linux
-MASTER_SITES=	# http://www.code-aster.org/FICHIERS/gibi/
-DISTNAME=	PACK_${PORTNAME}${ARCHI}${PORTVERSION}
+MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${ARCH}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -77,23 +77,9 @@ PLIST_SUB=	GIBIDIR=${LGIBIDIR} ASTER_TOOLS=${ASTER_TOOLS}
 
 BRANDELF?=	/usr/bin/brandelf -t Linux
 
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
-		${ECHO_MSG} "Because of licensing restrictions, you must fetch the binary"; \
-		${ECHO_MSG} "distribution manually.  Please access"; \
-		${ECHO_MSG} "<http://www.code-aster.org/telechargement/read_license_outils.php?prod=Gibi>"; \
-		${ECHO_MSG} "with a web browser, read the license carefully (in french),"; \
-		${ECHO_MSG} "check the box \"J'accepte les termes de la présente licence\""; \
-		${ECHO_MSG} "and click on the button \"Envoyer\"."; \
-		${ECHO_MSG} "On the second page, select Linux x86, Executable and 2000,"; \
-		${ECHO_MSG} "then click on the arrow to download the tarball"; \
-		${ECHO_MSG} "${DISTFILES}."; \
-		${ECHO_MSG} "Please place this file in ${DISTDIR}."; \
-	fi
-
 post-extract:
 	@(cd ${WRKDIR} && \
-		${TAR} xfz ${WRKDIR}/${DISTNAME:S/PACK/CASTEM/}.tar.gz)
+		${TAR} xfz ${WRKDIR}/CASTEM_${PORTNAME}PC_Linux_${PORTVERSION}.tar.gz)
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|DIR='repertoire_install'|DIR='${GIBIDIR}'|"	\
diff --git a/french/gibi/distinfo b/french/gibi/distinfo
index 5565d11536e6..2f4a4539ebd7 100644
--- a/french/gibi/distinfo
+++ b/french/gibi/distinfo
@@ -1 +1 @@
-MD5 (PACK_gibiPC_Linux_2000.tar) = 1ab42d8db97aaf3c86b26595d26aa9bc
+MD5 (gibi-2000-1.i386.tar) = 1ab42d8db97aaf3c86b26595d26aa9bc
diff --git a/french/homard/Makefile b/french/homard/Makefile
index ed5fd94bba16..3a92745a5e70 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	homard
 PORTVERSION=	6.2
 CATEGORIES=	french cad linux python
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/homard/
-DISTNAME=	${PORTNAME:U}_V${PORTVERSION}.Linux
+MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${ARCH}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A refinement and de-refinement mesh tool
@@ -31,6 +31,8 @@ USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME:U}_V${PORTVERSION}.Linux
+
 LHOMARDDIR?=	apps/${PORTNAME}
 ASTER_VER=	7.2
 vaster=		STA${ASTER_VER}
diff --git a/french/homard/distinfo b/french/homard/distinfo
index 184db7cec47b..2bcd04e76bdf 100644
--- a/french/homard/distinfo
+++ b/french/homard/distinfo
@@ -1 +1 @@
-MD5 (HOMARD_V6.2.Linux.tar.gz) = 4dced6bc6912450d18bd55cf484fc46b
+MD5 (homard-6.2-1.i386.tar.gz) = 4dced6bc6912450d18bd55cf484fc46b
diff --git a/french/med/Makefile b/french/med/Makefile
index 890abbf286c1..6836fb2ac24f 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	med
 PORTVERSION=	2.1.5
 CATEGORIES=	french cad converters
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/med/
-DISTNAME=	${PORTNAME}${PORTVERSION}_hdf5-1_src
+MASTER_SITES=	http://www.code-aster.org/FICHIERS/
+DISTNAME=	${PORTNAME}hdf-src-${PORTVERSION}-1.noarch
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/french/med/distinfo b/french/med/distinfo
index ef9f028264c7..2318f0927f5b 100644
--- a/french/med/distinfo
+++ b/french/med/distinfo
@@ -1 +1 @@
-MD5 (med2.1.5_hdf5-1_src.tar) = a19a5f481fbf48b1a2934517dfb717c5
+MD5 (medhdf-src-2.1.5-1.noarch.tar) = a19a5f481fbf48b1a2934517dfb717c5