Date: Tue, 31 Dec 2013 18:32:36 +0100 (CET) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185372: [exp-run] Convert USE_FORTRAN to USES=fortran Message-ID: <201312311732.rBVHWauA090886@kalimero.tijl.coosemans.org> Resent-Message-ID: <201312311740.rBVHe1LB023255@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185372
>Category: ports
>Synopsis: [exp-run] Convert USE_FORTRAN to USES=fortran
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 31 17:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
The attached patch replaces USE_FORTRAN with USES=fortran in the entire
ports tree. Because this changes the C and C++ compiler for the affected
ports (from lang/gcc to base system compiler) I expect this to take a few
iterations of exp-runs.
>How-To-Repeat:
>Fix:
--- fortran.patch begins here ---
Index: Mk/bsd.gcc.mk
===================================================================
--- Mk/bsd.gcc.mk (revision 338282)
+++ Mk/bsd.gcc.mk (working copy)
@@ -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,16 +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= g77 # use g77-34 (lang/gcc34)
-# 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.
#
@@ -84,39 +70,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
-
-# g77 from lang/gcc34.
-. elif ${USE_FORTRAN} == g77
-_USE_GCC:= 3.4
-FC:= g77-34
-F77:= g77-34
-. 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
@@ -210,11 +163,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}
@@ -246,7 +194,6 @@ USE_BINUTILS= yes
test-gcc:
@echo USE_GCC=${USE_GCC}
- @echo USE_FORTRAN=${USE_FORTRAN}
.if defined(IGNORE)
@echo "IGNORE: ${IGNORE}"
.else
@@ -267,7 +214,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}"
Index: Mk/bsd.octave.mk
===================================================================
--- Mk/bsd.octave.mk (revision 338282)
+++ Mk/bsd.octave.mk (working copy)
@@ -21,8 +21,7 @@ RUN_DEPENDS+= octave:${PORTSDIR}/math/oc
${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-//}
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk (revision 338282)
+++ Mk/bsd.port.mk (working copy)
@@ -1714,7 +1714,7 @@ EXTRACT_DEPENDS+= ${LOCALBASE}/bin/xz:${
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
Index: benchmarks/himenobench/Makefile
===================================================================
--- benchmarks/himenobench/Makefile (revision 338282)
+++ benchmarks/himenobench/Makefile (working copy)
@@ -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
Index: benchmarks/hpl/Makefile
===================================================================
--- benchmarks/hpl/Makefile (revision 338282)
+++ benchmarks/hpl/Makefile (working copy)
@@ -14,7 +14,7 @@ COMMENT= High Performance Computing Linp
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}
Index: biology/crux/Makefile
===================================================================
--- biology/crux/Makefile (revision 338282)
+++ biology/crux/Makefile (working copy)
@@ -10,22 +10,20 @@ MASTER_SITES= http://www.canonware.com/d
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= 2.5+
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: er
post-install:
@${PREFIX}/bin/crux -b -q /dev/null
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: biology/plink/Makefile
===================================================================
--- biology/plink/Makefile (revision 338282)
+++ biology/plink/Makefile (working copy)
@@ -15,9 +15,8 @@ LICENSE= GPLv2
LIB_DEPENDS= liblapack.so:${PORTSDIR}/math/lapack
-USES= gmake
+USES= fortran gmake
USE_ZIP= yes
-USE_FORTRAN= yes # Make it use the same compiler as lapack
PLIST_FILES= bin/plink
Index: cad/calculix/Makefile
===================================================================
--- cad/calculix/Makefile (revision 338282)
+++ cad/calculix/Makefile (working copy)
@@ -43,7 +43,8 @@ DIST_EXAMPLES= ccx_${PORTVERSION}.test${
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>
Index: cad/feappv/Makefile
===================================================================
--- cad/feappv/Makefile (revision 338282)
+++ cad/feappv/Makefile (working copy)
@@ -13,10 +13,9 @@ EXTRACT_ONLY= ${PORTNAME}${PORTVERSION:S
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
Index: cad/gmsh/Makefile
===================================================================
--- cad/gmsh/Makefile (revision 338282)
+++ cad/gmsh/Makefile (working copy)
@@ -27,9 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER
SLAVEDIRS= cad/gmsh-occ
-USE_FORTRAN= yes
-USES= cmake
-USE_GMAKE= yes
+USES= cmake fortran gmake
USE_GL= yes
ALL_TARGET= all
Index: cad/sceptre/Makefile
===================================================================
--- cad/sceptre/Makefile (revision 338282)
+++ cad/sceptre/Makefile (working copy)
@@ -12,7 +12,7 @@ COMMENT= General-purpose circuit analysi
LICENSE= GPLv2
-USE_FORTRAN= yes
+USES= fortran
MAKE_JOBS_UNSAFE= yes
NO_WRKSUBDIR= yes
Index: cad/scotch/Makefile
===================================================================
--- cad/scotch/Makefile (revision 338282)
+++ cad/scotch/Makefile (working copy)
@@ -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_/_/}
Index: comms/wsjt/Makefile
===================================================================
--- comms/wsjt/Makefile (revision 338282)
+++ comms/wsjt/Makefile (working copy)
@@ -22,9 +22,8 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scip
${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 \
Index: comms/wspr/Makefile
===================================================================
--- comms/wspr/Makefile (revision 338282)
+++ comms/wspr/Makefile (working copy)
@@ -21,10 +21,9 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scip
${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 \
Index: french/aster/Makefile
===================================================================
--- french/aster/Makefile (revision 338282)
+++ french/aster/Makefile (working copy)
@@ -43,7 +43,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnupl
LICENSE= GPLv2
-USES= bison
+USES= bison fortran
USE_PYTHON= 2.6-2.7 # >2.5 and <3.0
USE_TK= yes
HAS_CONFIGURE= yes
@@ -140,9 +140,6 @@ LIB_DEPENDS+= mpich.2:${PORTSDIR}/net/mp
HOME_MPI= ${LOCALBASE}
.endif
-USE_FORTRAN= yes
-GCC_VER= `${CC} -dumpversion`
-
.if defined(WITH_ZSH)
SHIA= zsh
.elif defined(WITH_BASH)
Index: french/med/Makefile
===================================================================
--- french/med/Makefile (revision 338282)
+++ french/med/Makefile (working copy)
@@ -15,7 +15,7 @@ LIB_DEPENDS= hdf5.7:${PORTSDIR}/science/
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
Index: graphics/cimg/Makefile
===================================================================
--- graphics/cimg/Makefile (revision 338282)
+++ graphics/cimg/Makefile (working copy)
@@ -34,12 +34,10 @@ CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
.if !defined(NOPORTDOCS)
-USES= gmake
+USES= fortran gmake
REINPLACE_ARGS= -i ""
LIB_DEPENDS+= libboard.so:${PORTSDIR}/graphics/libboard
-USE_FORTRAN= yes
-
. if !defined(WITH_DEBUG)
LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
Index: graphics/p5-PGPLOT/Makefile
===================================================================
--- graphics/p5-PGPLOT/Makefile (revision 338282)
+++ graphics/p5-PGPLOT/Makefile (working copy)
@@ -17,8 +17,7 @@ LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphi
INSTALL_TARGET= pure_install
SCRIPTS_ENV= PERL=${PERL}
-USE_FORTRAN= yes
-USES= perl5
+USES= fortran perl5
.if !defined(NOPORTEXAMPLES)
post-install:
Index: graphics/pfstools/Makefile
===================================================================
--- graphics/pfstools/Makefile (revision 338282)
+++ graphics/pfstools/Makefile (working copy)
@@ -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
Index: graphics/pgplot/Makefile
===================================================================
--- graphics/pgplot/Makefile (revision 338282)
+++ graphics/pgplot/Makefile (working copy)
@@ -15,8 +15,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/
MAKE_JOBS_UNSAFE= yes
-USES= shebangfix
-USE_FORTRAN= yes
+USES= fortran shebangfix
USE_LDCONFIG= yes
USE_XORG= x11 xproto xt
Index: graphics/vigra/Makefile
===================================================================
--- graphics/vigra/Makefile (revision 338282)
+++ graphics/vigra/Makefile (working copy)
@@ -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.6-2.7
BUILD_DEPENDS+= nosetests:${PORTSDIR}/devel/py-nose
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
Index: graphics/visionworkbench/Makefile
===================================================================
--- graphics/visionworkbench/Makefile (revision 338282)
+++ graphics/visionworkbench/Makefile (working copy)
@@ -18,9 +18,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= 2.4+
Index: graphics/xd3d/Makefile
===================================================================
--- graphics/xd3d/Makefile (revision 338282)
+++ graphics/xd3d/Makefile (working copy)
@@ -39,7 +39,7 @@ FETCH_CMD= /usr/bin/fetch
FETCH_BEFORE_ARGS= -R -o ${DISTDIR}/${DISTFILES}
USE_XORG= x11 xpm
-USE_FORTRAN= yes
+USES= fortran
FFLAGS+= -O
MEMORY_XD3D?= 64
Index: lang/ratfor/Makefile
===================================================================
--- lang/ratfor/Makefile (revision 338282)
+++ lang/ratfor/Makefile (working copy)
@@ -21,7 +21,7 @@ EXTRACT_AFTER_ARGS= | ${SH}
ALL_TARGET= all tests
MAN1= ratfor.1
-USE_FORTRAN= yes
+USES= fortran
NO_STAGE= yes
post-patch:
Index: math/R/Makefile
===================================================================
--- math/R/Makefile (revision 338282)
+++ math/R/Makefile (working copy)
@@ -107,7 +107,7 @@ R_SOVERSION= 1
RBLAS_SOVERSION= 2
RLAPACK_SOVERSION= 4
RMATH_SOVERSION= 0
-USE_FORTRAN= yes
+USES+= fortran
.include <bsd.port.options.mk>
Index: math/arpack/Makefile
===================================================================
--- math/arpack/Makefile (revision 338282)
+++ math/arpack/Makefile (working copy)
@@ -20,7 +20,7 @@ CONFLICTS= arpack-ng-[0-9]*
FFLAGS+= -ffixed-line-length-none
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
-USE_FORTRAN= yes
+USES= fortran
USE_LDCONFIG= yes
WRKSRC = ${WRKDIR}/ARPACK
Index: math/arpack-ng/Makefile
===================================================================
--- math/arpack-ng/Makefile (revision 338282)
+++ math/arpack-ng/Makefile (working copy)
@@ -13,7 +13,7 @@ COMMENT= Revised Argand library for solv
LICENSE= BSD
-USE_FORTRAN= yes
+USES= fortran
USE_LDCONFIG= yes
CONFLICTS= arpack-[0-9]*
Index: math/atlas/Makefile
===================================================================
--- math/atlas/Makefile (revision 338282)
+++ math/atlas/Makefile (working copy)
@@ -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.
Index: math/atlas-devel/Makefile
===================================================================
--- math/atlas-devel/Makefile (revision 338282)
+++ math/atlas-devel/Makefile (working copy)
@@ -16,8 +16,8 @@ IGNORE = : dependent ports have been alt
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
Index: math/bihar/Makefile
===================================================================
--- math/bihar/Makefile (revision 338282)
+++ math/bihar/Makefile (working copy)
@@ -41,7 +41,7 @@ LIB_DEPENDS= linpack.3:${PORTSDIR}/math/
NO_STAGE= yes
NO_WRKSUBDIR= yes
USE_LDCONFIG= yes
-USE_FORTRAN= yes
+USES= fortran
.if !defined(NOPORTDOCS)
PORTDOCS= fft.doc
Index: math/blacs/Makefile
===================================================================
--- math/blacs/Makefile (revision 338282)
+++ math/blacs/Makefile (working copy)
@@ -39,8 +39,7 @@ EXTRA_PATCHES+= ${FILESDIR}/Bmake.inc-mp
USE_LDCONFIG= yes
-USE_FORTRAN= yes
-USE_GMAKE=yes
+USES= fortran gmake
F77EXTRAFLAGS= #-w -fno-globals -fugly-complex
DEBUG_LEVEL= 0
Index: math/blocksolve95/Makefile
===================================================================
--- math/blocksolve95/Makefile (revision 338282)
+++ math/blocksolve95/Makefile (working copy)
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${MPIDIR}/lib/libmpich.a:
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
Index: math/cantor/Makefile
===================================================================
--- math/cantor/Makefile (revision 338282)
+++ math/cantor/Makefile (working copy)
@@ -43,7 +43,7 @@ RUN_DEPENDS+= octave:${PORTSDIR}/math/oc
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
Index: math/cblas/Makefile
===================================================================
--- math/cblas/Makefile (revision 338282)
+++ math/cblas/Makefile (working copy)
@@ -13,7 +13,7 @@ COMMENT= Reference implementation of the
LICENSE= BSD
-USE_FORTRAN= yes
+USES= fortran
CONFLICTS_INSTALL= atlas-[0-9]* atlas-devel-[0-9]*
Index: math/clp/Makefile
===================================================================
--- math/clp/Makefile (revision 338282)
+++ math/clp/Makefile (working copy)
@@ -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
Index: math/dynare/Makefile
===================================================================
--- math/dynare/Makefile (revision 338282)
+++ math/dynare/Makefile (working copy)
@@ -14,8 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boos
WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_FORTRAN= yes
+USES= fortran gmake
USE_XZ= yes
INFO= dynare
Index: math/eispack/Makefile
===================================================================
--- math/eispack/Makefile (revision 338282)
+++ math/eispack/Makefile (working copy)
@@ -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
Index: math/elmer-umfpack/Makefile
===================================================================
--- math/elmer-umfpack/Makefile (revision 338282)
+++ math/elmer-umfpack/Makefile (working copy)
@@ -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=
Index: math/fflas-ffpack/Makefile
===================================================================
--- math/fflas-ffpack/Makefile (revision 338282)
+++ math/fflas-ffpack/Makefile (working copy)
@@ -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
Index: math/gotoblas/Makefile
===================================================================
--- math/gotoblas/Makefile (revision 338282)
+++ math/gotoblas/Makefile (working copy)
@@ -30,9 +30,8 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/GotoBLAS2
-USES= gmake perl5
+USES= fortran gmake perl5
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/|}
Index: math/gretl/Makefile
===================================================================
--- math/gretl/Makefile (revision 338282)
+++ math/gretl/Makefile (working copy)
@@ -16,9 +16,8 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/
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
Index: math/jags/Makefile
===================================================================
--- math/jags/Makefile (revision 338282)
+++ math/jags/Makefile (working copy)
@@ -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}
Index: math/kktdirect/Makefile
===================================================================
--- math/kktdirect/Makefile (revision 338282)
+++ math/kktdirect/Makefile (working copy)
@@ -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
Index: math/lapack/Makefile
===================================================================
--- math/lapack/Makefile (revision 338282)
+++ math/lapack/Makefile (working copy)
@@ -18,7 +18,7 @@ COMMENT?= A library of Fortran 77 subrou
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_FORTRAN= yes
+USES= fortran
OPTIONS_DEFINE= PROFILE SHARED STATIC
OPTIONS_DEFAULT= SHARED STATIC
Index: math/lapack++/Makefile
===================================================================
--- math/lapack++/Makefile (revision 338282)
+++ math/lapack++/Makefile (working copy)
@@ -20,7 +20,7 @@ MAINTAINER= maho@FreeBSD.org
COMMENT= Linear Algebra PACKage in C++, a wrapper for LAPACK
WANT_GNOME= yes
-USES= pathfix gmake
+USES= fortran pathfix gmake
NO_STAGE= yes
.include <bsd.port.pre.mk>
@@ -35,7 +35,6 @@ LIB_DEPENDS+= blas.2:${PORTSDIR}/math/bl
LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack
.endif
-USE_FORTRAN= yes
GNU_CONFIGURE= yes
.if defined(WITH_ATLAS)
BLAS_LIB= -L${LOCALBASE}/lib -lf77blas
Index: math/lapack95/Makefile
===================================================================
--- math/lapack95/Makefile (revision 338282)
+++ math/lapack95/Makefile (working copy)
@@ -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
Index: math/lapacke/Makefile
===================================================================
--- math/lapacke/Makefile (revision 338282)
+++ math/lapacke/Makefile (working copy)
@@ -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
Index: math/levmar/Makefile
===================================================================
--- math/levmar/Makefile (revision 338282)
+++ math/levmar/Makefile (working copy)
@@ -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
Index: math/libflame/Makefile
===================================================================
--- math/libflame/Makefile (revision 338282)
+++ math/libflame/Makefile (working copy)
@@ -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
Index: math/libtsnnls/Makefile
===================================================================
--- math/libtsnnls/Makefile (revision 338282)
+++ math/libtsnnls/Makefile (working copy)
@@ -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
Index: math/linpack/Makefile
===================================================================
--- math/linpack/Makefile (revision 338282)
+++ math/linpack/Makefile (working copy)
@@ -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
Index: math/metis-edf/Makefile
===================================================================
--- math/metis-edf/Makefile (revision 338282)
+++ math/metis-edf/Makefile (working copy)
@@ -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
Index: math/mumps/Makefile
===================================================================
--- math/mumps/Makefile (revision 338282)
+++ math/mumps/Makefile (working copy)
@@ -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`/../../..
Index: math/openblas/Makefile
===================================================================
--- math/openblas/Makefile (revision 338282)
+++ math/openblas/Makefile (working copy)
@@ -25,11 +25,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}
Index: math/petsc/Makefile
===================================================================
--- math/petsc/Makefile (revision 338282)
+++ math/petsc/Makefile (working copy)
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --with-x-include=${LOCA
--with-x-lib=${LOCALBASE}/lib/libX11.so
.endif
-USE_FORTRAN= yes
+USES= fortran
FFLAGS+= -O2
PFX= ${PORTNAME}
TARGET= ${OPSYS:L}
Index: math/plplot/Makefile
===================================================================
--- math/plplot/Makefile (revision 338282)
+++ math/plplot/Makefile (working copy)
@@ -40,7 +40,7 @@ FREEFONT_DIR= ${LOCALBASE}/lib/X11/fonts
.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=""
Index: math/py-numpy/Makefile
===================================================================
--- math/py-numpy/Makefile (revision 338282)
+++ math/py-numpy/Makefile (working copy)
@@ -26,7 +26,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
MAN1= f2py.1
Index: math/py-symeig/Makefile
===================================================================
--- math/py-symeig/Makefile (revision 338282)
+++ math/py-symeig/Makefile (working copy)
@@ -14,10 +14,9 @@ COMMENT= Symmetrical eigenvalue routines
BUILD_DEPENDS+= ${PYNUMPY}
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
Index: math/qd/Makefile
===================================================================
--- math/qd/Makefile (revision 338282)
+++ math/qd/Makefile (working copy)
@@ -11,11 +11,9 @@ MAINTAINER= maho@FreeBSD.org
COMMENT= Double-Double and Quad-Double Arithmetic
GNU_CONFIGURE= yes
+USES= fortran
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-USE_FORTRAN= yes
-CONFIGURE_ARGS+= --enable-shared=yes
+CONFIGURE_ARGS= --enable-shared=yes
-.include <bsd.port.post.mk>
+NO_STAGE= yes
+.include <bsd.port.mk>
Index: math/qrupdate/Makefile
===================================================================
--- math/qrupdate/Makefile (revision 338282)
+++ math/qrupdate/Makefile (working copy)
@@ -15,7 +15,7 @@ LIB_DEPENDS= blas.2:${PORTSDIR}/math/bla
FETCH_ARGS= -p
-USES= gmake
+USES= fortran gmake
NO_STAGE= yes
.include <bsd.port.pre.mk>
@@ -27,7 +27,6 @@ BROKEN= Does not compile on sparc64: as
PICFLAG?= -fpic
.endif
-USE_FORTRAN= yes
USE_LDCONFIG= yes
pre-build:
Index: math/sage/Makefile
===================================================================
--- math/sage/Makefile (revision 338282)
+++ math/sage/Makefile (working copy)
@@ -30,12 +30,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
LDFLAGS:= -Wl,-rpath=${WRKSRC}/local/lib ${LDFLAGS}
FFLAGS+= -Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG}
CFLAGS+= -Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG}
Index: math/scalapack/Makefile
===================================================================
--- math/scalapack/Makefile (revision 338282)
+++ math/scalapack/Makefile (working copy)
@@ -24,7 +24,7 @@ LIB_DEPENDS= blacs.1:${PORTSDIR}/math/bl
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
Index: math/sdpa/Makefile
===================================================================
--- math/sdpa/Makefile (revision 338282)
+++ math/sdpa/Makefile (working copy)
@@ -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
Index: math/sdpara/Makefile
===================================================================
--- math/sdpara/Makefile (revision 338282)
+++ math/sdpara/Makefile (working copy)
@@ -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)
Index: math/slatec/Makefile
===================================================================
--- math/slatec/Makefile (revision 338282)
+++ math/slatec/Makefile (working copy)
@@ -19,7 +19,7 @@ MAINTAINER= mexas@bris.ac.uk
COMMENT= SLATEC Common Mathematical Library
USE_LDCONFIG= yes
-USE_FORTRAN= yes
+USES= fortran
WRKSRC= ${WRKDIR}/src
SHLIB_MAJOR= 1
Index: math/suitesparse/Makefile
===================================================================
--- math/suitesparse/Makefile (revision 338282)
+++ math/suitesparse/Makefile (working copy)
@@ -14,7 +14,7 @@ COMMENT= SuiteSparse is a set of package
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
Index: math/superlu/Makefile
===================================================================
--- math/superlu/Makefile (revision 338282)
+++ math/superlu/Makefile (working copy)
@@ -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/atl
BLAS= -lptf77blas
.endif
-USE_FORTRAN= yes
USE_LDCONFIG= yes
P_VERSION= 3.0
Index: math/superlu_mt/Makefile
===================================================================
--- math/superlu_mt/Makefile (revision 338282)
+++ math/superlu_mt/Makefile (working copy)
@@ -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}+ ' \
Property changes on: math/superlu_mt/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: math/superlu_mt/files/patch-make.inc
===================================================================
--- math/superlu_mt/files/patch-make.inc (revision 338282)
+++ math/superlu_mt/files/patch-make.inc (working copy)
@@ -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
Property changes on: math/superlu_mt/files/patch-make.inc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: math/taucs/Makefile
===================================================================
--- math/taucs/Makefile (revision 338282)
+++ math/taucs/Makefile (working copy)
@@ -16,7 +16,7 @@ COMMENT= C library of sparse linear solv
LIB_DEPENDS= metis.1:${PORTSDIR}/math/metis4
HAS_CONFIGURE= yes
-USE_FORTRAN= yes
+USES= fortran
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: math/trlan/Makefile
===================================================================
--- math/trlan/Makefile (revision 338282)
+++ math/trlan/Makefile (working copy)
@@ -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
Index: math/x12arima/Makefile
===================================================================
--- math/x12arima/Makefile (revision 338282)
+++ math/x12arima/Makefile (working copy)
@@ -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
Index: net/mpich2/Makefile
===================================================================
--- net/mpich2/Makefile (revision 338282)
+++ net/mpich2/Makefile (working copy)
@@ -22,8 +22,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/deve
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
GNU_CONFIGURE= yes
-USE_FORTRAN= yes
-USES= pkgconfig perl5
+USES= fortran pkgconfig perl5
USE_LDCONFIG= yes
USE_PERL5= build
USE_PYTHON= yes
Index: net/openmpi/Makefile
===================================================================
--- net/openmpi/Makefile (revision 338282)
+++ net/openmpi/Makefile (working copy)
@@ -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}
Index: net/openmpi-devel/Makefile
===================================================================
--- net/openmpi-devel/Makefile (revision 338282)
+++ net/openmpi-devel/Makefile (working copy)
@@ -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}
Index: science/2dhf/Makefile
===================================================================
--- science/2dhf/Makefile (revision 338282)
+++ science/2dhf/Makefile (working copy)
@@ -14,8 +14,10 @@ COMMENT= A Numerical Hartree-Fock Progra
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/
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")
Index: science/abinit/Makefile
===================================================================
--- science/abinit/Makefile (revision 338282)
+++ science/abinit/Makefile (working copy)
@@ -15,8 +15,7 @@ BUILD_DEPENDS= python:${PORTSDIR}/lang/p
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
Index: science/cdf/Makefile
===================================================================
--- science/cdf/Makefile (revision 338282)
+++ science/cdf/Makefile (working copy)
@@ -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
Index: science/cgnslib/Makefile
===================================================================
--- science/cgnslib/Makefile (revision 338282)
+++ science/cgnslib/Makefile (working copy)
@@ -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
Index: science/dcl/Makefile
===================================================================
--- science/dcl/Makefile (revision 338282)
+++ science/dcl/Makefile (working copy)
@@ -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
Index: science/dlpoly-classic/Makefile
===================================================================
--- science/dlpoly-classic/Makefile (revision 338282)
+++ science/dlpoly-classic/Makefile (working copy)
@@ -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
Index: science/elmer-eio/Makefile
===================================================================
--- science/elmer-eio/Makefile (revision 338282)
+++ science/elmer-eio/Makefile (working copy)
@@ -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=
Index: science/elmer-hutiter/Makefile
===================================================================
--- science/elmer-hutiter/Makefile (revision 338282)
+++ science/elmer-hutiter/Makefile (working copy)
@@ -14,7 +14,7 @@ COMMENT= HUTIter library for use in the
LIB_DEPENDS= arpack.1:${PORTSDIR}/math/arpack
-USE_FORTRAN= yes
+USES= fortran
NO_STAGE= yes
.include <bsd.port.pre.mk>
Index: science/fvcom/Makefile
===================================================================
--- science/fvcom/Makefile (revision 338282)
+++ science/fvcom/Makefile (working copy)
@@ -17,7 +17,7 @@ LIB_DEPENDS+= netcdff:${PORTSDIR}/scienc
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}
Index: science/gamess/Makefile
===================================================================
--- science/gamess/Makefile (revision 338282)
+++ science/gamess/Makefile (working copy)
@@ -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})
Index: science/getdp/Makefile
===================================================================
--- science/getdp/Makefile (revision 338282)
+++ science/getdp/Makefile (working copy)
@@ -15,8 +15,7 @@ COMMENT= A rather general finite element
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.
Index: science/ghemical/Makefile
===================================================================
--- science/ghemical/Makefile (revision 338282)
+++ science/ghemical/Makefile (working copy)
@@ -21,9 +21,7 @@ LIB_DEPENDS= mpqc:${PORTSDIR}/science/mp
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
Index: science/harminv/Makefile
===================================================================
--- science/harminv/Makefile (revision 338282)
+++ science/harminv/Makefile (working copy)
@@ -10,9 +10,8 @@ MASTER_SITES= http://ab-initio.mit.edu/h
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
Index: science/hdf5/Makefile
===================================================================
--- science/hdf5/Makefile (revision 338282)
+++ science/hdf5/Makefile (working copy)
@@ -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=""
Index: science/hdf5-18/Makefile
===================================================================
--- science/hdf5-18/Makefile (revision 338282)
+++ science/hdf5-18/Makefile (working copy)
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--disable-production --e
.endif
.if ${PORT_OPTIONS:MFORTRAN}
-USE_FORTRAN= yes
+USES+= fortran
CONFIGURE_ARGS+=--enable-fortran
CONFIGURE_ENV+= F9X=${FC}
PLIST_SUB+= FORTRAN=""
Index: science/libctl/Makefile
===================================================================
--- science/libctl/Makefile (revision 338282)
+++ science/libctl/Makefile (working copy)
@@ -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
Index: science/libghemical/Makefile
===================================================================
--- science/libghemical/Makefile (revision 338282)
+++ science/libghemical/Makefile (working copy)
@@ -17,13 +17,11 @@ BUILD_DEPENDS= obabel:${PORTSDIR}/scienc
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
PLIST_SUB= LIBGHEMICAL_VERSION="${PORTVERSION}"
Index: science/mbdyn/Makefile
===================================================================
--- science/mbdyn/Makefile (revision 338282)
+++ science/mbdyn/Makefile (working copy)
@@ -16,8 +16,7 @@ LIB_DEPENDS= arpack:${PORTSDIR}/math/arp
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
Index: science/meep/Makefile
===================================================================
--- science/meep/Makefile (revision 338282)
+++ science/meep/Makefile (working copy)
@@ -19,11 +19,9 @@ LIB_DEPENDS+= guile.21:${PORTSDIR}/lang/
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
Index: science/mpqc/Makefile
===================================================================
--- science/mpqc/Makefile (revision 338282)
+++ science/mpqc/Makefile (working copy)
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= maho@FreeBSD.org
COMMENT= The massively parallel quantum computing library and program
-USES= perl5 gmake
+USES= fortran gmake perl5
USE_BZIP2= yes
USE_LDCONFIG= yes
@@ -47,7 +47,6 @@ LIB_DEPENDS+= execinfo.1:${PORTSDIR}/dev
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf
-USE_FORTRAN= yes
.if defined(WITH_ICC)
CC= ${LOCALBASE}/intel_cc_80/bin/icc
Index: science/ncs/Makefile
===================================================================
--- science/ncs/Makefile (revision 338282)
+++ science/ncs/Makefile (working copy)
@@ -24,8 +24,7 @@ RUN_DEPENDS= xmgrace:${PORTSDIR}/math/gr
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=${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\\``/../../../
Index: science/netcdf/Makefile
===================================================================
--- science/netcdf/Makefile (revision 338282)
+++ science/netcdf/Makefile (working copy)
@@ -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.*
Index: science/netcdf4/Makefile
===================================================================
--- science/netcdf4/Makefile (revision 338282)
+++ science/netcdf4/Makefile (working copy)
@@ -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.*
Index: science/pnetcdf/Makefile
===================================================================
--- science/pnetcdf/Makefile (revision 338282)
+++ science/pnetcdf/Makefile (working copy)
@@ -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
Index: science/psi3/Makefile
===================================================================
--- science/psi3/Makefile (revision 338282)
+++ science/psi3/Makefile (working copy)
@@ -45,8 +45,7 @@ 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} \
Index: science/py-obspy/Makefile
===================================================================
--- science/py-obspy/Makefile (revision 338282)
+++ science/py-obspy/Makefile (working copy)
@@ -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
Index: science/py-scikit-learn/Makefile
===================================================================
--- science/py-scikit-learn/Makefile (revision 338282)
+++ science/py-scikit-learn/Makefile (working copy)
@@ -16,7 +16,7 @@ LIB_DEPENDS= libcblas.so:${PORTSDIR}/mat
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
Index: science/py-scipy/Makefile
===================================================================
--- science/py-scipy/Makefile (revision 338282)
+++ science/py-scipy/Makefile (working copy)
@@ -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
Index: science/v_sim/Makefile
===================================================================
--- science/v_sim/Makefile (revision 338282)
+++ science/v_sim/Makefile (working copy)
@@ -17,9 +17,8 @@ LICENSE_PERMS= dist-mirror dist-sell pkg
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
--- fortran.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312311732.rBVHWauA090886>