MSG

4 files changed, 32 insertions, 27 deletions

diff --git a/devel/fann/Makefile b/devel/fann/Makefile
index 38735137f5c..21feff8e87b 100644
--- a/devel/fann/Makefile
+++ b/devel/fann/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:16:57 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/22 01:17:27 gdt Exp $
 
 .include "Makefile.common"
 
 COMMENT=		Fast Artificial Neural Network
 
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
+LICENSE=		gnu-lgpl-v2.1
 
-PKGCONFIG_OVERRIDE+=	fann.pc.in
+USE_TOOLS+=		cmake
+USE_CMAKE=		yes
+USE_LANGUAGES+=		c99
+# Perhaps not, but camke complains
+USE_LANGUAGES+=		 c++
 
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}/${PREFIX}/share/doc/fann
-	(cd ${WRKSRC} && ${INSTALL_DATA} doc/* ${DESTDIR}/${PREFIX}/share/doc/fann)
+USE_TOOLS+=		pkg-config
+PKGCONFIG_OVERRIDE+=	fann.pc.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/fann/Makefile.common b/devel/fann/Makefile.common
index 1c5009a27d6..d560f4736e1 100644
--- a/devel/fann/Makefile.common
+++ b/devel/fann/Makefile.common
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2006/10/05 14:55:21 gdt Exp $
+# $NetBSD: Makefile.common,v 1.2 2014/01/22 01:17:27 gdt Exp $
 
-FANNVERSION=		2.0.0
-DISTNAME=		fann-${FANNVERSION}
+FANNVERSION=		2.2.0
+DISTNAME=		FANN-${FANNVERSION}-Source
+EXTRACT_SUFX=		.zip
+PKGNAME=		fann-${FANNVERSION}
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fann/}
 
diff --git a/devel/fann/PLIST b/devel/fann/PLIST
index cc67ff2fe70..880ca9d6060 100644
--- a/devel/fann/PLIST
+++ b/devel/fann/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/01/22 01:17:27 gdt Exp $
 include/compat_time.h
 include/doublefann.h
 include/fann.h
 include/fann_activation.h
 include/fann_cascade.h
+include/fann_cpp.h
 include/fann_data.h
 include/fann_error.h
 include/fann_internal.h
@@ -11,14 +12,16 @@ include/fann_io.h
 include/fann_train.h
 include/fixedfann.h
 include/floatfann.h
-lib/libdoublefann.la
-lib/libfann.la
-lib/libfixedfann.la
-lib/libfloatfann.la
+lib/libdoublefann.so
+lib/libdoublefann.so.2
+lib/libdoublefann.so.${PKGVERSION}
+lib/libfann.so
+lib/libfann.so.2
+lib/libfann.so.${PKGVERSION}
+lib/libfixedfann.so
+lib/libfixedfann.so.2
+lib/libfixedfann.so.${PKGVERSION}
+lib/libfloatfann.so
+lib/libfloatfann.so.2
+lib/libfloatfann.so.${PKGVERSION}
 lib/pkgconfig/fann.pc
-share/doc/fann/advancedusage.txt
-share/doc/fann/fann_en.pdf
-share/doc/fann/fixedpointusage.txt
-share/doc/fann/gettingstarted.txt
-share/doc/fann/installation.txt
-share/doc/fann/theory.txt
diff --git a/devel/fann/distinfo b/devel/fann/distinfo
index 1b03f015e08..e745122f9c6 100644
--- a/devel/fann/distinfo
+++ b/devel/fann/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/04 20:12:34 gdt Exp $
+$NetBSD: distinfo,v 1.2 2014/01/22 01:17:27 gdt Exp $
 
-SHA1 (fann-2.0.0.tar.gz) = ca82372412501934cfdbccc3a994420c69e57bf2
-RMD160 (fann-2.0.0.tar.gz) = 71f59a6c1f13f8b9989ae9b8db0b64d0fbd53921
-Size (fann-2.0.0.tar.gz) = 2544249 bytes
+SHA1 (FANN-2.2.0-Source.zip) = 6f95232c018af7f62fb4c7e39d160771a867d6e7
+RMD160 (FANN-2.2.0-Source.zip) = 7689aaacecfc6eacebfe7d999b4973092b5d9bbd
+Size (FANN-2.2.0-Source.zip) = 2285087 bytes