diff options
| author | joerg <joerg> | 2006-01-09 19:46:01 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-01-09 19:46:01 +0000 |
| commit | 9089cff8bf6563ebd361bbee2d39020a916af142 (patch) | |
| tree | aeb25474bba55485f0090b85a9af6d1b5fc7e268 /graphics/grap | |
| parent | ec4d82bb98f78294c43f655c269451322f36d7bd (diff) | |
| download | pkgsrc-9089cff8bf6563ebd361bbee2d39020a916af142.tar.gz | |
Fix errno. Fix GCC 3.4+ constructor issues. Move an extern up into a
central header.
Diffstat (limited to 'graphics/grap')
| -rw-r--r-- | graphics/grap/distinfo | 6 | ||||
| -rw-r--r-- | graphics/grap/patches/patch-ab | 18 | ||||
| -rw-r--r-- | graphics/grap/patches/patch-ac | 26 | ||||
| -rw-r--r-- | graphics/grap/patches/patch-ad | 13 |
4 files changed, 55 insertions, 8 deletions
diff --git a/graphics/grap/distinfo b/graphics/grap/distinfo index 88099320484..7b6829ecb7c 100644 --- a/graphics/grap/distinfo +++ b/graphics/grap/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 08:45:07 agc Exp $ +$NetBSD: distinfo,v 1.9 2006/01/09 19:46:01 joerg Exp $ SHA1 (grap-1.30.tar.gz) = d8083d75cc4ca7bbfcca1a0958e1da10e54f1c88 RMD160 (grap-1.30.tar.gz) = 54c80386ad15f18a0b7e848adcb0eaa06861451b Size (grap-1.30.tar.gz) = 167462 bytes SHA1 (patch-aa) = a1663c1f761c21983b38f74a150fcc2c28ebc177 -SHA1 (patch-ab) = 52c30e359b0d63c57c36cfd563e63fdc9b5e099c +SHA1 (patch-ab) = 20fca93edd15d4c1220b642671fb66fa2c40c2fe +SHA1 (patch-ac) = abd8fef7dd04e58c5a408cc8dc73f43debe84f37 +SHA1 (patch-ad) = fdafc8d4e3a4ac2887b7cfcecddd7b9c2c4577c9 diff --git a/graphics/grap/patches/patch-ab b/graphics/grap/patches/patch-ab index 0c38e0a4793..a61b8399fde 100644 --- a/graphics/grap/patches/patch-ab +++ b/graphics/grap/patches/patch-ab @@ -1,15 +1,21 @@ -$NetBSD: patch-ab,v 1.1 2004/01/14 15:57:09 agc Exp $ +$NetBSD: patch-ab,v 1.2 2006/01/09 19:46:01 joerg Exp $ ---- grap.h 2004/01/14 15:42:50 1.1 -+++ grap.h 2004/01/14 15:43:09 -@@ -8,6 +8,10 @@ +--- grap.h.orig 2002-10-26 16:32:03.000000000 +0000 ++++ grap.h +@@ -7,7 +7,16 @@ + #define DEFINES "/usr/share/grap/grap.defines" #endif - #ifndef STDC_HEADERS ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++extern bool print_lex_debug; + -+// keep up with gcc3.3 +using namespace std; + + #ifndef STDC_HEADERS ++ extern "C" { #ifndef __GNUC__ size_t strlen(const char*); diff --git a/graphics/grap/patches/patch-ac b/graphics/grap/patches/patch-ac new file mode 100644 index 00000000000..17348d16f00 --- /dev/null +++ b/graphics/grap/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.1 2006/01/09 19:46:01 joerg Exp $ + +--- grap_draw.h.orig 2006-01-09 19:32:42.000000000 +0000 ++++ grap_draw.h +@@ -422,16 +422,18 @@ public: + gridlist gds; // gridlines to draw + + frame() : ht(2), wid(3), tks(), gds() { +- DisplayString g = "%g"; ++ DisplayString g("%g"); + + for ( int i = 0 ; i < 4 ; i ++ ) { + desc[i] = linedesc(def,0,0); + label[i] = new stringlist; + lshift[i] = new shiftlist; +- griddef[i] = grid(0.0, desc+i, top_side, &g, lshift[i], 0); +- tickdef[i] = tick(0.0,((i== bottom_side || i == left_side ) ? ++ grid tmp_grid(0.0, desc+i, top_side, &g, lshift[i], 0); ++ griddef[i] = tmp_grid; ++ tick tmp_tick(0.0,((i== bottom_side || i == left_side ) ? + 0.125 : 0), + (sides) i, &g, lshift[i], 0); ++ tickdef[i] = tmp_tick; + } + } + diff --git a/graphics/grap/patches/patch-ad b/graphics/grap/patches/patch-ad new file mode 100644 index 00000000000..1cd49662bc9 --- /dev/null +++ b/graphics/grap/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2006/01/09 19:46:01 joerg Exp $ + +--- grap_lex.l.orig 2006-01-09 19:42:35.000000000 +0000 ++++ grap_lex.l +@@ -25,7 +25,7 @@ extern "C" { + #include "grap_draw.h" + #include "y.tab.h" + +-extern int errno; ++#include <errno.h> + + #ifndef STRERROR_DECLARED + #if HAVE_STRERROR |