Respect LDFLAGS wrt bug 336196. Thanks to Diego for the report. Fix install and implicit function declaration. Drop old.

(Portage version: 2.2_rc73/cvs/Linux x86_64)

2 files changed, 80 insertions, 0 deletions

diff --git a/sci-biology/rnaview/files/rnaview-20040713-implicit.patch b/sci-biology/rnaview/files/rnaview-20040713-implicit.patch
new file mode 100644
index 000000000000..009f6e79ae86
--- /dev/null
+++ b/sci-biology/rnaview/files/rnaview-20040713-implicit.patch
@@ -0,0 +1,13 @@
+Fix implicit function declaration
+
+--- src/xml2ps.c
++++ src/xml2ps.c
+@@ -36,7 +36,7 @@
+ void read_sugar_syn(char *inpfile, long **sugar_syn);
+ void get_sugar_syn(FILE *inp, char *value_ch);
+ void get_chain_broken(long nres, double **a, double **b, long *chain_broken);
+-
++extern void get_BDIR(char *BDIR, char *filename);
+ 
+ 
+ FILE  *psfile; 
diff --git a/sci-biology/rnaview/files/rnaview-20040713-makefile.patch b/sci-biology/rnaview/files/rnaview-20040713-makefile.patch
new file mode 100644
index 000000000000..5d9ecd99cf25
--- /dev/null
+++ b/sci-biology/rnaview/files/rnaview-20040713-makefile.patch
@@ -0,0 +1,67 @@
+Fix install paths, respect LDFLAGS, CFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=336196
+
+--- rnaml2ps/Makefile
++++ rnaml2ps/Makefile
+@@ -5,16 +5,21 @@
+ RNADRAW = rnaml2ps
+ OBJS_RNADRAW = rnaml2ps.o nrutil.o 
+ 
++all: $(RNADRAW)
++
+ $(RNADRAW):   $(OBJS_RNADRAW)
+-	$(CC) -o $(RNADRAW) $(OBJS_RNADRAW) -lm
++	$(CC) $(LDFLAGS) -o $(RNADRAW) $(OBJS_RNADRAW) -lm
+ 
+ nrutil.o : nrutil.c 
+-	cc -c  nrutil.c
++	$(CC) $(CFLAGS) -c  nrutil.c
+ 
+ rnaml2ps.o :  rnaml2ps.c
+-	cc -c  rnaml2ps.c
++	$(CC) $(CFLAGS) -c  rnaml2ps.c
+ 
+ 
+-.PHONY : clean
++.PHONY : clean all install
+ clean:
+-	rm *.o
++	rm -f *.o
++
++install:
++	install -D -m 0755 $(RNADRAW) $(DESTDIR)/usr/bin/$(RNADRAW)
+--- Makefile
++++ Makefile
+@@ -56,9 +56,14 @@
+            $(OBJ)/multiple.o \
+            $(OBJ)/statistics.o
+ 
++.PHONY: clean all install
++
++SUBDIRS = rnaml2ps
++
+ all: $(RNAVIEW)
++	for dir in ${SUBDIRS} ; do ( cd $$dir ; ${MAKE} all ) ; done
+ 
+-CFLAGS  =  $(LINCLUDES) 
++CFLAGS  +=  $(LINCLUDES)
+ 
+ $(RNAVIEW) : $(HFILES) $(OBJ_FILE) 
+ 	$(CC) $(CFLAGS) -o $@ $(OBJ_FILE) $(LDFLAGS) -lm $(MALLOCLIB)
+@@ -111,6 +116,15 @@
+ clean:
+ 	@rm -f $(OBJ)/*.o
+ 	@rm -f $(ALLTARGETS)
++	for dir in ${SUBDIRS} ; do ( cd $$dir ; ${MAKE} clean ) ; done
++
++install:
++	install -D -m 0755 bin/rnaview $(DESTDIR)/usr/bin/rnaview
++	mkdir -p $(DESTDIR)/usr/share/rnaview/BASEPARS
++	install -m 0644 BASEPARS/* $(DESTDIR)/usr/share/rnaview/BASEPARS
++	mkdir -p $(DESTDIR)/usr/share/rnaview/test
++	install -m 0644 test/* $(DESTDIR)/usr/share/rnaview/test
++	for dir in ${SUBDIRS} ; do ( cd $$dir ; ${MAKE} install ) ; done
+ 
+ export:
+ 	mkdir -p $(EXPORT_DIR)