Convert all USE_FORTRAN=yes to "USES=fortran, USE_GCC=yes". In most cases

USE_GCC=yes has been omitted though. Remove USE_FORTRAN handling from bsd.port.mk and bsd.gcc.mk. Minor cleanups in some ports like USE_GMAKE, NOPORTDOCS,... Exp-run: bdrewery Approved by: portmgr (bdrewery)
author: Tijl Coosemans <tijl@FreeBSD.org> 2014-02-16 17:15:31 +0000
committer: Tijl Coosemans <tijl@FreeBSD.org> 2014-02-16 17:15:31 +0000
commit: 564a799c7173c288d4d3a9be78ac3d2db983d512 (patch)
tree: 49e521faa408bc4bd163bfb0febf91e262772c1c
parent: af1790bfbbcd5831281907db9c04f3776b8d601c (diff)
download: ports-564a799c7173c288d4d3a9be78ac3d2db983d512.tar.gz
ports-564a799c7173c288d4d3a9be78ac3d2db983d512.zip
209 files changed, 457 insertions, 339 deletions
diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
index 4684214bfb91..860a774c0cc0 100644
--- a/Mk/Uses/cran.mk
+++ b/Mk/Uses/cran.mk
@@ -30,7 +30,7 @@ MASTER_SITE_CRAN_ARCHIVE+=	${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,}
 
 MASTER_SITES?=	${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}
 
-USE_FORTRAN=	yes
+USES+=		fortran
 BUILD_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
 RUN_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
 
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
index 80253e08808d..579bec0182cb 100644
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@@ -23,6 +23,7 @@ USE_BINUTILS=	yes
 F77=		gfortran${_GCC_VER}
 FC=		gfortran${_GCC_VER}
 FFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
+FCFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER}
 .elif ${fortran_ARGS} == ifort
@@ -34,7 +35,7 @@ FC=		${LOCALBASE}/intel_fc_80/bin/ifort
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
 .endif
 
-CONFIGURE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
-MAKE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
+CONFIGURE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
+MAKE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
 
 .endif
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index b1fabd8aa862..b9a43e4df3d9 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -7,8 +7,7 @@
 #
 # To request the use of a current version of GCC, specify USE_GCC=yes in
 # your port/system configuration.  This is the preferred use of USE_GCC.
-# It defines a canonical, default version of GCC.  The same version of
-# GCC is also implied by USE_FORTRAN=yes.
+# It defines a canonical, default version of GCC.
 #
 # USE_GCC=any is similar, except that it also accepts the old GCC 4.2-
 # based system compiler in older versions of FreeBSD.
@@ -18,9 +17,6 @@
 # do so by specifying USE_GCC=X.Y+ which requests at least GCC version
 # X.Y.  To request a specific version omit the trailing + sign.
 #
-# Use of a Fortran compiler is declared by the USE_FORTRAN knob, not
-# USE_GCC.
-#
 # Examples:
 #   USE_GCC=	yes			# port requires a current version of GCC
 #							# (4.6 as of today, subject to change).
@@ -28,15 +24,6 @@
 #   USE_GCC=	4.8+		# port requires GCC 4.8 or later.
 #   USE_GCC=	4.8			# port requires GCC 4.8.
 #
-# If your port needs a Fortran compiler, please specify that with the
-# USE_FORTRAN= knob.  Here is the list of options for that knob:
-#
-#   USE_FORTRAN=	yes		# use gfortran46 (lang/gcc46)
-#   USE_FORTRAN=	ifort	# use the Intel compiler (lang/ifc)
-#
-# Due to object file incompatiblity between Fortran compilers, we strongly
-# recommend to use only one of them on any system.
-#
 # If you are wondering what your port exactly does, use "make test-gcc"
 # to see some debugging.
 #
@@ -81,34 +68,6 @@ _GCCVERSION_${v}_V=	${j}
 . endfor
 .endfor
 
-# bsd.gcc.mk can also be used for primarily requesting a Fortran compiler.
-# If we are using GCC we still define whatever we'd usually do for C and
-# C++ as well.
-
-.if defined (USE_FORTRAN)
-
-# The default case, with a current lang/gcc port.
-. if ${USE_FORTRAN} == yes
-_USE_GCC:=	${GCC_DEFAULT_VERSION}
-FC:=	gfortran${GCC_DEFAULT_V}
-F77:=	gfortran${GCC_DEFAULT_V}
-
-# Intel Fortran compiler from lang/ifc.
-. elif ${USE_FORTRAN} == ifort
-BUILD_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
-RUN_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
-FC:=	${LOCALBASE}/intel_fc_80/bin/ifort
-F77:=	${LOCALBASE}/intel_fc_80/bin/ifort
-
-. else
-IGNORE=	specifies unknown value "${USE_FORTRAN}" for USE_FORTRAN
-. endif
-
-CONFIGURE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
-MAKE_ENV+=		F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
-.endif
-
-
 .if defined(USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
 
 . if ${USE_GCC} == any
@@ -201,11 +160,6 @@ _GCC_RUNTIME:=		${LOCALBASE}/lib/gcc${V}
 CFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 CXXFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 LDFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME}
-.    if defined (USE_FORTRAN)
-.    if ${USE_FORTRAN} == yes
-FFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
-.    endif
-.    endif
 # The following is for the sakes of some ports which use this without
 # ever telling us; to be fixed.
 _GCC_BUILD_DEPENDS:=	${_GCC_PORT_DEPENDS}
@@ -234,7 +188,6 @@ USE_BINUTILS=	yes
 
 test-gcc:
 	@echo USE_GCC=${USE_GCC}
-	@echo USE_FORTRAN=${USE_FORTRAN}
 .if defined(IGNORE)
 	@echo "IGNORE: ${IGNORE}"
 .else
@@ -255,7 +208,6 @@ test-gcc:
 	@echo Using GCC version ${_USE_GCC}
 .endif
 	@echo CC=${CC} - CXX=${CXX} - CPP=${CPP} - CFLAGS=\"${CFLAGS}\"
-	@echo F77=${F77} - FC=${FC} - FFLAGS=\"${FFLAGS}\"
 	@echo LDFLAGS=\"${LDFLAGS}\"
 	@echo "BUILD_DEPENDS=${BUILD_DEPENDS}"
 	@echo "RUN_DEPENDS=${RUN_DEPENDS}"
diff --git a/Mk/bsd.octave.mk b/Mk/bsd.octave.mk
index a656f189273d..a71e61c37537 100644
--- a/Mk/bsd.octave.mk
+++ b/Mk/bsd.octave.mk
@@ -21,8 +21,7 @@ RUN_DEPENDS+=	octave:${PORTSDIR}/math/octave \
 		${LOCALBASE}/libexec/octave/load-octave-pkg:${PORTSDIR}/math/octave-forge-base
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 
-USE_FORTRAN=	yes
-USES+=		gmake
+USES+=		fortran gmake
 
 DIST_SUBDIR=	octave-forge
 OCTAVE_PKGNAME=	${PORTNAME:S/octave-forge-//}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index dcdac836f75c..00e7305af2f9 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1712,7 +1712,7 @@ EXTRACT_DEPENDS+=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 EXTRACT_DEPENDS+=	unmakeself:${PORTSDIR}/archivers/unmakeself
 .endif
 
-.if defined(USE_GCC) || defined(USE_FORTRAN)
+.if defined(USE_GCC)
 .include "${PORTSDIR}/Mk/bsd.gcc.mk"
 .endif
 
diff --git a/benchmarks/himenobench/Makefile b/benchmarks/himenobench/Makefile
index b610c1782ced..8d02156243db 100644
--- a/benchmarks/himenobench/Makefile
+++ b/benchmarks/himenobench/Makefile
@@ -22,9 +22,10 @@ USE_LHA=	yes
 BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
 .endif
 
-USE_FORTRAN=	yes
 .if defined(WITH_IFC)
-USE_FORTRAN=	ifort
+USES+=		fortran:ifort
+.else
+USES+=		fortran
 .endif
 
 NO_STAGE=	yes
@@ -42,7 +43,7 @@ PLIST_SUB+=	WITH_ICC=""
 .else
 PLIST_SUB+=	WITH_ICC="@comment "
 .endif
-.if ${USE_FORTRAN} == ifort
+.if defined(WITH_IFC)
 FFLAGS_IFC+=	-O3 -tpp7 -axN -Vaxlib -ipo
 IFC=		${LOCALBASE}/intel_fc_80/bin/ifort
 PLIST_SUB+=	WITH_IFC=""
@@ -50,14 +51,14 @@ PLIST_SUB+=	WITH_IFC=""
 PLIST_SUB+=	WITH_IFC="@comment "
 .endif
 
-.if ${USE_FORTRAN} != yes
+.if defined(WITH_IFC)
 PLIST_SUB+=	WITH_GFORTRAN="@comment "
 .else
 PLIST_SUB+=	WITH_GFORTRAN=""
 .endif
 
 do-build:
-.if ${USE_FORTRAN} == yes
+.if ! defined(WITH_IFC)
 	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp    himenobmtxp.f90
 .endif
 #	cd ${WRKSRC} ; ${FC} ${FFLAGS} -o himenobmtxp_xl himenobmtxp_xl.f #Too large
@@ -87,7 +88,7 @@ do-build:
 .endif
 do-install:
 #	${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_xl          ${PREFIX}/bin #Too large
-.if ${USE_FORTRAN} == yes
+.if ! defined(WITH_IFC)
 	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp            ${PREFIX}/bin
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/himenobmtxp_l           ${PREFIX}/bin
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index 2db524d36734..3a302e8b5073 100644
--- a/benchmarks/hpl/Makefile
+++ b/benchmarks/hpl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	High Performance Computing Linpack Benchmark
 LIB_DEPENDS=	libblas.so:${PORTSDIR}/math/blas \
 		libmpich.so:${PORTSDIR}/net/mpich2
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 HPL_ARCH?=	FreeBSD_PIV_CBLAS
 MAKE_ARGS=	arch=${HPL_ARCH}
diff --git a/benchmarks/octave-forge-benchmark/Makefile b/benchmarks/octave-forge-benchmark/Makefile
index f3bb38a1b8b8..5d0475d78fb4 100644
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-benchmark
 PORTVERSION=	1.1.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	benchmarks math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/biology/crux/Makefile b/biology/crux/Makefile
index b303a7f992bb..b6e7dce08b3e 100644
--- a/biology/crux/Makefile
+++ b/biology/crux/Makefile
@@ -10,22 +10,20 @@ MASTER_SITES=	http://www.canonware.com/download/Crux/
 MAINTAINER=	jasone@FreeBSD.org
 COMMENT=	Software toolkit for phylogenetic inference
 
+USES=		fortran gmake
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD} --disable-mpi
 USE_CSTD=	gnu99
-USE_GMAKE=	yes
 USE_PYTHON=	yes
 
 OPTIONS_DEFINE=	SYS_LINALG
 SYS_LINALG_DESC=	Enable system ATLAS/LAPACK
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_FORTRAN=	yes
 
 .include <bsd.port.options.mk>
 
@@ -43,4 +41,4 @@ BROKEN=		Does not build on powerpc-9: error in pthreads
 post-install:
 	@${PREFIX}/bin/crux -b -q /dev/null
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/biology/plink/Makefile b/biology/plink/Makefile
index bfd37ec1e825..a9711e69d1b5 100644
--- a/biology/plink/Makefile
+++ b/biology/plink/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	plink
 PORTVERSION=	1.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology science
 MASTER_SITES=	http://pngu.mgh.harvard.edu/~purcell/plink/dist/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Whole genome association analysis toolset
