pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Nuke USE_FORTRAN and bring the f2c handling within the...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0519035f0b09
branches:  trunk
changeset: 487302:0519035f0b09
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 12 15:31:58 2005 +0000

description:
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.

diffstat:

 benchmarks/benchfft/Makefile |   4 +-
 cad/tnt-mmtl/Makefile        |   3 +-
 devel/hdf/Makefile           |   4 +-
 devel/netcdf/Makefile        |   3 +-
 doc/CHANGES                  |   4 +-
 graphics/plplot/Makefile     |   4 +-
 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 +-
 misc/molden/Makefile         |   4 +-
 mk/bsd.pkg.mk                |  40 ++++--------------
 mk/compiler.mk               |  23 +++++++---
 mk/compiler/ccc.mk           |  12 +++++-
 mk/compiler/f2c.mk           |  93 ++++++++++++++++++++++++++++++++++++++++++++
 mk/compiler/gcc.mk           |  19 ++++++++-
 mk/compiler/mipspro.mk       |  12 +++++-
 mk/compiler/sunpro.mk        |  12 +++++-
 mk/compiler/xlc.mk           |  12 +++++-
 parallel/mpi-ch/Makefile     |   6 +-
 parallel/pvm3/Makefile       |   4 +-
 38 files changed, 247 insertions(+), 113 deletions(-)

diffs (truncated from 944 to 300 lines):

diff -r 83576fb83c96 -r 0519035f0b09 benchmarks/benchfft/Makefile
--- a/benchmarks/benchfft/Makefile      Wed Jan 12 15:31:11 2005 +0000
+++ b/benchmarks/benchfft/Makefile      Wed Jan 12 15:31:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/11/01 15:07:51 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/01/12 15:31:58 jlam Exp $
 
 DISTNAME=              benchfft-2.0
 PKGREVISION=   1
@@ -16,7 +16,7 @@
 GNU_CONFIGURE=         yes
 USE_BUILDLINK3=                yes
 USE_GNU_TOOLS+=                make
-USE_FORTRAN=           yes
+USE_LANGUAGES=         fortran
 USE_LIBTOOL=           yes
 
 LTCONFIG_OVERRIDE=     ${WRKDIR}/fftw-2.0.1/ltconfig
diff -r 83576fb83c96 -r 0519035f0b09 cad/tnt-mmtl/Makefile
--- a/cad/tnt-mmtl/Makefile     Wed Jan 12 15:31:11 2005 +0000
+++ b/cad/tnt-mmtl/Makefile     Wed Jan 12 15:31:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:13 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/12 15:31:58 jlam Exp $
 #
 
 DISTNAME=      tnt-1.2.2
@@ -20,7 +20,6 @@
 USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 USE_LANGUAGES= c c++ fortran
-USE_FORTRAN=   YES
 
 post-patch:
        ${MV} ${WRKSRC}/tnt ${WRKSRC}/tnt-mmtl
diff -r 83576fb83c96 -r 0519035f0b09 devel/hdf/Makefile
--- a/devel/hdf/Makefile        Wed Jan 12 15:31:11 2005 +0000
+++ b/devel/hdf/Makefile        Wed Jan 12 15:31:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:28 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/01/12 15:31:59 jlam Exp $
 
 DISTNAME=              HDF4.2r0
 PKGNAME=               hdf-4.2r0
@@ -10,7 +10,7 @@
 HOMEPAGE=              http://hdf.ncsa.uiuc.edu/hdf4.html
 COMMENT=               NCSA Hierarchical Data Format
 
-USE_FORTRAN=           # defined
+USE_LANGUAGES=         fortran
 USE_BUILDLINK3=                yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-szlib
diff -r 83576fb83c96 -r 0519035f0b09 devel/netcdf/Makefile
--- a/devel/netcdf/Makefile     Wed Jan 12 15:31:11 2005 +0000
+++ b/devel/netcdf/Makefile     Wed Jan 12 15:31:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/11/10 09:33:18 markd Exp $
+# $NetBSD: Makefile,v 1.21 2005/01/12 15:32:00 jlam Exp $
 
 DISTNAME=      netcdf-3.5.0
 PKGREVISION=   2
@@ -12,7 +12,6 @@
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK3=                yes
-USE_FORTRAN=           # defined
 USE_LANGUAGES=         c c++ fortran
 USE_LIBTOOL=           # defined
 GNU_CONFIGURE=         # defined
diff -r 83576fb83c96 -r 0519035f0b09 doc/CHANGES
--- a/doc/CHANGES       Wed Jan 12 15:31:11 2005 +0000
+++ b/doc/CHANGES       Wed Jan 12 15:31:58 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8717 2005/01/12 14:04:44 xtraeme Exp $
+$NetBSD: CHANGES,v 1.8718 2005/01/12 15:31:59 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -263,3 +263,5 @@
        Added pbzip2-0.8.3 [wiz 2005-01-12]
        Added ladspa-1.12 [xtraeme 2005-01-12]
        Added terminatorx-3.82 [xtraeme 2005-01-12]
+       bsd.pkg.mk: deprecate USE_FORTRAN in favor of USE_LANGUAGES+=fortran
+               [jlam 2005-01-12]
diff -r 83576fb83c96 -r 0519035f0b09 graphics/plplot/Makefile
--- a/graphics/plplot/Makefile  Wed Jan 12 15:31:11 2005 +0000
+++ b/graphics/plplot/Makefile  Wed Jan 12 15:31:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/10/15 11:54:11 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/01/12 15:32:00 jlam Exp $
 
 DISTNAME=              plplot-5.2.1
 PKGREVISION=           3
@@ -12,7 +12,7 @@
 USE_BUILDLINK3=                yes
 GNU_CONFIGURE=         # defined
 USE_GNU_TOOLS+=                m4 make
-USE_FORTRAN=           # defined
+USE_LANGUAGES=         fortran
 USE_X11=               # defined
 USE_PERL5=             build
 USE_LIBTOOL=           # defined
diff -r 83576fb83c96 -r 0519035f0b09 math/R/Makefile
--- a/math/R/Makefile   Wed Jan 12 15:31:11 2005 +0000
+++ b/math/R/Makefile   Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 # 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 -r 83576fb83c96 -r 0519035f0b09 math/algae/Makefile
--- a/math/algae/Makefile       Wed Jan 12 15:31:11 2005 +0000
+++ b/math/algae/Makefile       Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 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 -r 83576fb83c96 -r 0519035f0b09 math/blas/Makefile
--- a/math/blas/Makefile        Wed Jan 12 15:31:11 2005 +0000
+++ b/math/blas/Makefile        Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 WRKSRC=                        ${WRKDIR}
+USE_LANGUAGES=         fortran
 USE_BUILDLINK3=                YES
-USE_FORTRAN=           YES
 USE_LIBTOOL=           YES
 
 INSTALLATION_DIRS=     lib
diff -r 83576fb83c96 -r 0519035f0b09 math/dcdflib.f/Makefile
--- a/math/dcdflib.f/Makefile   Wed Jan 12 15:31:11 2005 +0000
+++ b/math/dcdflib.f/Makefile   Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 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 -r 83576fb83c96 -r 0519035f0b09 math/dfftpack/Makefile
--- a/math/dfftpack/Makefile    Wed Jan 12 15:31:11 2005 +0000
+++ b/math/dfftpack/Makefile    Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 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 -r 83576fb83c96 -r 0519035f0b09 math/eispack/Makefile
--- a/math/eispack/Makefile     Wed Jan 12 15:31:11 2005 +0000
+++ b/math/eispack/Makefile     Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 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 -r 83576fb83c96 -r 0519035f0b09 math/fftpack/Makefile
--- a/math/fftpack/Makefile     Wed Jan 12 15:31:11 2005 +0000
+++ b/math/fftpack/Makefile     Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 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 -r 83576fb83c96 -r 0519035f0b09 math/fftw/Makefile
--- a/math/fftw/Makefile        Wed Jan 12 15:31:11 2005 +0000
+++ b/math/fftw/Makefile        Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 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 -r 83576fb83c96 -r 0519035f0b09 math/fftw2/Makefile
--- a/math/fftw2/Makefile       Wed Jan 12 15:31:11 2005 +0000
+++ b/math/fftw2/Makefile       Wed Jan 12 15:31:58 2005 +0000
@@ -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-i386-hacks
 .endif
 USE_BUILDLINK3=                yes
-USE_FORTRAN=           yes
+USE_LANGUAGES=         fortran
 USE_GNU_TOOLS+=                make
 USE_MAKEINFO=          yes
 INFO_FILES=            fftw.info
diff -r 83576fb83c96 -r 0519035f0b09 math/grace/Makefile
--- a/math/grace/Makefile       Wed Jan 12 15:31:11 2005 +0000
+++ b/math/grace/Makefile       Wed Jan 12 15:31:58 2005 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index