diff options
| author | agc <agc@pkgsrc.org> | 2001-10-23 11:38:31 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-10-23 11:38:31 +0000 |
| commit | 83c04ab4bcb24a8c18fd4646221a78911cc7e071 (patch) | |
| tree | 185354b1dc547b177e75c3b4a1ac99e4f652a579 /sysutils/xmeter | |
| parent | 5a15a909b246e5cf916597b06504c76e11de1cc7 (diff) | |
| download | pkgsrc-83c04ab4bcb24a8c18fd4646221a78911cc7e071.tar.gz | |
Standardise on one xmeter package:
+ Use sysutils as the category, since it's best-placed there
+ Bring over the patch from x11/xmeter to quieten the compilation.
+ Retain the installation into X11BASE from sysutils/xmeter (there's an
application default file that has to be placed somewhere)
+ Retain the better description from sysutils/xmeter
Diffstat (limited to 'sysutils/xmeter')
| -rw-r--r-- | sysutils/xmeter/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xmeter/patches/patch-aa | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/sysutils/xmeter/distinfo b/sysutils/xmeter/distinfo index c192366a3d3..d622d6b337f 100644 --- a/sysutils/xmeter/distinfo +++ b/sysutils/xmeter/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/10/23 10:30:12 agc Exp $ +$NetBSD: distinfo,v 1.2 2001/10/23 11:38:31 agc Exp $ SHA1 (xmeter-1.15.tar.gz) = 2377d4ffad82f2a1397d41969c3d3be76e6f54d7 Size (xmeter-1.15.tar.gz) = 20695 bytes +SHA1 (patch-aa) = a07d78142dd5408557d3e72f508db70939124d39 diff --git a/sysutils/xmeter/patches/patch-aa b/sysutils/xmeter/patches/patch-aa new file mode 100644 index 00000000000..17088443679 --- /dev/null +++ b/sysutils/xmeter/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1 2001/10/23 11:38:31 agc 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 @@ + #define PORTMAP /* Get right function declarations on Solaris 2 */ + #include <rpc/rpc.h> + #include <rpc/pmap_prot.h> ++#undef FSHIFT /* Use protocol's shift and scale values */ ++#undef FSCALE + #include <rpcsvc/rstat.h> + /* + * We need the definitions of CP_USER, CP_NICE and CP_SYS. Some systems +@@ -231,7 +228,7 @@ + char *name; /* Name of stat for menu widget */ + } STATDATA; + +-#if defined(SVR4) || defined(sgi) ++#if defined(SVR4) || defined(sgi) || (defined(BSD) && BSD >= 199306) + #define SIGTYPE void + #else + #define SIGTYPE int |