8 files changed, 11 insertions, 62 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 585cf2849a2c..ebf7f45a75b3 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	eficas
-DISTVERSIONPREFIX=	full-src-
 DISTVERSION=	2.0.3-1
-DISTVERSIONSUFFIX=	.noarch
+PORTREVISION=	1
 CATEGORIES=	french cad
-MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
-DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASter Command FIle Editor
@@ -21,14 +18,12 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw	\
 		${PYNUMPY}							\
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-ASTER_VER=	10.2.0
-ASTER_DISTVERSION=	${ASTER_VER}-1
-EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
-
 USE_PYTHON=	yes
 REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 LEFICASDIR?=	apps/${PORTNAME}
@@ -56,10 +51,6 @@ FIXSHTK=	bureau.py cataediteur.py panels.py
 FIXSHQT4=	typeNode.py
 FIXBASH=	cataSTA9/Macro/macr_ecre_calc_ops.py cataSTA10/Macro/macr_ecre_calc_ops.py
 
-post-extract:
-	(cd ${WRKDIR} &&	\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
-
 pre-configure:
 	${RM} ${WRKSRC}/convert/Parserv5/Translate.py.orig
 	${RM} -r ${WRKSRC}/Pmw	# Use our ported Pmw
@@ -98,4 +89,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
+.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
deleted file mode 100644
index da93a363feb7..000000000000
--- a/french/eficas/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (aster-full-src-10.2.0-1.noarch.tar.gz) = b2ba78c4d41d40933a98e21f16f3ec3d
-SHA256 (aster-full-src-10.2.0-1.noarch.tar.gz) = 99fe143121ffde6089335163902a75805ba61fe559c3176846db1452491b5d48
-SIZE (aster-full-src-10.2.0-1.noarch.tar.gz) = 181662707
diff --git a/french/eficas_doc/Makefile b/french/eficas_doc/Makefile
index f8e86c68be3c..9f2cfec44d17 100644
--- a/french/eficas_doc/Makefile
+++ b/french/eficas_doc/Makefile
@@ -6,22 +6,15 @@
 #
 
 PORTNAME=	eficas-doc
-DISTVERSIONPREFIX=	full-src-
 DISTVERSION=	2.0.3-1
-DISTVERSIONSUFFIX=	.noarch
+PORTREVISION=	1
 CATEGORIES=	french cad
-MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
-DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	ASter Command FIle Editor - doc files
 
 RUN_DEPENDS=	eficas:${PORTSDIR}/french/eficas
 
-ASTER_VER=	10.2.0
-ASTER_DISTVERSION=	${ASTER_VER}-1
-EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME:S/-doc//}-${PORTVERSION:R}/Aster
 PKG_INSTALL=	pkg-install
@@ -31,10 +24,6 @@ LEFICASDIR?=	apps/${PORTNAME:S/-doc//}
 EFICASDIR=	${PREFIX}/${LEFICASDIR}
 PLIST_SUB=	EFICASDIR=${LEFICASDIR}
 
-post-extract:
-	(cd ${WRKDIR} &&	\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
-
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKG_INSTALL} ${PKGNAME} PRE-INSTALL
 
@@ -44,4 +33,5 @@ do-install:
 	(cd ${WRKSRC}/Cata &&	\
 		${COPYTREE_SHARE} \* ${EFICASDIR}/Aster/Cata)
 
+.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/french/eficas_doc/distinfo b/french/eficas_doc/distinfo
deleted file mode 100644
index da93a363feb7..000000000000
--- a/french/eficas_doc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (aster-full-src-10.2.0-1.noarch.tar.gz) = b2ba78c4d41d40933a98e21f16f3ec3d
-SHA256 (aster-full-src-10.2.0-1.noarch.tar.gz) = 99fe143121ffde6089335163902a75805ba61fe559c3176846db1452491b5d48
-SIZE (aster-full-src-10.2.0-1.noarch.tar.gz) = 181662707
diff --git a/french/homard/Makefile b/french/homard/Makefile
index 088945de7180..317ab21025b2 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	homard
-DISTVERSIONPREFIX=	full-src-
 DISTVERSION=	9.6-1
-DISTVERSIONSUFFIX=	.all
+PORTREVISION=	1
 CATEGORIES=	french cad linux
-MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
-DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${ASTER_DISTVERSIONSUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A refinement and de-refinement mesh tool
@@ -31,12 +28,8 @@ REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
 
 LHOMARDDIR?=	apps/${PORTNAME}
-ASTER_VER=	10.2.0
-ASTER_DISTVERSION=	${ASTER_VER}-1
-ASTER_DISTVERSIONSUFFIX=	.noarch
 vaster=		STA${ASTER_VER:R}
 ASTER_TOOLS=	${LOCALBASE}/aster/outils
 HOMARDDIR=	${PREFIX}/${LHOMARDDIR}
@@ -51,10 +44,6 @@ DOCS=		A_Lire.txt Readme.txt
 PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY}			\
 		UNAMES=${OPSYS} HOMARDPG=${HOMARDPG} ASTER_TOOLS=${ASTER_TOOLS}
 
-post-extract:
-	(cd ${WRKDIR} &&	\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
-
 pre-configure:
 	${REINPLACE_CMD} -e "s#/logiciels/HOMARD/HOMARD_PUBLIC#${PREFIX}/bin#"		\
 		${WRKSRC}/${HOMARDWDIR}/${HOMARDSCRIPT}
@@ -90,4 +79,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
+.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/french/homard/distinfo b/french/homard/distinfo
deleted file mode 100644
index da93a363feb7..000000000000
--- a/french/homard/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (aster-full-src-10.2.0-1.noarch.tar.gz) = b2ba78c4d41d40933a98e21f16f3ec3d
-SHA256 (aster-full-src-10.2.0-1.noarch.tar.gz) = 99fe143121ffde6089335163902a75805ba61fe559c3176846db1452491b5d48
-SIZE (aster-full-src-10.2.0-1.noarch.tar.gz) = 181662707
diff --git a/math/metis-edf/Makefile b/math/metis-edf/Makefile
index 668c5061d8b1..fcf4f6621bd9 100644
--- a/math/metis-edf/Makefile
+++ b/math/metis-edf/Makefile
@@ -6,23 +6,15 @@
 #
 
 PORTNAME=	metis-edf
-DISTVERSIONPREFIX=	full-src-
 DISTVERSION=	4.1-2
-DISTVERSIONSUFFIX=	.noarch
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
-MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
-DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meshes partionning tool used by Code_Aster
 
 CONFLICTS=	metis-[0-9]*
 
-ASTER_VER=	10.1.0
-ASTER_DISTVERSION=	${ASTER_VER}-4
-EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
-
 ALL_TARGET=	default
 MAKE_ENV+=	AR="${AR}" PICFLAG="${PICFLAG}"
 MAKE_JOBS_UNSAFE=	yes
@@ -32,7 +24,7 @@ USE_FORTRAN=	yes
 FFLAGS+=	-O2
 PICFLAG?=	-fPIC
 
-WRKSRC=		${WRKDIR}/${PORTNAME:C/-/_/}-${PORTVERSION:R}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 PROGS=		kmetis onmetis.exe pmetis
 DOCS=		CHANGES Doc/manual.ps README_Code_Aster
@@ -41,6 +33,7 @@ FORTRANLIBS=	-lgfortranbegin -lgfortran
 GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 
 MACHINEARCH=	${ARCH}
 .if ${ARCH} == "i386"
@@ -50,10 +43,6 @@ PLIST_SUB+=	SHLIB=""
 PLIST_SUB+=	SHLIB="@comment "
 .endif
 
-post-extract:
-	(cd ${WRKDIR} &&	\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME:C/-/_/}-${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
-
 pre-configure:
 .if ${MACHINEARCH} != "i386"
 	${FIND} ${WRKSRC} -type f -name "*.c" -o -name "*.h" | ${XARGS}	\
diff --git a/math/metis-edf/distinfo b/math/metis-edf/distinfo
deleted file mode 100644
index 74854df498b7..000000000000
--- a/math/metis-edf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (aster-full-src-10.1.0-4.noarch.tar.gz) = 49fe55a0a46491124c16965a2db59c5e
-SHA256 (aster-full-src-10.1.0-4.noarch.tar.gz) = c72f82abadb627925cbc5cbf9909f969e4c60f29325a62d78664eb03a860468a
-SIZE (aster-full-src-10.1.0-4.noarch.tar.gz) = 163690307