@@ -15,15 +16,13 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack
 
-USES=		gmake
-USE_ZIP=	yes
-USE_FORTRAN=	yes	# Make it use the same compiler as lapack
+# We need Fortran LDFLAGS to link with Lapack.
+USES=		fortran gmake
 
 PLIST_FILES=	bin/plink
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/plink ${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/plink ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/biology/plink/files/patch-Makefile b/biology/plink/files/patch-Makefile
index cb1e7f5fc537..e98b69aa6559 100644
--- a/biology/plink/files/patch-Makefile
+++ b/biology/plink/files/patch-Makefile
@@ -1,15 +1,16 @@
 --- Makefile.orig	2009-10-10 11:00:20.000000000 -0500
 +++ Makefile	2012-09-07 08:24:26.000000000 -0500
-@@ -26,7 +26,7 @@
+@@ -26,25 +26,25 @@
  WITH_WEBCHECK = 1
  FORCE_32BIT = 
  WITH_ZLIB = 1
 -WITH_LAPACK = 
+-FORCE_DYNAMIC = 
 +WITH_LAPACK = 1
- FORCE_DYNAMIC = 
++FORCE_DYNAMIC = 1
  
  # Put C++ compiler here; Windows has it's own specific version
-@@ -34,17 +34,17 @@
+ CXX_UNIX = g++
  CXX_WIN = c:\bin\mingw\bin\mingw32-g++.exe
  
  # Any other compiler flags here ( -Wall, -g, etc)
@@ -18,7 +19,7 @@
  
  # Misc
 -LIB_LAPACK = /usr/lib/liblapack.so.3
-+LIB_LAPACK = -L${LOCALBASE}/lib -llapack -lblas -lgfortran
++LIB_LAPACK = ${LDFLAGS} -L${LOCALBASE}/lib -llapack -lblas
  
  
  # --------------------------------------------------------------------
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 4b61958a54f7..51820ce005af 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -43,7 +43,8 @@ DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}	\
 		cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
+USES=		fortran gmake
+USE_GCC=	yes
 USE_XORG=	xmu
 USE_GL=	glut
 
@@ -54,7 +55,6 @@ CCX_VER=	ccx_${PORTVERSION}
 CGX_VER=	cgx_2.6
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
 OPTIONS_DEFINE= METIS METIS_EDF
@@ -81,9 +81,6 @@ BLAS_LIBS=		-lblas
 LAPACK_LIBS=		-llapack
 .endif
 
-USE_FORTRAN=	yes
-USE_GCC=	yes
-
 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
