From 6bc4a4cb99af9d4a347a9201047b80cdb9b8ba22 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 20 Dec 2012 21:37:37 +0000
Subject: Fix return type of function to match the (missing) return values.

---
 sysutils/xmeter/distinfo         |  4 ++--
 sysutils/xmeter/patches/patch-aa | 49 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 7 deletions(-)

(limited to 'sysutils/xmeter')

diff --git a/sysutils/xmeter/distinfo b/sysutils/xmeter/distinfo
index 2a245a361b0..51e669f8aef 100644
--- a/sysutils/xmeter/distinfo
+++ b/sysutils/xmeter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:41:00 agc Exp $
+$NetBSD: distinfo,v 1.4 2012/12/20 21:37:37 joerg Exp $
 
 SHA1 (xmeter-1.15.tar.gz) = 2377d4ffad82f2a1397d41969c3d3be76e6f54d7
 RMD160 (xmeter-1.15.tar.gz) = 5c6df005d139d01e26f404fdfd845c69364113bc
 Size (xmeter-1.15.tar.gz) = 20695 bytes
-SHA1 (patch-aa) = a07d78142dd5408557d3e72f508db70939124d39
+SHA1 (patch-aa) = 0b27a56719be80d4f21a1b08692af41c6b41378d
diff --git a/sysutils/xmeter/patches/patch-aa b/sysutils/xmeter/patches/patch-aa
index 17088443679..2f9c2ba939b 100644
--- a/sysutils/xmeter/patches/patch-aa
+++ b/sysutils/xmeter/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2001/10/23 11:38:31 agc Exp $
+$NetBSD: patch-aa,v 1.2 2012/12/20 21:37:37 joerg Exp $
 
 Use the right signal handler type.
 
---- xmeter.c	1998/10/30 10:41:09	1.1
-+++ xmeter.c	1998/10/30 10:41:51
-@@ -135,6 +135,8 @@
+--- xmeter.c.orig	1994-05-25 01:01:15.000000000 +0000
++++ xmeter.c
+@@ -135,6 +135,8 @@ static char	*RCSid="$Header: /net/src/ra
  #define PORTMAP		/* Get right function declarations on Solaris 2	*/
  #include <rpc/rpc.h>
  #include <rpc/pmap_prot.h>
@@ -13,7 +13,7 @@ Use the right signal handler type.
  #include <rpcsvc/rstat.h>
  /*
   * We need the definitions of CP_USER, CP_NICE and CP_SYS.  Some systems
-@@ -231,7 +228,7 @@
+@@ -228,7 +230,7 @@ typedef struct {
      char	*name;		/* Name of stat for menu widget		*/
  } STATDATA;
  
@@ -22,3 +22,42 @@ Use the right signal handler type.
  #define SIGTYPE	void
  #else
  #define SIGTYPE	int
+@@ -249,6 +251,8 @@ void		popdownscale();
+ void		quit();
+ char		*mystrdup();
+ 
++void runprog(METER *h, int s);
++
+ static STATDATA		sd[] = {
+ #define S_COLL		0
+   {fcoll, "coll"},
+@@ -922,7 +926,7 @@ char	*data;
+   sh = h->sh;
+   if (h->oldstate == FATAL && sh->pid != -1) {	/* Ignore dead hosts	*/
+       *(double *) data = 0.0;
+-      return;
++      return -1;
+   }
+   if (h->oldjumpscroll) {		/* Restore old jumpscroll value	*/
+       n = 0;
+@@ -987,6 +991,7 @@ char	*data;
+ 	  sh->pid = waitforhost(h);
+   }
+   h->oldstate = s;
++  return 0;
+ }
+ 
+ /*
+@@ -1019,11 +1024,7 @@ METER	*h;
+ /*
+  * runprog - Run user specified alert program.
+  */
+-runprog(h, s)
+-
+-METER	*h;
+-int	s;
+-
++void runprog(METER *h, int s)
+ {
+   char	oldstate[4];
+   char	state[4];
-- 
cgit v1.2.3