Update to 2.91 which includes a new rewritten Python interface

5 files changed, 13 insertions, 27 deletions

diff --git a/science/libsvm/Makefile b/science/libsvm/Makefile
index bfe64a43991a..f10a3ce200d5 100644
--- a/science/libsvm/Makefile
+++ b/science/libsvm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libsvm
-PORTVERSION=	2.90
+PORTVERSION=	2.91
 PORTEPOCH=	1
 CATEGORIES=	science math
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~cjlin/libsvm/ \
@@ -20,6 +20,9 @@ OPTIONS=	OCFLAGS "Use optimized CFLAGS" On
 
 USE_ZIP=	yes
 
+USE_LDCONFIG=	yes
+ALL_TARGET=	all lib
+
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-python"
 CATEGORIES+=	python
 
@@ -27,13 +30,9 @@ USE_PYTHON=	yes
 
 MAKE_ARGS=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 
-PYEXAMPLES=	python/cross_validation.py \
-		python/svm_test.py \
-		python/test_cross_validation.py
-
 TXT_DOCS=	README.python
 
-BUILD_WRKSRC=	${WRKSRC}/python
+NO_BUILD=	yes
 
 .else
 TXT_DOCS=	COPYRIGHT README FAQ.html README.tools
@@ -57,8 +56,6 @@ CFLAGS=		-Wall -Wconversion -O3
 .endif
 
 post-patch:
-
-post-extract:
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-python"
 	@${CP} ${WRKSRC}/python/README ${WRKSRC}/README.python
 .else
@@ -67,19 +64,15 @@ post-extract:
 
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-python"
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/python/svm.py ${PYTHON_SITELIBDIR}/
-	${INSTALL_PROGRAM} ${WRKSRC}/python/svmc.so ${PYTHON_SITELIBDIR}/
-	${MKDIR} ${EXAMPLESDIR}
-	for f in ${PYEXAMPLES}; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$f ${EXAMPLESDIR}; \
-	done
-
+	${INSTALL_DATA} ${WRKSRC}/python/svm.py ${PYTHON_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/python/svmutil.py ${PYTHON_SITELIBDIR}/
 .else
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/svm-train ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/svm-predict ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/svm-scale ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/libsvm.so.1 ${PREFIX}/lib/
 	${MKDIR} ${DATADIR}
 	for f in ${TOOLS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DATADIR}; \
diff --git a/science/libsvm/distinfo b/science/libsvm/distinfo
index 5875f5901187..01e0227baa8d 100644
--- a/science/libsvm/distinfo
+++ b/science/libsvm/distinfo
@@ -1,3 +1,3 @@
-MD5 (libsvm-2.9.zip) = db48307e0b1ab71760c7f4342a2d6ba2
-SHA256 (libsvm-2.9.zip) = 805fd20ec71a15ca2fc10c0c843be249489a667eaedb29cc7bc141dd39f2c66a
-SIZE (libsvm-2.9.zip) = 578082
+MD5 (libsvm-2.91.zip) = ce5755b6820ffd07e28c9c5ac8f8f7b1
+SHA256 (libsvm-2.91.zip) = ec3001a3bb6796acb9d4d17a3c0b2a2d3a350bc162bde753f1b75b71ebd5353d
+SIZE (libsvm-2.91.zip) = 570505
diff --git a/science/libsvm/files/patch-python-Makefile b/science/libsvm/files/patch-python-Makefile
deleted file mode 100644
index 0dbef91c2e00..000000000000
--- a/science/libsvm/files/patch-python-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- python/Makefile.orig	Fri May  5 22:00:19 2006
-+++ python/Makefile	Sun Apr  1 20:50:00 2007
-@@ -1,4 +1,4 @@
--CC = g++
-+CC = ${CXX}
- SWIG ?= swig
- 
- #Windows: see ../README ../Makefile.win
diff --git a/science/libsvm/pkg-descr b/science/libsvm/pkg-descr
index 72d16dab601e..c6b9e450b46a 100644
--- a/science/libsvm/pkg-descr
+++ b/science/libsvm/pkg-descr
@@ -5,7 +5,7 @@ nu-SVC), regression (epsilon-SVR, nu-SVR) and distribution estimation
 Since version 2.8, it implements an SMO-type algorithm proposed in this paper:
 R.-E. Fan, P.-H. Chen, and C.-J. Lin. Working set selection using second order
 information for training SVM. Journal of Machine Learning Research 6,
-1889-1918, 2005. You can also find a pseudo code there. (how to cite LIBSVM)
+1889-1918, 2005. You can also find a pseudo code there.
 
 Our goal is to help users from other fields to easily use SVM as a tool. LIBSVM
 provides a simple interface where users can easily link it with their own
diff --git a/science/libsvm/pkg-plist b/science/libsvm/pkg-plist
index 56be2091c615..fb08720e57cf 100644
--- a/science/libsvm/pkg-plist
+++ b/science/libsvm/pkg-plist
@@ -1,6 +1,7 @@
 bin/svm-predict
 bin/svm-scale
 bin/svm-train
+lib/libsvm.so.1
 %%DATADIR%%/checkdata.py
 %%DATADIR%%/easy.py
 %%DATADIR%%/grid.py