@@ -148,4 +145,4 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/feappv/Makefile b/cad/feappv/Makefile
index ea19b62441df..a06f70e6fc4a 100644
--- a/cad/feappv/Makefile
+++ b/cad/feappv/Makefile
@@ -13,10 +13,9 @@ EXTRACT_ONLY=	${PORTNAME}${PORTVERSION:S/.//}${EXTRACT_SUFX}
 MAINTAINER=	mexas@bris.ac.uk
 COMMENT=	Finite element analysis program (personal version)
 
-USES=		gmake
+USES=		fortran gmake
 USE_ZIP=	yes
 USE_XORG=	x11
-USE_FORTRAN=	yes
 MAKEFILE=	makefile
 MAKE_ENV=	FEAPPVHOME3_1="${WRKSRC}"
 ALL_TARGET=	install
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index d12903e7d412..363a2fbcc471 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gmsh
 PORTVERSION=	2.8.4
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
@@ -26,9 +27,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
 
 SLAVEDIRS=	cad/gmsh-occ
 
-USE_FORTRAN=	yes
-USES=		cmake
-USE_GMAKE=	yes
+USES=		cmake fortran gmake
 USE_GL=		yes
 ALL_TARGET=	all
 
diff --git a/cad/gmsh/files/patch-Fltk-Main.cpp b/cad/gmsh/files/patch-Fltk-Main.cpp
new file mode 100644
index 000000000000..d5ec754d8136
--- /dev/null
+++ b/cad/gmsh/files/patch-Fltk-Main.cpp
@@ -0,0 +1,11 @@
+--- Fltk/Main.cpp.orig
++++ Fltk/Main.cpp
+@@ -3,7 +3,7 @@
+ // See the LICENSE.txt file for license information. Please report all
+ // bugs and problems to the public mailing list <gmsh@geuz.org>.
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <string>
+ #include "Gmsh.h"
+ #include "GmshMessage.h"
diff --git a/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp b/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp
new file mode 100644
index 000000000000..855c1939a918
--- /dev/null
+++ b/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp
@@ -0,0 +1,13 @@
+--- Mesh/meshGFaceBDS.cpp.orig
++++ Mesh/meshGFaceBDS.cpp
+@@ -771,8 +771,8 @@
+   while (it != m.edges.end()){
+     BDS_Edge *e = *it;
+     if (!e->deleted && e->numfaces() == 2){
+-      std::map<BDS_Point*, MVertex*>::iterator itp1 = recoverMap->find(e->p1);
+-      std::map<BDS_Point*, MVertex*>::iterator itp2 = recoverMap->find(e->p2);
++      std::map<BDS_Point*, MVertex*, PointLessThan>::iterator itp1 = recoverMap->find(e->p1);
++      std::map<BDS_Point*, MVertex*, PointLessThan>::iterator itp2 = recoverMap->find(e->p2);
+       if (itp1 != recoverMap->end() &&
+           itp2 != recoverMap->end() &&
+           itp1->second == itp2->second) toSplit.insert(e);
diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist
index 9ed8acaff405..77aabf76f383 100644
--- a/cad/gmsh/pkg-plist
+++ b/cad/gmsh/pkg-plist
@@ -63,6 +63,7 @@ include/gmsh/OptHomRun.h
 include/gmsh/PView.h
 include/gmsh/PViewData.h
 include/gmsh/PViewDataGModel.h
+include/gmsh/PViewDataList.h
 include/gmsh/PViewOptions.h
 include/gmsh/Pair.h
 include/gmsh/ParamCoord.h
@@ -103,6 +104,7 @@ include/gmsh/linearSystem.h
 include/gmsh/linearSystemCSR.h
 include/gmsh/linearSystemFull.h
 include/gmsh/linearSystemGMM.h
+include/gmsh/linearSystemMUMPS.h
 include/gmsh/linearSystemPETSc.h
 include/gmsh/mathEvaluator.h
 include/gmsh/mathex.h
diff --git a/cad/sceptre/Makefile b/cad/sceptre/Makefile
index f66f78a916bd..3e6e8721ee33 100644
--- a/cad/sceptre/Makefile
+++ b/cad/sceptre/Makefile
@@ -12,7 +12,7 @@ COMMENT=	General-purpose circuit analysis program
 
 LICENSE=	GPLv2
 
-USE_FORTRAN=	yes
+USES=		fortran
 
 MAKE_JOBS_UNSAFE=	yes
 NO_WRKSUBDIR=		yes
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 962eed11c7bc..70d8e161185c 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -22,7 +22,7 @@ USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 
 .if defined(MAINTAINER_MODE)
-USE_FORTRAN=	yes
+USES+=		fortran
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/b_/_/}
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 2879c9fc5da3..351e7a720a71 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -22,9 +22,8 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
 		${PYNUMPY}
 
 ALL_TARGET=	build
+USES=		fortran gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
 		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 802e63be685e..a7c37fd9d0c9 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -21,10 +21,9 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
 		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
 		${PYNUMPY}
 
+USES=		fortran gmake
 USE_BZIP2=	yes
 ALL_TARGET=	build
-USE_GMAKE=	yes
-USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
 		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 2c94ec2daf46..556badae4a62 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot	\
 
 LICENSE=	GPLv2
 
-USES=		bison
+USES=		bison fortran
 USE_PYTHON=	2	# >2.5 and <3.0
 USE_TK=		yes
 HAS_CONFIGURE=	yes
@@ -140,9 +140,6 @@ LIB_DEPENDS+=	mpich.2:${PORTSDIR}/net/mpich2
 HOME_MPI=	${LOCALBASE}
 .endif
 
-USE_FORTRAN=	yes
-GCC_VER=	`${CC} -dumpversion`
-
 .if defined(WITH_ZSH)
 SHIA=		zsh
 .elif defined(WITH_BASH)
diff --git a/french/med/Makefile b/french/med/Makefile
index 82b36dfbee43..6d4e4a7442c4 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	hdf5.7:${PORTSDIR}/science/hdf5-18
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_FORTRAN=	yes
+USES=		fortran gmake
 USE_TK=		yes
 FFLAGS+=	-O2
 
@@ -25,7 +25,6 @@ CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-f90=${FC} --docdir=${DOCSDIR}
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 7a68fe5fad75..a574e7619180 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	pgplot.5:${PORTSDIR}/graphics/pgplot
 
 INSTALL_TARGET=	pure_install
 SCRIPTS_ENV=	PERL=${PERL}
-USE_FORTRAN=	yes
-USES=		perl5
+USES=		fortran perl5
 
 .if !defined(NOPORTEXAMPLES)
 post-install:
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 6201a43c92a1..3903cec72620 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -114,7 +114,7 @@ PLIST_SUB+=	IM="@comment "
 
 .if ${PORT_OPTIONS:MOCTAVE}
 CONFIGURE_ARGS+=--enable-octave
-USE_FORTRAN=	yes
+USES+=		fortran
 
 # need to determine which octave installed which patching
 PATCH_DEPENDS+=	mkoctfile:${PORTSDIR}/math/octave
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 0327353d1834..37869570d222 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		shebangfix
-USE_FORTRAN=	yes
+USES=		fortran shebangfix
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xproto xt
 
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 12a5d41a1555..537cba418a2a 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -45,8 +45,8 @@ CMAKE_ARGS+=	-DWITH_OPENEXR=0
 .if ${PORT_OPTIONS:MNUMPY}
 CONFLICTS_BUILD=	python3*
 CMAKE_ARGS+=	-DWITH_VIGRANUMPY=1
+USES+=		fortran
 USE_GCC=	yes
-USE_FORTRAN=	yes
 USE_PYTHON=	2
 BUILD_DEPENDS+=	nosetests:${PORTSDIR}/devel/py-nose
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index 40025083986a..01dfc53e75a9 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -20,9 +20,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		fortran pkgconfig
 USE_QT4=	moc_build qmake_build
-USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index c22dbfd38601..96e5cfd08325 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -38,8 +38,8 @@ REINPLACE_ARGS=	-i ""
 FETCH_CMD=	/usr/bin/fetch
 FETCH_BEFORE_ARGS=	-R -o ${DISTDIR}/${DISTFILES}
 
+USES=		fortran
 USE_XORG=	x11 xpm
-USE_FORTRAN=	yes
 FFLAGS+=	-O
 MEMORY_XD3D?=	64
 
diff --git a/lang/ratfor/Makefile b/lang/ratfor/Makefile
index 3549446250f5..faac32272381 100644
--- a/lang/ratfor/Makefile
+++ b/lang/ratfor/Makefile
@@ -20,8 +20,7 @@ EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| ${SH}
 ALL_TARGET=	all tests
 MAN1=		ratfor.1
-
-USE_FORTRAN=	yes
+USES=		fortran
 
 NO_STAGE=	yes
 post-patch:
diff --git a/lang/ratfor/files/patch-Makefile b/lang/ratfor/files/patch-Makefile
index 2fca4ba2d99e..7ded0badaae8 100644
--- a/lang/ratfor/files/patch-Makefile
+++ b/lang/ratfor/files/patch-Makefile
@@ -1,5 +1,14 @@
 --- Makefile.orig	2013-11-16 17:28:28.000000000 +0100
 +++ Makefile	2013-11-16 17:27:51.000000000 +0100
+@@ -11,7 +11,7 @@
+ #	On GNU,		        use S_CHAR="char"
+ #
+ 
+-CFLAGS+=	-DF77 -DS_CHAR="char"
++CFLAGS+=	-DF77 -DS_CHAR="char" -Wno-error=return-type
+ #CFLAGS+=	-DS_CHAR="char"
+ OBJS=		rat4.o lookup.o getopt.o
+ 
 @@ -26,13 +26,15 @@
  clean:
  	rm -f *.o *~ ratfor ratfor77 a.out test testw test.f testw.f
diff --git a/math/R/Makefile b/math/R/Makefile
index b95fc170fed9..cc29f835bc41 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -108,7 +108,8 @@ R_SOVERSION=		1
 RBLAS_SOVERSION=	2
 RLAPACK_SOVERSION=	4
 RMATH_SOVERSION=	0
-USE_FORTRAN=		yes
+USES+=			fortran
+USE_GCC=		yes
 
 .include <bsd.port.options.mk>
 
diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile
index c88dec2b9329..db7576aed75c 100644
--- a/math/arpack-ng/Makefile
+++ b/math/arpack-ng/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Revised Argand library for solving large-scale eigenvalue problems
 
 LICENSE=	BSD
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 
 CONFLICTS=	arpack-[0-9]*
diff --git a/math/arpack/Makefile b/math/arpack/Makefile
index 537d48e9c408..c35167d8175b 100644
--- a/math/arpack/Makefile
+++ b/math/arpack/Makefile
@@ -16,11 +16,14 @@ EXTRACT_ONLY=	${PORTNAME}${PORTVERSION}.tar.gz
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Argand Library: large eigenvalue subroutines (serial version)
 
+BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
+
 CONFLICTS=	arpack-ng-[0-9]*
+CPP=		tradcpp
 FFLAGS+=	-ffixed-line-length-none
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 WRKSRC =	${WRKDIR}/ARPACK
 
@@ -128,7 +131,7 @@ pre-build:
 	@${ECHO_CMD} "Renaming LAPACK functions ..."
 	@for f in `${FIND} ${WRKDIR} -type f -mindepth 2 -name '*.f'` ; do \
 		${MV} $${f} $${f}.unproc ; \
-		${CPP} -C -I${WRKDIR} -imacros arpack_compat_f.h -traditional-cpp \
+		${CPP} -C -I${WRKDIR} -imacros arpack_compat_f.h \
 			$${f}.unproc $${f} ; done
 
 do-build:
diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index bc999534c009..74b74b04ea90 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -16,8 +16,8 @@ IGNORE =	: dependent ports have been altered to link with math/atlas -- please\
 use that port instead of math/atlas-devel, while the latter is being revised
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
 
+USES=		fortran gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/ATLAS
 USE_LDCONFIG=	yes
 CONFLICTS=	atlas-[0-9]* cblas-[0-9]*
@@ -27,7 +27,6 @@ NO_STAGE=	yes
 
 NOT_FOR_ARCHS=	alpha
 
-USE_FORTRAN=	yes
 CCOMPILER=	${CC}
 LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
 LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 28e75d4d4f53..3599ef808256 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -17,7 +17,7 @@ LICENSE=	BSD
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/math/lapack:checksum
 
 USE_BZIP2=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 
 CONFLICTS=	atlas-devel-[0-9]* cblas-[0-9]*
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
diff --git a/math/bihar/Makefile b/math/bihar/Makefile
index 34b916df7ce0..973e52a73dc9 100644
--- a/math/bihar/Makefile
+++ b/math/bihar/Makefile
@@ -41,7 +41,7 @@ LIB_DEPENDS=	linpack.3:${PORTSDIR}/math/linpack
 NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	fft.doc
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index fffa06e7f500..5a43a57f2a8e 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -39,8 +39,7 @@ EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-mpich.diff
 
 USE_LDCONFIG=	yes
 
-USE_FORTRAN=	yes
-USE_GMAKE=yes
+USES=		fortran gmake
 F77EXTRAFLAGS=	#-w -fno-globals -fugly-complex
 DEBUG_LEVEL=	0
 
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index 3b6c4c7a5d00..a0f57f219b8f 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${MPIDIR}/lib/libmpich.a:${PORTSDIR}/net/mpich2
 LIB_DEPENDS=	f2c.2:${PORTSDIR}/lang/f2c
 RUN_DEPENDS=	${MPIDIR}/bin/mpirun:${PORTSDIR}/net/mpich2
 
-USE_GMAKE=	yes
+USES=		fortran gmake
 MAKEFILE=	makefile
 MAKE_ARGS=	GMAKE=${GMAKE} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT}	\
 		BLAS_LIB="${BLAS_LIB}" LAPACK_LIB="${LAPACK_LIB}"
@@ -27,7 +27,6 @@ MPIDIR=		${LOCALBASE}
 PETSC_ARCH=	freebsd
 BOPT?=		O
 
-USE_FORTRAN=	yes
 FFLAGS+=	-O2
 
 INCLUDES=	BMmsg.h BSdepend.h BSlog.h BSmy_blas.h BSprivate.h BSsparse.h
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 36a328e0bce4..6c4b41989bda 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS+=	octave:${PORTSDIR}/math/octave
 BUILD_DEPENDS+=	R:${PORTSDIR}/math/R
 RUN_DEPENDS+=	R:${PORTSDIR}/math/R
 # Required to set CFLAGS for -lgfortran.
-USE_FORTRAN=	yes
+USES+=		fortran
 PLIST_SUB+=	R=""
 .else
 CMAKE_ARGS+=	-DWITH_R:BOOL=FALSE
diff --git a/math/cblas/Makefile b/math/cblas/Makefile
index 5cfe09235500..42021506c555 100644
--- a/math/cblas/Makefile
+++ b/math/cblas/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Reference implementation of the C interface to the legacy Fortran BLAS
 
 LICENSE=	BSD
 
-USE_FORTRAN=	yes
+USES=		fortran
 
 CONFLICTS_INSTALL=	atlas-[0-9]* atlas-devel-[0-9]*
 
diff --git a/math/clp/Makefile b/math/clp/Makefile
index fad406a67594..d4596c4fe01d 100644
--- a/math/clp/Makefile
+++ b/math/clp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Linear Programming Solver
 
 LIB_DEPENDS=	lapack.4:${PORTSDIR}/math/lapack
 
-USE_FORTRAN=	yes
+USES=		fortran
 CXXFLAGS+=	-ffast-math -fomit-frame-pointer
 
 GNU_CONFIGURE=	yes
diff --git a/math/dynare/Makefile b/math/dynare/Makefile
index d53bc019a704..b4d8228768ae 100644
--- a/math/dynare/Makefile
+++ b/math/dynare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dynare
 PORTVERSION=	4.4.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.dynare.org/release/source/
 
@@ -10,13 +11,12 @@ MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Software platform for handling a wide class of economic models
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/unordered_set.hpp:${PORTSDIR}/devel/boost-libs
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libumfpack.so:${PORTSDIR}/math/suitesparse
-BUILD_DEPENDS+=	${LOCALBASE}/include/matio.h:${PORTSDIR}/math/matio
+LIB_DEPENDS=	libumfpack.so:${PORTSDIR}/math/suitesparse \
+		libmatio.so:${PORTSDIR}/math/matio
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
-USES=		gmake
-USE_FORTRAN=	yes
+USES=		fortran gmake
 USE_XZ=		yes
 
 INFO=		dynare
@@ -30,6 +30,9 @@ MATLAB_CONFIGURE_ENABLE=	matlab
 OCTAVE_CONFIGURE_ENABLE=	octave
 OCTAVE_BUILD_DEPENDS=		octave:${PORTSDIR}/math/octave
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 post-configure:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index 420aad9e6ea4..c4c4422cd101 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Eigenvalue system package
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 
 SHLIB_MAJOR=	2
diff --git a/math/elmer-umfpack/Makefile b/math/elmer-umfpack/Makefile
index c95ca62e4761..fcc1b72f915b 100644
--- a/math/elmer-umfpack/Makefile
+++ b/math/elmer-umfpack/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	elmer-
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	UMFPACK library used by ELMER FEM package
 
-USE_FORTRAN=	yes
+USES=		fortran
 GNU_CONFIGURE=	yes
 ALL_TARGET=
 
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index 1a33391e5bda..3f4aa57a49da 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -39,11 +39,11 @@ WITH_BLAS?=	gsl
 .if ${WITH_BLAS} == "gotoblas"
 CONFIGURE_ARGS+=	--with-gotoblas2="${LOCALBASE}" --with-lapack=blas
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
-USE_FORTRAN=	yes
+USES+=		fortran
 .elif ${WITH_BLAS} == "atlas"
 CONFIGURE_ARGS+=	--with-cblas="${LOCALBASE}" --with-lapack=blas
 LIB_DEPENDS+=	libcblas.so:${PORTSDIR}/math/atlas
-USE_FORTRAN=	yes
+USES+=		fortran
 .elif ${WITH_BLAS} == "gsl"
 CONFIGURE_ARGS+=	--with-gsl="${LOCALBASE}"
 LIB_DEPENDS+=	libgslcblas.so:${PORTSDIR}/math/gsl
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index 416296bca06d..f92058bf0d1a 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -30,9 +30,9 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/GotoBLAS2
 
-USES=		gmake perl5
+USES=		fortran gmake perl5
+USE_GCC=	yes
 USE_PERL5=	build
-USE_FORTRAN=	yes
 GOTOLIBS=	libgoto2 libgoto2p
 GOTOFILES=	${GOTOLIBS:S|$|.so|} ${GOTOLIBS:S|$|.so.1|} ${GOTOLIBS:S|$|.a|}
 PLIST_FILES=	${GOTOFILES:S|^|lib/|}
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index fb31907a87d6..c87ab9d441f1 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
-USES=		gmake pathfix pkgconfig
+USES=		fortran gmake pathfix pkgconfig
 WANT_GNOME=	yes
 
 ALL_TARGET=		# empty
diff --git a/math/jags/Makefile b/math/jags/Makefile
index aad51c1624dd..c589b590e467 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -19,8 +19,7 @@ COMMENT=	Just Another Gibbs Sampler
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USES=		bison gmake
-USE_FORTRAN=	yes
+USES=		bison fortran gmake
 USE_LDCONFIG=	yes
 
 DIST_SUBDIR=	${PORTNAME}
diff --git a/math/kktdirect/Makefile b/math/kktdirect/Makefile
index 98086f4463b9..98208b0feb18 100644
--- a/math/kktdirect/Makefile
+++ b/math/kktdirect/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	KKTDirect${PORTVERSION}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Direct solver package for saddle-point (KKT) matrices
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 
 MAKE_JOBS_UNSAFE=yes
diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile
index 7d314d83dfeb..cb5bbadee8fd 100644
--- a/math/lapack++/Makefile
+++ b/math/lapack++/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lapack++
 PORTVERSION=	2.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=   SF/lapackpp/lapackpp/${PORTVERSION} \
 		http://math.nist.gov/lapack++/:doc
@@ -19,8 +19,7 @@ EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Linear Algebra PACKage in C++, a wrapper for LAPACK
 
-WANT_GNOME=	yes
-USES=	pathfix gmake
+USES=		fortran gmake pathfix
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
@@ -35,7 +34,6 @@ LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
 LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 .endif
 
-USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 .if defined(WITH_ATLAS)
 BLAS_LIB=	-L${LOCALBASE}/lib -lf77blas
diff --git a/math/lapack++/files/patch-configure b/math/lapack++/files/patch-configure
new file mode 100644
index 000000000000..9055b19b0c1d
--- /dev/null
+++ b/math/lapack++/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig
++++ configure
+@@ -26093,7 +26093,7 @@
+     *)
+       ARCH="OS_${target_os}"
+       # Workaround for bogus system names
+-      ARCH=` echo ${ARCH} | ${SED} 's/^a-z0-9_//g' `
++      ARCH=` echo ${ARCH} | ${SED} 's/[^A-Za-z0-9_]//g' `
+       ;;
+ esac
+ { echo "$as_me:$LINENO: result: $ARCH" >&5
diff --git a/math/lapack++/files/patch-src-genmd.cc b/math/lapack++/files/patch-src-genmd.cc
new file mode 100644
index 000000000000..bba2c18e1117
--- /dev/null
+++ b/math/lapack++/files/patch-src-genmd.cc
@@ -0,0 +1,10 @@
+--- src/genmd.cc.orig
++++ src/genmd.cc
+@@ -65,7 +65,6 @@
+ }
+ 
+ #if !(defined(OS_WIN32) || LAPACK_OS_WIN32)
+-extern "C" double drand48(void) throw ();
+ #endif
+ 
+ LaGenMatDouble& LaRandUniform(LaGenMatDouble &A, 
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 51268decb1bc..2912505bfb87 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -18,7 +18,7 @@ COMMENT?=	A library of Fortran 77 subroutines for linear algebra
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_FORTRAN=	yes
+USES=		fortran
 
 OPTIONS_DEFINE=	PROFILE SHARED STATIC
 OPTIONS_DEFAULT=	SHARED STATIC
diff --git a/math/lapack95/Makefile b/math/lapack95/Makefile
index f1756b26a2bc..4a097eaee698 100644
--- a/math/lapack95/Makefile
+++ b/math/lapack95/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	lapack95
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	LAPACK95, Fortran90/95 wrapper for LAPACK
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/LAPACK95
 
diff --git a/math/lapacke/Makefile b/math/lapacke/Makefile
index 75ca2296f222..473bf05c6755 100644
--- a/math/lapacke/Makefile
+++ b/math/lapacke/Makefile
@@ -18,7 +18,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 
 OPTIONS_DEFINE=	PROFILE XLAPACKE
 PROFILE_DESC=	Build a profiling library
diff --git a/math/levmar/Makefile b/math/levmar/Makefile
index f03f12844414..217794872141 100644
--- a/math/levmar/Makefile
+++ b/math/levmar/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PROFILE
 PROFILE_DESC=	Build a profiling library
diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index 41f4b663b058..e294179d456c 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -205,7 +205,7 @@ CONFIGURE_ARGS+=	--enable-supermatrix
 CONFIGURE_ARGS+=	--disable-supermatrix
 .endif
 
-.if !(defined(USE_GCC) || defined(USE_FORTRAN) || !empty(CC:M*gcc4*))
+.if !(defined(USE_GCC) || !empty(CC:M*gcc4*))
 CONFIGURE_ARGS+=	--disable-autodetect-f77-ldflags \
 			--disable-autodetect-f77-name-mangling
 .endif
diff --git a/math/libtsnnls/Makefile b/math/libtsnnls/Makefile
index 52ebacffe2d7..a8e3de0dced2 100644
--- a/math/libtsnnls/Makefile
+++ b/math/libtsnnls/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	tzhuan@gmail.com
 COMMENT=	Fast Sparse Nonnegative Least Squares Solver
 
 GNU_CONFIGURE=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	GOTOBLAS ATLAS
@@ -50,6 +50,7 @@ BLAS=-lptf77blas
 LAPACK=-lalapack -lptcblas
 .endif
 
-CONFIGURE_ARGS=	--with-blas="${BLAS}" --with-lapack="${LAPACK}"
+CONFIGURE_ARGS+=--with-blas="${BLAS}" --with-lapack="${LAPACK}"
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index ac86cbaceac7..239b4af6c394 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Linear Algebra package
 LIB_DEPENDS=	blas.2:${PORTSDIR}/math/blas
 MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 
+USES=		fortran
+
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-USE_FORTRAN=	yes
-
 USE_LDCONFIG=	yes
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
diff --git a/math/metis-edf/Makefile b/math/metis-edf/Makefile
index 3714078bc631..cdf321faf7c3 100644
--- a/math/metis-edf/Makefile
+++ b/math/metis-edf/Makefile
@@ -16,7 +16,7 @@ MAKE_ENV+=	AR="${AR}" PICFLAG="${PICFLAG}"
 MAKE_JOBS_UNSAFE=	yes
 REINPLACE_ARGS=	-i ""
 
-USE_FORTRAN=	yes
+USES=		fortran
 FFLAGS+=	-O2
 PICFLAG?=	-fPIC
 
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index 9e5dd8d6e0e4..9d78d71ec32c 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -30,7 +30,7 @@ NO_STAGE=	yes
 
 SLAVEDIRS=	math/mumps-mpich
 
-USE_FORTRAN=	yes
+USES=		fortran
 
 FORTRANLIBS=	-lgfortran
 GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile
index 33f9e216e1df..e667cf7d50e4 100644
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-actuarial
 PORTVERSION=	1.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ad/Makefile b/math/octave-forge-ad/Makefile
index af2d18039f85..b8c34a2566c4 100644
--- a/math/octave-forge-ad/Makefile
+++ b/math/octave-forge-ad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ad
 PORTVERSION=	1.0.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-audio/Makefile b/math/octave-forge-audio/Makefile
index ad5005e57e8d..f623756fd04b 100644
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-audio
 PORTVERSION=	1.1.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-base/Makefile b/math/octave-forge-base/Makefile
index ab3584fa0b3a..8c731ae1a143 100644
--- a/math/octave-forge-base/Makefile
+++ b/math/octave-forge-base/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-base
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	#none
 DISTFILES=	#none
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index da8c7f66adff..e7558b13cc9b 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-bim
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-bioinfo/Makefile b/math/octave-forge-bioinfo/Makefile
index 97677f531af9..c73bdf78d999 100644
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-bioinfo
 PORTVERSION=	0.1.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-cgi/Makefile b/math/octave-forge-cgi/Makefile
index 044cb9f6707e..2bac49367511 100644
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-cgi
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-civil-engineering/Makefile b/math/octave-forge-civil-engineering/Makefile
index ee859f6dd1d2..1ea3538c701c 100644
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-civil-engineering
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index 5e8cd752acc4..68b1acc74d00 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-communications
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index a8f994124990..e006bc33e353 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-control
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index dc78630c1280..cab0834319a1 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-data-smoothing
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile
index e142546a5f49..9f27ec8d7bb1 100644
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-database
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile
index 708fcc7b8c1f..df154141e584 100644
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-dataframe
 PORTVERSION=	0.9.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-dicom/Makefile b/math/octave-forge-dicom/Makefile
index 2a2d42c76b57..3b48c1edc91d 100644
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-dicom
 PORTVERSION=	0.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index 290d9aab146d..3ad30465c7db 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-econometrics
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-engine/Makefile b/math/octave-forge-engine/Makefile
index a7985cbf582c..88637949bf5b 100644
--- a/math/octave-forge-engine/Makefile
+++ b/math/octave-forge-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-engine
 PORTVERSION=	1.0.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile
index 2b261a6c56a0..73eb4049f315 100644
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fenv
 PORTVERSION=	0.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index 0d6d8a7e0715..c51414818095 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-financial
 PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index 5bec076f46b4..4eb4764be1a3 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fits
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fl-core/Makefile b/math/octave-forge-fl-core/Makefile
index 8677f8d7e41e..99d46bc9eaa5 100644
--- a/math/octave-forge-fl-core/Makefile
+++ b/math/octave-forge-fl-core/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fl-core
 PORTVERSION=	1.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile
index e6ff0560c2c9..5961d7db5802 100644
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fpl
 PORTVERSION=	1.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile
index 880267e6b497..19475ccc69b0 100644
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fuzzy-logic-toolkit
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile
index 11367cbaf16a..0e2c3c744014 100644
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ga
 PORTVERSION=	0.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile
index 74eff27867b9..85b544f06a01 100644
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-general
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile
index 91162e31c0a5..837c03cd516d 100644
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-generate_html
 PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index bce56fce7124..aae52a46d373 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-geometry
 PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile
index 735c27b24666..e61f2e7004da 100644
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-gnuplot
 PORTVERSION=	1.0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index ee7c8d50e955..d2fbb822ed31 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-gsl
 PORTVERSION=	1.0.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
@@ -14,6 +14,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
 
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} s+/bin/bash+${LOCALBASE}/bin/bash+g ${WRKSRC}/src/config*
diff --git a/math/octave-forge-ident/Makefile b/math/octave-forge-ident/Makefile
index e5632235f938..295c7ebf6d7a 100644
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ident
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index 931f76b76713..032932d012a1 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-image
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
@@ -17,6 +18,8 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal
 RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general
 
+USES=		compiler:c++0x
+
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-patch:
diff --git a/math/octave-forge-informationtheory/Makefile b/math/octave-forge-informationtheory/Makefile
index d5c9a8d98f16..f8f7e4ddc379 100644
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-informationtheory
 PORTVERSION=	0.1.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-integration/Makefile b/math/octave-forge-integration/Makefile
index f6cf8c399b64..1e4aedce6e62 100644
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-integration
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index a893f30236c3..dd18faced832 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-io
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math
 
diff --git a/math/octave-forge-irsa/Makefile b/math/octave-forge-irsa/Makefile
index 2741e508298c..24439a4fe06f 100644
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-irsa
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile
index b77a68be7c86..40541287025d 100644
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-linear-algebra
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-lssa/Makefile b/math/octave-forge-lssa/Makefile
index 73d46f9c34ff..092a6cce0fa6 100644
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-lssa
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index b684f9434716..f50ff69f219a 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ltfat
 PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index be7c3bdd7730..30ebf87351cc 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-mapping
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index 4ef941c2849f..cf1320acfd79 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-mechanics
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index 007d21365c7e..37100e39904f 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-miscellaneous
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-missing-functions/Makefile b/math/octave-forge-missing-functions/Makefile
index ef39fd609e29..9b01bb143671 100644
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-missing-functions
 PORTVERSION=	1.0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index aa9d2a98edbf..5b10d225302b 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-msh
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-multicore/Makefile b/math/octave-forge-multicore/Makefile
index 3fcc003d8dbd..e0b3a7ac07d9 100644
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-multicore
 PORTVERSION=	0.2.15
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-mvn/Makefile b/math/octave-forge-mvn/Makefile
index 5a12ae2a71d9..b00b032547c2 100644
--- a/math/octave-forge-mvn/Makefile
+++ b/math/octave-forge-mvn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-mvn
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile
index dcce64df0832..1e0568e408e2 100644
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-nan
 PORTVERSION=	2.5.9
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ncarray/Makefile b/math/octave-forge-ncarray/Makefile
index 93237dadce4c..6c63714cbd11 100644
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-ncarray
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-netcdf/Makefile b/math/octave-forge-netcdf/Makefile
index f9b15da096a4..0c04e5eeff0a 100644
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-netcdf
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile
index a0fd23e8fd63..a5ea1f1b82cc 100644
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-nlwing2
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile
index d21b5cfbefd9..afd25f7fad0e 100644
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-nnet
 PORTVERSION=	0.1.13
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile
index 930b3321235e..c6d6a3d3b97b 100644
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-nurbs
 PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-ocs/Makefile b/math/octave-forge-ocs/Makefile
