diff options
Diffstat (limited to 'math/rlab/patches/patch-ab')
| -rw-r--r-- | math/rlab/patches/patch-ab | 70 |
1 files changed, 39 insertions, 31 deletions
diff --git a/math/rlab/patches/patch-ab b/math/rlab/patches/patch-ab index 0fb394bb7ad..240d789ad53 100644 --- a/math/rlab/patches/patch-ab +++ b/math/rlab/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ +$NetBSD: patch-ab,v 1.3 2001/02/02 02:06:44 jtb Exp $ --- Makefile.in.orig Fri Apr 30 14:32:04 1999 +++ Makefile.in @@ -32,6 +32,19 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ mand = $(exec_prefix)/man mandir = $(exec_prefix)/man/man1 buildir = @BUILD_DIR@ +@@ -166,9 +166,9 @@ + # Don't change these without modifying the install actions + # + +-TOPDIR = $(libdir)/rlab-$(VER) +-DOCDIR = $(TOPDIR)/doc +-RHELPDIR = $(TOPDIR)/doc/help ++TOPDIR = $(libdir)/rlab ++DOCDIR = $(prefix)/share/doc/rlab ++RHELPDIR = $(TOPDIR)/help + RLIBDIR = $(TOPDIR)/rlib + DEFAULT_RC0 = $(TOPDIR)/.rlab + TOOLBOX = $(TOPDIR)/toolbox @@ -236,7 +236,7 @@ SRC = $(R_SRC) $(F_SRC) $(EXTRA_SRC) $(GNU_SRC) $(CMD_SRC) OBJ = $(R_OBJ) $(F_OBJ) $(EXTRA_OBJ) $(GNU_OBJ) $(CMD_OBJ) @@ -50,7 +63,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ # # Ignore these unless you know what CodeTEST Native for Solaris is. -@@ -301,51 +301,72 @@ +@@ -301,51 +301,67 @@ COPYDIR = rlib toolbox controls-toolbox doc examples .rlab config.h test.r \ test.getline test.input Makefile @@ -66,49 +79,44 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ - cp misc/pgplot.r ${TOPDIR}/rlib/plot.r;\ - cd misc/pghelp; tar cf - . | (cd ${RHELPDIR}; umask 022; tar xf - ) ;\ +install: rlab -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/rlab -+ $(BSD_INSTALL_DATA) $(buildir)/.rlab $(libdir)/rlab -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/rlib ++ $(BSD_INSTALL_DATA_DIR) $(TOPDIR) ++ $(BSD_INSTALL_DATA) $(buildir)/.rlab $(TOPDIR) ++ $(BSD_INSTALL_DATA_DIR) $(RLIBDIR) + @for f in $(buildir)/rlib/*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/rlib/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(RLIBDIR)"; \ + echo $$i; $$i; \ + done -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/toolbox ++ $(BSD_INSTALL_DATA_DIR) $(TOOLBOX) + @for f in $(buildir)/toolbox/*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/toolbox/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(TOOLBOX)"; \ + echo $$i; $$i; \ + done -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/controls-toolbox ++ $(BSD_INSTALL_DATA_DIR) $(CTOOLBOX) + @for f in $(buildir)/controls-toolbox/*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/controls-toolbox/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(CTOOLBOX)"; \ + echo $$i; $$i; \ + done -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/help ++ $(BSD_INSTALL_DATA_DIR) $(RHELPDIR) + @for f in $(buildir)/doc/help/*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(RHELPDIR)"; \ + echo $$i; $$i; \ + done -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/examples ++ $(BSD_INSTALL_DATA_DIR) $(TOPDIR)/examples + @for f in $(buildir)/examples/* $(buildir)/test.*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/examples/"; \ -+ echo $$i; $$i; \ -+ done -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/doc/rlab -+ $(BSD_INSTALL_DATA) $(buildir)/doc/rlab-ref.ps $(libdir)/doc/rlab -+ @for f in BUGS PROBLEMS README.Metis README.PGRAF \ -+ README.PLPLOT README.SPARSE TODO WHATS.NEW; do \ -+ i="$(BSD_INSTALL_DATA) $(buildir)/$$f $(libdir)/doc/rlab/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(TOPDIR)/examples/"; \ + echo $$i; $$i; \ + done -+ $(BSD_INSTALL_DATA_DIR) $(libdir)/doc/html/rlab ++ $(BSD_INSTALL_DATA_DIR) $(prefix)/share/doc/rlab ++ $(BSD_INSTALL_DATA) $(buildir)/doc/rlab-ref.ps $(DOCDIR) ++ $(BSD_INSTALL_DATA_DIR) $(prefix)/share/doc/html/rlab + @for f in $(buildir)/doc/html/*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/doc/html/rlab/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/doc/html/rlab/"; \ + echo $$i; $$i; \ + done + if test "$(PLOT_PROG)" = "plplot" ; then \ -+ $(BSD_INSTALL_DATA) $(buildir)/misc/plplot.r $(libdir)/rlab/rlib/plot.r;\ ++ $(BSD_INSTALL_DATA) $(buildir)/misc/plplot.r $(RLIBDIR)/plot.r;\ + for f in $(buildir)/misc/plhelp/*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(RHELPDIR)"; \ + echo $$i; $$i; \ + done \ fi @@ -116,10 +124,10 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ - cp misc/gnuplot.r ${TOPDIR}/rlib/plot.r;\ - cp misc/gp-compat.r ${TOPDIR}/rlib/gp-compat.r;\ - cd misc/gnuplothelp; tar cf - . | (cd ${RHELPDIR}; umask 022; tar xf - ) ;\ -+ $(BSD_INSTALL_DATA) $(buildir)/misc/gnuplot.r $(libdir)/rlab/rlib/plot.r;\ -+ $(BSD_INSTALL_DATA) $(buildir)/misc/gp-compat.r $(libdir)/rlab/rlib/gp-compat.r;\ ++ $(BSD_INSTALL_DATA) $(buildir)/misc/gnuplot.r $(RLIBDIR)/plot.r;\ ++ $(BSD_INSTALL_DATA) $(buildir)/misc/gp-compat.r $(RLIBDIR)/gp-compat.r;\ + for f in $(buildir)/misc/gnuplothelp/*; do \ -+ i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \ ++ i="$(BSD_INSTALL_DATA) $$f $(RHELPDIR)"; \ + echo $$i; $$i; \ + done \ fi @@ -129,7 +137,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ - $(INSTALL_PROGRAM) rlab $(bindir)/rlab-$(VER) - if test -x "$(bindir)/rlab2" ; then\ - rm -f $(bindir)/rlab2;\ -+ $(BSD_INSTALL_DATA) $(buildir)/misc/plotmtv.r $(libdir)/rlab/rlib/;\ ++ $(BSD_INSTALL_DATA) $(buildir)/misc/plotmtv.r $(RLIBDIR);\ fi + $(BSD_INSTALL_PROGRAM) $(buildir)/rlab $(bindir)/rlab-$(VER) sed 's@rlab_exec_prefix@$(exec_prefix)@' ./misc/rlab > ./misc/rlab.tmp.0 @@ -159,7 +167,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ FRC: -@@ -526,22 +547,23 @@ +@@ -526,22 +542,23 @@ # main.o: main.c rlab.h config.h ent.h mds.h mdr.h btree.h listnode.h \ @@ -191,7 +199,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $ op.o: op.c rlab.h config.h ent.h mds.h mdr.h btree.h listnode.h code.h \ list.h symbol.h class.h util.h opapp.o: opapp.c rlab.h config.h ent.h mds.h mdr.h btree.h listnode.h \ -@@ -551,118 +573,124 @@ +@@ -551,118 +568,124 @@ complex.o: complex.c complex.h rlab.h config.h ent.h mds.h mdr.h \ btree.h listnode.h util.h list.h mathl.h function.o: function.c rlab.h config.h ent.h mds.h mdr.h btree.h \ |