summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-biology/njplot/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-biology/njplot/files')
-rw-r--r--sci-biology/njplot/files/njplot-2.3-buildsystem.patch59
-rw-r--r--sci-biology/njplot/files/njplot-2.3-format-security.patch16
2 files changed, 75 insertions, 0 deletions
diff --git a/sci-biology/njplot/files/njplot-2.3-buildsystem.patch b/sci-biology/njplot/files/njplot-2.3-buildsystem.patch
new file mode 100644
index 000000000000..61f8b95ea160
--- /dev/null
+++ b/sci-biology/njplot/files/njplot-2.3-buildsystem.patch
@@ -0,0 +1,59 @@
+ makefile | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/makefile b/makefile
+index ccb7dc2..9488c2a 100644
+--- a/makefile
++++ b/makefile
+@@ -7,10 +7,10 @@ NO_PDF = -DNO_PDF
+ #PDFLIB = -L$(PDF) -lpdf
+
+ # c compiler and linker
+-CC = gcc
++CC ?= gcc
+
+ # Vibrant top directory
+-VIBRANT = /banques0/ncbiJun04
++VIBRANT = /usr/include/ncbi
+
+
+ # X11 include directory
+@@ -24,15 +24,15 @@ OBJECTS = njplot-vib.o
+ OBJUNROOTED = unrooted-vib.o preptree.o
+
+
+-CFLAGS = -c -DWIN_MOTIF -Dunix -I$(VIBRANT)/include -I$(VIBRANT)/vibrant -I$(VIBRANT)/corelib \
++CFLAGS += -c -DWIN_MOTIF -Dunix -I$(VIBRANT)/include -I$(VIBRANT)/vibrant -I$(VIBRANT)/corelib \
+ -I$(VIBRANT) -I$(PDF) -I$(X11INCL) -I$(MOTIFINCL) $(HELPFILENAME) $(NO_PDF) \
+- -Wimplicit-function-declaration -g
++ -Wimplicit-function-declaration
+
+ all: njplot unrooted newicktops newicktotxt
+
+
+ njplot : $(OBJECTS)
+- $(CC) -g -o njplot $(OBJECTS) \
++ $(CC) $(LDFLAGS) -o njplot $(OBJECTS) \
+ -L$(VIBRANT)/lib \
+ -lvibrant -lncbi \
+ $(PDFLIB) \
+@@ -40,16 +40,16 @@ njplot : $(OBJECTS)
+ -L/usr/X11R6/lib -lXmu -lXt -lX11 -lm
+
+ unrooted : $(OBJUNROOTED)
+- $(CC) -g -o unrooted $(OBJUNROOTED) \
++ $(CC) $(LDFLAGS) -o unrooted $(OBJUNROOTED) \
+ -L$(VIBRANT)/lib -lvibrant -lncbi \
+ -L$(MOTIFLIB) -lXm \
+ -L/usr/X11R6/lib -lXmu -lXt -lX11 -lm
+
+ newicktops: njplot-vib.c
+- $(CC) -DNO_GUI -DNO_PDF -o $@ njplot-vib.c -lm
++ $(CC) $(LDFLAGS) $(CFLAGS) -DNO_GUI -DNO_PDF -o $@ njplot-vib.c -lm
+
+ newicktotxt: njplot-vib.c
+- $(CC) -DTTY -o $@ njplot-vib.c -lm
++ $(CC) -DTTY $(LDFLAGS) $(CFLAGS) -o $@ njplot-vib.c -lm
+
+
+ .c.o :
diff --git a/sci-biology/njplot/files/njplot-2.3-format-security.patch b/sci-biology/njplot/files/njplot-2.3-format-security.patch
new file mode 100644
index 000000000000..686b8475e9ed
--- /dev/null
+++ b/sci-biology/njplot/files/njplot-2.3-format-security.patch
@@ -0,0 +1,16 @@
+ njplot-vib.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/njplot-vib.c b/njplot-vib.c
+index fe55609..63fd3b6 100644
+--- a/njplot-vib.c
++++ b/njplot-vib.c
+@@ -1976,7 +1976,7 @@ PDFONLY" no window interface, just write the PDF/PostScript tree plot\n"
+ #else
+ fprintf(stderr,
+ #endif
+- message);
++ "%s", message);
+ exit(0);
+ }
+ }