diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2009-08-10 00:45:07 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2009-08-10 00:45:07 +0000 |
| commit | a8fd1d1350d2a7557d1389463205f0025eee3c6b (patch) | |
| tree | 3e501afc53d202e1391b029b58b0feb5881436b8 | |
| parent | Fix the build on 6.X. (diff) | |
Update to 3.2.2
Notes
Notes:
svn path=/head/; revision=239230
| -rw-r--r-- | math/fftw3-fortran/Makefile | 2 | ||||
| -rw-r--r-- | math/fftw3-long-fortran/Makefile | 2 | ||||
| -rw-r--r-- | math/fftw3-long/Makefile | 4 | ||||
| -rw-r--r-- | math/fftw3/Makefile | 9 | ||||
| -rw-r--r-- | math/fftw3/distinfo | 6 |
5 files changed, 10 insertions, 13 deletions
diff --git a/math/fftw3-fortran/Makefile b/math/fftw3-fortran/Makefile index 3592ee0ffc80..6bccbd1dd30f 100644 --- a/math/fftw3-fortran/Makefile +++ b/math/fftw3-fortran/Makefile @@ -12,6 +12,4 @@ FFTW3_FLAVOR= default FORTRAN_SHIM= yes MASTERDIR= ${.CURDIR}/../../math/fftw3 -ONLY_FOR_ARCHS= i386 sparc64 - .include "${MASTERDIR}/Makefile" diff --git a/math/fftw3-long-fortran/Makefile b/math/fftw3-long-fortran/Makefile index eef9c69e32fb..ca010a5645ff 100644 --- a/math/fftw3-long-fortran/Makefile +++ b/math/fftw3-long-fortran/Makefile @@ -12,6 +12,4 @@ FFTW3_FLAVOR= long FORTRAN_SHIM= yes MASTERDIR= ${.CURDIR}/../../math/fftw3 -ONLY_FOR_ARCHS= i386 sparc64 - .include "${MASTERDIR}/Makefile" diff --git a/math/fftw3-long/Makefile b/math/fftw3-long/Makefile index 15c2227a9501..26b1c715f526 100644 --- a/math/fftw3-long/Makefile +++ b/math/fftw3-long/Makefile @@ -5,13 +5,11 @@ # $FreeBSD$ # $MCom: ports-experimental/math/fftw3-long/Makefile,v 1.1 2006/03/28 00:08:58 ahze Exp $ -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Fast C routines (Long Double Precision) FFTW3_FLAVOR= long MASTERDIR= ${.CURDIR}/../../math/fftw3 -ONLY_FOR_ARCHS= i386 sparc64 - .include "${MASTERDIR}/Makefile" diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 70f5c37db159..cf8a6976767a 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -6,8 +6,8 @@ # $MCom: ports-experimental/math/fftw3/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $ PORTNAME= fftw3 -PORTVERSION= 3.2.1 -PORTREVISION?= 1 +PORTVERSION= 3.2.2 +PORTREVISION?= 0 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.fftw.org/pub/fftw/old/ @@ -84,7 +84,10 @@ FFTW3_PKGNAMESUFFIX= -float CONFIGURE_ARGS+=--enable-float .else .if ${FFTW3_FLAVOR}=="long" +. if ${OSVERSION} < 800000 +ONLY_FOR_ARCHS= i386 sparc64 LIB_DEPENDS+= ml.0:${PORTSDIR}/math/ldouble +. endif FFTW3_SUFX= l .if defined(FORTRAN_SHIM) FFTW3_PKGNAMESUFFIX= -long-fortran @@ -122,7 +125,7 @@ post-patch: s|fftw-wisdom-to-conf: $(top_builddir)/config.status||; \ s|bin_SCRIPTS = fftw-wisdom-to-conf||' \ ${WRKSRC}/tools/Makefile.in -.if ${FFTW3_FLAVOR}=="long" +.if ${FFTW3_FLAVOR}=="long" && ${OSVERSION} < 800000 @${REINPLACE_CMD} -e 's|cosl sinl tanl||' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|@LIBS@|-lml @LIBS@|' diff --git a/math/fftw3/distinfo b/math/fftw3/distinfo index d52768af6c85..c42c781f4989 100644 --- a/math/fftw3/distinfo +++ b/math/fftw3/distinfo @@ -1,3 +1,3 @@ -MD5 (fftw-3.2.1.tar.gz) = 712d3f33625a0a76f5758648d4b925f7 -SHA256 (fftw-3.2.1.tar.gz) = 076a43a8000d331076181ea9e72a56a9cd050400535b7bb3fc2f53b707e712f5 -SIZE (fftw-3.2.1.tar.gz) = 3476044 +MD5 (fftw-3.2.2.tar.gz) = b616e5c91218cc778b5aa735fefb61ae +SHA256 (fftw-3.2.2.tar.gz) = 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f +SIZE (fftw-3.2.2.tar.gz) = 3495117 |