ports/166533: update math/fann from 2.1.0b to 2.2.0

[Tz-Huan Huang]

>Number:         166533
>Category:       ports
>Synopsis:       update math/fann from 2.1.0b to 2.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 31 03:30:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Tz-Huan Huang
>Release:        9.0-CURRENT
>Organization:
National Taiwan University
>Environment:
FreeBSD tzhuan.csie.org 9.0-CURRENT FreeBSD 9.0-CURRENT #9 r223076M: Thu Jun 16 00:07:14 CST 2011     root at tzhuan.csie.org:/usr/obj/usr/src/sys/TZHUAN  amd64
>Description:
Update math/fann from 2.1.0b to 2.2.0
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN fann.orig/Makefile fann/Makefile
--- fann.orig/Makefile	2009-08-22 08:28:00.000000000 +0800
+++ fann/Makefile	2012-03-31 11:11:50.014150993 +0800
@@ -6,17 +6,24 @@
 #
 
 PORTNAME=	fann
-PORTVERSION=	2.1.0b
+PORTVERSION=	2.2.0
 CATEGORIES=	math science
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}eta
-DISTNAME=	fann-2.1.0beta
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+DISTNAME=	FANN-2.2.0-Source
 
 MAINTAINER=	tzhuan at csie.org
 COMMENT=	A free open source neural network library
 
-WRKSRC=		${WRKDIR}/fann-2.1.0
+WRKSRC=		${WRKDIR}/FANN-2.2.0-Source
+
+USE_CMAKE=	yes
 USE_ZIP=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+post-patch:
+	${REINPLACE_CMD} -e 's|/lib/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/CMakeLists.txt
+
+post-configure:
+	${ENV} CPP=${CPP} CC=${CC} CXX=${CXX} ${CMAKE_BIN} ${WRKSRC} -DCMAKE_INSTALL_PREFIX=${PREFIX}
+
 .include <bsd.port.mk>
diff -urN fann.orig/distinfo fann/distinfo
--- fann.orig/distinfo	2011-03-20 20:50:05.000000000 +0800
+++ fann/distinfo	2012-03-31 11:10:17.226136190 +0800
@@ -1,2 +1,2 @@
-SHA256 (fann-2.1.0beta.zip) = c24171b5b9c87946bd2f50045cc8dbd0121629fe426615501db14e6043e4a141
-SIZE (fann-2.1.0beta.zip) = 4033198
+SHA256 (FANN-2.2.0-Source.zip) = 434b85fce60701c4e0066c442d60110d8e649f278e4edb814f0c0e7a1e0929fd
+SIZE (FANN-2.2.0-Source.zip) = 2285087
diff -urN fann.orig/files/patch-Makefile.in fann/files/patch-Makefile.in
--- fann.orig/files/patch-Makefile.in	2007-03-07 03:15:43.000000000 +0800
+++ fann/files/patch-Makefile.in	1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Mar  4 21:27:52 2007
-+++ Makefile.in	Thu Sep 14 13:40:25 2006
-@@ -179,7 +179,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = src
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = fann.pc
- EXTRA_DIST = benchmarks examples MicrosoftVisualC++6.0 MicrosoftVisualC++.Net \
- 	MicrosoftWindowsDll BorlandC++Builder6.0 src/include/config.h \
diff -urN fann.orig/pkg-descr fann/pkg-descr
--- fann.orig/pkg-descr	2007-03-07 03:15:43.000000000 +0800
+++ fann/pkg-descr	2012-03-31 11:04:12.066154462 +0800
@@ -1,11 +1,11 @@
 Fast Artificial Neural Network Library is a free open source neural network
 library, which implements multilayer artificial neural networks in C with
-support for both fully connected and sparsely connected networks.
-Cross-platform execution in both fixed and floating point are supported. It
-includes a framework for easy handling of training data sets. It is easy to
-use, versatile, well documented, and fast. PHP, C++, .NET, Ada, Python, Delphi,
-Octave, Ruby, Pure Data and Mathematica bindings are available. A reference
-manual accompanies the library with examples and recommendations on how to use
-the library. A graphical user interface is also available for the library.
+support for both fully connected and sparsely connected networks. Cross-platform
+execution in both fixed and floating point are supported. It includes a
+framework for easy handling of training data sets. It is easy to use, versatile,
+well documented, and fast. Bindings to more than 15 programming languages are
+available. An easy to read introduction article and a reference manual
+accompanies the library with examples and recommendations on how to use the
+library. Several graphical user interfaces are also available for the library.
 
-WWW:	http://leenissen.dk/fann/
+WWW:	http://leenissen.dk/
diff -urN fann.orig/pkg-plist fann/pkg-plist
--- fann.orig/pkg-plist	2007-03-07 03:15:43.000000000 +0800
+++ fann/pkg-plist	2012-03-31 11:08:23.315151985 +0800
@@ -3,6 +3,7 @@
 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
@@ -10,20 +11,16 @@
 include/fann_train.h
 include/fixedfann.h
 include/floatfann.h
-lib/libdoublefann.a
-lib/libdoublefann.la
 lib/libdoublefann.so
 lib/libdoublefann.so.2
-lib/libfann.a
-lib/libfann.la
+lib/libdoublefann.so.2.2.0
 lib/libfann.so
 lib/libfann.so.2
-lib/libfixedfann.a
-lib/libfixedfann.la
+lib/libfann.so.2.2.0
 lib/libfixedfann.so
 lib/libfixedfann.so.2
-lib/libfloatfann.a
-lib/libfloatfann.la
+lib/libfixedfann.so.2.2.0
 lib/libfloatfann.so
 lib/libfloatfann.so.2
+lib/libfloatfann.so.2.2.0
 libdata/pkgconfig/fann.pc


>Release-Note:
>Audit-Trail:
>Unformatted: