Update to version 2.1.1.

PR:		10758, 10917

10 files changed, 90 insertions, 74 deletions

diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index b6a4bbe64081..1a2436774bbf 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for: fftw
-# Version required:	2.0.1
+# Version required:	2.1.1
 # Date created:		Dec 28 1998
 # Whom:			Lars Koeller <lkoeller@cc.fh-lippe.de>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/18 08:38:33 taoka Exp $
 #
 
-DISTNAME=	fftw-2.0.1
+DISTNAME=	fftw-2.1.1
 CATEGORIES=	math
 MASTER_SITES=	ftp://theory.lcs.mit.edu/pub/fftw/	\
-		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
+		ftp://pm.cse.rmit.edu.au/pub/dsp/fftw/
 
-MAINTAINER=	Lars.Koeller@Uni-Bielefeled.DE
+MAINTAINER=	lkoeller@cc.fh-lippe.de
 
-HAS_CONFIGURE=	YES
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 .if ${ARCH} == "i386"
-    CONFIGURE_ARGS= 	--enable-i386-hacks
+CONFIGURE_ARGS=	--enable-i386-hacks
 .endif
-
-CONFIGURE_ARGS+= 	--enable-shared
+CONFIGURE_ARGS+=--enable-shared
 
 post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-	.for info in fftw.info
-		install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-	.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/fftw
+	${CP} ${WRKSRC}/doc/fftw.ps ${PREFIX}/share/doc/fftw
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/math/fftw/distinfo b/math/fftw/distinfo
index c1d06eec80d0..8e9f09fcc24b 100644
--- a/math/fftw/distinfo
+++ b/math/fftw/distinfo
@@ -1 +1 @@
-MD5 (fftw-2.0.1.tar.gz) = ebd79d36f85e995bab49bb675ec6847e
+MD5 (fftw-2.1.1.tar.gz) = f08c76e452d5a8642aefcd61cc4597e0
diff --git a/math/fftw/pkg-comment b/math/fftw/pkg-comment
index eed982c6bde1..2e2e602fb16b 100644
--- a/math/fftw/pkg-comment
+++ b/math/fftw/pkg-comment
@@ -1 +1 @@
-Fast C routines library to compute the Discrete Fourier Transform
+Fast C routines to compute the Discrete Fourier Transform
diff --git a/math/fftw/pkg-descr b/math/fftw/pkg-descr
index 46dcef355057..5224c25018f3 100644
--- a/math/fftw/pkg-descr
+++ b/math/fftw/pkg-descr
@@ -1,12 +1,14 @@
+FFTW is a C subroutine library for computing the Discrete Fourier Transform
+(DFT) in one or more dimensions, of both real and complex data, and of
+arbitrary input size. We believe that FFTW, which is free software, should
+become the FFT library of choice for most applications. Our benchmarks,
+performed on on a variety of platforms, show that FFTW's performance is
+typically superior to that of other publicly available FFT software.
+Moreover, FFTW's performance is portable: the program will perform well on
+most architectures without modification.
 
-  FFTW, the Fastest Fourier Transform in the West.  FFTW is a comprehensive
-  collection of fast C routines for computing the discrete Fourier transform
-  (DFT) in one or more dimensions, of both real and complex data, and of
-  arbitrary input size.  FFTW also includes parallel transforms, documented
-  elsewhere.  We assume herein that the reader is already familiar with the
-  properties and uses of the DFT that are relevant to her application.
-  Otherwise, see e.g. `The Fast Fourier Transform' by E. O. Brigham
-  (Prentice-Hall, Englewood Cliffs, NJ, 1974).  Our web page also has links to
-  FFT-related information online, see
-
-	http://theory.lcs.mit.edu/~fftw
+The FFTW package was developed at MIT by Matteo Frigo and Steven G.
+Johnson.  Please send email to fftw@theory.lcs.mit.edu so that we can keep
+track of users and send you information about new releases.  The latest 
+version of FFTW, benchmarks, links, and other information can be found at
+the FFTW home page:  http://theory.lcs.mit.edu/~fftw
diff --git a/math/fftw/pkg-plist b/math/fftw/pkg-plist
index a2c144a4e185..33aea15032d0 100644
--- a/math/fftw/pkg-plist
+++ b/math/fftw/pkg-plist
@@ -1,11 +1,3 @@
-lib/libfftw.la
-lib/libfftw.so.2.1
-lib/libfftw.so
-lib/libfftw.a
-lib/librfftw.la
-lib/librfftw.so.2.1
-lib/librfftw.so
-lib/librfftw.a
 include/fftw.h
 include/rfftw.h
 @unexec install-info --delete %D/info/fftw.info %D/info/dir
@@ -13,5 +5,19 @@ info/fftw.info
 info/fftw.info-1
 info/fftw.info-2
 info/fftw.info-3
+info/fftw.info-4
+info/fftw.info-5
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/fftw.info %D/info/dir
+lib/libfftw.a
+lib/libfftw.la
+lib/libfftw.so
+lib/libfftw.so.2
+lib/librfftw.a
+lib/librfftw.la
+lib/librfftw.so
+lib/librfftw.so.2
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/fftw/fftw.ps
+@dirrm share/doc/fftw
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index b6a4bbe64081..1a2436774bbf 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for: fftw
-# Version required:	2.0.1
+# Version required:	2.1.1
 # Date created:		Dec 28 1998
 # Whom:			Lars Koeller <lkoeller@cc.fh-lippe.de>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/03/18 08:38:33 taoka Exp $
 #
 
-DISTNAME=	fftw-2.0.1
+DISTNAME=	fftw-2.1.1
 CATEGORIES=	math
 MASTER_SITES=	ftp://theory.lcs.mit.edu/pub/fftw/	\
-		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
+		ftp://pm.cse.rmit.edu.au/pub/dsp/fftw/
 
-MAINTAINER=	Lars.Koeller@Uni-Bielefeled.DE
+MAINTAINER=	lkoeller@cc.fh-lippe.de
 
-HAS_CONFIGURE=	YES
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 .if ${ARCH} == "i386"
-    CONFIGURE_ARGS= 	--enable-i386-hacks
+CONFIGURE_ARGS=	--enable-i386-hacks
 .endif
-
-CONFIGURE_ARGS+= 	--enable-shared
+CONFIGURE_ARGS+=--enable-shared
 
 post-install:
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-	.for info in fftw.info
-		install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-	.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/fftw
+	${CP} ${WRKSRC}/doc/fftw.ps ${PREFIX}/share/doc/fftw
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/math/fftw3/distinfo b/math/fftw3/distinfo
index c1d06eec80d0..8e9f09fcc24b 100644
--- a/math/fftw3/distinfo
+++ b/math/fftw3/distinfo
@@ -1 +1 @@
-MD5 (fftw-2.0.1.tar.gz) = ebd79d36f85e995bab49bb675ec6847e
+MD5 (fftw-2.1.1.tar.gz) = f08c76e452d5a8642aefcd61cc4597e0
diff --git a/math/fftw3/pkg-comment b/math/fftw3/pkg-comment
index eed982c6bde1..2e2e602fb16b 100644
--- a/math/fftw3/pkg-comment
+++ b/math/fftw3/pkg-comment
@@ -1 +1 @@
-Fast C routines library to compute the Discrete Fourier Transform
+Fast C routines to compute the Discrete Fourier Transform
diff --git a/math/fftw3/pkg-descr b/math/fftw3/pkg-descr
index 46dcef355057..5224c25018f3 100644
--- a/math/fftw3/pkg-descr
+++ b/math/fftw3/pkg-descr
@@ -1,12 +1,14 @@
+FFTW is a C subroutine library for computing the Discrete Fourier Transform
+(DFT) in one or more dimensions, of both real and complex data, and of
+arbitrary input size. We believe that FFTW, which is free software, should
+become the FFT library of choice for most applications. Our benchmarks,
+performed on on a variety of platforms, show that FFTW's performance is
+typically superior to that of other publicly available FFT software.
+Moreover, FFTW's performance is portable: the program will perform well on
+most architectures without modification.
 
-  FFTW, the Fastest Fourier Transform in the West.  FFTW is a comprehensive
-  collection of fast C routines for computing the discrete Fourier transform
-  (DFT) in one or more dimensions, of both real and complex data, and of
-  arbitrary input size.  FFTW also includes parallel transforms, documented
-  elsewhere.  We assume herein that the reader is already familiar with the
-  properties and uses of the DFT that are relevant to her application.
-  Otherwise, see e.g. `The Fast Fourier Transform' by E. O. Brigham
-  (Prentice-Hall, Englewood Cliffs, NJ, 1974).  Our web page also has links to
-  FFT-related information online, see
-
-	http://theory.lcs.mit.edu/~fftw
+The FFTW package was developed at MIT by Matteo Frigo and Steven G.
+Johnson.  Please send email to fftw@theory.lcs.mit.edu so that we can keep
+track of users and send you information about new releases.  The latest 
+version of FFTW, benchmarks, links, and other information can be found at
+the FFTW home page:  http://theory.lcs.mit.edu/~fftw
diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist
index a2c144a4e185..33aea15032d0 100644
--- a/math/fftw3/pkg-plist
+++ b/math/fftw3/pkg-plist
@@ -1,11 +1,3 @@
-lib/libfftw.la
-lib/libfftw.so.2.1
-lib/libfftw.so
-lib/libfftw.a
-lib/librfftw.la
-lib/librfftw.so.2.1
-lib/librfftw.so
-lib/librfftw.a
 include/fftw.h
 include/rfftw.h
 @unexec install-info --delete %D/info/fftw.info %D/info/dir
@@ -13,5 +5,19 @@ info/fftw.info
 info/fftw.info-1
 info/fftw.info-2
 info/fftw.info-3
+info/fftw.info-4
+info/fftw.info-5
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/fftw.info %D/info/dir
+lib/libfftw.a
+lib/libfftw.la
+lib/libfftw.so
+lib/libfftw.so.2
+lib/librfftw.a
+lib/librfftw.la
+lib/librfftw.so
+lib/librfftw.so.2
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/fftw/fftw.ps
+@dirrm share/doc/fftw