From 8b92a2cd89cb16d454c1cffa85a1c2d46f72c86a Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Wed, 17 Jun 2009 19:29:52 +0000 Subject: - Ensure Fortran shim is not built if USE_FORTRAN is not set. - Split Fortran option into slave ports fftw3-fortran long-fortran float-fortran - Have to bump PORTREVISION for package builds etc.. - Fix silly spelling mistakes "Percision" -> "Precision" noted. Reviewed by: itetcu (portmgr) Approved by: ahze (Maintainer) --- math/fftw3/Makefile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'math/fftw3') diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 16017e042a85..70f5c37db159 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -7,7 +7,7 @@ PORTNAME= fftw3 PORTVERSION= 3.2.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.fftw.org/pub/fftw/old/ @@ -38,13 +38,14 @@ MAN1= fftw${FFTW3_SUFX}-wisdom.1 INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec .endif -OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off \ - FORTRAN "Build Fortran shims (needs gcc from port)" on +OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off -.include - -.if defined(WITH_FORTRAN) +.if defined(FORTRAN_SHIM) USE_FORTRAN= yes +CONFLICTS= fftw3-3* +.else +CONFIGURE_ARGS+= --disable-fortran +CONFLICTS= fftw3-*fortran-3* .endif .include @@ -75,19 +76,30 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS_3DNOW}" .if defined(FFTW3_FLAVOR) .if ${FFTW3_FLAVOR}=="float" FFTW3_SUFX= f +.if defined(FORTRAN_SHIM) +FFTW3_PKGNAMESUFFIX= -float-fortran +.else FFTW3_PKGNAMESUFFIX= -float +.endif CONFIGURE_ARGS+=--enable-float .else .if ${FFTW3_FLAVOR}=="long" LIB_DEPENDS+= ml.0:${PORTSDIR}/math/ldouble FFTW3_SUFX= l +.if defined(FORTRAN_SHIM) +FFTW3_PKGNAMESUFFIX= -long-fortran +.else FFTW3_PKGNAMESUFFIX= -long +.endif CONFIGURE_ARGS+=--enable-long-double .endif .endif .endif .if ${FFTW3_FLAVOR}=="default" +.if defined(FORTRAN_SHIM) +FFTW3_PKGNAMESUFFIX= -fortran +.endif PLIST_SUB+= DEF="" .else PLIST_SUB+= DEF="@comment " -- cgit v1.2.3