Date: Sun, 16 Feb 2014 17:15:32 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344614 - in head: Mk Mk/Uses benchmarks/himenobench benchmarks/hpl benchmarks/octave-forge-benchmark biology/crux biology/plink biology/plink/files cad/calculix cad/feappv cad/gmsh cad... Message-ID: <201402161715.s1GHFWCk044636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Feb 16 17:15:31 2014 New Revision: 344614 URL: http://svnweb.freebsd.org/changeset/ports/344614 QAT: https://qat.redports.org/buildarchive/r344614/ Log: 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) Added: head/cad/gmsh/files/patch-Fltk-Main.cpp (contents, props changed) head/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp (contents, props changed) head/math/lapack++/files/ head/math/lapack++/files/patch-configure (contents, props changed) head/math/lapack++/files/patch-src-genmd.cc (contents, props changed) head/science/netcdf4/files/ head/science/netcdf4/files/patch-cxx4-ncGroup.cpp (contents, props changed) head/science/psi3/files/patch-src-bin-clag-clag.cc (contents, props changed) head/science/psi3/files/patch-src-bin-geom-geom.cc (contents, props changed) head/science/psi3/files/patch-src-bin-nonbonded-nonbonded.cc (contents, props changed) head/science/psi3/files/patch-src-bin-transqt2-transqt.cc (contents, props changed) head/science/psi3/files/patch-src-lib-libbasis-combinate.cc (contents, props changed) head/science/psi3/files/patch-src-lib-libipv1-ip_read.cc (contents, props changed) head/science/psi3/files/patch-src-lib-libpsio-psio.hpp (contents, props changed) Modified: head/Mk/Uses/cran.mk head/Mk/Uses/fortran.mk head/Mk/bsd.gcc.mk head/Mk/bsd.octave.mk head/Mk/bsd.port.mk head/benchmarks/himenobench/Makefile head/benchmarks/hpl/Makefile head/benchmarks/octave-forge-benchmark/Makefile head/biology/crux/Makefile head/biology/plink/Makefile head/biology/plink/files/patch-Makefile head/cad/calculix/Makefile head/cad/feappv/Makefile head/cad/gmsh/Makefile head/cad/gmsh/pkg-plist head/cad/sceptre/Makefile head/cad/scotch/Makefile head/comms/wsjt/Makefile head/comms/wspr/Makefile head/french/aster/Makefile head/french/med/Makefile head/graphics/p5-PGPLOT/Makefile head/graphics/pfstools/Makefile head/graphics/pgplot/Makefile head/graphics/vigra/Makefile head/graphics/visionworkbench/Makefile head/graphics/xd3d/Makefile head/lang/ratfor/Makefile head/lang/ratfor/files/patch-Makefile head/math/R/Makefile head/math/arpack-ng/Makefile head/math/arpack/Makefile head/math/atlas-devel/Makefile head/math/atlas/Makefile head/math/bihar/Makefile head/math/blacs/Makefile head/math/blocksolve95/Makefile head/math/cantor/Makefile head/math/cblas/Makefile head/math/clp/Makefile head/math/dynare/Makefile head/math/eispack/Makefile head/math/elmer-umfpack/Makefile head/math/fflas-ffpack/Makefile head/math/gotoblas/Makefile head/math/gretl/Makefile head/math/jags/Makefile head/math/kktdirect/Makefile head/math/lapack++/Makefile head/math/lapack/Makefile head/math/lapack95/Makefile head/math/lapacke/Makefile head/math/levmar/Makefile head/math/libflame/Makefile head/math/libtsnnls/Makefile head/math/linpack/Makefile head/math/metis-edf/Makefile head/math/mumps/Makefile head/math/octave-forge-actuarial/Makefile head/math/octave-forge-ad/Makefile head/math/octave-forge-audio/Makefile head/math/octave-forge-base/Makefile head/math/octave-forge-bim/Makefile head/math/octave-forge-bioinfo/Makefile head/math/octave-forge-cgi/Makefile head/math/octave-forge-civil-engineering/Makefile head/math/octave-forge-communications/Makefile head/math/octave-forge-control/Makefile head/math/octave-forge-data-smoothing/Makefile head/math/octave-forge-database/Makefile head/math/octave-forge-dataframe/Makefile head/math/octave-forge-dicom/Makefile head/math/octave-forge-econometrics/Makefile head/math/octave-forge-engine/Makefile head/math/octave-forge-fenv/Makefile head/math/octave-forge-financial/Makefile head/math/octave-forge-fits/Makefile head/math/octave-forge-fl-core/Makefile head/math/octave-forge-fpl/Makefile head/math/octave-forge-fuzzy-logic-toolkit/Makefile head/math/octave-forge-ga/Makefile head/math/octave-forge-general/Makefile head/math/octave-forge-generate_html/Makefile head/math/octave-forge-geometry/Makefile head/math/octave-forge-gnuplot/Makefile head/math/octave-forge-gsl/Makefile head/math/octave-forge-ident/Makefile head/math/octave-forge-image/Makefile head/math/octave-forge-informationtheory/Makefile head/math/octave-forge-integration/Makefile head/math/octave-forge-io/Makefile head/math/octave-forge-irsa/Makefile head/math/octave-forge-linear-algebra/Makefile head/math/octave-forge-lssa/Makefile head/math/octave-forge-ltfat/Makefile head/math/octave-forge-mapping/Makefile head/math/octave-forge-mechanics/Makefile head/math/octave-forge-miscellaneous/Makefile head/math/octave-forge-missing-functions/Makefile head/math/octave-forge-msh/Makefile head/math/octave-forge-multicore/Makefile head/math/octave-forge-mvn/Makefile head/math/octave-forge-nan/Makefile head/math/octave-forge-ncarray/Makefile head/math/octave-forge-netcdf/Makefile head/math/octave-forge-nlwing2/Makefile head/math/octave-forge-nnet/Makefile head/math/octave-forge-nurbs/Makefile head/math/octave-forge-ocs/Makefile head/math/octave-forge-oct2mat/Makefile head/math/octave-forge-octcdf/Makefile head/math/octave-forge-octclip/Makefile head/math/octave-forge-octgpr/Makefile head/math/octave-forge-octproj/Makefile head/math/octave-forge-odebvp/Makefile head/math/octave-forge-odepkg/Makefile head/math/octave-forge-optim/Makefile head/math/octave-forge-optiminterp/Makefile head/math/octave-forge-outliers/Makefile head/math/octave-forge-parallel/Makefile head/math/octave-forge-pdb/Makefile head/math/octave-forge-plot/Makefile head/math/octave-forge-pt_br/Makefile head/math/octave-forge-quaternion/Makefile head/math/octave-forge-queueing/Makefile head/math/octave-forge-secs1d/Makefile head/math/octave-forge-secs2d/Makefile head/math/octave-forge-secs3d/Makefile head/math/octave-forge-signal/Makefile head/math/octave-forge-simp/Makefile head/math/octave-forge-sockets/Makefile head/math/octave-forge-specfun/Makefile head/math/octave-forge-special-matrix/Makefile head/math/octave-forge-spline-gcvspl/Makefile head/math/octave-forge-splines/Makefile head/math/octave-forge-statistics/Makefile head/math/octave-forge-strings/Makefile head/math/octave-forge-struct/Makefile head/math/octave-forge-symband/Makefile head/math/octave-forge-symbolic/Makefile head/math/octave-forge-tcl-octave/Makefile head/math/octave-forge-tsa/Makefile head/math/octave-forge-video/Makefile head/math/octave-forge-xraylib/Makefile head/math/octave-forge-zenity/Makefile head/math/openblas/Makefile head/math/parmetis/Makefile head/math/petsc/Makefile head/math/plplot/Makefile head/math/py-numpy/Makefile head/math/py-symeig/Makefile head/math/qd/Makefile head/math/qrupdate/Makefile head/math/sage/Makefile head/math/scalapack/Makefile head/math/sdpa/Makefile head/math/sdpara/Makefile head/math/slatec/Makefile head/math/suitesparse/Makefile head/math/superlu/Makefile head/math/superlu_mt/Makefile head/math/superlu_mt/files/patch-make.inc head/math/taucs/Makefile head/math/trlan/Makefile head/math/x12arima/Makefile head/net/mpich2/Makefile head/net/openmpi-devel/Makefile head/net/openmpi/Makefile head/science/2dhf/Makefile head/science/abinit/Makefile head/science/cdf/Makefile head/science/cgnslib/Makefile head/science/dcl/Makefile head/science/dlpoly-classic/Makefile head/science/elmer-eio/Makefile head/science/elmer-hutiter/Makefile head/science/fvcom/Makefile head/science/gamess/Makefile head/science/getdp/Makefile head/science/ghemical/Makefile head/science/harminv/Makefile head/science/hdf5-18/Makefile head/science/hdf5/Makefile head/science/libctl/Makefile head/science/libghemical/Makefile head/science/mbdyn/Makefile head/science/meep/Makefile head/science/mpqc/Makefile head/science/ncs/Makefile head/science/netcdf/Makefile head/science/netcdf4/Makefile head/science/pnetcdf/Makefile head/science/psi3/Makefile head/science/py-obspy/Makefile head/science/py-scikit-learn/Makefile head/science/py-scipy/Makefile head/science/v_sim/Makefile Modified: head/Mk/Uses/cran.mk ============================================================================== --- head/Mk/Uses/cran.mk Sun Feb 16 17:10:19 2014 (r344613) +++ head/Mk/Uses/cran.mk Sun Feb 16 17:15:31 2014 (r344614) @@ -30,7 +30,7 @@ MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE 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 Modified: head/Mk/Uses/fortran.mk ============================================================================== --- head/Mk/Uses/fortran.mk Sun Feb 16 17:10:19 2014 (r344613) +++ head/Mk/Uses/fortran.mk Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Sun Feb 16 17:10:19 2014 (r344613) +++ head/Mk/bsd.gcc.mk Sun Feb 16 17:15:31 2014 (r344614) @@ -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}" Modified: head/Mk/bsd.octave.mk ============================================================================== --- head/Mk/bsd.octave.mk Sun Feb 16 17:10:19 2014 (r344613) +++ head/Mk/bsd.octave.mk Sun Feb 16 17:15:31 2014 (r344614) @@ -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-//} Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Feb 16 17:10:19 2014 (r344613) +++ head/Mk/bsd.port.mk Sun Feb 16 17:15:31 2014 (r344614) @@ -1712,7 +1712,7 @@ EXTRACT_DEPENDS+= ${LOCALBASE}/bin/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 Modified: head/benchmarks/himenobench/Makefile ============================================================================== --- head/benchmarks/himenobench/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/benchmarks/himenobench/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/benchmarks/hpl/Makefile ============================================================================== --- head/benchmarks/hpl/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/benchmarks/hpl/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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} Modified: head/benchmarks/octave-forge-benchmark/Makefile ============================================================================== --- head/benchmarks/octave-forge-benchmark/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/benchmarks/octave-forge-benchmark/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -3,7 +3,7 @@ PORTNAME= octave-forge-benchmark PORTVERSION= 1.1.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= benchmarks math MAINTAINER= stephen@FreeBSD.org Modified: head/biology/crux/Makefile ============================================================================== --- head/biology/crux/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/biology/crux/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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= 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: er post-install: @${PREFIX}/bin/crux -b -q /dev/null -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/biology/plink/Makefile ============================================================================== --- head/biology/plink/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/biology/plink/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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> Modified: head/biology/plink/files/patch-Makefile ============================================================================== --- head/biology/plink/files/patch-Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/biology/plink/files/patch-Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 # -------------------------------------------------------------------- Modified: head/cad/calculix/Makefile ============================================================================== --- head/cad/calculix/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/cad/calculix/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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> Modified: head/cad/feappv/Makefile ============================================================================== --- head/cad/feappv/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/cad/feappv/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/cad/gmsh/Makefile ============================================================================== --- head/cad/gmsh/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/cad/gmsh/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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}-${PORTVER SLAVEDIRS= cad/gmsh-occ -USE_FORTRAN= yes -USES= cmake -USE_GMAKE= yes +USES= cmake fortran gmake USE_GL= yes ALL_TARGET= all Added: head/cad/gmsh/files/patch-Fltk-Main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/gmsh/files/patch-Fltk-Main.cpp Sun Feb 16 17:15:31 2014 (r344614) @@ -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" Added: head/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp Sun Feb 16 17:15:31 2014 (r344614) @@ -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); Modified: head/cad/gmsh/pkg-plist ============================================================================== --- head/cad/gmsh/pkg-plist Sun Feb 16 17:10:19 2014 (r344613) +++ head/cad/gmsh/pkg-plist Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/cad/sceptre/Makefile ============================================================================== --- head/cad/sceptre/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/cad/sceptre/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -12,7 +12,7 @@ COMMENT= General-purpose circuit analysi LICENSE= GPLv2 -USE_FORTRAN= yes +USES= fortran MAKE_JOBS_UNSAFE= yes NO_WRKSUBDIR= yes Modified: head/cad/scotch/Makefile ============================================================================== --- head/cad/scotch/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/cad/scotch/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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_/_/} Modified: head/comms/wsjt/Makefile ============================================================================== --- head/comms/wsjt/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/comms/wsjt/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 \ Modified: head/comms/wspr/Makefile ============================================================================== --- head/comms/wspr/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/comms/wspr/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 \ Modified: head/french/aster/Makefile ============================================================================== --- head/french/aster/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/french/aster/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -43,7 +43,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnupl 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/mp HOME_MPI= ${LOCALBASE} .endif -USE_FORTRAN= yes -GCC_VER= `${CC} -dumpversion` - .if defined(WITH_ZSH) SHIA= zsh .elif defined(WITH_BASH) Modified: head/french/med/Makefile ============================================================================== --- head/french/med/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/french/med/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/graphics/p5-PGPLOT/Makefile ============================================================================== --- head/graphics/p5-PGPLOT/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/graphics/p5-PGPLOT/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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: Modified: head/graphics/pfstools/Makefile ============================================================================== --- head/graphics/pfstools/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/graphics/pfstools/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/graphics/pgplot/Makefile ============================================================================== --- head/graphics/pgplot/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/graphics/pgplot/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/graphics/vigra/Makefile ============================================================================== --- head/graphics/vigra/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/graphics/vigra/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/graphics/visionworkbench/Makefile ============================================================================== --- head/graphics/visionworkbench/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/graphics/visionworkbench/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/graphics/xd3d/Makefile ============================================================================== --- head/graphics/xd3d/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/graphics/xd3d/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/lang/ratfor/Makefile ============================================================================== --- head/lang/ratfor/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/lang/ratfor/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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: Modified: head/lang/ratfor/files/patch-Makefile ============================================================================== --- head/lang/ratfor/files/patch-Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/lang/ratfor/files/patch-Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/R/Makefile ============================================================================== --- head/math/R/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/R/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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> Modified: head/math/arpack-ng/Makefile ============================================================================== --- head/math/arpack-ng/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/arpack-ng/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -13,7 +13,7 @@ COMMENT= Revised Argand library for solv LICENSE= BSD -USE_FORTRAN= yes +USES= fortran USE_LDCONFIG= yes CONFLICTS= arpack-[0-9]* Modified: head/math/arpack/Makefile ============================================================================== --- head/math/arpack/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/arpack/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -16,11 +16,14 @@ EXTRACT_ONLY= ${PORTNAME}${PORTVERSION}. 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: Modified: head/math/atlas-devel/Makefile ============================================================================== --- head/math/atlas-devel/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/atlas-devel/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/atlas/Makefile ============================================================================== --- head/math/atlas/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/atlas/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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. Modified: head/math/bihar/Makefile ============================================================================== --- head/math/bihar/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/bihar/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/blacs/Makefile ============================================================================== --- head/math/blacs/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/blacs/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/blocksolve95/Makefile ============================================================================== --- head/math/blocksolve95/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/blocksolve95/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/cantor/Makefile ============================================================================== --- head/math/cantor/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/cantor/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/cblas/Makefile ============================================================================== --- head/math/cblas/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/cblas/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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]* Modified: head/math/clp/Makefile ============================================================================== --- head/math/clp/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/clp/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/dynare/Makefile ============================================================================== --- head/math/dynare/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/dynare/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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.co 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} "" Modified: head/math/eispack/Makefile ============================================================================== --- head/math/eispack/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/eispack/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/elmer-umfpack/Makefile ============================================================================== --- head/math/elmer-umfpack/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/elmer-umfpack/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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= Modified: head/math/fflas-ffpack/Makefile ============================================================================== --- head/math/fflas-ffpack/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/fflas-ffpack/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/gotoblas/Makefile ============================================================================== --- head/math/gotoblas/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/gotoblas/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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/|} Modified: head/math/gretl/Makefile ============================================================================== --- head/math/gretl/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/gretl/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/jags/Makefile ============================================================================== --- head/math/jags/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/jags/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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} Modified: head/math/kktdirect/Makefile ============================================================================== --- head/math/kktdirect/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/kktdirect/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/lapack++/Makefile ============================================================================== --- head/math/lapack++/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/lapack++/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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_SUF 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/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 Added: head/math/lapack++/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/lapack++/files/patch-configure Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Added: head/math/lapack++/files/patch-src-genmd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/lapack++/files/patch-src-genmd.cc Sun Feb 16 17:15:31 2014 (r344614) @@ -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, Modified: head/math/lapack/Makefile ============================================================================== --- head/math/lapack/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/lapack/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/lapack95/Makefile ============================================================================== --- head/math/lapack95/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/lapack95/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -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 Modified: head/math/lapacke/Makefile ============================================================================== --- head/math/lapacke/Makefile Sun Feb 16 17:10:19 2014 (r344613) +++ head/math/lapacke/Makefile Sun Feb 16 17:15:31 2014 (r344614) @@ -18,7 +18,7 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE USE_LDCONFIG= yes -USE_FORTRAN= yes *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402161715.s1GHFWCk044636>