summaryrefslogtreecommitdiff
path: root/graphics/yplot/patches
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/yplot/patches')
-rw-r--r--graphics/yplot/patches/patch-aa64
-rw-r--r--graphics/yplot/patches/patch-ab102
-rw-r--r--graphics/yplot/patches/patch-ac39
-rw-r--r--graphics/yplot/patches/patch-ad14
4 files changed, 75 insertions, 144 deletions
diff --git a/graphics/yplot/patches/patch-aa b/graphics/yplot/patches/patch-aa
index 8831b88d5f4..a6136663d31 100644
--- a/graphics/yplot/patches/patch-aa
+++ b/graphics/yplot/patches/patch-aa
@@ -1,32 +1,38 @@
-$NetBSD: patch-aa,v 1.3 2001/04/02 00:56:02 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2001/06/20 12:58:56 jtb Exp $
---- Makefile.build.orig Fri Sep 3 21:59:31 1999
-+++ Makefile.build
-@@ -8,8 +8,7 @@
- ROOT=
+--- configure.orig Wed Jun 20 04:20:56 2001
++++ configure
+@@ -528,15 +528,6 @@
+ # install with prefix=/usr/local/plplot or prefix=/usr and also installation
+ # of plplot with debs or rpm's (where plplot is installed with prefix=/usr).
- # These flags needed to compile ps.c and ljiip.c driver routines
--CFLAGS = -O -DSTDC_HEADERS=1 -DPAD_ARRAY=1 -I. -I/usr/lib/yorick/1.4/h \
-- -I/usr/lib/plplot/include -DDOUBLE
-+CFLAGS = -O -DSTDC_HEADERS=1 -DPAD_ARRAY=1 -I. -DDOUBLE
+-incdirs="\
+- /usr \
+- /usr/local/plplot"
+-for dir in $incdirs; do
+- if test -r "$dir/bin/plplot-config"; then
+- PLPLOT_PREFIX="$dir"
+- break
+- fi
+-done
+ if test -z "$PLPLOT_PREFIX"; then
+ echo "$ac_t""ERROR: configuration cannot continue because plplot" 1>&6
+ echo "$ac_t""is not installed in one of the standard places." 1>&6
+@@ -548,17 +539,6 @@
+ # This list of directories should cover the common cases of yorick
+ # rpm package or Debian package install.
- ##############################################
-
-@@ -46,7 +45,7 @@
- "Nameclash! must get rid of Makefile so this can work"; false ; fi
- yorick -batch make.i yplotl yplotl.i
- mv -f Makefile Makefile_yplotl
-- make -f Makefile_yplotl
-+ make -f Makefile_yplotl PKG_LIBS="`plplot-config --libs` -lyorm"
-
- ##############################################
-
-@@ -64,7 +63,7 @@
- "Nameclash! must get rid of Makefile so this can work"; false ; fi
- yorick -batch make.i yplot yplot.i
- mv -f Makefile Makefile_yplot
-- make -f Makefile_yplot
-+ make -f Makefile_yplot PKG_LIBS="`plplot-config --libs` -lyorm"
-
- # generate doc/yplot.doc using local yplot and mkdoc
- doc/yplot.doc: yplot yplot_doc.csh
+-incdirs="\
+- /usr/lib/yorick/1.4 \
+- /usr/lib/yorick/1.4/i486-debian-linux/"
+-for dir in $incdirs; do
+-# lib seems to be a common sub-directory for these directories on either
+-# rpm or debian systems.
+- if test -r "$dir/lib"; then
+- YORICK_CONTRIB_PREFIX="$dir"
+- break
+- fi
+-done
+ if test -z "$YORICK_CONTRIB_PREFIX"; then
+ echo "$ac_t""ERROR: configuration cannot continue because yorick" 1>&6
+ echo "$ac_t""is not installed in one of the standard places." 1>&6
diff --git a/graphics/yplot/patches/patch-ab b/graphics/yplot/patches/patch-ab
index 8b2a0d0b5fd..0d5d1f4999e 100644
--- a/graphics/yplot/patches/patch-ab
+++ b/graphics/yplot/patches/patch-ab
@@ -1,73 +1,33 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/02/14 11:52:11 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2001/06/20 12:58:56 jtb Exp $
---- ps.c.orig Wed Feb 14 09:22:25 2001
-+++ ps.c
-@@ -28,12 +28,12 @@
-
- PLplot PostScript device driver.
- */
--#include "plDevs.h"
-+#include "plplot/plDevs.h"
-
- #ifdef PLD_ps
-
--#include "plplotP.h"
--#include "drivers.h"
-+#include "plplot/plplotP.h"
-+#include "plplot/drivers.h"
-
- #include <string.h>
- #include <time.h>
-@@ -133,8 +133,8 @@
-
- dev = (PSDev *) pls->dev;
-
-- dev->xold = UNDEFINED;
-- dev->yold = UNDEFINED;
-+ dev->xold = PL_UNDEFINED;
-+ dev->yold = PL_UNDEFINED;
-
- plP_setpxl(pxlx, pxly);
-
-@@ -400,8 +400,8 @@
- {
- PSDev *dev = (PSDev *) pls->dev;
-
-- dev->xold = UNDEFINED;
-- dev->yold = UNDEFINED;
-+ dev->xold = PL_UNDEFINED;
-+ dev->yold = PL_UNDEFINED;
-
- pls->page++;
- fprintf(OF, "%%%%Page: %d %d\n", (int) pls->page, (int) pls->page);
-@@ -487,8 +487,8 @@
-
- fprintf(OF, " S\n%d W", width);
-
-- dev->xold = UNDEFINED;
-- dev->yold = UNDEFINED;
-+ dev->xold = PL_UNDEFINED;
-+ dev->yold = PL_UNDEFINED;
- break;
- }
- case PLSTATE_COLOR0:
-@@ -514,7 +514,7 @@
-
- /* Reinitialize current point location. */
-
-- if (dev->xold != UNDEFINED && dev->yold != UNDEFINED) {
-+ if (dev->xold != PL_UNDEFINED && dev->yold != PL_UNDEFINED) {
- fprintf(OF, " %d %d M \n", (int)dev->xold, (int)dev->yold);
- }
- }
-@@ -591,8 +591,8 @@
- pls->bytecnt += strlen(outbuf);
- pls->linepos += 21;
- }
-- dev->xold = UNDEFINED;
-- dev->yold = UNDEFINED;
-+ dev->xold = PL_UNDEFINED;
-+ dev->yold = PL_UNDEFINED;
- fprintf(OF, " F ");
- }
+--- Makefile.build.in.orig Wed Jun 20 03:59:57 2001
++++ Makefile.build.in
+@@ -299,19 +299,16 @@
+ ##############################################
+
+ install: all yplot.i yplotl.i
+- mkdir -p $(ROOT)$(YPLOT_PREFIX)/bin
+- cp yplot yplotl $(ROOT)$(YPLOT_PREFIX)/bin
+- mkdir -p $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/
+- cp ANNOUNCE CHANGES COPYING DEVICES GOALS INSTALL README yplot.lsm\
+- doc/*.tex doc/*.dvi doc/ytut.ps.gz doc/yplot.doc \
+- doc/demo[1-6].ps \
+- doc/plpoin.ps doc/plsym.ps.??\
++ $(BSD_INSTALL_PROGRAM) yplot yplotl $(ROOT)$(YPLOT_PREFIX)/bin
++ $(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/
++ $(BSD_INSTALL_DATA) ANNOUNCE CHANGES COPYING DEVICES GOALS \
++ README doc/*.dvi doc/ytut.ps.gz doc/yplot.doc doc/demo[1-6].ps \
+ $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/
+- mkdir -p $(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.0/examples
+- cp doc/*.i doc/test.dat \
+- $(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.0/examples
+- mkdir -p $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib
+- cp yplot.i yplotl.i $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib
++ $(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/examples/yplot
++ $(BSD_INSTALL_DATA) doc/*.i doc/test.dat \
++ $(ROOT)$(YPLOT_PREFIX)/share/examples/yplot
++ $(BSD_INSTALL_DATA_DIR) $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib
++ $(BSD_INSTALL_DATA) yplot.i yplotl.i $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib
+
+ ##############################################
diff --git a/graphics/yplot/patches/patch-ac b/graphics/yplot/patches/patch-ac
index 372c92bb643..d924a8b7667 100644
--- a/graphics/yplot/patches/patch-ac
+++ b/graphics/yplot/patches/patch-ac
@@ -1,31 +1,10 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/14 11:52:11 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2001/06/20 12:58:56 jtb Exp $
---- ljiip.c.orig Wed Feb 14 09:23:57 2001
-+++ ljiip.c
-@@ -28,12 +28,12 @@
- compression can speed up the printing up to 3x
-
- */
--#include "plDevs.h"
-+#include "plplot/plDevs.h"
-
- #ifdef PLD_ljii
-
--#include "plplotP.h"
--#include "drivers.h"
-+#include "plplot/plplotP.h"
-+#include "plplot/drivers.h"
- #include <math.h>
- #include <string.h>
-
-@@ -119,8 +119,8 @@
-
- dev = plAllocDev(pls);
-
-- dev->xold = UNDEFINED;
-- dev->yold = UNDEFINED;
-+ dev->xold = PL_UNDEFINED;
-+ dev->yold = PL_UNDEFINED;
- dev->xmin = 0;
- dev->ymin = 0;
-
+--- parse_documentation.py.orig Wed Jun 20 13:44:10 2001
++++ parse_documentation.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#! /usr/bin/env python
+ #Parse Yorick documentation from any file that includes it.
+ #However, there is some yplot-specific stuff for the function
+ #call assumed as part of the first lines of the documentation
diff --git a/graphics/yplot/patches/patch-ad b/graphics/yplot/patches/patch-ad
deleted file mode 100644
index f1faa5fa2f9..00000000000
--- a/graphics/yplot/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/02/14 11:52:11 jtb Exp $
-
---- pplot.c.orig Wed Feb 14 09:24:41 2001
-+++ pplot.c
-@@ -1,7 +1,7 @@
- #define DOUBLE
--#include "plplot.h"
--#include <stdio.h>
- #include <math.h>
-+#include "plplot/plplot.h"
-+#include <stdio.h>
- #include <stdlib.h>
-
- #define WORD_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZ_1234567890abcdefghijklmnopqrstuvwxyz"
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 09:37:01 +0000