diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 3 | ||||
| -rw-r--r-- | math/fftw3-float-fortran/Makefile | 15 | ||||
| -rw-r--r-- | math/fftw3-float/Makefile | 2 | ||||
| -rw-r--r-- | math/fftw3-fortran/Makefile | 15 | ||||
| -rw-r--r-- | math/fftw3-long-fortran/Makefile | 15 | ||||
| -rw-r--r-- | math/fftw3-long/Makefile | 2 | ||||
| -rw-r--r-- | math/fftw3/Makefile | 28 |
7 files changed, 9 insertions, 71 deletions
diff --git a/math/Makefile b/math/Makefile index f04356592a31..dd0de4e49bf6 100644 --- a/math/Makefile +++ b/math/Makefile @@ -74,10 +74,7 @@ SUBDIR += fftw-float SUBDIR += fftw3 SUBDIR += fftw3-float - SUBDIR += fftw3-float-fortran - SUBDIR += fftw3-fortran SUBDIR += fftw3-long - SUBDIR += fftw3-long-fortran SUBDIR += fityk SUBDIR += fpc-fftw SUBDIR += fpc-numlib diff --git a/math/fftw3-float-fortran/Makefile b/math/fftw3-float-fortran/Makefile deleted file mode 100644 index efbe20080382..000000000000 --- a/math/fftw3-float-fortran/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: fftw3-float-fortran -# Date created: June 14, 2009 -# Whom: Diane Bruce <db@FreeBSD.org> -# -# $FreeBSD$ - -PORTREVISION= 0 - -COMMENT= Fast C routines (Single Precision) with fortran shim - -FFTW3_FLAVOR= float -FORTRAN_SHIM= yes -MASTERDIR= ${.CURDIR}/../../math/fftw3 - -.include "${MASTERDIR}/Makefile" diff --git a/math/fftw3-float/Makefile b/math/fftw3-float/Makefile index adc50e839d5c..635c48f48055 100644 --- a/math/fftw3-float/Makefile +++ b/math/fftw3-float/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # $MCom: ports-experimental/math/fftw3-float/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $ -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Fast C routines (Single Precision) diff --git a/math/fftw3-fortran/Makefile b/math/fftw3-fortran/Makefile deleted file mode 100644 index 6bccbd1dd30f..000000000000 --- a/math/fftw3-fortran/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: fftw3-fortran -# Date created: June 14, 2009 -# Whom: Diane Bruce <db@FreeBSD.org> -# -# $FreeBSD$ - -PORTREVISION= 0 - -COMMENT= Fast C routines (Long Double Precision) with fortran shim - -FFTW3_FLAVOR= default -FORTRAN_SHIM= yes -MASTERDIR= ${.CURDIR}/../../math/fftw3 - -.include "${MASTERDIR}/Makefile" diff --git a/math/fftw3-long-fortran/Makefile b/math/fftw3-long-fortran/Makefile deleted file mode 100644 index ca010a5645ff..000000000000 --- a/math/fftw3-long-fortran/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: fftw3-long-fortran -# Date created: June 14, 2009 -# Whom: Diane Bruce <db@FreeBSD.org> -# -# $FreeBSD$ - -PORTREVISION= 0 - -COMMENT= Fast C routines (Long Double Precision) with fortran shim - -FFTW3_FLAVOR= long -FORTRAN_SHIM= yes -MASTERDIR= ${.CURDIR}/../../math/fftw3 - -.include "${MASTERDIR}/Makefile" diff --git a/math/fftw3-long/Makefile b/math/fftw3-long/Makefile index 26b1c715f526..ab90ea52f28d 100644 --- a/math/fftw3-long/Makefile +++ b/math/fftw3-long/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # $MCom: ports-experimental/math/fftw3-long/Makefile,v 1.1 2006/03/28 00:08:58 ahze Exp $ -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Fast C routines (Long Double Precision) diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index cf8a6976767a..a351caf02851 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -7,7 +7,7 @@ PORTNAME= fftw3 PORTVERSION= 3.2.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.fftw.org/pub/fftw/old/ @@ -40,14 +40,6 @@ INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off -.if defined(FORTRAN_SHIM) -USE_FORTRAN= yes -CONFLICTS= fftw3-3* -.else -CONFIGURE_ARGS+= --disable-fortran -CONFLICTS= fftw3-*fortran-3* -.endif - .include <bsd.port.pre.mk> .if defined(WITH_OPTIMIZED_CFLAGS) @@ -76,33 +68,22 @@ 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" . if ${OSVERSION} < 800000 -ONLY_FOR_ARCHS= i386 sparc64 +ONLY_FOR_ARCHS= i386 sparc64 LIB_DEPENDS+= ml.0:${PORTSDIR}/math/ldouble . endif 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 " @@ -132,6 +113,11 @@ post-patch: .endif .endif +post-configure: + @{ECHO_CMD} "#define F77_FUNC(name,NAME) name ## _" >>${WRKSRC}/config.h + @{ECHO_CMD} "#define F77_FUNC_(name,NAME) name ## _" >>${WRKSRC}/config.h + @{ECHO_CMD} "#define F77_FUNC_EQUIV 1" >>${WRKSRC}/config.h + .if defined(FFTW3_FLAVOR) && ${FFTW3_FLAVOR}!="default" post-install: @${INSTALL_MAN} ${WRKSRC}/tools/fftw${FFTW3_SUFX}-wisdom.1 ${PREFIX}/man/man1 |