From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 10 20:36:13 2006 Return-Path: X-Original-To: freebsd-ports-bugs@FreeBSD.org Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E47316B10F; Sat, 10 Jun 2006 20:36:13 +0000 (UTC) (envelope-from fernan@iib.unsam.edu.ar) Received: from smtp.unsam.edu.ar (smtp.unsam.edu.ar [170.210.48.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF827467C2; Sat, 10 Jun 2006 11:28:05 +0000 (GMT) (envelope-from fernan@iib.unsam.edu.ar) Received: from omega.iib.unsam.edu.ar (omega.iib.unsam.edu.ar [192.168.10.14]) by smtp.unsam.edu.ar (8.12.6/8.12.6) with ESMTP id k5ABQboh011007; Sat, 10 Jun 2006 08:26:37 -0300 (ART) (envelope-from fernan@iib.unsam.edu.ar) Received: from omega.iib.unsam.edu.ar (localhost [127.0.0.1]) by omega.iib.unsam.edu.ar (8.13.6/8.13.6) with ESMTP id k5ABS0Nd023740; Sat, 10 Jun 2006 08:28:00 -0300 (ART) (envelope-from fernan@iib.unsam.edu.ar) Received: (from fernan@localhost) by omega.iib.unsam.edu.ar (8.13.6/8.13.3/Submit) id k5ABRtUc023739; Sat, 10 Jun 2006 08:27:55 -0300 (ART) (envelope-from fernan@iib.unsam.edu.ar) X-Authentication-Warning: omega.iib.unsam.edu.ar: fernan set sender to fernan@iib.unsam.edu.ar using -f Date: Sat, 10 Jun 2006 08:27:55 -0300 From: Fernan Aguero To: Pav Lucistnik Message-ID: <20060610112755.GB22939@iib.unsam.edu.ar> Mail-Followup-To: Pav Lucistnik , freebsd-ports-bugs@FreeBSD.org References: <200606092227.k59MRIQF072889@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="IJpNTDwzlM2Ie8A6" Content-Disposition: inline In-Reply-To: <200606092227.k59MRIQF072889@freefall.freebsd.org> User-Agent: Mutt/1.5.11 Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/98764: [maintainer-update] update BLAST, add executable for other architectures X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jun 2006 20:36:13 -0000 --IJpNTDwzlM2Ie8A6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline +----[ Pav Lucistnik (09.Jun.2006 19:31): | | Synopsis: [maintainer-update] update BLAST, add executable for other architectures | | State-Changed-From-To: open->feedback | State-Changed-By: pav | State-Changed-When: Fri Jun 9 22:26:59 UTC 2006 | State-Changed-Why: | I'm afraid our make(1) does not understand .elsif lines. | Was this tested?? Mmm ... yes my fault, it should have been an '.elif' instead. As per your question about the port being tested, yes it was tested, and the port installed fine on my FreeBSD-6.1 (i386) box, which is weird because I saw no errors coming from make and make is pretty picky about things sometimes. Given that to get at the last .else line (6.x on i386) it should have already evaluated all the previous conditions, it strikes me as odd that it hadn't stopped with an error ... maybe it just ignored these lines and fell through to the last .else (where it obviously succeeded in my case)? http://genoma.unsam.edu.ar/~fernan/freebsd/blast.out Also, I don't have access to all the possible combinations of architecture/osversion to test my .if, .elif, .else lines ... so in this sense, this is only partially tested. I fixed those '.elsif' lines and the port builds fine, as before (no difference at all). Patch attached. Fernan | Responsible-Changed-From-To: freebsd-ports-bugs->pav | Responsible-Changed-By: pav | Responsible-Changed-When: Fri Jun 9 22:26:59 UTC 2006 | Responsible-Changed-Why: | Track | | http://www.freebsd.org/cgi/query-pr.cgi?pr=98764 | +----] --IJpNTDwzlM2Ie8A6 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="blast.diff" diff -ruN /usr/ports/biology/blast/Makefile blast/Makefile --- /usr/ports/biology/blast/Makefile Sun Jan 15 12:12:49 2006 +++ blast/Makefile Sat Jun 10 08:22:55 2006 @@ -8,7 +8,7 @@ PORTNAME= wu-blast PORTVERSION= 2.0 -PORTREVISION= 20060101 +PORTREVISION= 20060322 # YYYYMMDD CATEGORIES= biology MASTER_SITES= # EXTRACT_SUFX= .tar.Z @@ -21,7 +21,7 @@ IGNOREFILES= ${DISTFILES} RESTRICTED= "License does not allow redistribution of binaries. You should first register for the software, which is free for academic use." -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes DOWNLOAD_URL= http://blast.wustl.edu/licensing @@ -30,7 +30,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message PORTDOCS= COPYRIGHT FAQ-Indexing.html HISTORY LICENSE Memory.html \ - README.html parameters.html + README.html parameters.html tabular.html BINS= blasta gb2fasta gt2fasta memfile nrdb pam patdb \ pir2fasta sp2fasta xdformat xdget SCRIPTS= wu-blastall wu-formatdb @@ -39,10 +39,22 @@ .include +.if ${ARCH} == amd64 +.if ${OSVERSION} >= 500001 +DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-5.x-x64 +.elif ${OSVERSION} >= 600000 +DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-6.x-x64 +.else +IGNORE= "There are no WU-BLAST executables for your combination of architecture and FreeBSD version. Consider moving to one of the supported versions for your architecture" +.endif +.else .if ${OSVERSION} < 500000 DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-4.x-i686 +.elif ${OSVERSION} >= 50000 && ${OSVERSION} < 600000 +DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-5.x-i686 .else -DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-i686 +DISTNAME= blast${PORTVERSION:S/.0//}.freebsd-6.x-i686 +.endif .endif .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) diff -ruN /usr/ports/biology/blast/distinfo blast/distinfo --- /usr/ports/biology/blast/distinfo Sun Jan 15 12:12:49 2006 +++ blast/distinfo Fri Jun 9 15:59:39 2006 @@ -1,4 +1,10 @@ MD5 (blast2.freebsd-4.x-i686.tar.Z) = IGNORE -MD5 (blast2.freebsd-i686.tar.Z) = IGNORE +MD5 (blast2.freebsd-5.x-i686.tar.Z) = IGNORE +MD5 (blast2.freebsd-6.x-i686.tar.Z) = IGNORE +MD5 (blast2.freebsd-5.x-x64.tar.Z) = IGNORE +MD5 (blast2.freebsd-6.x-x64.tar.Z) = IGNORE SHA256 (blast2.freebsd-4.x-i686.tar.Z) = IGNORE -SHA256 (blast2.freebsd-i686.tar.Z) = IGNORE +SHA256 (blast2.freebsd-5.x-i686.tar.Z) = IGNORE +SHA256 (blast2.freebsd-6.x-i686.tar.Z) = IGNORE +SHA256 (blast2.freebsd-5.x-x64.tar.Z) = IGNORE +SHA256 (blast2.freebsd-6.x-x64.tar.Z) = IGNORE diff -ruN /usr/ports/biology/blast/pkg-plist blast/pkg-plist --- /usr/ports/biology/blast/pkg-plist Fri Mar 18 10:01:07 2005 +++ blast/pkg-plist Sat Jun 10 08:23:17 2006 @@ -26,6 +26,7 @@ %%PORTDOCS%%%%DOCSDIR%%/README.html %%PORTDOCS%%%%DOCSDIR%%/parameters.html %%PORTDOCS%%%%DOCSDIR%%/parameters.pdf +%%PORTDOCS%%%%DOCSDIR%%/tabular.html %%DATADIR%%/matrix/aa/nuc.4.4 %%DATADIR%%/matrix/aa/BLOSUM30 %%DATADIR%%/matrix/aa/BLOSUM35 --IJpNTDwzlM2Ie8A6--