fftw version bump

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2183 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/sci/libs/fftw/Manifest b/sci/libs/fftw/Manifest
new file mode 100644 (file)
index 0000000..96dfc09
--- /dev/null
+++ b/sci/libs/fftw/Manifest
@@ -0,0 +1,3 @@
+DIST fftw-3.2.1.tar.gz 3476044 MD5 712d3f33625a0a76f5758648d4b925f7 RMD160 b8537c9a245638ea01bbac7ca56862844be674be SHA1 690a7cb4fb947a555eaf166cd098a43b61796723 SHA256 076a43a8000d331076181ea9e72a56a9cd050400535b7bb3fc2f53b707e712f5 SHA512 d8bd676fe94df328591cd89a277ab4ce060fbd6531f9f287ed3e8352fca6dc2d4a95e0f8cf9c73637bb03c1453ce5d35b238cae5e6c89d36de55d50dff92793b
+MKBUILD fftw.mkbuild 4448 MD5 3d9f652f18112086a4b73a62ad344606 RMD160 371aed2140e61b18462bc45737bda95863aa7c73 SHA1 49f4b3d9351bd24e55073f897adc69d1863403a4 SHA256 6093f6e3d49acbb769882cc510c294156060caa16bcdaf4463fbb91f40f97816 SHA512 5327779e26ac80c39e5f0659046b40a9f06c1ca65de2de7a32a7aadc13a0c35c79dc1e4109a6a171de962e4fb937c1ff569d413c255af2f9988577598314c85d
+SLACKBUILD fftw.SlackBuild 7226 MD5 293cd865c9ee50fddbb25fd2a0015221 RMD160 7a4032e4bb88460b1d5a2b724ee43930cc1ed1a4 SHA1 b808ce8cdb84ffc201a083b7606cf976af342a69 SHA256 f7d6fa062fb65f748124b9524c6c4ecadc3d94639f02e653aaa96a159a6a3e75 SHA512 4d7a20dda255193611c6997b577433e1c062c79ca7c9d00a374b6910ebcf9d24df851916552f15663f3574b7a1059e5d2a0045d72c2d485005b40f6181c3907a

diff --git a/sci/libs/fftw/fftw.SlackBuild b/sci/libs/fftw/fftw.SlackBuild
index 8d8aaa0e50561fb2ace15fc517ee9712417a74ee..5a2cd9e40c40dd5e986ffa4440cfc91b17bc7a94 100755 (executable)
--- a/sci/libs/fftw/fftw.SlackBuild
+++ b/sci/libs/fftw/fftw.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for fftw, by Silvio Rhatto
 # requires:  
-# tested: fftw-3.2
+# tested: fftw-3.2.1
+# model: generic.mkSlackBuild $Rev: 784 $
 #
 
 # Look for slackbuildrc
@@ -31,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="fftw"
 PKG_NAME="fftw"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=3.2}
+SRC_VERSION=${VERSION:=3.2.1}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -47,9 +48,9 @@ NUMJOBS=${NUMJOBS:=""}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +66,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -91,10 +93,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="
+patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
          $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
 for patch in $patches; do
+  patch="`basename $patch`"
   if [ -f "$CWD/$patch" ]; then
     patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +106,7 @@ for patch in $patches; do
     gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch.gz" ]; then
     gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
-  fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
-  for patch_url in [[PATCH URLS]]; do
-    patch="`basename $patch_url`"
-    if [ ! -s "$SRC_DIR/$patch" ]; then
-      wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
-    fi
+  elif [ -f "$SRC_DIR/$patch" ]; then
     if [ "`basename $patch .gz`" != "$patch" ]; then
       gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
     elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,8 +114,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
     else
       patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
     fi
-  done
-fi
+  fi
+done
 
 # Thanks to Kyle Guinn <elyk at 3@gmail.com> for the section below,
 # obtained from http://slackbuilds.org/slackbuilds/12.1/libraries/fftw/fftw.SlackBuild