index 4081c329b43e..5212e6f506c5 100644
--- a/math/octave-forge-ocs/Makefile
+++ b/math/octave-forge-ocs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-ocs
 PORTVERSION=	0.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-oct2mat/Makefile b/math/octave-forge-oct2mat/Makefile
index f97a75508086..69d679e8b1ed 100644
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-oct2mat
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-octcdf/Makefile b/math/octave-forge-octcdf/Makefile
index bf92ce1aac99..71214d3e5efb 100644
--- a/math/octave-forge-octcdf/Makefile
+++ b/math/octave-forge-octcdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-octcdf
 PORTVERSION=	1.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile
index 045f961bd735..518040abc851 100644
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-octclip
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-octgpr/Makefile b/math/octave-forge-octgpr/Makefile
index a00651e50493..291e245738f8 100644
--- a/math/octave-forge-octgpr/Makefile
+++ b/math/octave-forge-octgpr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-octgpr
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index c3c48552490d..8d2341b72a63 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-octproj
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-odebvp/Makefile b/math/octave-forge-odebvp/Makefile
index 7806ff93cf7e..8f96fa39e400 100644
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-odebvp
 PORTVERSION=	1.0.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-odepkg/Makefile b/math/octave-forge-odepkg/Makefile
index cdd9bacdde35..749e9182f236 100644
--- a/math/octave-forge-odepkg/Makefile
+++ b/math/octave-forge-odepkg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-odepkg
 PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index 46c72c82297f..3075e2bfcef1 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-optim
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-optiminterp/Makefile b/math/octave-forge-optiminterp/Makefile
index 60c03cd1c5e7..a73e7eb9125d 100644
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-optiminterp
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-outliers/Makefile b/math/octave-forge-outliers/Makefile
index b4b45ea3f865..479c209503d1 100644
--- a/math/octave-forge-outliers/Makefile
+++ b/math/octave-forge-outliers/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-outliers
 PORTVERSION=	0.13.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile
index 008eae7a5fc1..e9609931fe2d 100644
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-parallel
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-pdb/Makefile b/math/octave-forge-pdb/Makefile
index 96221b1667e2..baec29252c4f 100644
--- a/math/octave-forge-pdb/Makefile
+++ b/math/octave-forge-pdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-pdb
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-plot/Makefile b/math/octave-forge-plot/Makefile
index 73cba4ecbcb8..47ce8dcf2861 100644
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-plot
 PORTVERSION=	1.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-pt_br/Makefile b/math/octave-forge-pt_br/Makefile
index e23f636c4b8a..99a969bba9ef 100644
--- a/math/octave-forge-pt_br/Makefile
+++ b/math/octave-forge-pt_br/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-pt_br
 PORTVERSION=	1.0.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-quaternion/Makefile b/math/octave-forge-quaternion/Makefile
index f7decdd7034c..decc306e65b5 100644
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-quaternion
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-queueing/Makefile b/math/octave-forge-queueing/Makefile
index 52cb4d51d0e8..9c0d293caca2 100644
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-queueing
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-secs1d/Makefile b/math/octave-forge-secs1d/Makefile
index ae6b6d9d6fc4..263d586f318c 100644
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-secs1d
 PORTVERSION=	0.0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-secs2d/Makefile b/math/octave-forge-secs2d/Makefile
index 833c338cc9a9..c11e89fe956b 100644
--- a/math/octave-forge-secs2d/Makefile
+++ b/math/octave-forge-secs2d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-secs2d
 PORTVERSION=	0.0.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile
index e9ff688c1174..a9724ca893fa 100644
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-secs3d
 PORTVERSION=	0.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile
index 3ec1fc3561cb..c4bd4822dcb1 100644
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-signal
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-simp/Makefile b/math/octave-forge-simp/Makefile
index 1529820e0b60..c4893aaebb55 100644
--- a/math/octave-forge-simp/Makefile
+++ b/math/octave-forge-simp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-simp
 PORTVERSION=	1.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile
index 0b34b4646d59..7c0515274a0e 100644
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-sockets
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-specfun/Makefile b/math/octave-forge-specfun/Makefile
index cd7af539c7c4..22b51ad37304 100644
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-specfun
 PORTVERSION=	1.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-special-matrix/Makefile b/math/octave-forge-special-matrix/Makefile
index 7126544ddf60..89c700c3439d 100644
--- a/math/octave-forge-special-matrix/Makefile
+++ b/math/octave-forge-special-matrix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-special-matrix
 PORTVERSION=	1.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-spline-gcvspl/Makefile b/math/octave-forge-spline-gcvspl/Makefile
index 60f29dcf8cce..0ff2712190f8 100644
--- a/math/octave-forge-spline-gcvspl/Makefile
+++ b/math/octave-forge-spline-gcvspl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-spline-gcvspl
 PORTVERSION=	1.0.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-splines/Makefile b/math/octave-forge-splines/Makefile
index b59db4695361..1c7578d358ba 100644
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-splines
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile
index 51344b51df3a..9e618518c480 100644
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-statistics
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-strings/Makefile b/math/octave-forge-strings/Makefile
index 5639e97d521b..069459a2e11c 100644
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-strings
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-struct/Makefile b/math/octave-forge-struct/Makefile
index b95e98e0e9e9..408bd103084d 100644
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-struct
 PORTVERSION=	1.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-symband/Makefile b/math/octave-forge-symband/Makefile
index bebb44d8d05a..34f1697ff5d4 100644
--- a/math/octave-forge-symband/Makefile
+++ b/math/octave-forge-symband/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-symband
 PORTVERSION=	1.0.10
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
index a8880c1e6d14..20f665377165 100644
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-symbolic
 PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-tcl-octave/Makefile b/math/octave-forge-tcl-octave/Makefile
index 145cf22e749b..852040faec62 100644
--- a/math/octave-forge-tcl-octave/Makefile
+++ b/math/octave-forge-tcl-octave/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-tcl-octave
 PORTVERSION=	0.1.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile
index 4d4bebb011ba..d5ec924ae747 100644
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-tsa
 PORTVERSION=	4.2.7
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index 2984e93c9294..b116c0452f39 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-video
 PORTVERSION=	1.0.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-xraylib/Makefile b/math/octave-forge-xraylib/Makefile
index 172b04353492..90c7c80d2927 100644
--- a/math/octave-forge-xraylib/Makefile
+++ b/math/octave-forge-xraylib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-xraylib
 PORTVERSION=	1.0.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/octave-forge-zenity/Makefile b/math/octave-forge-zenity/Makefile
index c135b3f0e185..e7b813e6f3bb 100644
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-zenity
 PORTVERSION=	0.5.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index fafb1e39892a..b014230c4aef 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -24,11 +24,9 @@ GH_COMMIT=	835293c
 LARGE_FILE=	large.tgz
 TIMING_FILE=	timing.tgz
 
-USES=		gmake perl5
+USES=		fortran gmake perl5
 USE_GCC=	4.6+
-USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
 USE_PERL5=	build
 
 OPENBLAS_SUFX=	r${PORTVERSION}
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index cfe0c38c1ff5..c68a04b57114 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -22,7 +22,6 @@ OPENMPI_DESC=	Use openmpi instead of mpich2
 
 USES=		cmake gmake
 
-MAKE_ARGS+=	MAKEFLAGS=MAKE=${GMAKE}
 PLIST_FILES=	include/parmetis/metis.h \
 		include/parmetis/parmetis.h \
 		lib/parmetis/libmetis.a \
@@ -47,7 +46,8 @@ MPICC=		${LOCALBASE}/bin/mpicc
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|BUILDDIR =.*|BUILDDIR = build| ; \
-		 s|make -C|${MAKE_CMD} -C|' ${WRKSRC}/Makefile
+		 s|make -C|$$(MAKE) -C| ; \
+		 s|$$(MAKEFLAGS)||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
 		's|"-O3"|""|' ${WRKSRC}/metis/GKlib/GKlibSystem.cmake
 
diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index dac39d95144c..1a22f853328a 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--with-x-include=${LOCALBASE}/include	\
 			--with-x-lib=${LOCALBASE}/lib/libX11.so
 .endif
 
-USE_FORTRAN=	yes
+USES=		fortran
 FFLAGS+=	-O2
 PFX=		${PORTNAME}
 TARGET=		${OPSYS:L}
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index a7b1397dd206..720dbba48b09 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -40,7 +40,7 @@ FREEFONT_DIR=	${LOCALBASE}/lib/X11/fonts/freefont-ttf
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFORTRAN}
-USE_FORTRAN=	yes
+USES+=		fortran
 CONFIGURE_ENV+=	CMAKE_Fortran_COMPILER="${FC}"
 CMAKE_ARGS+=	-DENABLE_f95:BOOL=ON -DENABLE_f77:BOOL=ON
 PLIST_SUB+=	FORTRAN=""
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 4be93dc4a500..042bbbc4ede4 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	SUITESPARSE
 ATLAS_DESC=		Use optimized blas library
 SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
 
-USE_FORTRAN=			yes
+USES=		fortran
 USE_PYTHON=			yes
 USE_PYDISTUTILS=		yes
 PYDISTUTILS_CONFIGUREARGS+=	--fcompiler=gnu95
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index 09a9ae8a704d..68f672fd2e3b 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS+=	${PYNUMPY}
 LATEST_LINK=	py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-numpy/options
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/math/qd/Makefile b/math/qd/Makefile
index 2b3fccf7a0e2..99574fb91f20 100644
--- a/math/qd/Makefile
+++ b/math/qd/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Double-Double and Quad-Double Arithmetic
 
 GNU_CONFIGURE=	yes
-USE_FORTRAN=	yes
-CONFIGURE_ARGS+=	--enable-shared=yes
+USES=		fortran
 
 .include <bsd.port.mk>
diff --git a/math/qrupdate/Makefile b/math/qrupdate/Makefile
index e89843d1ee63..4da8832e42ee 100644
--- a/math/qrupdate/Makefile
+++ b/math/qrupdate/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fortran library for fast updates of QR and Cholesky decomposition
 
 LIB_DEPENDS=	blas.2:${PORTSDIR}/math/blas lapack.4:${PORTSDIR}/math/lapack
 
-USES=		gmake
+USES=		fortran gmake
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
@@ -25,7 +25,6 @@ BROKEN=		Does not compile on sparc64: assertions fail
 PICFLAG?=	-fpic
 .endif
 
-USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 
 pre-build:
diff --git a/math/sage/Makefile b/math/sage/Makefile
index 4062af610f68..80dfdd1f9f74 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -32,12 +32,10 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 PLIST_FILES=	bin/sage
-USE_FORTRAN=	yes
 USE_GCC=	yes
 USE_TK=		yes
-USE_GMAKE=	yes
 USE_TEX=	latex:build
-USES=		iconv
+USES=		fortran gmake iconv
 MAKE_JOBS_SAFE=	yes
 LDFLAGS:=	-Wl,-rpath=${WRKSRC}/local/lib ${LDFLAGS}
 FFLAGS+=	-Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG}
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index be8255cd5054..21f0956ff323 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	blacs.1:${PORTSDIR}/math/blacs
 CONFLICTS=	elmer-mathlibs-1*
 
 USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 
 ARCH2FIX=	PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \
 		REDIST/SRC SRC TOOLS TOOLS/LAPACK
diff --git a/math/sdpa/Makefile b/math/sdpa/Makefile
index a3487528dde3..97c506d743ec 100644
--- a/math/sdpa/Makefile
+++ b/math/sdpa/Makefile
@@ -12,14 +12,13 @@ DIST_SUBDIR=	sdpa
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Very efficient SDP (semidefinite programming) solver
 
-USES=		gmake
+USES=		fortran gmake
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 SRCDATE=	20090729
 MANUALFILE=	sdpa7-manual.pdf
-USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}.src
 
diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index c049bb590a17..418161efa8c8 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -22,8 +22,7 @@ MANDATE=	20080618
 MANUALVER=	7.1.1
 SRCFILE=	${PORTNAME}.${PORTVERSION}.src.${SRCDATE}.tar.gz
 #MANUALFILE=	${PORTNAME}.${MANUALVER}.manual.${MANDATE}.pdf
-USE_FORTRAN=	yes
-USES=		gmake
+USES=		fortran gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
 .if exists(${LOCALBASE}/lib/libgoto2.so)
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index 08c234cd15e3..f33c69071edd 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -18,8 +18,8 @@ EXTRACT_ONLY=	slatec_src.tgz slatec_chk.tgz
 MAINTAINER=	mexas@bris.ac.uk
 COMMENT=	SLATEC Common Mathematical Library
 
+USES=		fortran
 USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
 WRKSRC=		${WRKDIR}/src
 SHLIB_MAJOR=	1
 
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index 3eb954ea41c0..6d8f2ba65877 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -14,7 +14,7 @@ COMMENT=	SuiteSparse is a set of packages for sparse matrices calculation
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-USES=		gmake
+USES=		fortran gmake
 
 .if defined (WITH_METIS)
 LIB_DEPENDS=	metis.1:${PORTSDIR}/math/metis4
@@ -67,7 +67,6 @@ PICFLAG?=	-fpic
 .endif
 
 USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
 WRKSRC=${WRKDIR}/SuiteSparse
 WRKSRC_SHARED=${WRKSRC}_shared
 SVERSION=1
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index 0b6c7725fbbd..d992a1a11767 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -17,6 +17,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A library of routines for performing sparse factorization
 
+USES=		fortran
+
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
@@ -39,7 +41,6 @@ LIB_DEPENDS+=	atlas:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
 .endif
 
-USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 
 P_VERSION=	3.0
diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile
index 46e94fa3a81c..8a88991d5289 100644
--- a/math/superlu_mt/Makefile
+++ b/math/superlu_mt/Makefile
@@ -17,8 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Routines for performing multithreaded sparse factorization
 
