3 files changed, 59 insertions, 60 deletions
diff --git a/libraries/fftw/fftw.SlackBuild b/libraries/fftw/fftw.SlackBuild
index 7f207e2125..6f5f5c8ecf 100644
--- a/libraries/fftw/fftw.SlackBuild
+++ b/libraries/fftw/fftw.SlackBuild
@@ -3,15 +3,24 @@
 # Slackware build script for fftw
 # Written by Kyle Guinn <elyk03@gmail.com>
 
-PRGNAM=fftw
-VERSION=3.1.2
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
+PRGNAM="fftw"
+VERSION=${VERSION:="3.2"}
+ARCH=${ARCH:-"custom"}
+BUILD=${BUILD:-"1"}
+TAG=${TAG:-"_SBo"}
+
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+TMP=${TMP:-"/tmp/SBo"}
+PKG="$TMP/package-$PRGNAM-$VERSION"
+OUTPUT=${OUTPUT:-"/tmp"}
+
+DOCS="AUTHORS CONVENTIONS COPYING COPYRIGHT 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.
+unset CFLAGS
+unset CXXFLAGS
+unset FFLAGS
 
 set -e
 
@@ -19,14 +28,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a-st .
 
-# 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.
-#
 # 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
@@ -56,69 +62,62 @@ chmod -R u+w,go+r-w,a-s .
 # precision, but not another.  (This should be documented somewhere...)
 
 # compile fftw3
-CFLAGS= \
-CXXFLAGS= \
-FFLAGS= \
 ./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/fftw-$VERSION \
-  --enable-shared \
-  --disable-static \
-  --enable-threads
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--mandir=/usr/man \
+	--infodir=/usr/info \
+	--docdir=/usr/doc/fftw-$VERSION \
+	--enable-shared \
+	--disable-static \
+	--enable-threads
 make
 make install-strip DESTDIR=$PKG
 
 # compile fftw3f
-CFLAGS= \
-CXXFLAGS= \
-FFLAGS= \
 ./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/fftw-$VERSION \
-  --enable-shared \
-  --disable-static \
-  --enable-threads \
-  --enable-float
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--mandir=/usr/man \
+	--infodir=/usr/info \
+	--docdir=/usr/doc/fftw-$VERSION \
+	--enable-shared \
+	--disable-static \
+	--enable-threads \
+	--enable-float
 make
 make install-strip DESTDIR=$PKG
 
 # compile fftw3l
-CFLAGS= \
-CXXFLAGS= \
-FFLAGS= \
 ./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/fftw-$VERSION \
-  --enable-shared \
-  --disable-static \
-  --enable-threads \
-  --enable-long-double
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--mandir=/usr/man \
+	--infodir=/usr/info \
+	--docdir=/usr/doc/fftw-$VERSION \
+	--enable-shared \
+	--disable-static \
+	--enable-threads \
+	--enable-long-double
 make
 make install-strip DESTDIR=$PKG
 
 ( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+	find . -type f -exec gzip -9 {} \;
+	for i in $(find . -type l); do \
+		ln -s $(readlink $i).gz $i.gz; \
+		rm $i; \
+	done
 )
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog INSTALL \
-  NEWS README TODO doc/html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/fftw/fftw.info b/libraries/fftw/fftw.info
index 3abb4a598f..40f23d74a6 100644
--- a/libraries/fftw/fftw.info
+++ b/libraries/fftw/fftw.info
@@ -1,8 +1,8 @@
 PRGNAM="fftw"
-VERSION="3.1.2"
+VERSION="3.2"
 HOMEPAGE="http://www.fftw.org/"
-DOWNLOAD="http://www.fftw.org/fftw-3.1.2.tar.gz"
-MD5SUM="08f2e21c9fd02f4be2bd53a62592afa4"
+DOWNLOAD="ftp://ftp.fftw.org/pub/fftw/fftw-3.2.tar.gz"
+MD5SUM="280960ddbad368ebb96c073a2b642f5d"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
 APPROVED="rworkman"
diff --git a/libraries/fftw/slack-desc b/libraries/fftw/slack-desc
index 7b6430065b..22a1130c24 100644
--- a/libraries/fftw/slack-desc
+++ b/libraries/fftw/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+    |-----handy-ruler------------------------------------------------------|
 fftw: fftw (Fastest Fourier Transform in the West)
 fftw: 
 fftw: FFTW is a free collection of fast C routines for computing the
@@ -15,5 +15,5 @@ fftw: arbitrary array sizes efficiently.  FFTW is typically faster than
 fftw: other publically-available FFT implementations, and is even
 fftw: competitive with vendor-tuned libraries.
 fftw:
-fftw:
+fftw: Homepage: http://www.fftw.org/
 fftw: