Attachment 49235 Details for Bug 75248 – libsvm-2.71_2.patch

[patch] libsvm-2.71_2.patch

libsvm-2.71_2.patch (text/plain), 4.03 KB, created by Rong-En Fan on 2004-12-19 02:20:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rong-En Fan

Created: 2004-12-19 02:20:27 UTC

Size: 4.03 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/science/libsvm/Makefile /home/rafan/tmp/ports/science/libsvm/Makefile
>--- /usr/ports/science/libsvm/Makefile	Tue Dec 14 02:26:43 2004
>+++ /home/rafan/tmp/ports/science/libsvm/Makefile	Sat Dec 18 02:19:03 2004
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	libsvm
> PORTVERSION=	2.71
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	science math
> MASTER_SITES=	http://www.csie.ntu.edu.tw/~cjlin/libsvm/ \
> 		http://www.csie.ntu.edu.tw/~cjlin/libsvm/oldfiles/
>@@ -16,16 +16,17 @@
> COMMENT=	A library for Support Vector Machines
> 
> USE_ZIP=	yes
>+USE_REINPLACE=	yes
>+
> .if defined(WITH_PYTHON)
> CATEGORIES+=	python
> USE_PYTHON=	yes
>-USE_REINPLACE=	yes
> PLIST_SUB+=	LIBSVM_PYTHON=""
>-.else
>-PLIST_SUB+=	LIBSVM_PYTHON="@comment "
> PYEXAMPLES=	python/cross_validation.py \
> 		python/svm_test.py \
> 		python/test_cross_validation.py
>+.else
>+PLIST_SUB+=	LIBSVM_PYTHON="@comment "
> .endif
> 
> TXT_DOCS=	COPYRIGHT README FAQ.html README.python
>@@ -37,6 +38,14 @@
> 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."
>@@ -47,7 +56,9 @@
> 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:
>@@ -82,4 +93,4 @@
> 	@${CAT} ${PKGMESSAGE}
> 	@${ECHO} ""
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/science/libsvm/files/patch-Makefile /home/rafan/tmp/ports/science/libsvm/files/patch-Makefile
>--- /usr/ports/science/libsvm/files/patch-Makefile	Sat Dec 11 21:24:57 2004
>+++ /home/rafan/tmp/ports/science/libsvm/files/patch-Makefile	Sat Dec 18 02:15:11 2004
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Tue Nov 16 00:45:06 2004
>-+++ Makefile	Tue Nov 16 00:46:01 2004
>+--- Makefile.orig	Sat Nov 20 09:35:29 2004
>++++ Makefile	Sat Dec 18 02:14:59 2004
> @@ -1,5 +1,4 @@
> -CXXC = g++
> -CFLAGS = -Wall -O3 
>@@ -7,3 +7,11 @@
>  
>  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 -ruN --exclude=CVS /usr/ports/science/libsvm/files/patch-python-Makefile /home/rafan/tmp/ports/science/libsvm/files/patch-python-Makefile
>--- /usr/ports/science/libsvm/files/patch-python-Makefile	Sat Dec 11 12:39:53 2004
>+++ /home/rafan/tmp/ports/science/libsvm/files/patch-python-Makefile	Thu Dec 16 07:25:39 2004
>@@ -11,7 +11,7 @@
>  
> -CFLAGS = -O3 -I$(PYTHON_INCLUDEDIR) -I..
> -LDFLAGS = -shared
>-+CFLAGS += -I$(PYTHON_INCLUDEDIR) -I..
>++CFLAGS += -I$(PYTHON_INCLUDEDIR) -I.. %%AMD64%%
> +LDFLAGS += -shared
>  
>  all: svmc.so
>diff -ruN --exclude=CVS /usr/ports/science/libsvm/pkg-message /home/rafan/tmp/ports/science/libsvm/pkg-message
>--- /usr/ports/science/libsvm/pkg-message	Sat Dec 11 12:39:52 2004
>+++ /home/rafan/tmp/ports/science/libsvm/pkg-message	Thu Dec 16 07:28:23 2004
>@@ -2,4 +2,3 @@
> Some useful tools are installed to %%DATADIR%%.
> Most of them are written in Python, please install
> lang/python before trying them.
>-
>diff -ruN --exclude=CVS /usr/ports/science/libsvm/pkg-plist /home/rafan/tmp/ports/science/libsvm/pkg-plist
>--- /usr/ports/science/libsvm/pkg-plist	Tue Dec 14 02:26:43 2004
>+++ /home/rafan/tmp/ports/science/libsvm/pkg-plist	Wed Dec 15 15:44:06 2004
>@@ -3,6 +3,10 @@
> bin/svm-train
> %%DATADIR%%/grid.py
> %%DATADIR%%/easy.py
>+%%LIBSVM_PYTHON%%%%EXAMPLESDIR%%/cross_validation.py
>+%%LIBSVM_PYTHON%%%%EXAMPLESDIR%%/svm_test.py
>+%%LIBSVM_PYTHON%%%%EXAMPLESDIR%%/test_cross_validation.py
> %%LIBSVM_PYTHON%%%%PYTHON_SITELIBDIR%%/svm.py
> %%LIBSVM_PYTHON%%%%PYTHON_SITELIBDIR%%/svmc.so
>+%%LIBSVM_PYTHON%%@dirrm %%EXAMPLESDIR%%
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 75248: 49235