-USE_FORTRAN=	yes
-USE_GMAKE=	yes
+USES=		fortran gmake
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
@@ -71,8 +70,10 @@ post-patch:
 	${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
 	@${REINPLACE_CMD} -e 's+%%BLAS%%+-L${LOCALBASE}/lib ${BLAS}+ ; \
 			s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
+			s+%%CPPFLAGS%%+${CPPFLAGS}+; \
 			s+%%CFLAGS%%+${CFLAGS}+; \
 			s+%%FFLAGS%%+${FFLAGS}+; \
+			s+%%LDFLAGS%%+${LDFLAGS}+; \
 			s+%%FPIC%%++; \
 	  s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \
 	  s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \
@@ -80,8 +81,10 @@ post-patch:
 
 	@${REINPLACE_CMD} -e 's+%%BLAS%%+-L${LOCALBASE}/lib ${BLAS}+ ; \
 			s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
+			s+%%CPPFLAGS%%+${CPPFLAGS}+; \
 			s+%%CFLAGS%%+${CFLAGS} ${FPIC}+; \
 			s+%%FFLAGS%%+${FFLAGS} ${FPIC}+; \
+			s+%%LDFLAGS%%+${LDFLAGS}+; \
 			s+%%FPIC%%+${FPIC}+; \
 	  s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \
 	  s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \
diff --git a/math/superlu_mt/files/patch-make.inc b/math/superlu_mt/files/patch-make.inc
index 4ef5f716d687..1c57231ce747 100644
--- a/math/superlu_mt/files/patch-make.inc
+++ b/math/superlu_mt/files/patch-make.inc
@@ -41,11 +41,11 @@
 -LOADER       = xlc_r
 -LOADOPTS     = -bmaxdata:0x80000000
 +CC           = %%CC%%
-+CFLAGS       = $(PREDEFS) %%CFLAGS%% %%PTHREAD_CFLAGS%%
-+FORTRAN	     = %%FC%%
++CFLAGS       = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%% %%PTHREAD_CFLAGS%%
++FORTRAN      = %%FC%%
 +FFLAGS       = %%FFLAGS%%
-+LOADER       = %%FC%%
-+LOADOPTS     = -O
++LOADER       = %%CC%%
++LOADOPTS     = %%LDFLAGS%%
 +NOOPTS       = %%FPIC%%
  #
  #  C preprocessor defs for compilation for the Fortran interface
diff --git a/math/taucs/Makefile b/math/taucs/Makefile
index 3af76ca52f7b..8181192e0b72 100644
--- a/math/taucs/Makefile
+++ b/math/taucs/Makefile
@@ -16,7 +16,7 @@ COMMENT=	C library of sparse linear solvers
 LIB_DEPENDS=	metis.1:${PORTSDIR}/math/metis4
 
 HAS_CONFIGURE=	yes
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/math/trlan/Makefile b/math/trlan/Makefile
index 1951a3a6dc1a..f0949a933026 100644
--- a/math/trlan/Makefile
+++ b/math/trlan/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Thick-restart Lanczos method for eigenproblems
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	lib
diff --git a/math/x12arima/Makefile b/math/x12arima/Makefile
index 88abbf6074b7..66412775a28a 100644
--- a/math/x12arima/Makefile
+++ b/math/x12arima/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	jh@jameshoward.us
 COMMENT=	X-12-ARIMA seasonal adjustment program
 
-USE_FORTRAN=	yes
+USES=		fortran
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile.lnx
 NO_STAGE=	yes
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index f7711726bf0d..0a12d6c5e1f7 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 GNU_CONFIGURE=	yes
-USE_FORTRAN=	yes
-USES=		pkgconfig perl5
+USES=		fortran perl5 pkgconfig
+USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_PYTHON=	yes
diff --git a/net/openmpi-devel/Makefile b/net/openmpi-devel/Makefile
index 0a9961db0b9e..337588158e82 100644
--- a/net/openmpi-devel/Makefile
+++ b/net/openmpi-devel/Makefile
@@ -18,8 +18,7 @@ CONFLICTS=	openmpi-1.6.*
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
-USES=		gmake pkgconfig
-USE_FORTRAN=	yes
+USES=		fortran gmake pkgconfig
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${UNIQUENAME}${PKGNAMESUFFIX}
@@ -32,6 +31,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--program-prefix= \
 			--with-hwloc=${LOCALBASE} \
 			--with-libltdl=${LOCALBASE}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 		${PREFIX}/${MPIDIR}/lib/openmpi
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 55e0eabdd482..fcaebaa55835 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	openmpi-devel-1.7.*
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
-USES=		gmake pkgconfig
-USE_FORTRAN=	yes
+USES=		fortran gmake pkgconfig
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${UNIQUENAME}
diff --git a/science/2dhf/Makefile b/science/2dhf/Makefile
index c576446368ea..e187cb7a287e 100644
--- a/science/2dhf/Makefile
+++ b/science/2dhf/Makefile
@@ -14,8 +14,10 @@ COMMENT=	A Numerical Hartree-Fock Program for Diatomic Molecules
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 .if defined(WITH_INTEL)
-USE_FORTRAN=	ifort
+USES+=		fortran:ifort
 BUILD_DEPENDS+=  ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
+.else
+USES+=		fortran
 .endif
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
@@ -30,8 +32,6 @@ LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 BLAS=		-lblas
 .endif
 
-USE_FORTRAN=	yes
-
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double
 .if (${MACHINE_ARCH} == "i386")
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index cc247aa1912a..b6f2ce0a1f18 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 LIB_DEPENDS=	netcdff.4:${PORTSDIR}/science/netcdf3-ftn	\
 		gsl:${PORTSDIR}/math/gsl
 
-USES=		gmake perl5
-USE_FORTRAN=	yes
+USES=		fortran gmake perl5
 USE_PYTHON=	yes
 USE_PERL5=	build
 USE_AUTOTOOLS=	autoconf automake
@@ -26,18 +25,21 @@ CONFIGURE_ARGS=	--disable-wannier90 --disable-bigdft --disable-etsf-io	\
 		--with-netcdf-includes="-I${LOCALBASE}/include"		\
 		--enable-bindings --enable-gsl				\
 		--with-netcdf-libs="-L${LOCALBASE}/lib -lnetcdff -lnetcdf"
-ALL_TARGET=	all libabinit
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	latex:build dvipsk:build
 BUILD_DEPENDS+= gm4:${PORTSDIR}/devel/m4		\
 		markdown:${PORTSDIR}/textproc/markdown
 USE_GHOSTSCRIPT_BUILD=	yes
 .endif
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
 MANUAL_PACKAGE_BUILD=	takes a tremendous amount of time to build on pointyhat nodes
 .endif
@@ -57,15 +59,19 @@ LAPACK=		-llapack
 .endif
 
 pre-configure:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/^abinit_top_subdirs =/s| doc||' ${WRKSRC}/config/specs/other.cf
 .endif
-.if defined(NOPORTEXAMPLES)
+.if ! ${PORT_OPTIONS:MEXAMPLES}
 	${REINPLACE_CMD} -e '/^abinit_top_subdirs =/s| tests||' ${WRKSRC}/config/specs/other.cf
 .endif
 	(cd ${WRKSRC} && ./config/scripts/makemake)
 	${CHMOD} a+x ${WRKSRC}/bindings/parser/*.py
 
+post-build:
+	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} libabinit)
+
 post-install:
 	${MKDIR} ${PREFIX}/include ${PREFIX}/lib
 .for lf in libabinip.a libabinis.a
@@ -79,4 +85,4 @@ post-install:
 regression-test:
 	cd ${WRKSRC}/tests ; ${GMAKE} tests_min
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 304bf8b757ba..ed630287b142 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 VER=		${PORTVERSION:S/.//:S/./_/}
 
-USE_FORTRAN=	yes
+USES=		fortran
 
 WRKSRC=		${WRKDIR}/cdf${VER}-dist
 SUB_FILES=	pkg-message
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index c45928ef945e..3db38778cf7a 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB=	HDF5="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
-USE_FORTRAN=	yes
+USES+=		fortran
 CMAKE_ARGS+=	-DENABLE_TESTS:BOOL=TRUE -DENABLE_FORTRAN:BOOL=TRUE
 TESTSBIN=	cgwrite cgread test_partial
 .endif
diff --git a/science/dcl/Makefile b/science/dcl/Makefile
index 3c78a28aadbc..4aa7a5de5c00 100644
--- a/science/dcl/Makefile
+++ b/science/dcl/Makefile
@@ -13,9 +13,8 @@ MAINTAINER=	murashin@gfd-dennou.org
 COMMENT=	Scientific graphic library for geoscience
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		pkgconfig
+USES=		fortran pkgconfig
 USE_XORG=	x11 xext
-USE_FORTRAN=	yes
 USE_GNOME=	gtk20 gdkpixbuf2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-x
diff --git a/science/dlpoly-classic/Makefile b/science/dlpoly-classic/Makefile
index 60398be62f14..c0e77086eab7 100644
--- a/science/dlpoly-classic/Makefile
+++ b/science/dlpoly-classic/Makefile
@@ -19,8 +19,7 @@ OPTIONS_DEFINE=	GUI DOCS EXAMPLES
 OPTIONS_DEFAULT=	GUI
 GUI_DESC=	Install Java GUI
 
-USE_GMAKE=	yes
-USE_FORTRAN=	yes
+USES=		fortran gmake
 
 SUB_FILES=	dlpoly-gui
 
diff --git a/science/elmer-eio/Makefile b/science/elmer-eio/Makefile
index 75eb8b9a99a3..3050840790b8 100644
--- a/science/elmer-eio/Makefile
+++ b/science/elmer-eio/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	elmer-
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	ELMER FEM Package Data base Interface
 
-USE_FORTRAN=	yes
+USES=		fortran
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=
diff --git a/science/elmer-hutiter/Makefile b/science/elmer-hutiter/Makefile
index 98caf36ea5f1..73b0c0df4342 100644
--- a/science/elmer-hutiter/Makefile
+++ b/science/elmer-hutiter/Makefile
@@ -14,7 +14,7 @@ COMMENT=	HUTIter library for use in the ELMER FEM package
 
 LIB_DEPENDS=	arpack.1:${PORTSDIR}/math/arpack
 
-USE_FORTRAN=	yes
+USES=		fortran
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
diff --git a/science/fvcom/Makefile b/science/fvcom/Makefile
index ddfb60ec7e58..d5f0f2665603 100644
--- a/science/fvcom/Makefile
+++ b/science/fvcom/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS+=	netcdff:${PORTSDIR}/science/netcdf-ftn \
 		lapack:${PORTSDIR}/math/lapack \
 		blas:${PORTSDIR}/math/lapack
 
-USE_FORTRAN=	yes
+USES=		fortran
 WRKSRC=		${WRKDIR}/FVCOM2.7.1/FVCOM_source
 
 PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/science/gamess/Makefile b/science/gamess/Makefile
index 17138ef3bbcd..a30e51343059 100644
--- a/science/gamess/Makefile
+++ b/science/gamess/Makefile
@@ -11,12 +11,10 @@ DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A freely obtainable ab-initio molecular orbital calculation program
 
-USE_GMAKE=	yes
+USES=		fortran gmake
 WRKSRC=         ${WRKDIR}/gamess
 SNAPDATE=	20130501.1
 
-USE_FORTRAN=   yes
-
 RESTRICTED=	NOT DISTRIBUTED FREELY. BUT YOU CAN OBTAIN SOURCE CODE FREELY.
 
 .if !exists(${DISTDIR}/${DISTFILES})
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 6ae03104525f..61aea8f1a796 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -15,8 +15,7 @@ COMMENT=	A rather general finite element solver using mixed finite elements
 LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl	\
 		lapack.4:${PORTSDIR}/math/lapack
 
-USE_GMAKE=	yes
-USE_FORTRAN=	yes
+USES=		fortran gmake
 GNU_CONFIGURE=	yes
 # Using --enable-sparskit instead of math/petsc.  The maintainer couldn't get
 # the math/petsc to work.  This is a bmake/gmake clash.
@@ -29,6 +28,9 @@ MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's/-lgfortran/& $${LDFLAGS}/' ${WRKSRC}/configure
+
 post-install:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc && ${FIND} -s ${WRKSRC}/doc/* | ${SED} -e 's#${WRKSRC}/doc/##' | ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${DOCSDIR}
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 8cc075034b05..47fc7740c06f 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -21,9 +21,7 @@ LIB_DEPENDS=	mpqc:${PORTSDIR}/science/mpqc \
 		oglappth:${PORTSDIR}/science/liboglappth \
 		mopac7:${PORTSDIR}/biology/mopac
 
-USES=		pkgconfig gettext
-USE_FORTRAN=	yes
-USE_GMAKE=	yes
+USES=		fortran gettext gmake pkgconfig
 USE_GNOME=	glib20 gtk20 libglade2
 USE_GL=		glut
 GNU_CONFIGURE=	yes
diff --git a/science/harminv/Makefile b/science/harminv/Makefile
index 5dba0ecfc8a6..306f548439b2 100644
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	http://ab-initio.mit.edu/harminv/
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Solver of harmonic inversion
 
-USE_GMAKE=	yes
+USES=		fortran gmake
 GNU_CONFIGURE=	yes
-USE_FORTRAN=	yes
 USE_GCC=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 2c39adad0612..9827872758f0 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--disable-production --enable-debug=all
 .endif
 
 .if ${PORT_OPTIONS:MFORTRAN}
-USE_FORTRAN=	yes
+USES+=		fortran
 CONFIGURE_ARGS+=--enable-fortran
 CONFIGURE_ENV+=	F9X=${FC}
 PLIST_SUB+=	FORTRAN=""
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index e6f7d465a1f5..6b49ecabc1ce 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -36,7 +36,7 @@ NO_STAGE=	yes
 
 .if defined(WITH_FORTRAN)
 LIBTOOLFILES+=		fortran/configure
-USE_FORTRAN=		yes
+USES+=			fortran
 CONFIGURE_ENV+=		F9X=${FC}
 CONFIGURE_ARGS+=	--enable-fortran
 PLIST_SUB+=		FORTRAN=""
diff --git a/science/libctl/Makefile b/science/libctl/Makefile
index 2ae8f8d81fa1..52590525aed5 100644
--- a/science/libctl/Makefile
+++ b/science/libctl/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Control Language Library
 
 LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
+USES=		fortran
 USE_AUTOTOOLS=	libtool
-USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 
 MAN1=		gen-ctl-io.1
diff --git a/science/libghemical/Makefile b/science/libghemical/Makefile
index 3398584bf7b8..ece81e1d9a25 100644
--- a/science/libghemical/Makefile
+++ b/science/libghemical/Makefile
@@ -17,14 +17,14 @@ BUILD_DEPENDS=	obabel:${PORTSDIR}/science/openbabel \
 LIB_DEPENDS+=	mpqc:${PORTSDIR}/science/mpqc \
 		f2c:${PORTSDIR}/lang/f2c
 
-USE_GMAKE=	yes
-USES=	pathfix pkgconfig gettext
+USES=		fortran gettext gmake pathfix pkgconfig
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=   yes
 
-USE_FORTRAN=	yes
 CONFIGURE_ARGS+=	--enable-mpqc
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	LIBGHEMICAL_VERSION="${PORTVERSION}"
 
 NO_STAGE=	yes
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index b935535d93d6..a7fcf307d40f 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	arpack:${PORTSDIR}/math/arpack \
 		umfpack:${PORTSDIR}/math/suitesparse
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_FORTRAN=	yes
+USES=		fortran gmake
 MAN1=		mbdyn.1
 CPPFLAGS+=	-fpermissive -I${LOCALBASE}/include/suitesparse
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/science/meep/Makefile b/science/meep/Makefile
index 63bbe293f478..c8b0cb3dddd3 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -19,11 +19,9 @@ LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile \
 		hdf5.7:${PORTSDIR}/science/hdf5-18
 RUN_DEPENDS+=	harminv:${PORTSDIR}/science/harminv
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_FORTRAN=	yes
 USE_GCC=	yes
-USES=		gettext iconv pathfix
+USES=		fortran gettext gmake iconv pathfix
 USE_AUTOTOOLS+=	libltdl
 CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index f29953cee0f3..de01e23fb1ec 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -10,10 +10,14 @@ MASTER_SITES=	SF
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	The massively parallel quantum computing library and program
 
-USES=		perl5 gmake
+GNU_CONFIGURE=	yes
+USES=		fortran gmake perl5
+USE_AUTOTOOLS=	autoconf
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
@@ -37,7 +41,7 @@ LAPACK=		-llapack
 LIB_DEPENDS+=	mpich:${PORTSDIR}/net/mpich2
 .endif
 LIB_DEPENDS+=	int.1:${PORTSDIR}/science/libint
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	latex:build
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
@@ -45,10 +49,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 .endif
 
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf
-USE_FORTRAN=	yes
-
 .if defined(WITH_ICC)
 CC=		${LOCALBASE}/intel_cc_80/bin/icc
 CXX=		${LOCALBASE}/intel_cc_80/bin/icpc
@@ -83,7 +83,7 @@ CONFIGURE_ARGS+=--with-include="-I${WRKDIR} -I${LOCALBASE}/include"
 
 MPQC_COMMAND=	${PREFIX}/bin/mpqc
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 .include "${FILESDIR}/manpages"
 .endif
 
@@ -92,16 +92,12 @@ CFLAGS+=	-O2 -ffast-math
 CXXFLAGS+=	-O2 -ffast-math
 .endif
 
-EXTRARPATH=	-Wl,-rpath=`${CAT} ${WRKSRC}/LIBDIR`
-
 pre-configure:
 	@${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes."
-	@${DIRNAME} `${CC} -print-file-name=libstdc++.so` > ${WRKSRC}/LIBDIR
-	@${REINPLACE_CMD} -e 's|%%EXTRARPATH%%|${EXTRARPATH}|g' ${WRKSRC}/lib/LocalMakefile.in
 
 do-build:
 	@cd ${WRKSRC} ; ${GMAKE}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/doc ; ${GMAKE}
 .endif
 
@@ -113,7 +109,7 @@ do-install:
 		${TAR} -xf - -C ${PREFIX}/share/mpqc/validate
 	${FIND} ${PREFIX}/share/mpqc/validate | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	${FIND} ${PREFIX}/share/mpqc/validate -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	rm -f ${WRKSRC}/doc/man/man1/_*mpqc_*.1
 	rm -f ${WRKSRC}/doc/man/man3/_*mpqc_*.3
 	rm -f ${WRKSRC}/doc/man/man3/sc_PsiCCSD_T.3* #somehow this file is not generated in tinderbox
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index ec4bdd1df6f8..39f3d24fe02a 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS=	xmgrace:${PORTSDIR}/math/grace	\
 		cs_preprocess:${PORTSDIR}/science/ecs
 
 USE_ZIP=	yes
-USE_GMAKE=	yes
-USES=		gettext iconv
+USES=		fortran gettext gmake iconv
 USE_GNOME=	libxml2
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -38,7 +37,6 @@ MAKE_ENV=	NOM_ARCH=${OPSYS} CS_MPI_PATH=${MPI_HOME}/bin	\
 		MPI_HOME=${MPI_HOME} MPI_LIBS="${MPI_LIBS}"
 USE_LDCONFIG=	yes
 
-USE_FORTRAN=	yes
 FORTRANLIBDIR=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``
 FORTRANLIBDIR2=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
 
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 86ef2d905292..b09b6d06cc23 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netcdf
 PORTVERSION=	3.6.3
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	science
 MASTER_SITES=	http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
@@ -43,7 +43,7 @@ CPPFLAGS+=	-DpgiFortran
 CONFLICTS+=	netcdf-3.*
 MAN3+=		netcdf_f77.3 netcdf_f90.3
 PLIST_SUB+=	FORTRAN=""
-USE_FORTRAN=	yes
+USES+=		fortran
 .else
 CONFIGURE_ARGS+=--disable-f77 --disable-f90
 CONFLICTS+=	netcdf-ftn-3.*
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index ff905cbe209e..4ddc23522ec4 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netcdf
 PORTVERSION=	4.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
@@ -52,7 +52,7 @@ CONFLICTS+=	netcdf-4.*
 MAN3+=		netcdf_f77.3 netcdf_f90.3
 PKGNAMESUFFIX+=	-ftn
 PLIST_SUB+=	FORTRAN=""
-USE_FORTRAN=	yes
+USES+=		fortran
 .else
 CONFIGURE_ARGS+=--disable-f77 --disable-f90
 CONFLICTS+=	netcdf-ftn-4.*
diff --git a/science/netcdf4/files/patch-cxx4-ncGroup.cpp b/science/netcdf4/files/patch-cxx4-ncGroup.cpp
new file mode 100644
index 000000000000..bf0fc7d1bb05
--- /dev/null
+++ b/science/netcdf4/files/patch-cxx4-ncGroup.cpp
@@ -0,0 +1,29 @@
+--- cxx4/ncGroup.cpp.orig
++++ cxx4/ncGroup.cpp
+@@ -218,7 +218,7 @@
+  
+   // search in child groups of the children
+   if(location == ChildrenOfChildrenGrps || location == AllChildrenGrps || location == AllGrps ) {
+-    map<string,NcGroup>::iterator it;
++    multimap<string,NcGroup>::iterator it;
+     multimap<string,NcGroup> groups(getGroups(ChildrenGrps));
+     for (it=groups.begin();it!=groups.end();it++) {
+       multimap<string,NcGroup> childGroups(it->second.getGroups(AllChildrenGrps));
+@@ -1251,7 +1251,7 @@
+   // search in current group and parent groups.
+   NcGroup tmpGroup(*this); 
+   multimap<string,NcDim>::iterator itD;
+-  map<string,NcVar>::iterator itV;
++  multimap<string,NcVar>::iterator itV;
+   while(1) {
+     // get the collection of NcDim objects defined in this group.
+     multimap<string,NcDim> dimTmp(tmpGroup.getDims());
+@@ -1289,7 +1289,7 @@
+   // search in current group and parent groups.
+   multimap<string,NcDim>::iterator itD;
+   NcGroup tmpGroup(*this); 
+-  map<string,NcVar>::iterator itV;
++  multimap<string,NcVar>::iterator itV;
+   while(1) {
+     // get the collection of NcDim objects defined in this group.
+     multimap<string,NcDim> dimTmp(tmpGroup.getDims());
diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile
index ca52f2fba4f9..752e9c76bbbb 100644
--- a/science/pnetcdf/Makefile
+++ b/science/pnetcdf/Makefile
@@ -21,8 +21,7 @@ CFLAGS+=	-fPIC -DPIC
 CONFIGURE_ENV=	M4FLAGS=""
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_FORTRAN=	yes
-USES=		gmake
+USES=		fortran gmake
 
 MAN1=		ncmpidiff.1 ncmpidump.1 ncmpigen.1
 MAN3=		pnetcdf.3
diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index b684c1ed9364..2159c78cea71 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	psi3
 PORTVERSION=	3.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	SF/psicode/psi/${PORTVERSION} \
 		http://www.psicode.org/doc/:doc \
@@ -45,17 +45,18 @@ LAPACK=		-lalapack -lptcblas
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_FORTRAN=	yes
+USES=		fortran gmake
 CONFIGURE_ARGS=	--with-cc=${CC} \
 		--with-cxx=${CXX} \
 		--with-fc=${FC} \
+		--with-opt="${CFLAGS}" \
 		--with-lapack="${LAPACK}" \
 		--with-blas="${BLAS}" \
 		--datadir=${PREFIX}/share/psi3 \
 		--docdir=${WRKSRC}/tmpdoc/ \
 		--with-libdirs="-L${LOCALBASE}/lib" \
 		--with-libs="-lcompat"
+CFLAGS+=	-Wno-error=return-type
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
diff --git a/science/psi3/files/patch-src-bin-clag-clag.cc b/science/psi3/files/patch-src-bin-clag-clag.cc
new file mode 100644
index 000000000000..936ec5520098
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-clag-clag.cc
@@ -0,0 +1,10 @@
+--- src/bin/clag/clag.cc.orig
++++ src/bin/clag/clag.cc
+@@ -46,6 +46,7 @@
+ /***************************************************************************/
+ using namespace psi::clag;
+ 
++int
+ main(int argc, char **argv) 
+ {
+ 
diff --git a/science/psi3/files/patch-src-bin-geom-geom.cc b/science/psi3/files/patch-src-bin-geom-geom.cc
new file mode 100644
index 000000000000..12a3a4afde46
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-geom-geom.cc
@@ -0,0 +1,10 @@
+--- src/bin/geom/geom.cc.orig
++++ src/bin/geom/geom.cc
+@@ -115,6 +115,7 @@
+ void fill_sym_matrix(double **A, int size);
+ }} // namespace psi::geom
+ 
++int
+ main(int argc, char* argv[])
+ {
+   using namespace psi::geom;
diff --git a/science/psi3/files/patch-src-bin-nonbonded-nonbonded.cc b/science/psi3/files/patch-src-bin-nonbonded-nonbonded.cc
new file mode 100644
index 000000000000..c959af29e2f5
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-nonbonded-nonbonded.cc
@@ -0,0 +1,10 @@
+--- src/bin/nonbonded/nonbonded.cc.orig
++++ src/bin/nonbonded/nonbonded.cc
+@@ -32,7 +32,6 @@
+ #include <physconst.h>
+ #include <psifiles.h>
+ #include <masses.h>
+-#include <string>
+ 
+ #include "globals.h"
+ #include "nonbonded.h"
diff --git a/science/psi3/files/patch-src-bin-transqt2-transqt.cc b/science/psi3/files/patch-src-bin-transqt2-transqt.cc
new file mode 100644
index 000000000000..1dd018025cf9
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-transqt2-transqt.cc
@@ -0,0 +1,10 @@
+--- src/bin/transqt2/transqt.cc.orig
++++ src/bin/transqt2/transqt.cc
+@@ -65,6 +65,7 @@
+ 
+ using namespace psi::transqt2;
+ 
++int
+ main(int argc, char *argv[])
+ {
+   int nso, nmo, ntri_so, ntri_mo, nirreps;
diff --git a/science/psi3/files/patch-src-lib-libbasis-combinate.cc b/science/psi3/files/patch-src-lib-libbasis-combinate.cc
new file mode 100644
index 000000000000..3bae2543e928
--- /dev/null
+++ b/science/psi3/files/patch-src-lib-libbasis-combinate.cc
@@ -0,0 +1,12 @@
+--- src/lib/libbasis/combinate.cc.orig
++++ src/lib/libbasis/combinate.cc
+@@ -3,9 +3,7 @@
+     \brief Enter brief description of file here 
+ */
+ 
+-extern "C" {
+ #include <libciomr/libciomr.h>
+-}
+ 
+ #include <stdexcept>
+ #include "combinate.h"
diff --git a/science/psi3/files/patch-src-lib-libipv1-ip_read.cc b/science/psi3/files/patch-src-lib-libipv1-ip_read.cc
new file mode 100644
index 000000000000..34d6e0b5e0bf
--- /dev/null
+++ b/science/psi3/files/patch-src-lib-libipv1-ip_read.cc
@@ -0,0 +1,20 @@
+--- src/lib/libipv1/ip_read.cc.orig
++++ src/lib/libipv1/ip_read.cc
+@@ -12,7 +12,9 @@
+ #include "ip_types.h"
+ #define _IP_ALLOCATE_GLOBAL_
+ #include "ip_global.h"
++extern "C" {
+ #include "y.tab.h"
++}
+ 
+ #include "ip_read.gbl"
+ #include "ip_read.lcl"
+@@ -27,7 +29,6 @@
+ 
+ /* The input for yacc. */
+ extern FILE *yyin;
+-extern void yyparse(void);
+ 
+ /* Set up static variables. */
+ /*static ip_keyword_tree_t *sub_tree = NULL;*/
diff --git a/science/psi3/files/patch-src-lib-libpsio-psio.hpp b/science/psi3/files/patch-src-lib-libpsio-psio.hpp
new file mode 100644
index 000000000000..789d4bd464fb
--- /dev/null
+++ b/science/psi3/files/patch-src-lib-libpsio-psio.hpp
@@ -0,0 +1,17 @@
+--- src/lib/libpsio/psio.hpp.orig
++++ src/lib/libpsio/psio.hpp
+@@ -157,10 +157,11 @@
+ 
+   };
+   
+-extern "C" {
+-  extern int psiopp_ipv1_config(PSIO *psio_obj);
+-}
+   extern PSIO* _default_psio_lib_;
+ }
+ 
++extern "C" {
++  int psiopp_ipv1_config(psi::PSIO *psio_obj);
++}
++
+ #endif /* header guard */
diff --git a/science/py-obspy/Makefile b/science/py-obspy/Makefile
index 2d3d0d0b7dae..ac915a9b69ff 100644
--- a/science/py-obspy/Makefile
+++ b/science/py-obspy/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:${PORTSDIR}/databases/py-sqlalchemy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_FORTRAN=		yes
+USES=			fortran
 USE_ZIP=		yes
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index 9b721eb141ba..43fa8cb3bb46 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libcblas.so:${PORTSDIR}/math/cblas
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0.8.0:${PORTSDIR}/science/py-scipy
 
