| 1 |
jlec 10/02/27 10:01:54 |
| 2 |
|
| 3 |
Added: 2.6.1-Makefile.patch 2.6.1-path.patch |
| 4 |
Log: |
| 5 |
Imported from sci overlay |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-chemistry/psipred/files/2.6.1-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-Makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-Makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 2.6.1-Makefile.patch |
| 15 |
=================================================================== |
| 16 |
--- src/Makefile 2008-03-09 22:59:51.000000000 +0100 |
| 17 |
+++ src/Makefile.new 2009-04-09 12:31:38.669457918 +0200 |
| 18 |
@@ -6,9 +6,7 @@ |
| 19 |
#### CFLAGS Flags to pass to C compiler. |
| 20 |
|
| 21 |
INCDIR = . |
| 22 |
-CC = cc |
| 23 |
|
| 24 |
-CFLAGS = -O |
| 25 |
LIBS = -lm |
| 26 |
|
| 27 |
all: psipred psipass2 seq2mtx pfilt |
| 28 |
@@ -20,13 +18,13 @@ |
| 29 |
/bin/rm -f psipred psipass2 seq2mtx pfilt |
| 30 |
|
| 31 |
psipred: sspred_avpred.c ssdefs.h sspred_net.h |
| 32 |
- $(CC) $(CFLAGS) sspred_avpred.c $(LIBS) -o psipred |
| 33 |
+ $(CC) $(CFLAGS) $(LDFLAGS) sspred_avpred.c $(LIBS) -o psipred |
| 34 |
|
| 35 |
psipass2: sspred_hmulti.c ssdefs.h sspred_net2.h |
| 36 |
- $(CC) $(CFLAGS) sspred_hmulti.c $(LIBS) -o psipass2 |
| 37 |
+ $(CC) $(CFLAGS) $(LDFLAGS) sspred_hmulti.c $(LIBS) -o psipass2 |
| 38 |
|
| 39 |
seq2mtx: seq2mtx.c |
| 40 |
- $(CC) $(CFLAGS) seq2mtx.c $(LIBS) -o seq2mtx |
| 41 |
+ $(CC) $(CFLAGS) $(LDFLAGS) seq2mtx.c $(LIBS) -o seq2mtx |
| 42 |
|
| 43 |
pfilt: pfilt.c |
| 44 |
- $(CC) $(CFLAGS) pfilt.c $(LIBS) -o pfilt |
| 45 |
+ $(CC) $(CFLAGS) $(LDFLAGS) pfilt.c $(LIBS) -o pfilt |
| 46 |
--- src/Makefile 2009-04-09 12:34:41.636939862 +0200 |
| 47 |
+++ src/Makefile.new 2009-04-09 12:36:03.796098341 +0200 |
| 48 |
@@ -12,7 +12,8 @@ |
| 49 |
all: psipred psipass2 seq2mtx pfilt |
| 50 |
|
| 51 |
install: |
| 52 |
- /bin/cp psipred psipass2 seq2mtx pfilt ../bin |
| 53 |
+ /bin/mkdir -p $(DESTDIR)/usr/bin |
| 54 |
+ /bin/cp psipred psipass2 seq2mtx pfilt $(DESTDIR)/usr/bin |
| 55 |
|
| 56 |
clean: |
| 57 |
/bin/rm -f psipred psipass2 seq2mtx pfilt |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 sci-chemistry/psipred/files/2.6.1-path.patch |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-path.patch?rev=1.1&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-path.patch?rev=1.1&content-type=text/plain |
| 65 |
|
| 66 |
Index: 2.6.1-path.patch |
| 67 |
=================================================================== |
| 68 |
--- runpsipred 2008-04-05 00:14:36.000000000 +0200 |
| 69 |
+++ runpsipred.new 2009-04-09 12:40:46.376203036 +0200 |
| 70 |
@@ -14,13 +14,13 @@ |
| 71 |
set dbname = nr |
| 72 |
|
| 73 |
# Where the NCBI programs have been installed |
| 74 |
-set ncbidir = /usr/local/bin |
| 75 |
+set ncbidir = @GENTOO_PORTAGE_EPREFIX@/usr/bin |
| 76 |
|
| 77 |
# Where the PSIPRED V2 programs have been installed |
| 78 |
-set execdir = ./bin |
| 79 |
+set execdir = @GENTOO_PORTAGE_EPREFIX@/usr/bin |
| 80 |
|
| 81 |
# Where the PSIPRED V2 data files have been installed |
| 82 |
-set datadir = ./data |
| 83 |
+set datadir = @GENTOO_PORTAGE_EPREFIX@/usr/share/psipred/data |
| 84 |
|
| 85 |
set basename = $1:r |
| 86 |
set rootname = $basename:t |
| 87 |
--- runpsipred_single 2008-04-05 00:14:38.000000000 +0200 |
| 88 |
+++ runpsipred_single.new 2009-04-09 12:41:10.086067082 +0200 |
| 89 |
@@ -10,10 +10,10 @@ |
| 90 |
# NOTE: Script modified to be more cluster friendly (DTJ April 2008) |
| 91 |
|
| 92 |
# Where the PSIPRED V2 programs have been installed |
| 93 |
-set execdir = ./bin |
| 94 |
+set execdir = @GENTOO_PORTAGE_EPREFIX@/usr/bin |
| 95 |
|
| 96 |
# Where the PSIPRED V2 data files have been installed |
| 97 |
-set datadir = ./data |
| 98 |
+set datadir = @GENTOO_PORTAGE_EPREFIX@/usr/share/psipred/data |
| 99 |
|
| 100 |
set basename = $1:r |
| 101 |
set rootname = $basename:t |
Archives