24 files changed, 32 insertions, 61 deletions

diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 2888364e4806..ceb0689c837c 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abinit
 PORTVERSION=	5.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/abinit|} \
 		ftp://ftp.abinit.org/pub/abinitio/ABINIT_v${PORTVERSION}/
@@ -20,8 +20,6 @@ CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:262
-GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
-PLIST_SUB=	GNU_HOST=${GNU_HOST}
 
 .include <bsd.port.pre.mk>
 
diff --git a/science/abinit/pkg-plist b/science/abinit/pkg-plist
index f578234e919d..e78bfecd9df5 100644
--- a/science/abinit/pkg-plist
+++ b/science/abinit/pkg-plist
@@ -1,18 +1,18 @@
-abinit/5.2/bin/%%GNU_HOST%%-abinis
-abinit/5.2/bin/%%GNU_HOST%%-abinitgw
-abinit/5.2/bin/%%GNU_HOST%%-mrgddb
-abinit/5.2/bin/%%GNU_HOST%%-mrggkk
-abinit/5.2/bin/%%GNU_HOST%%-mrgscr
-abinit/5.2/bin/%%GNU_HOST%%-anaddb
-abinit/5.2/bin/%%GNU_HOST%%-aim
-abinit/5.2/bin/%%GNU_HOST%%-cut3d
-abinit/5.2/bin/%%GNU_HOST%%-macroave
-abinit/5.2/bin/%%GNU_HOST%%-newsp
-abinit/5.2/bin/%%GNU_HOST%%-conducti
-abinit/5.2/bin/%%GNU_HOST%%-optic
-abinit/5.2/bin/%%GNU_HOST%%-lwf
-abinit/5.2/bin/%%GNU_HOST%%-band2eps
-abinit/5.2/bin/%%GNU_HOST%%-abinetcdf
+abinit/5.2/bin/abinis
+abinit/5.2/bin/abinitgw
+abinit/5.2/bin/mrgddb
+abinit/5.2/bin/mrggkk
+abinit/5.2/bin/mrgscr
+abinit/5.2/bin/anaddb
+abinit/5.2/bin/aim
+abinit/5.2/bin/cut3d
+abinit/5.2/bin/macroave
+abinit/5.2/bin/newsp
+abinit/5.2/bin/conducti
+abinit/5.2/bin/optic
+abinit/5.2/bin/lwf
+abinit/5.2/bin/band2eps
+abinit/5.2/bin/abinetcdf
 abinit/5.2/doc/macroave/macroave.tex
 abinit/5.2/doc/macroave/README
 abinit/5.2/doc/macroave/macroave.pdf
diff --git a/science/bft/Makefile b/science/bft/Makefile
index 4658977ae415..c68d660db17a 100644
--- a/science/bft/Makefile
+++ b/science/bft/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 TESTSBIN=	bft_test bft_mem_usage_test bft_printf_test
 
diff --git a/science/buddy/Makefile b/science/buddy/Makefile
index 2f2d235f3b04..d7b4f08de605 100644
--- a/science/buddy/Makefile
+++ b/science/buddy/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A Binary Decision Diagram library
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index f40fb3423c04..97c5bc0d507c 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -20,7 +20,6 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:262
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS+="${CFLAGS}" CPPFLAGS+="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-emf=yes --with-localedir=${PREFIX}
 
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index e4da471d8e87..6ea40c72eabd 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS=	med.2:${PORTSDIR}/french/med		\
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-bft=${LOCALBASE}		\
 		--with-hdf5=${LOCALBASE}	\
 		--with-cgns=${LOCALBASE}	\
diff --git a/science/elmer-fem/Makefile b/science/elmer-fem/Makefile
index 75ba0067a6e9..b41740d59422 100644
--- a/science/elmer-fem/Makefile
+++ b/science/elmer-fem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fem
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science tk
 MASTER_SITES=	SF/elmerfem
 PKGNAMEPREFIX=	elmer-
diff --git a/science/elmer-fem/pkg-plist b/science/elmer-fem/pkg-plist
index af88bab18a3d..3c01fdbdb545 100644
--- a/science/elmer-fem/pkg-plist
+++ b/science/elmer-fem/pkg-plist
@@ -1,4 +1,4 @@
-bin/%%ARCH%%-portbld-freebsd%%OSREL%%-SC2Elmer
+bin/SC2Elmer
 bin/ElmerSolver
 bin/GebhardtFactors
 bin/ViewFactors
