2 files changed, 21 insertions, 21 deletions
diff --git a/academic/fann/fann.SlackBuild b/academic/fann/fann.SlackBuild
index 093fef5d26376..4fcf4368743a7 100644
--- a/academic/fann/fann.SlackBuild
+++ b/academic/fann/fann.SlackBuild
@@ -5,11 +5,11 @@
 # Written by Andrew Conway (ajc AT countingthoughts DOT com)
 
 PRGNAM=fann
-VERSION=${VERSION:-2.1.0beta}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SHORTVERSION=${SHORTVERSION:-2.1.0}
+SRCNAME=FANN-$VERSION-Source
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -43,9 +43,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SHORTVERSION
-unzip $CWD/$PRGNAM-${VERSION}.zip
-cd $PRGNAM-$SHORTVERSION
+rm -rf $SRCNAME
+unzip $CWD/$SRCNAME.zip
+cd $SRCNAME
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,25 +53,25 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make 
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL README \
+  COPYING.txt README.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/fann/fann.info b/academic/fann/fann.info
index 7cdbf4ad487ff..9aa18840288ee 100644
--- a/academic/fann/fann.info
+++ b/academic/fann/fann.info
@@ -1,8 +1,8 @@
 PRGNAM="fann"
-VERSION="2.1.0beta"
+VERSION="2.2.0"
 HOMEPAGE="http://leenissen.dk/fann/wp/"
-DOWNLOAD="http://prdownloads.sourceforge.net/fann/fann-2.1.0beta.zip"
-MD5SUM="9c53d96ce415c927cb97b8f9de2ea881"
+DOWNLOAD="http://prdownloads.sourceforge.net/fann/FANN-2.2.0-Source.zip"
+MD5SUM="292d914684c9eab1d84eb1f59b0fbf69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""