diff options
| -rw-r--r-- | sysutils/xfce4-diskperf-plugin/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/xfce4-diskperf-plugin/buildlink3.mk | 4 | ||||
| -rw-r--r-- | sysutils/xfce4-diskperf-plugin/distinfo | 7 | ||||
| -rw-r--r-- | sysutils/xfce4-diskperf-plugin/patches/patch-aa | 19 |
4 files changed, 7 insertions, 28 deletions
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile index 064443e5533..d1262ceae57 100644 --- a/sysutils/xfce4-diskperf-plugin/Makefile +++ b/sysutils/xfce4-diskperf-plugin/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:17 tv Exp $ +# $NetBSD: Makefile,v 1.8 2004/10/08 06:21:38 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 1.4.1 +XFCE4_VERSION= 1.5 DISTNAME= xfce4-diskperf-plugin-${XFCE4_VERSION} -PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://download.berlios.de/xfce-goodies/ COMMENT= XFce4 disk performance plugin diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk index 53827bb6c5c..0d3c401c81f 100644 --- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk +++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/07/07 11:26:05 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/10/08 06:21:38 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin} BUILDLINK_PACKAGES+= xfce4-diskperf-plugin .if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=1.4.1 +BUILDLINK_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=1.5 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin .endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK diff --git a/sysutils/xfce4-diskperf-plugin/distinfo b/sysutils/xfce4-diskperf-plugin/distinfo index 7c613034426..4f14d1f80b9 100644 --- a/sysutils/xfce4-diskperf-plugin/distinfo +++ b/sysutils/xfce4-diskperf-plugin/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2004/07/07 11:26:05 martti Exp $ +$NetBSD: distinfo,v 1.3 2004/10/08 06:21:38 martti Exp $ -SHA1 (xfce4-diskperf-plugin-1.4.1.tar.gz) = 51e2653eda48895b9f6521b7850071f4a03fab87 -Size (xfce4-diskperf-plugin-1.4.1.tar.gz) = 314273 bytes -SHA1 (patch-aa) = 3b244cfbcd7098bdcbd8b44ef9adc0d1aa38e732 +SHA1 (xfce4-diskperf-plugin-1.5.tar.gz) = 1c1f2bea61d48c5a5ac25dd072d5734af0491854 +Size (xfce4-diskperf-plugin-1.5.tar.gz) = 226767 bytes diff --git a/sysutils/xfce4-diskperf-plugin/patches/patch-aa b/sysutils/xfce4-diskperf-plugin/patches/patch-aa deleted file mode 100644 index cf1f5df1113..00000000000 --- a/sysutils/xfce4-diskperf-plugin/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/12/03 05:07:32 martti Exp $ - ---- panel-plugin/devperf.c.orig Tue Nov 11 01:00:41 2003 -+++ panel-plugin/devperf.c Mon Nov 17 10:39:35 2003 -@@ -292,8 +292,14 @@ - gettimeofday (&tv, 0); - perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull * - tv.tv_sec + 1000ull * tv.tv_usec; -+#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000) -+ /* NetBSD < 1.6K does not have separate read/write statistics. */ -+ perf->rbytes = drive.dk_bytes; -+ perf->wbytes = drive.dk_bytes; -+#else - perf->rbytes = drive.dk_rbytes; - perf->wbytes = drive.dk_wbytes; -+#endif - /* - * XXX - Currently, I don't know of any way to determine write/read busy - * time separatly. |