diff --git a/science/elmer-matc/Makefile b/science/elmer-matc/Makefile
index 05d9e8bc0514..8d39d69cf307 100644
--- a/science/elmer-matc/Makefile
+++ b/science/elmer-matc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	matc
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	SF/elmerfem
 PKGNAMEPREFIX=	elmer-
diff --git a/science/elmer-matc/pkg-plist b/science/elmer-matc/pkg-plist
index ec1b9ea861b2..c631322bebff 100644
--- a/science/elmer-matc/pkg-plist
+++ b/science/elmer-matc/pkg-plist
@@ -1,4 +1,4 @@
-bin/%%ARCH%%-portbld-freebsd%%OSREL%%-matc
+bin/matc
 include/elmer/fnames.h
 include/elmer/gra.h
 include/elmer/matc.h
diff --git a/science/elmer-meshgen2d/Makefile b/science/elmer-meshgen2d/Makefile
index e618416482fd..8ae44c25ff1d 100644
--- a/science/elmer-meshgen2d/Makefile
+++ b/science/elmer-meshgen2d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	meshgen2d
 PORTVERSION=	5.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	SF/elmerfem
 PKGNAMEPREFIX=	elmer-
@@ -20,14 +20,7 @@ USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=
 
-PLIST_FILES=	bin/${MACHINE_ARCH}-portbld-freebsd${OSREL}-ElmerMesh2D \
-		bin/${MACHINE_ARCH}-portbld-freebsd${OSREL}-Mesh2D	\
-		bin/ElmerMesh2D bin/Mesh2D
-
-post-install:
-		${LN} -sf ${PREFIX}/bin/${MACHINE_ARCH}-portbld-freebsd${OSREL}-ElmerMesh2D \
-			${PREFIX}/bin/ElmerMesh2D
-		${LN} -sf ${PREFIX}/bin/${MACHINE_ARCH}-portbld-freebsd${OSREL}-Mesh2D \
-			${PREFIX}/bin/Mesh2D
+PLIST_FILES=	bin/ElmerMesh2D \
+		bin/Mesh2D
 
 .include <bsd.port.mk>
diff --git a/science/elmerfront/Makefile b/science/elmerfront/Makefile
index cb39ac1c7a23..787b80f86213 100644
--- a/science/elmerfront/Makefile
+++ b/science/elmerfront/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	front
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	SF/elmerfem
 PKGNAMEPREFIX=	elmer
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84	\
 		${LOCALBASE}/lib/libeioc.a:${PORTSDIR}/science/elmer-eio
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84	\
 		ElmerSolver:${PORTSDIR}/science/elmer-fem	\
-		${MACHINE_ARCH}-portbld-freebsd${OSREL}-ElmerMesh2D:${PORTSDIR}/science/elmer-meshgen2d
+		ElmerMesh2D:${PORTSDIR}/science/elmer-meshgen2d
 
 # Elmer avoids the new C++ headers because they cause problems
 # on older systems (Irix)
@@ -34,6 +34,5 @@ USE_GMAKE=	yes
 ALL_TARGET=
 
 DATADIR=	${PREFIX}/share/elmerfront
-PLIST_SUB=	ARCH=${MACHINE_ARCH}
 
 .include <bsd.port.mk>
diff --git a/science/elmerfront/pkg-plist b/science/elmerfront/pkg-plist
index 685c5065eda7..9fd4d0e4308c 100644
--- a/science/elmerfront/pkg-plist
+++ b/science/elmerfront/pkg-plist
@@ -1,4 +1,4 @@
-bin/%%ARCH%%-portbld-freebsd%%OSREL%%-ElmerFront
+bin/ElmerFront
 %%DATADIR%%/lib/SOLVER.KEYWORDS
 %%DATADIR%%/lib/SolverAdaptiveFields.edf
 %%DATADIR%%/lib/SolverGeneric1Fields.edf
diff --git a/science/elmergrid/Makefile b/science/elmergrid/Makefile
index 63d9d713fbde..e2c0041c6c00 100644
--- a/science/elmergrid/Makefile
+++ b/science/elmergrid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmergrid
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	SF/elmerfem
 
