[pkgsrc/trunk]: pkgsrc/devel/py-fann Use fann-devel rather than fann; python ...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4d9ae4a7a87
branches:  trunk
changeset: 519953:b4d9ae4a7a87
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Oct 12 19:05:08 2006 +0000

description:
Use fann-devel rather than fann; python support in 2.0.0 doesn't work.

diffstat:

 devel/py-fann/Makefile         |  11 ++++++-----
 devel/py-fann/PLIST            |   5 +----
 devel/py-fann/distinfo         |  10 +++++-----
 devel/py-fann/patches/patch-aa |  21 +++++++++++----------
 4 files changed, 23 insertions(+), 24 deletions(-)

diffs (84 lines):

diff -r 8dcdd14f4936 -r b4d9ae4a7a87 devel/py-fann/Makefile
--- a/devel/py-fann/Makefile    Thu Oct 12 18:32:12 2006 +0000
+++ b/devel/py-fann/Makefile    Thu Oct 12 19:05:08 2006 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2006/10/05 18:51:01 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/12 19:05:08 gdt Exp $
 
-.include "../../devel/fann/Makefile.common"
-PKGNAME=       ${PYPKGPREFIX}-fann-${FANNVERSION}
-PKGREVISION=   1
+.include "../../devel/fann-devel/Makefile.common"
+PKGNAME=       ${PYPKGPREFIX}-fann-${FANNVERSION}.${FANNDATE}
 
 COMMENT=               Fast Artificial Neural Network python interface
 
+USE_LANGUAGES=         c c++
+
 PYDISTUTILSPKG=                YES
 PYSETUPSUBDIR=         python
 
-.include "../../devel/fann/buildlink3.mk"
+.include "../../devel/fann-devel/buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8dcdd14f4936 -r b4d9ae4a7a87 devel/py-fann/PLIST
--- a/devel/py-fann/PLIST       Thu Oct 12 18:32:12 2006 +0000
+++ b/devel/py-fann/PLIST       Thu Oct 12 19:05:08 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/10/05 18:51:01 gdt Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/10/12 19:05:08 gdt Exp $
 ${PYSITELIB}/pyfann/__init__.py
 ${PYSITELIB}/pyfann/__init__.pyc
 ${PYSITELIB}/pyfann/__init__.pyo
@@ -6,7 +6,4 @@
 ${PYSITELIB}/pyfann/libfann.py
 ${PYSITELIB}/pyfann/libfann.pyc
 ${PYSITELIB}/pyfann/libfann.pyo
-${PYSITELIB}/pyfann/fann.py
-${PYSITELIB}/pyfann/fann.pyc
-${PYSITELIB}/pyfann/fann.pyo
 @dirrm ${PYSITELIB}/pyfann
diff -r 8dcdd14f4936 -r b4d9ae4a7a87 devel/py-fann/distinfo
--- a/devel/py-fann/distinfo    Thu Oct 12 18:32:12 2006 +0000
+++ b/devel/py-fann/distinfo    Thu Oct 12 19:05:08 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/10/05 18:51:01 gdt Exp $
+$NetBSD: distinfo,v 1.3 2006/10/12 19:05:08 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 (patch-aa) = 889cf88228a29728cc5fd15378251e3460d71db7
+SHA1 (fann-2.1.0-20061012.tar.bz2) = 4ad8f9a55e3410bbb3a583e9466a774acd1c574e
+RMD160 (fann-2.1.0-20061012.tar.bz2) = caf138cb743752108c66a8b2542bc4cffe1c6e67
+Size (fann-2.1.0-20061012.tar.bz2) = 3396644 bytes
+SHA1 (patch-aa) = 5b283f9682aca1cba3b4bd2ebbb1aa605ed4630a
diff -r 8dcdd14f4936 -r b4d9ae4a7a87 devel/py-fann/patches/patch-aa
--- a/devel/py-fann/patches/patch-aa    Thu Oct 12 18:32:12 2006 +0000
+++ b/devel/py-fann/patches/patch-aa    Thu Oct 12 19:05:08 2006 +0000
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2006/10/05 18:51:01 gdt Exp $
+$NetBSD: patch-aa,v 1.3 2006/10/12 19:05:08 gdt Exp $
 
---- python/setup.py.orig       2006-01-06 16:45:28.000000000 -0500
+--- python/setup.py.orig       2006-03-18 12:37:12.000000000 -0500
 +++ python/setup.py
-@@ -40,6 +40,6 @@ setup(
-     url='http://sourceforge.net/projects/fann/',
-     license='GNU LESSER GENERAL PUBLIC LICENSE (LGPL)',
-     py_modules=['pyfann.libfann','pyfann.fann'],
--    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann.i','pyfann/fann_helper.c'], include_dirs=['../src/include'], extra_objects=['../src/doublefann.o']) ]
-+    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann.i','pyfann/fann_helper.c'], include_dirs=['../src/include'], libraries=['doublefann'] )]
- )
- 
+@@ -42,7 +42,7 @@ setup(
+     py_modules=['pyfann.libfann'],
+     ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann_wrap.cxx'], 
+                             include_dirs=['../src/include'], 
+-                            extra_objects=['../src/doublefann.o'],
++                          libraries=['doublefann'],
+                             define_macros=[("SWIG_COMPILE",None)]
+                             ),
+                 ]