libraries/fftw: Updated for version 3.2.1

2 files changed, 40 insertions, 30 deletions

diff --git a/libraries/fftw/fftw.SlackBuild b/libraries/fftw/fftw.SlackBuild
index 6f5f5c8ecf..9cdd74f184 100644
--- a/libraries/fftw/fftw.SlackBuild
+++ b/libraries/fftw/fftw.SlackBuild
@@ -4,8 +4,8 @@
 # Written by Kyle Guinn <elyk03@gmail.com>
 
 PRGNAM="fftw"
-VERSION=${VERSION:="3.2"}
-ARCH=${ARCH:-"custom"}
+VERSION=${VERSION:-"3.2.1"}
+ARCH=${ARCH:-"i486"}
 BUILD=${BUILD:-"1"}
 TAG=${TAG:-"_SBo"}
 
@@ -14,13 +14,24 @@ TMP=${TMP:-"/tmp/SBo"}
 PKG="$TMP/package-$PRGNAM-$VERSION"
 OUTPUT=${OUTPUT:-"/tmp"}
 
-DOCS="AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog INSTALL NEWS README TODO doc/html"
+DOCS="AUTHORS CONVENTIONS COPY* ChangeLog INSTALL NEWS README* TODO doc/html"
 
-# According to doc/fftw3.pdf, the configure script should choose the best value
-# for $CFLAGS.  We will assume that the script knows what it is doing.
+# According to doc/fftw3.pdf the configure script should choose the best
+# value for $CFLAGS.  These variables must be unset so that the configure
+# script will decide.
 unset CFLAGS
 unset CXXFLAGS
 unset FFLAGS
+PKGARCH="custom"
+
+if [ "$ARCH" = "i486" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+fi
+
 
 set -e
 
@@ -33,10 +44,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-st .
 
-# By default we will leave out these machine-dependent optimizations.  If your
-# machine supports these, feel free to add them to the configure options.
-# Note that fftw may refuse to compile by doing so -- watch for error messages
-# about the precision not matching.
+# By default this script leaves out these machine-dependent optimizations.
+# If your machine supports these, feel free to add them to the configure
+# options.  Note that fftw may refuse to compile by doing so -- watch for
+# error messages about the precision not matching.  See the link below.
+#
 # --enable-fma      enable optimizations for machines with fused multiply-add
 # --enable-k7       enable AMD K7 optimizations, including 3dNow!
 # --enable-sse      enable SSE optimizations (Pentium III+)
@@ -46,24 +58,20 @@ chmod -R u+w,go+r-w,a-st .
 #                   disable compiler optimizations that would produce
 #                   unportable binaries
 #
-# You can also build fftw using a different precision.  --enable-float may be
-# required depending on any SIMD code enabled with the above options.
-# --enable-single       compile fftw in single precision
-# --enable-float        synonym for --enable-single
-# --enable-long-double  compile fftw in long-double precision
-#
-# Heinz Wiesinger points out that these extra precisions can be compiled 
-# as well.  --enable-float will append an 'f' to the library names, while
-# --enable-long-double will append an 'l'.  We have to compile three separate
-# times instead of once to create all of the files.
+# Compiling with the default options creates a double-precision library
+# named libfftw3.  --enable-float or --enable-single builds a single
+# precision library (libfftw3f), and --enable-long-double builds a
+# long-double precision library (libfftw3l).  This script builds all three
+# libraries since they can coexist on the same machine.
 #
-# Note that the ./configure; make; make install commands below are not inside
-# a loop.  You may be able to --enable one of the SIMD options for one
-# precision, but not another.  (This should be documented somewhere...)
+# You may be able to --enable one of the SIMD options when compiling for
+# one precision, but not for another.  Check this page for details:
+# http://www.fftw.org/fftw3_doc/Installation-on-Unix.html
 
-# compile fftw3
+# compile libfftw3
 ./configure \
 	--prefix=/usr \
+        --libdir=/usr/lib${LIBDIRSUFFIX} \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--mandir=/usr/man \
@@ -75,9 +83,10 @@ chmod -R u+w,go+r-w,a-st .
 make
 make install-strip DESTDIR=$PKG
 
-# compile fftw3f
+# compile libfftw3f
 ./configure \
 	--prefix=/usr \
+        --libdir=/usr/lib${LIBDIRSUFFIX} \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--mandir=/usr/man \
@@ -90,9 +99,10 @@ make install-strip DESTDIR=$PKG
 make
 make install-strip DESTDIR=$PKG
 
-# compile fftw3l
+# compile libfftw3l
 ./configure \
 	--prefix=/usr \
+        --libdir=/usr/lib${LIBDIRSUFFIX} \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--mandir=/usr/man \
@@ -114,7 +124,7 @@ make install-strip DESTDIR=$PKG
 )
 
 rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
+gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -124,4 +134,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.tgz
diff --git a/libraries/fftw/fftw.info b/libraries/fftw/fftw.info
index 40f23d74a6..43c98ee36c 100644
--- a/libraries/fftw/fftw.info
+++ b/libraries/fftw/fftw.info
@@ -1,8 +1,8 @@
 PRGNAM="fftw"
-VERSION="3.2"
+VERSION="3.2.1"
 HOMEPAGE="http://www.fftw.org/"
-DOWNLOAD="ftp://ftp.fftw.org/pub/fftw/fftw-3.2.tar.gz"
-MD5SUM="280960ddbad368ebb96c073a2b642f5d"
+DOWNLOAD="ftp://ftp.fftw.org/pub/fftw/fftw-3.2.1.tar.gz"
+MD5SUM="712d3f33625a0a76f5758648d4b925f7"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
 APPROVED="rworkman"