diff options
| author | fredb <fredb> | 2002-11-07 15:07:46 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-11-07 15:07:46 +0000 |
| commit | 8bc757649753eb1ee2728e03967a6bba4c065ea7 (patch) | |
| tree | f4d1893db5965a688f9a22c62bc64af420378bfd /sysutils | |
| parent | 93b0e1c4f444dd1898463db7e2483febf79cd5ef (diff) | |
| download | pkgsrc-8bc757649753eb1ee2728e03967a6bba4c065ea7.tar.gz | |
Make this build on NetBSD 1.6K (new, separate read and write disk
stats), set OSVERSION_SPECIFIC, and bump PKGREVISION.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gkrellm/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/gkrellm/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/gkrellm/patches/patch-ac | 31 |
3 files changed, 36 insertions, 3 deletions
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index eeed23dbd15..2a337548eb5 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2002/08/25 21:50:59 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2002/11/07 15:07:46 fredb Exp $ # DISTNAME= gkrellm-1.2.11 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://web.wt.net/~billw/gkrellm/ EXTRACT_SUFX= .tar.bz2 @@ -13,6 +13,7 @@ COMMENT= GTK based system monitor BUILD_USES_MSGFMT= YES +OSVERSION_SPECIFIC= YES USE_BUILDLINK2= YES USE_X11= YES USE_GMAKE= YES diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index baa0b514785..195cb13ef35 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2002/08/25 21:50:59 jlam Exp $ +$NetBSD: distinfo,v 1.14 2002/11/07 15:07:46 fredb Exp $ SHA1 (gkrellm-1.2.11.tar.bz2) = 809d4bb0c983d65651919b7fd483b64b097a7bf3 Size (gkrellm-1.2.11.tar.bz2) = 434998 bytes SHA1 (patch-aa) = 275ca080072fd6cda3def1d60cc094b09bf0bd25 SHA1 (patch-ab) = f9fa96e47ad7fd47c2eaaf6b2a25b55cf1acb947 +SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82 diff --git a/sysutils/gkrellm/patches/patch-ac b/sysutils/gkrellm/patches/patch-ac new file mode 100644 index 00000000000..be0e2740b04 --- /dev/null +++ b/sysutils/gkrellm/patches/patch-ac @@ -0,0 +1,31 @@ +$NetBSD: patch-ac,v 1.3 2002/11/07 15:07:46 fredb Exp $ + +--- src/disk.c.orig Tue Jan 1 15:08:07 2002 ++++ src/disk.c +@@ -446,10 +446,24 @@ + * d.xfer value (number of transfers) but there a scaling problem: + * d.xfer is usually much more smaller thant d.dk_bytes... */ + ++ /* Separate read/write stats were implemented in NetBSD 1.6K. */ ++ + disk = (DiskMon *) list->data; +- disk->rblk = d.dk_bytes / 512; /* block size hardcoded : +- * d.dk_byteshift is always 0 ?? */ ++#if __NetBSD_Version__ >= 106110000 ++ /* d.dk_byteshift is not set in, or used, by the kernel as of ++ * NetBSD 1.6K, but maybe one day... In the meantime, NetBSD ++ * only supports a blocksize of 512 == 2^^9, so assume that. */ ++ if (d.dk_byteshift == 0) { ++ disk->rblk = d.dk_rbytes >> 9; ++ disk->wblk = d.dk_wbytes >> 9; ++ } else { ++ disk->rblk = d.dk_rbytes / d.dk_byteshift; ++ disk->wblk = d.dk_wbytes / d.dk_byteshift; ++ } ++#else ++ disk->rblk = d.dk_bytes >> 9; + disk->wblk = 0; ++#endif + + composite_disk->rblk += disk->rblk; + composite_disk->wblk += disk->wblk; /* useless, isn't it ? :-D */ |