-USE_FORTRAN=	yes
+USES=		fortran
 LATEST_LINK=	py-${PORTNAME}
 
 USE_PYTHON=	yes
diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
index a0121b9e3b29..b2bcefafd75b 100644
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${PYNUMPY}	\
 LATEST_LINK=	py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-numpy/options
 
-USE_FORTRAN=	yes
+USES=		fortran
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index 1d422248e60d..9b54f7f8f987 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -17,9 +17,8 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
-USES=		gmake pkgconfig
+USES=		fortran gmake pkgconfig
 USE_BZIP2=	yes
-USE_FORTRAN=	yes
 USE_GNOME=	gtk20
 USE_GL=		yes
 GNU_CONFIGURE=	yes
author	Tijl Coosemans <tijl@FreeBSD.org>	2014-02-16 17:15:31 +0000
committer	Tijl Coosemans <tijl@FreeBSD.org>	2014-02-16 17:15:31 +0000
commit	564a799c7173c288d4d3a9be78ac3d2db983d512 (patch)
tree	49e521faa408bc4bd163bfb0febf91e262772c1c
parent	af1790bfbbcd5831281907db9c04f3776b8d601c (diff)
download	ports-564a799c7173c288d4d3a9be78ac3d2db983d512.tar.gz ports-564a799c7173c288d4d3a9be78ac3d2db983d512.zip