diff options
author | wiz <wiz> | 2011-09-29 21:00:19 +0000 |
---|---|---|
committer | wiz <wiz> | 2011-09-29 21:00:19 +0000 |
commit | 6d68f35e48c01d7e85f41adcf48d029cc8d1b0cd (patch) | |
tree | 0ac7e8a920fddc3b78e7b17deec4d262b657ed2f | |
parent | 942c4399aa8919c52fad648736c7f65339ba0aa1 (diff) | |
download | pkgsrc-6d68f35e48c01d7e85f41adcf48d029cc8d1b0cd.tar.gz |
Fix build on NetBSD-current.
-rw-r--r-- | sysutils/xuvmstat/distinfo | 8 | ||||
-rw-r--r-- | sysutils/xuvmstat/patches/patch-aa | 49 | ||||
-rw-r--r-- | sysutils/xuvmstat/patches/patch-ac | 16 | ||||
-rw-r--r-- | sysutils/xuvmstat/patches/patch-ad | 16 |
4 files changed, 60 insertions, 29 deletions
diff --git a/sysutils/xuvmstat/distinfo b/sysutils/xuvmstat/distinfo index 8db62563c57..594a543387e 100644 --- a/sysutils/xuvmstat/distinfo +++ b/sysutils/xuvmstat/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2010/03/04 14:56:13 martin Exp $ +$NetBSD: distinfo,v 1.10 2011/09/29 21:00:19 wiz Exp $ SHA1 (xuvmstat20050909.tar.gz) = b8118b1b11c260683ff14fe2200e9ee584f6b7c5 RMD160 (xuvmstat20050909.tar.gz) = 6400ee7e396c410bf22ef9673b27b909f2a29a68 Size (xuvmstat20050909.tar.gz) = 7661 bytes -SHA1 (patch-aa) = 8bcd46408285f29472e5c65535dcb30945bb2b90 +SHA1 (patch-aa) = 85115066c866198ba3c40b3bf819d68272921cdd SHA1 (patch-ab) = d68a14dc0a465b1f6e6a3b422f41f677c03b20b6 -SHA1 (patch-ac) = c08d6a7034e7911edd8c7080ad5913e68c601e54 -SHA1 (patch-ad) = a5acb667b1c30afac025ef815a45b0e94f664bd9 +SHA1 (patch-ac) = e1c71e5f4a1936723a8b591e5fd5543e1f2f8223 +SHA1 (patch-ad) = 3e607f136531e486f2404368b3922250cd3b3d8c diff --git a/sysutils/xuvmstat/patches/patch-aa b/sysutils/xuvmstat/patches/patch-aa index 69a52d14e40..eb2eb134fba 100644 --- a/sysutils/xuvmstat/patches/patch-aa +++ b/sysutils/xuvmstat/patches/patch-aa @@ -1,8 +1,16 @@ -$NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ +$NetBSD: patch-aa,v 1.10 2011/09/29 21:00:19 wiz Exp $ ---- xuvmstat.c.orig 2005-09-09 15:38:48.000000000 +0200 -+++ xuvmstat.c 2010-03-04 15:51:54.000000000 +0100 -@@ -40,13 +40,13 @@ +--- xuvmstat.c.orig 2005-09-09 13:38:48.000000000 +0000 ++++ xuvmstat.c +@@ -24,6 +24,7 @@ + * xuvmstat.c + */ + ++#include <err.h> + #include <errno.h> + #include <stdio.h> + #include <string.h> +@@ -40,19 +41,19 @@ #include "libcdcx.h" @@ -18,7 +26,14 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ struct timeval tv, otv; struct graph *gp_faults, *gp_traps, *gp_intrs, *gp_ctx; -@@ -100,7 +100,7 @@ + #define WIDTH 300 + +-main(argc, argv) ++int main(argc, argv) + + int argc; + char **argv; +@@ -100,7 +101,7 @@ char **argv; XMapRaised(xdpy.dpy, win); XFlush(xdpy.dpy); @@ -27,7 +42,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ gettimeofday(&tv, NULL); get_uvmexp(&oexp); gettimeofday(&otv, NULL); -@@ -135,8 +135,8 @@ +@@ -135,8 +136,8 @@ char **argv; if (retval == 0) { timeradd(&now, &incr, &ping); otv = tv; @@ -38,7 +53,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ gettimeofday(&tv, NULL); /* NEW GRAPH DATA HERE */ -@@ -186,7 +186,7 @@ +@@ -186,7 +187,7 @@ int was_timeout; XSetFont(xdpy->dpy, gc, fnt_fixed->fid); snprintf(buf, sizeof(buf),"The UVM system manages %d %d-byte pages", @@ -47,7 +62,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y, buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 5; -@@ -205,12 +205,12 @@ +@@ -205,12 +206,12 @@ int was_timeout; colors[4] = purple; } @@ -66,7 +81,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ vals, colors, white); } -@@ -229,12 +229,12 @@ +@@ -229,12 +230,12 @@ int was_timeout; colors[4] = purple; } @@ -85,7 +100,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ vals, colors, white); } -@@ -245,11 +245,11 @@ +@@ -245,11 +246,11 @@ int was_timeout; u_long vals[3]; u_long colors[3]; @@ -101,7 +116,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ vals, colors, white); } -@@ -260,10 +260,10 @@ +@@ -260,10 +261,10 @@ int was_timeout; u_long vals[2]; u_long colors[2]; @@ -115,7 +130,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ vals, colors, white); } -@@ -274,10 +274,10 @@ +@@ -274,10 +275,10 @@ int was_timeout; u_long vals[2]; u_long colors[2]; @@ -129,7 +144,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ vals, colors, white); } -@@ -289,15 +289,15 @@ +@@ -289,15 +290,15 @@ int was_timeout; if (init == 0) { static char *names[] = { "faults", "anon", "ancow", "obj", "copy", "zero" }; @@ -152,7 +167,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ gp_faults = create_graph(6, "FAULTS", names, before, after, color, white); } -@@ -311,10 +311,10 @@ +@@ -311,10 +312,10 @@ int was_timeout; if (init == 0) { static char *names[] = { "traps" }; @@ -165,7 +180,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ gp_traps = create_graph(1, "TRAPS", names, before, after, color, white); } -@@ -330,12 +330,12 @@ +@@ -330,12 +331,12 @@ int was_timeout; if (init == 0) { static char *names[] = { "intrs", "soft", "syscall" }; @@ -182,7 +197,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ gp_intrs = create_graph(3, "INTRS", names, before, after, color, white); } -@@ -349,12 +349,12 @@ +@@ -349,12 +350,12 @@ int was_timeout; if (init == 0) { static char *names[] = { "cswtch", "swin", "swout" }; @@ -199,7 +214,7 @@ $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ gp_ctx = create_graph(3, "SWITCH/SWAP", names, before, after, color, white); } -@@ -372,26 +372,31 @@ +@@ -372,26 +373,31 @@ int was_timeout; buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 5; diff --git a/sysutils/xuvmstat/patches/patch-ac b/sysutils/xuvmstat/patches/patch-ac index 02cd821af41..81968c0b8c6 100644 --- a/sysutils/xuvmstat/patches/patch-ac +++ b/sysutils/xuvmstat/patches/patch-ac @@ -1,8 +1,16 @@ -$NetBSD: patch-ac,v 1.3 2006/11/10 10:07:20 martin Exp $ +$NetBSD: patch-ac,v 1.4 2011/09/29 21:00:19 wiz Exp $ ---- get_uvmexp.c.orig 2001-02-19 15:23:55.000000000 +0100 -+++ get_uvmexp.c 2006-11-10 10:49:30.000000000 +0100 -@@ -28,14 +28,14 @@ +--- get_uvmexp.c.orig 2001-02-19 14:23:55.000000000 +0000 ++++ get_uvmexp.c +@@ -20,6 +20,7 @@ + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ ++#include <err.h> + #include <stdio.h> + #include <sys/param.h> + #include <sys/sysctl.h> +@@ -28,14 +29,14 @@ void get_uvmexp(uvmexp) diff --git a/sysutils/xuvmstat/patches/patch-ad b/sysutils/xuvmstat/patches/patch-ad index ab7cdb8ca9f..0ed9f2b635e 100644 --- a/sysutils/xuvmstat/patches/patch-ad +++ b/sysutils/xuvmstat/patches/patch-ad @@ -1,8 +1,16 @@ -$NetBSD: patch-ad,v 1.1 2006/11/10 10:07:20 martin Exp $ +$NetBSD: patch-ad,v 1.2 2011/09/29 21:00:19 wiz Exp $ ---- libcdcx.c.orig 2005-09-09 15:38:48.000000000 +0200 -+++ libcdcx.c 2006-11-10 10:58:23.000000000 +0100 -@@ -285,7 +285,7 @@ +--- libcdcx.c.orig 2005-09-09 13:38:48.000000000 +0000 ++++ libcdcx.c +@@ -31,6 +31,7 @@ + */ + + ++#include <err.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -285,7 +286,7 @@ struct graph *create_graph(nlines, title int nlines; char *title; char **names; |