From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 31 Aug 2021 08:59:54 +0100
Subject: gentoo resync : 31.08.2021

---
 .../njplot/files/njplot-2.3-buildsystem.patch      | 59 ----------------------
 .../njplot/files/njplot-2.3-format-security.patch  | 16 ------
 2 files changed, 75 deletions(-)
 delete mode 100644 sci-biology/njplot/files/njplot-2.3-buildsystem.patch
 delete mode 100644 sci-biology/njplot/files/njplot-2.3-format-security.patch

(limited to 'sci-biology/njplot/files')

diff --git a/sci-biology/njplot/files/njplot-2.3-buildsystem.patch b/sci-biology/njplot/files/njplot-2.3-buildsystem.patch
deleted file mode 100644
index 61f8b95ea160..000000000000
--- a/sci-biology/njplot/files/njplot-2.3-buildsystem.patch
+++ /dev/null
@@ -1,59 +0,0 @@
- 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
deleted file mode 100644
index 686b8475e9ed..000000000000
--- a/sci-biology/njplot/files/njplot-2.3-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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);
- 		}
- 	}
-- 
cgit v1.2.3