From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 19 02:20:27 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1BA416A4CE for ; Sun, 19 Dec 2004 02:20:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98E3D43D2F for ; Sun, 19 Dec 2004 02:20:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBJ2KRa3048017 for ; Sun, 19 Dec 2004 02:20:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBJ2KRmA048016; Sun, 19 Dec 2004 02:20:27 GMT (envelope-from gnats) Resent-Date: Sun, 19 Dec 2004 02:20:27 GMT Resent-Message-Id: <200412190220.iBJ2KRmA048016@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rong-En Fan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEB4816A4CE for ; Sun, 19 Dec 2004 02:11:10 +0000 (GMT) Received: from muse.csie.ntu.edu.tw (muse.csie.ntu.edu.tw [140.112.28.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00D4343D5C for ; Sun, 19 Dec 2004 02:11:10 +0000 (GMT) (envelope-from rafan@infor.org) Received: from localhost (localhost.csie.ntu.edu.tw [127.0.0.1]) by muse.csie.ntu.edu.tw (Postfix) with ESMTP id 9B2D752106 for ; Sun, 19 Dec 2004 10:11:08 +0800 (CST) Received: from muse.csie.ntu.edu.tw ([127.0.0.1]) by localhost (muse.csie.ntu.edu.tw [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 72013-71 for ; Sun, 19 Dec 2004 10:11:06 +0800 (CST) Received: from woodstock.csie.org (220-135-116-9.HINET-IP.hinet.net [220.135.116.9]) by muse.csie.ntu.edu.tw (Postfix) with ESMTP id DCA9652159 for ; Sun, 19 Dec 2004 10:11:00 +0800 (CST) Received: (from rafan@localhost) by woodstock.csie.org (8.13.1/8.13.1/Submit) id iBJ2AZdr001639; Sun, 19 Dec 2004 10:10:35 +0800 (CST) (envelope-from rafan) Message-Id: <200412190210.iBJ2AZdr001639@woodstock.csie.org> Date: Sun, 19 Dec 2004 10:10:35 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/75248: [MAINTAINER] science/libsvm: fix compliation on amd64, pkg-plist X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2004 02:20:27 -0000 >Number: 75248 >Category: ports >Synopsis: [MAINTAINER] science/libsvm: fix compliation on amd64, pkg-plist >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: Sun Dec 19 02:20:27 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 6.0-CURRENT i386 >Organization: NTU CSIE >Environment: System: FreeBSD woodstock.csie.org 6.0-CURRENT FreeBSD 6.0-CURRENT #42: Tue Dec 14 04:41:54 CST 2004 >Description: - add -fPIC for amd64 - fix pkg-plist, bump PORTREVISION I didn't correct install examples Poked by pointyhat via Kris. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- libsvm-2.71_2.patch begins here --- 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 + +.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 +.include 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%% --- libsvm-2.71_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: