From 2f8d992377c78289531edd7802f73556d4b4aaa8 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 12 Jan 2005 15:31:58 +0000 Subject: Nuke USE_FORTRAN and bring the f2c handling within the mk/compiler framework. The list of changes include: * Modify compiler.mk so that "c" is always prepended to USE_LANGUAGES, so we no longer need to say it in package Makefiles. Packages should now append to USE_LANGUAGES instead of setting it. * Create mk/compiler/f2c.mk which implements another pseudo-compiler "f2c" that may be used with any C compiler backend, e.g. PKGSRC_COMPILER= f2c ccache gcc * Teach the various "real" compiler files, e.g., sunpro.mk, mipspro.mk, etc., to use f2c if the native Fortran compiler isn't present. Packages that use Fortran should now simply include the line: USE_LANGUAGES+= fortran in the package Makefile. --- math/R/Makefile | 3 +-- math/algae/Makefile | 4 ++-- math/blas/Makefile | 4 ++-- math/dcdflib.f/Makefile | 4 ++-- math/dfftpack/Makefile | 6 +++--- math/eispack/Makefile | 6 +++--- math/fftpack/Makefile | 6 +++--- math/fftw/Makefile | 4 ++-- math/fftw2/Makefile | 6 +++--- math/grace/Makefile | 4 ++-- math/lapack/Makefile | 4 ++-- math/linpack/Makefile | 4 ++-- math/minpack/Makefile | 6 +++--- math/octave-current/Makefile | 4 ++-- math/octave/Makefile | 4 ++-- math/odepack/Makefile | 6 +++--- math/quadpack/Makefile | 6 +++--- math/scilab/Makefile | 4 ++-- math/slatec/Makefile | 4 ++-- math/tela/Makefile | 6 +++--- math/xmgr/Makefile | 6 +++--- 21 files changed, 50 insertions(+), 51 deletions(-) (limited to 'math') diff --git a/math/R/Makefile b/math/R/Makefile index b8fbefd57e4..7e138423f49 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2004/11/18 12:31:29 markd Exp $ +# $NetBSD: Makefile,v 1.60 2005/01/12 15:32:00 jlam Exp $ DISTNAME= R-2.0.1 CATEGORIES= math @@ -51,7 +51,6 @@ CONFIGURE_ENV+= ac_cv_lib_blas_dgemm_=yes # Pass the Fortran compiler to the configure script in case it's overridden # by the package builder. # -USE_FORTRAN= # defined USE_LANGUAGES= c fortran # Package assumes it can append to files (specifically DESCRIPTION) that have diff --git a/math/algae/Makefile b/math/algae/Makefile index dd53da3610e..f1d2f4502e9 100644 --- a/math/algae/Makefile +++ b/math/algae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/10/03 00:12:55 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/01/12 15:32:00 jlam Exp $ DISTNAME= algae-4.1.3 PKGREVISION= 2 @@ -12,7 +12,7 @@ COMMENT= Interpreted language for numerical analysis DEPENDS+= gnuplot>=3.5:../../graphics/gnuplot GNU_CONFIGURE= # defined -USE_FORTRAN= # defined +USE_LANGUAGES= fortran USE_BUILDLINK3= yes USE_GNU_READLINE= # uses history_truncate_file diff --git a/math/blas/Makefile b/math/blas/Makefile index e720b65fc10..d7a748c83ce 100644 --- a/math/blas/Makefile +++ b/math/blas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/10/03 00:12:55 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/01/12 15:32:00 jlam Exp $ # DISTNAME= blas @@ -17,8 +17,8 @@ COMMENT= Basic Linear Algebra Subprograms (Fortran) PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} +USE_LANGUAGES= fortran USE_BUILDLINK3= YES -USE_FORTRAN= YES USE_LIBTOOL= YES INSTALLATION_DIRS= lib diff --git a/math/dcdflib.f/Makefile b/math/dcdflib.f/Makefile index 41174753231..37aa94ada91 100644 --- a/math/dcdflib.f/Makefile +++ b/math/dcdflib.f/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/10/03 00:12:55 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/01/12 15:32:00 jlam Exp $ DISTNAME= dcdflib.f-1.1 PKGREVISION= 1 @@ -10,7 +10,7 @@ HOMEPAGE= http://odin.mdacc.tmc.edu/anonftp/ COMMENT= Library of Fortran Routines for Cumulative Distribution Functions WRKSRC= ${WRKDIR}/dcdflib.f/src -USE_FORTRAN= yes +USE_LANGUAGES= fortran post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dcdflib.f diff --git a/math/dfftpack/Makefile b/math/dfftpack/Makefile index 29f2d280a3f..10a1775eda1 100644 --- a/math/dfftpack/Makefile +++ b/math/dfftpack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2004/10/03 00:12:55 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/01/12 15:32:00 jlam Exp $ DISTNAME= dfftpack-20001209 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Double precision version of FFTPACK NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_FORTRAN= YES +USE_LANGUAGES= fortran WRKSRC= ${WRKDIR}/dfftpack post-extract: diff --git a/math/eispack/Makefile b/math/eispack/Makefile index 015bf81fcb1..5a2d2246256 100644 --- a/math/eispack/Makefile +++ b/math/eispack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2004/10/03 00:12:55 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/01/12 15:32:00 jlam Exp $ DISTNAME= eispack-20001130 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Fortran routines for the solution of eigenvalue problems NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_FORTRAN= YES +USE_LANGUAGES= fortran WRKSRC= ${WRKDIR}/eispack pre-build: diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile index 50a7027135c..45f05a4fa74 100644 --- a/math/fftpack/Makefile +++ b/math/fftpack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2004/10/03 00:12:56 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/01/12 15:32:00 jlam Exp $ DISTNAME= fftpack-20001130 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Single precision Fortran FFT subroutines NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_FORTRAN= YES +USE_LANGUAGES= fortran WRKSRC= ${WRKDIR}/fftpack post-extract: diff --git a/math/fftw/Makefile b/math/fftw/Makefile index af06dd37650..0ff2f5f9519 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/10/03 00:12:56 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/01/12 15:32:01 jlam Exp $ .if (${MACHINE_ARCH} == "powerpc") DISTNAME= fftw-3.0.1-fma @@ -19,7 +19,7 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= fftw.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared -USE_FORTRAN= yes +USE_LANGUAGES= fortran USE_GNU_TOOLS+= make INFO_FILES= fftw3.info diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile index 942c8ac13e7..5e1371b6fa9 100644 --- a/math/fftw2/Makefile +++ b/math/fftw2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2004/10/03 00:12:56 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/01/12 15:32:01 jlam Exp $ DISTNAME= fftw-2.1.5 PKGNAME= fftw2-2.1.5 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ http://www.fftw.org/ @@ -19,7 +19,7 @@ CONFIGURE_ARGS= --enable-shared CONFIGURE_ARGS+= --enable-i386-hacks .endif USE_BUILDLINK3= yes -USE_FORTRAN= yes +USE_LANGUAGES= fortran USE_GNU_TOOLS+= make USE_MAKEINFO= yes INFO_FILES= fftw.info diff --git a/math/grace/Makefile b/math/grace/Makefile index bc590bfb462..fa3ad5390f9 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/12/28 23:18:17 reed Exp $ +# $NetBSD: Makefile,v 1.34 2005/01/12 15:32:01 jlam Exp $ # DISTNAME= grace-5.1.14 @@ -19,7 +19,7 @@ COMMENT= GRaphing, Advanced Computation and Exploration of data USE_BUILDLINK3= YES USE_X11BASE= YES USE_GNU_TOOLS+= make -USE_FORTRAN= YES +USE_LANGUAGES= fortran GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-grace-home=${PREFIX}/grace CONFIGURE_ARGS+= --without-bundled-xbae diff --git a/math/lapack/Makefile b/math/lapack/Makefile index d12ed79e86f..985b6c62b11 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/01/03 15:33:55 wennmach Exp $ +# $NetBSD: Makefile,v 1.19 2005/01/12 15:32:01 jlam Exp $ # DISTNAME= lapack @@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/LAPACK DIST_SUBDIR= lapack-20010201 USE_BUILDLINK3= YES -USE_FORTRAN= YES +USE_LANGUAGES= fortran USE_LIBTOOL= YES BUILD_TARGET= lapacklib diff --git a/math/linpack/Makefile b/math/linpack/Makefile index c998bb22775..63c87e15184 100644 --- a/math/linpack/Makefile +++ b/math/linpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/10/03 00:12:56 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/01/12 15:32:01 jlam Exp $ DISTNAME= linpack-20010510 PKGREVISION= 1 @@ -11,7 +11,7 @@ COMMENT= Library of linear algebra Fortran routines DEPENDS+= blas-[0-9]*:../../math/blas NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_FORTRAN= yes +USE_LANGUAGES= fortran WRKSRC= ${WRKDIR}/linpack .include "../../mk/bsd.pkg.mk" diff --git a/math/minpack/Makefile b/math/minpack/Makefile index 4736b86c15e..51d37bb1f3a 100644 --- a/math/minpack/Makefile +++ b/math/minpack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2004/10/03 00:12:56 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/01/12 15:32:01 jlam Exp $ DISTNAME= minpack-20001130 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= FORTRAN 77 library for the solution of nonlinear equations NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_FORTRAN= YES +USE_LANGUAGES= fortran WRKSRC= ${WRKDIR}/minpack pre-build: diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 7f463bbc0bd..383e4999cac 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2004/12/05 11:17:54 adam Exp $ +# $NetBSD: Makefile,v 1.39 2005/01/12 15:32:01 jlam Exp $ DISTNAME= octave-${OCTAVE_VER} PKGNAME= octave-current-${OCTAVE_VER} @@ -25,7 +25,7 @@ BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3) .endif USE_BUILDLINK3= yes -USE_FORTRAN= yes +USE_LANGUAGES= fortran USE_GNU_TOOLS+= make USE_GNU_READLINE= yes USE_MAKEINFO= yes diff --git a/math/octave/Makefile b/math/octave/Makefile index 2bde2c665e1..e41f43ed8cb 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/10/03 00:12:57 tv Exp $ +# $NetBSD: Makefile,v 1.50 2005/01/12 15:32:01 jlam Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.17 @@ -23,7 +23,7 @@ CONFLICTS+= octave-2.1.* USE_BUILDLINK3= yes USE_X11= yes GNU_CONFIGURE= yes -USE_FORTRAN= yes +USE_LANGUAGES= fortran USE_LIBTOOL= yes USE_GNU_TOOLS+= make CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}" diff --git a/math/odepack/Makefile b/math/odepack/Makefile index 11441664d5f..1ad6ed0fd1c 100644 --- a/math/odepack/Makefile +++ b/math/odepack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2004/10/03 00:12:57 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/01/12 15:32:01 jlam Exp $ DISTNAME= odepack-20001130 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -11,7 +11,7 @@ COMMENT= Systematized Collection of ODE Solvers DEPENDS+= linpack>=20010427:../../math/linpack NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_FORTRAN= yes +USE_LANGUAGES= fortran WRKSRC= ${WRKDIR}/odepack pre-build: diff --git a/math/quadpack/Makefile b/math/quadpack/Makefile index a0a480f89fc..80e16d6309b 100644 --- a/math/quadpack/Makefile +++ b/math/quadpack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2004/10/03 00:12:57 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/01/12 15:32:01 jlam Exp $ DISTNAME= quadpack-20001130 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Fortran subroutines for the solution of definite univariate integrals NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_FORTRAN= YES +USE_LANGUAGES= fortran WRKSRC= ${WRKDIR}/quadpack pre-build: diff --git a/math/scilab/Makefile b/math/scilab/Makefile index dcb9db9fe85..6080d409fe5 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2004/12/24 17:21:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.59 2005/01/12 15:32:01 jlam Exp $ # DISTNAME= ${SCIBASE}.src @@ -19,7 +19,7 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha USE_BUILDLINK3= yes -USE_FORTRAN= yes +USE_LANGUAGES= fortran USE_X11BASE= yes USE_LIBTOOL= yes diff --git a/math/slatec/Makefile b/math/slatec/Makefile index cd77767369f..5786ff0c3cb 100644 --- a/math/slatec/Makefile +++ b/math/slatec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/10/03 00:12:57 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/01/12 15:32:01 jlam Exp $ # DISTNAME= slatec_src @@ -18,7 +18,7 @@ COMMENT= Library of mathematical and statistical Fortran 77 subroutines WRKSRC= ${WRKDIR}/src USE_BUILDLINK3= YES -USE_FORTRAN= YES +USE_LANGUAGES= fortran USE_LIBTOOL= YES post-extract: diff --git a/math/tela/Makefile b/math/tela/Makefile index 797dfe632cf..c896e09c263 100644 --- a/math/tela/Makefile +++ b/math/tela/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2004/10/03 00:12:57 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/01/12 15:32:01 jlam Exp $ DISTNAME= tela-1.34 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.funet.fi/pub/sci/math/tela/ \ ftp://sumppu.fmi.fi/pub/tela/ @@ -13,7 +13,7 @@ COMMENT= Tensor Language - a programming language for scientific computing DEPENDS+= plotmtv-[0-9]*:../../graphics/plotmtv GNU_CONFIGURE= # defined -USE_FORTRAN= # defined +USE_LANGUAGES= fortran USE_X11= # defined USE_BUILDLINK3= yes diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index a478d01da74..98e50c7254e 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2004/12/03 15:15:03 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/01/12 15:32:01 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp # DISTNAME= xmgr-4.1.2 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/xmgr4/src/ \ ftp://plasma-gate.weizmann.ac.il/pub/xmgr4/src/old/ \ @@ -20,7 +20,7 @@ BUILD_DEPENDS= bison-[0-9]*:../../devel/bison USE_BUILDLINK3= YES USE_X11BASE= YES -USE_FORTRAN= YES +USE_LANGUAGES= fortran GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-acegr-home="${PREFIX}" -- cgit v1.2.3