diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2005-07-12 12:05:46 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-07-12 12:05:46 +0000 |
commit | 2bf089d981539e5b99c05bdba051887f9e32a41c (patch) | |
tree | 9aff47f4cb5449280f7def1e4201e09a8ef44067 /science/libsvm | |
parent | d4c0ac1f537cf98860854c350db7734c30caec42 (diff) | |
download | ports-2bf089d981539e5b99c05bdba051887f9e32a41c.tar.gz ports-2bf089d981539e5b99c05bdba051887f9e32a41c.zip |
Notes
Diffstat (limited to 'science/libsvm')
-rw-r--r-- | science/libsvm/Makefile | 15 | ||||
-rw-r--r-- | science/libsvm/distinfo | 4 | ||||
-rw-r--r-- | science/libsvm/files/patch-Makefile | 8 | ||||
-rw-r--r-- | science/libsvm/files/patch-python-Makefile | 19 |
4 files changed, 13 insertions, 33 deletions
diff --git a/science/libsvm/Makefile b/science/libsvm/Makefile index 55f77fb58930..c00f732b03ea 100644 --- a/science/libsvm/Makefile +++ b/science/libsvm/Makefile @@ -6,8 +6,9 @@ # PORTNAME= libsvm -PORTVERSION= 2.71 -PORTREVISION= 2 +PORTVERSION= 2.8 +PORTREVISION= 0 +PORTEPOCH= 1 CATEGORIES= science math MASTER_SITES= http://www.csie.ntu.edu.tw/~cjlin/libsvm/ \ http://www.csie.ntu.edu.tw/~cjlin/libsvm/oldfiles/ @@ -33,19 +34,13 @@ TXT_DOCS= COPYRIGHT README FAQ.html README.python .if !defined(NOPORTDOCS) PORTDOCS= ${TXT_DOCS} .endif -TOOLS= python/grid.py python/easy.py +TOOLS= tools/grid.py tools/easy.py MSG_FILE= ${PKGDIR}/pkg-message PKGMESSAGE= ${WRKSRC}/pkg-message .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" -AMD64= -fPIC -.else -AMD64= -.endif - pre-everything:: .if defined(WITH_PYTHON) @${ECHO_MSG} "Build with Python interface." @@ -56,9 +51,7 @@ pre-everything:: post-patch: .if defined(WITH_PYTHON) @${REINPLACE_CMD} -e "s,%%PYTHON_INCLUDEDIR%%,${PYTHON_INCLUDEDIR}," ${WRKSRC}/python/Makefile - @${REINPLACE_CMD} -e "s,%%AMD64%%,${AMD64}," ${WRKSRC}/python/Makefile .endif - @${REINPLACE_CMD} -e "s,%%AMD64%%,${AMD64}," ${WRKSRC}/Makefile @${SED} 's|%%DATADIR%%|${DATADIR}|g' ${MSG_FILE} > ${PKGMESSAGE} post-build: diff --git a/science/libsvm/distinfo b/science/libsvm/distinfo index 7ef0f9c6678a..c9092fefa656 100644 --- a/science/libsvm/distinfo +++ b/science/libsvm/distinfo @@ -1,2 +1,2 @@ -MD5 (libsvm-2.71.zip) = 192078dbae0510caa5505707941d1f00 -SIZE (libsvm-2.71.zip) = 450094 +MD5 (libsvm-2.8.zip) = 4fd61442270279a37d5a1e4bb4d04db3 +SIZE (libsvm-2.8.zip) = 457595 diff --git a/science/libsvm/files/patch-Makefile b/science/libsvm/files/patch-Makefile index c64fd7b5b59d..78f20fe8ae9c 100644 --- a/science/libsvm/files/patch-Makefile +++ b/science/libsvm/files/patch-Makefile @@ -7,11 +7,3 @@ all: svm-train svm-predict svm-scale -@@ -10,6 +9,6 @@ - svm-scale: svm-scale.c - $(CXXC) $(CFLAGS) svm-scale.c -o svm-scale - svm.o: svm.cpp svm.h -- $(CXXC) $(CFLAGS) -c svm.cpp -+ $(CXXC) $(CFLAGS) %%AMD64%% -c svm.cpp - clean: - rm -f *~ svm.o svm-train svm-predict svm-scale diff --git a/science/libsvm/files/patch-python-Makefile b/science/libsvm/files/patch-python-Makefile index fb0e6cd43af6..f7cf19abaf1f 100644 --- a/science/libsvm/files/patch-python-Makefile +++ b/science/libsvm/files/patch-python-Makefile @@ -1,18 +1,13 @@ ---- python/Makefile.orig Wed Mar 24 19:33:46 2004 -+++ python/Makefile Tue Nov 16 01:14:32 2004 -@@ -1,11 +1,11 @@ +--- python/Makefile.orig Tue Jul 12 01:11:46 2005 ++++ python/Makefile Tue Jul 12 01:11:50 2005 +@@ -1,8 +1,8 @@ -CC = g++ -+CC = $(CXX) ++CC = ${CXX} SWIG ?= swig #Windows: see ../README ../Makefile.win --PYTHON_INCLUDEDIR ?= /usr/include/python2.3 +-PYTHON_INCLUDEDIR ?= /usr/include/python2.4 +PYTHON_INCLUDEDIR ?= %%PYTHON_INCLUDEDIR%% --CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I.. --LDFLAGS = -shared -+CFLAGS += -I$(PYTHON_INCLUDEDIR) -I.. %%AMD64%% -+LDFLAGS += -shared - - all: svmc.so - + CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I.. + LDFLAGS = -shared |