Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17263

Modified Files:
        wwwblast.info wwwblast.patch 
Log Message:
Make this thing actually able to compile (API additions vs version in
external package it linked:(


Index: wwwblast.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/wwwblast.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wwwblast.info       20 Jan 2006 20:30:41 -0000      1.1
+++ wwwblast.info       30 Mar 2006 07:29:00 -0000      1.2
@@ -1,11 +1,18 @@
 Package: wwwblast
 Version: 2.2.9
-Revision: 1
+Revision: 2
 Source: ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/20040505/ncbi.tar.gz
 SourceRename: %n-%v.tar.gz
 Source-MD5: fd88e28e0d7323346731a8169c696b6d
 SourceDirectory: ncbi/network/wwwblast
 Patch: %n.patch
+PatchScript: <<
+  #!/bin/sh -ev
+  cd Src
+  ln -s ../../../api/txalign.c .
+  ln -s ../../../tools/xmlblast.c .
+  ln -s ../../../desktop/salogif.c .
+<<
 Depends: ncbitools
 CompileScript: <<
 cp -p Src/Makefile Src/Makefile.old
@@ -178,5 +185,11 @@
 For more information, see:
 http://www.ncbi.nlm.nih.gov/BLAST/
 <<
+DescPort: <<
+  dmacks: This package includes a newer ncbitools than fink's
+  "ncbitools" package and makes use of new APIs in it. So we build
+  those specific parts of the local ncbitools that have the new
+  functions that wwwblast needs.
+<<
 Maintainer: Richard Graul <[EMAIL PROTECTED]>
 Homepage: http://www.ncbi.nlm.nih.gov/BLAST/

Index: wwwblast.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/wwwblast.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wwwblast.patch      20 Jan 2006 20:30:41 -0000      1.1
+++ wwwblast.patch      30 Mar 2006 07:29:00 -0000      1.2
@@ -1,5 +1,6 @@
---- wwwblast/Src/Makefile      Fri Nov 21 13:10:56 2003
-+++ wwwblast/Src/Makefile      Sun May 30 17:04:36 2004
+diff -Nurd -x'*~' wwwblast.orig/Src/Makefile wwwblast/Src/Makefile
+--- wwwblast.orig/Src/Makefile 2003-11-21 16:10:56.000000000 -0500
++++ wwwblast/Src/Makefile      2006-03-30 02:13:58.000000000 -0500
 @@ -1,12 +1,12 @@
  # Set the NCBI variable to your local path to the NCBI toolkit!
  #NCBI = 
@@ -29,15 +30,25 @@
  
  #
  CC=cc 
-@@ -46,7 +46,7 @@
+@@ -46,15 +46,15 @@
  LIBS = $(NCBI_LIBDIR)
  DEBUG_FLAG = -O
  # For MacOS, use the following line:
 -#DEBUG_FLAG = -O2 -g
 +DEBUG_FLAG = -O2 -g
  
- OBJ_FILES = wwwbutl.c $(LIBS)/ncbithr.o
+-OBJ_FILES = wwwbutl.c $(LIBS)/ncbithr.o
++OBJ_FILES = wwwbutl.c $(LIBS)/ncbithr.o txalign.o xmlblast.o salogif.o
+ 
+ #  Defines: 
+ #  NCBI_CLIENT_SERVER - full NCBI Client/server including BLAST search
+ #  NCBI_ENTREZ_CLIENT - Client server for gi/accession lookups
  
+-INCDIR = -I. -I$(NCBI_INCDIR)
++INCDIR = -I. -I../../../api -I../../../tools -I../../../desktop 
-I$(NCBI_INCDIR)
+ 
+ # Additional include path for internal NCBI BLAST 2 sequences only.
+ # Comment out for standalone
 @@ -63,17 +63,17 @@
  
  CFLAGS = -c $(DEBUG_FLAG) $(INCDIR)
@@ -59,8 +70,21 @@
  
  # For full NCBI Client-server model
  #CFLAGS += -DNCBI_CLIENT_SERVER
---- wwwblast/index.html        Tue Aug  6 12:03:51 2002
-+++ wwwblast/index.html        Mon May 31 08:43:18 2004
+diff -Nurd -x'*~' wwwblast.orig/Src/viewgif.c wwwblast/Src/viewgif.c
+--- wwwblast.orig/Src/viewgif.c        2003-07-15 13:42:19.000000000 -0400
++++ wwwblast/Src/viewgif.c     2006-03-30 02:17:38.000000000 -0500
+@@ -1,6 +1,8 @@
+ #include <signal.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ static void SigAlrmHandler(int);
+ static void SigTermHandler(int);
+diff -Nurd -x'*~' wwwblast.orig/index.html wwwblast/index.html
+--- wwwblast.orig/index.html   2002-08-06 15:03:51.000000000 -0400
++++ wwwblast/index.html        2006-03-30 01:59:16.000000000 -0500
 @@ -9,20 +9,15 @@
  
  <UL>



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to