head 1.5; access; symbols pkgsrc-2015Q1:1.4.0.68 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.66 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.64 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.62 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.60 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.58 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.56 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.54 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.52 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.50 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.48 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.46 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.44 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.42 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.40 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.38 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.36 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.34 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.32 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.30 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.28 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.26 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.24 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.22 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.20 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.18 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.16 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.14 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.12 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.10 pkgsrc-2008Q1:1.4.0.8 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 XFCE-4_2_x:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.14 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.12 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.1.1.0.6 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2015.04.21.08.56.40; author jperkin; state dead; branches; next 1.4; commitid 7bC9eaQQq3KiZqiy; 1.4 date 2007.04.12.09.55.13; author martti; state Exp; branches; next 1.3; 1.3 date 2006.07.02.10.13.11; author martti; state Exp; branches; next 1.2; 1.2 date 2004.10.08.06.21.38; author martti; state dead; branches 1.2.14.1; next 1.1; 1.1 date 2003.12.03.05.07.32; author martti; state Exp; branches 1.1.1.1; next ; 1.2.14.1 date 2006.07.08.08.48.13; author salo; state Exp; branches; next ; 1.1.1.1 date 2003.12.03.05.07.32; author martti; state Exp; branches; next ; desc @@ 1.5 log @Update Xfce to 4.12.0. This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major Xfce releases since 4.6.2, our previous pkgsrc release. For more information about the thousands of changes in each major release since then, please see: Xfce 4.12 announcement: http://www.xfce.org/about/news Xfce 4.12 tour: http://www.xfce.org/about/tour Xfce 4.10 announcement: http://www.xfce.org/about/news/?post=1335571200 Xfce 4.10 tour: http://www.xfce.org/about/tour410 Xfce 4.8 announcement: http://www.xfce.org/about/news/?post=1295136000 Xfce 4.8 tour: http://www.xfce.org/about/tour48 The pkgsrc changes since then are: New packages: archivers/xfce4-thunar-archive graphics/elementary-xfce-icon-theme mail/xfce4-mailwatch-plugin misc/xfce4-time-out-plugin multimedia/xfce4-thunar-media-tags sysutils/xfce4-mount-plugin sysutils/xfce4-taskmanager sysutils/xfce4-thunar-vcs sysutils/xfce4-verve-plugin x11/xfce4-garcon x11/xfce4-notifyd x11/xfce4-tumbler x11/xfce4-whiskermenu-plugin Renamed packages: devel/xfconf to devel/xfce4-conf x11/libxfce4menu to x11/libxfce4ui x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter Updated packages: audio/xfce4-mixer audio/xfce4-xmms-plugin devel/xfce4-dev-tools editors/xfce4-mousepad graphics/ristretto meta-pkgs/xfce4-extras meta-pkgs/xfce4 misc/xfce4-weather-plugin multimedia/xfce4-mpc-plugin net/xfce4-wavelan-plugin sysutils/xfce4-appfinder sysutils/xfce4-battery-plugin sysutils/xfce4-cpugraph-plugin sysutils/xfce4-diskperf-plugin sysutils/xfce4-fsguard-plugin sysutils/xfce4-genmon-plugin sysutils/xfce4-netload-plugin sysutils/xfce4-quicklauncher-plugin sysutils/xfce4-systemload-plugin sysutils/xfce4-thunar sysutils/xfce4-xarchiver sysutils/xfce4-xkb-plugin textproc/xfce4-dict-plugin time/xfce4-datetime-plugin time/xfce4-orage time/xfce4-timer-plugin wm/xfce4-wm-themes wm/xfce4-wm x11/libxfce4gui x11/libxfce4util x11/xfce4-clipman-plugin x11/xfce4-desktop x11/xfce4-exo x11/xfce4-eyes-plugin x11/xfce4-gtk2-engine x11/xfce4-notes-plugin x11/xfce4-panel x11/xfce4-places-plugin x11/xfce4-session x11/xfce4-settings x11/xfce4-terminal Removed packages: sysutils/xfce4-volman x11/xfce4-utils This is based on a huge amount of work by the NetBSDfr team and Youri Mouton, who takes over as MAINTAINER, and has been tested by Youri on a large number of platforms prior to commit. A massive thanks to them. Any issues with the import are mine alone as the committer-by-proxy. @ text @$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:13 martti Exp $ --- panel-plugin/devperf.c.orig 2003-11-30 12:58:54.000000000 +0200 +++ panel-plugin/devperf.c 2006-07-02 10:05:44.000000000 +0300 @@@@ -264,21 +264,39 @@@@ const char *device = (const char *) p_pvDevice; struct timeval tv; size_t size, i, ndrives; +#ifdef HW_DISKSTATS struct disk_sysctl *drives, drive; +#else + struct io_sysctl *drives, drive; +#endif int mib[3]; mib[0] = CTL_HW; +#ifdef HW_DISKSTATS mib[1] = HW_DISKSTATS; mib[2] = sizeof(struct disk_sysctl); +#else + mib[1] = HW_IOSTATS; + mib[2] = sizeof(struct io_sysctl); +#endif + if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1) return(-1); +#ifdef HW_DISKSTATS ndrives = size / sizeof(struct disk_sysctl); +#else + ndrives = size / sizeof(struct io_sysctl); +#endif drives = malloc(size); if (sysctl(mib, 3, drives, &size, NULL, 0) == -1) return(-1); for (i = 0; i < ndrives; i++) { +#ifdef HW_DISKSTATS if (strcmp(drives[i].dk_name, device) == 0) { +#else + if (strcmp(drives[i].name, device) == 0) { +#endif drive = drives[i]; break; } @@@@ -292,13 +310,18 @@@@ 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) +#ifdef HW_DISKSTATS +# 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 +# else perf->rbytes = drive.dk_rbytes; perf->wbytes = drive.dk_wbytes; +# endif +#else + perf->rbytes = drive.rbytes; + perf->wbytes = drive.wbytes; #endif /* @@@@ -306,10 +329,18 @@@@ * time separatly. * -- Benedikt */ +#ifdef HW_DISKSTATS perf->qlen = drive.dk_xfer; perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.dk_time_sec + 1000ull * drive.dk_time_usec) / 2ull; perf->wbusy_ns = perf->rbusy_ns; +#else + perf->qlen = drive.xfer; + perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.time_sec + + 1000ull * drive.time_usec) / 2ull; + perf->wbusy_ns = perf->rbusy_ns; + +#endif return(0); } @ 1.4 log @Updated to Xfce 4.4.1 See http://www.xfce.org/documentation/changelogs/4.4.1 for details. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Apply io_sysctl patch by Kibum Han (pkg/33772) @ text @@ 1.2 log @Updated xfce4-diskperf-plugin to 1.5 * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2003/12/03 05:07:32 martti Exp $ d3 43 a45 3 --- 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 @@@@ d49 8 a56 5 +#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 d59 6 a64 1 +#endif d66 1 a66 1 * XXX - Currently, I don't know of any way to determine write/read busy d68 17 @ 1.2.14.1 log @Pullup ticket 1715 - requested by martti build fix for xfce4-diskperf-plugin Revisions pulled up: - pkgsrc/sysutils/xfce4-diskperf-plugin/distinfo 1.5 - pkgsrc/sysutils/xfce4-diskperf-plugin/patches/patch-aa 1.3 Module Name: pkgsrc Committed By: martti Date: Sun Jul 2 10:13:11 UTC 2006 Modified Files: pkgsrc/sysutils/xfce4-diskperf-plugin: distinfo Added Files: pkgsrc/sysutils/xfce4-diskperf-plugin/patches: patch-aa Log Message: Apply io_sysctl patch by Kibum Han (pkg/33772) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2006/07/02 10:13:11 martti Exp $ d3 3 a5 43 --- panel-plugin/devperf.c.orig 2003-11-30 12:58:54.000000000 +0200 +++ panel-plugin/devperf.c 2006-07-02 10:05:44.000000000 +0300 @@@@ -264,21 +264,39 @@@@ const char *device = (const char *) p_pvDevice; struct timeval tv; size_t size, i, ndrives; +#ifdef HW_DISKSTATS struct disk_sysctl *drives, drive; +#else + struct io_sysctl *drives, drive; +#endif int mib[3]; mib[0] = CTL_HW; +#ifdef HW_DISKSTATS mib[1] = HW_DISKSTATS; mib[2] = sizeof(struct disk_sysctl); +#else + mib[1] = HW_IOSTATS; + mib[2] = sizeof(struct io_sysctl); +#endif + if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1) return(-1); +#ifdef HW_DISKSTATS ndrives = size / sizeof(struct disk_sysctl); +#else + ndrives = size / sizeof(struct io_sysctl); +#endif drives = malloc(size); if (sysctl(mib, 3, drives, &size, NULL, 0) == -1) return(-1); for (i = 0; i < ndrives; i++) { +#ifdef HW_DISKSTATS if (strcmp(drives[i].dk_name, device) == 0) { +#else + if (strcmp(drives[i].name, device) == 0) { +#endif drive = drives[i]; break; } @@@@ -292,13 +310,18 @@@@ d9 5 a13 8 -#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000) +#ifdef HW_DISKSTATS +# 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 +# else d16 1 a16 6 +# endif +#else + perf->rbytes = drive.rbytes; + perf->wbytes = drive.wbytes; #endif d18 1 a18 1 @@@@ -306,10 +329,18 @@@@ a19 17 * -- Benedikt */ +#ifdef HW_DISKSTATS perf->qlen = drive.dk_xfer; perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.dk_time_sec + 1000ull * drive.dk_time_usec) / 2ull; perf->wbusy_ns = perf->rbusy_ns; +#else + perf->qlen = drive.xfer; + perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.time_sec + + 1000ull * drive.time_usec) / 2ull; + perf->wbusy_ns = perf->rbusy_ns; + +#endif return(0); } @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Disk performance plugin for XFce4. @ text @@