@@ -17,11 +17,6 @@ COMMENT=	A Mesh Manipulation Utility for use with the ELMER FEM package
 ALL_TARGET=
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/${MACHINE_ARCH}-portbld-freebsd${OSREL}-ElmerGrid	\
-		bin/ElmerGrid
-
-post-install:
-		${LN} -sf ${PREFIX}/bin/${MACHINE_ARCH}-portbld-freebsd${OSREL}-ElmerGrid \
-			${PREFIX}/bin/ElmerGrid
+PLIST_FILES=	bin/ElmerGrid
 
 .include <bsd.port.mk>
diff --git a/science/elmerpost/Makefile b/science/elmerpost/Makefile
index 3ec4606c0961..6049d5ae1598 100644
--- a/science/elmerpost/Makefile
+++ b/science/elmerpost/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmerpost
 PORTVERSION=	5.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	SF/elmerfem
 
@@ -30,8 +30,6 @@ ALL_TARGET=
 USE_FORTRAN=	yes
 CONFIGURE_ENV+=	FC=${FC} F77=${FC} FCFLAGS=${FCFLAGS}
 
-PLIST_SUB=	ARCH=${MACHINE_ARCH}
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
diff --git a/science/elmerpost/pkg-plist b/science/elmerpost/pkg-plist
index 7019777d2aa6..280ab1ee33b1 100644
--- a/science/elmerpost/pkg-plist
+++ b/science/elmerpost/pkg-plist
@@ -1,6 +1,6 @@
-bin/%%ARCH%%-portbld-freebsd%%OSREL%%-ElmerPost
-bin/%%ARCH%%-portbld-freebsd%%OSREL%%-QueryGLXExt
-bin/%%ARCH%%-portbld-freebsd%%OSREL%%-sico2elmer
+bin/ElmerPost
+bin/QueryGLXExt
+bin/sico2elmer
 %%DATADIR%%/help/index.html
 %%DATADIR%%/help/http.tcl
 %%DATADIR%%/help/help.tcl
diff --git a/science/fvm/Makefile b/science/fvm/Makefile
index 59772b63f979..57baf4af5491 100644
--- a/science/fvm/Makefile
+++ b/science/fvm/Makefile
@@ -25,7 +25,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-bft=${LOCALBASE}	\
 		--with-hdf5=${LOCALBASE}	\
 		--with-cgns=${LOCALBASE}	\
diff --git a/science/gerris/Makefile b/science/gerris/Makefile
index d7b3e7286903..cf6034bee73c 100644
--- a/science/gerris/Makefile
+++ b/science/gerris/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+=	--disable-dx
 
 USE_GMAKE=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=		yes
 USE_GNOME=		pkgconfig
 
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index b716bd018d21..92f0f5d103a3 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS=	gsl.12:${PORTSDIR}/math/gsl	\
 USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-gsl-prefix=${LOCALBASE}	\
 		--with-blas-lapack-prefix=${LOCALBASE}
 WANT_PERL=	yes
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index e561b9ca21ed..a44b4dbcc43a 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -37,7 +37,6 @@ LIB_DEPENDS+=	plplotd.11:${PORTSDIR}/math/plplot	\
 		readline.5:${PORTSDIR}/devel/readline
 
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick"	\
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index ad4893927215..1d210075014f 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -25,7 +25,6 @@ RUN_DEPENDS=	${LOCALBASE}/mpich/bin/mpicc:${PORTSDIR}/net/mpich
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 
diff --git a/science/kmovisto/Makefile b/science/kmovisto/Makefile
index ee3929f8b833..9ae75626cef6 100644
--- a/science/kmovisto/Makefile
+++ b/science/kmovisto/Makefile
@@ -20,7 +20,6 @@ USE_QT_VER=	3
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/science/minc/Makefile b/science/minc/Makefile
index 58dfd66863ea..273174acfe72 100644
--- a/science/minc/Makefile
+++ b/science/minc/Makefile
@@ -33,7 +33,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-static=yes --enable-shared=yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 CONFLICTS=	minc-2*
 
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index 5507b5abe855..3fe60b756b5b 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -33,7 +33,6 @@ USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-shared=yes --enable-static=yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 CONFLICTS=	minc-1*
 LATEST_LINK=	minc2