head 1.6; access; symbols pkgsrc-2017Q3:1.5.0.40 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.36 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.34 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.32 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.30 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.28 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.26 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.24 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.22 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.20 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.18 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.16 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.14 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.12 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.10 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.8 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.6 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.4 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.2 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.4.0.44 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.42 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.40 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.38 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.36 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.34 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.32 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.30 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.28 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.26 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.24 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.22 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.20 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.18 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.16 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.14 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.12 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.10 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.8 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.6 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.4 pkgsrc-2008Q1:1.4.0.2 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.3.0.10 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.8 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.4 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2017.09.26.10.27.21; author wiz; state dead; branches; next 1.5; commitid 9ARpkXTuh9Wg2H8A; 1.5 date 2013.01.15.15.35.25; author joerg; state Exp; branches; next 1.4; 1.4 date 2008.01.04.21.05.58; author markd; state Exp; branches; next 1.3; 1.3 date 2006.10.08.07.49.27; author markd; state Exp; branches; next 1.2; 1.2 date 2005.03.23.21.44.37; author markd; state dead; branches; next 1.1; 1.1 date 2004.11.01.16.39.06; author gavan; state Exp; branches; next ; desc @@ 1.6 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-fi,v 1.5 2013/01/15 15:35:25 joerg Exp $ --- ksysguard/ksysguardd/NetBSD/Memory.c.orig 2005-10-10 15:04:31.000000000 +0000 +++ ksysguard/ksysguardd/NetBSD/Memory.c @@@@ -21,12 +21,12 @@@@ */ #include -#include #include #include #include #include #include +#include #include #include #include @@@@ -34,6 +34,7 @@@@ /* Everything post 1.5.x uses uvm/uvm_* includes */ #if __NetBSD_Version__ >= 105010000 #include +#include #else #include #endif @@@@ -45,29 +46,25 @@@@ static size_t Total = 0; static size_t MFree = 0; static size_t Used = 0; -static size_t Buffers = 0; -static size_t Cached = 0; +static size_t Active = 0; +static size_t Inactive = 0; +static size_t Wired = 0; +static size_t Execpages = 0; +static size_t Filepages = 0; static size_t STotal = 0; static size_t SFree = 0; static size_t SUsed = 0; -static kvm_t *kd; void initMemory(struct SensorModul* sm) { - char *nlistf = NULL; - char *memf = NULL; - char buf[_POSIX2_LINE_MAX]; - - if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf)) == NULL) { - log_error("kvm_openfiles()"); - return; - } - registerMonitor("mem/physical/free", "integer", printMFree, printMFreeInfo, sm); registerMonitor("mem/physical/used", "integer", printUsed, printUsedInfo, sm); - registerMonitor("mem/physical/buf", "integer", printBuffers, printBuffersInfo, sm); - registerMonitor("mem/physical/cached", "integer", printCached, printCachedInfo, sm); + registerMonitor("mem/physical/active", "integer", printActive, printActiveInfo, sm); + registerMonitor("mem/physical/inactive", "integer", printInactive, printInactiveInfo, sm); + registerMonitor("mem/physical/wired", "integer", printWired, printWiredInfo, sm); + registerMonitor("mem/physical/execpages", "integer", printExecpages, printExecpagesInfo, sm); + registerMonitor("mem/physical/filepages", "integer", printFilepages, printFilepagesInfo, sm); registerMonitor("mem/swap/free", "integer", printSwapFree, printSwapFreeInfo, sm); registerMonitor("mem/swap/used", "integer", printSwapUsed, printSwapUsedInfo, sm); } @@@@ -75,7 +72,6 @@@@ initMemory(struct SensorModul* sm) void exitMemory(void) { - kvm_close(kd); } int @@@@ -83,7 +79,6 @@@@ updateMemory(void) { #define ARRLEN(X) (sizeof(X)/sizeof(X[0])) - long pagesize; /* using a long promotes the arithmetic */ size_t len; { @@@@ -95,37 +90,26 @@@@ updateMemory(void) } { - struct uvmexp x; - static int mib[] = { CTL_VM, VM_UVMEXP }; + struct uvmexp_sysctl x; + static int mib[] = { CTL_VM, VM_UVMEXP2 }; len = sizeof(x); STotal = SUsed = SFree = -1; - pagesize = 1; + Active = Inactive = Wired = Execpages = Filepages = MFree = Used = -1; if (-1 < sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0)) { - pagesize = x.pagesize; - STotal = (pagesize*x.swpages) >> 10; - SUsed = (pagesize*x.swpginuse) >> 10; + STotal = (x.pagesize*x.swpages) >> 10; + SUsed = (x.pagesize*x.swpginuse) >> 10; SFree = STotal - SUsed; + MFree = (x.free * x.pagesize) >> 10; + Active = (x.active * x.pagesize) >> 10; + Inactive = (x.inactive * x.pagesize) >> 10; + Wired = (x.wired * x.pagesize) >> 10; + Execpages = (x.execpages * x.pagesize) >> 10; + Filepages = (x.filepages * x.pagesize) >> 10; + Used = Total - MFree; } } - /* can't find NetBSD filesystem buffer info */ - Buffers = -1; - - /* NetBSD doesn't know about vm.stats */ - Cached = -1; - - { - static int mib[]={ CTL_VM, VM_METER }; - struct vmtotal x; - - len = sizeof(x); - MFree = Used = -1; - if (sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0) > -1) { - MFree = (x.t_free * pagesize) >> 10; - Used = (x.t_rm * pagesize) >> 10; - } - } return 0; } @@@@ -154,27 +138,63 @@@@ printUsedInfo(const char* cmd) } void -printBuffers(const char* cmd) +printActive(const char* cmd) +{ + fprintf(CurrentClient, "%d\n", Active); +} + +void +printActiveInfo(const char* cmd) +{ + fprintf(CurrentClient, "Active Memory\t0\t%d\tKB\n", Total); +} + +void +printInactive(const char* cmd) +{ + fprintf(CurrentClient, "%d\n", Inactive); +} + +void +printInactiveInfo(const char* cmd) +{ + fprintf(CurrentClient, "Inactive Memory\t0\t%d\tKB\n", Total); +} + +void +printWired(const char* cmd) +{ + fprintf(CurrentClient, "%d\n", Wired); +} + +void +printWiredInfo(const char* cmd) +{ + fprintf(CurrentClient, "Wired Memory\t0\t%d\tKB\n", Total); +} + +void +printExecpages(const char* cmd) { - fprintf(CurrentClient, "%d\n", Buffers); + fprintf(CurrentClient, "%d\n", Execpages); } void -printBuffersInfo(const char* cmd) +printExecpagesInfo(const char* cmd) { - fprintf(CurrentClient, "Buffer Memory\t0\t%d\tKB\n", Total); + fprintf(CurrentClient, "Exec Pages\t0\t%d\tKB\n", Total); } void -printCached(const char* cmd) +printFilepages(const char* cmd) { - fprintf(CurrentClient, "%d\n", Cached); + fprintf(CurrentClient, "%d\n", Filepages); } void -printCachedInfo(const char* cmd) +printFilepagesInfo(const char* cmd) { - fprintf(CurrentClient, "Cached Memory\t0\t%d\tKB\n", Total); + fprintf(CurrentClient, "File Pages\t0\t%d\tKB\n", Total); } void @ 1.5 log @Include sys/resource.h and uvm/uvm_extern.h for NetBSD/current. Requires _KMEMUSER as well on NetBSD. @ text @d1 1 a1 1 $NetBSD: patch-fi,v 1.4 2008/01/04 21:05:58 markd Exp $ @ 1.4 log @Various kdebase updates. Option to build kompmgr - from Sergey Svishchev improved kdeeject script - from Sergey Svishchev ksysguard tidyup, improved handling of process list. infocenter tidyup Add NetBSD support to kicker/applets/naughty (finally fixing PR 25052) Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-fi,v 1.3 2006/10/08 07:49:27 markd Exp $ d3 1 a3 1 --- ksysguard/ksysguardd/NetBSD/Memory.c.orig 2005-10-11 04:04:31.000000000 +1300 d5 1 a5 1 @@@@ -21,7 +21,6 @@@@ d13 15 a27 1 @@@@ -45,29 +44,25 @@@@ d67 1 a67 1 @@@@ -75,7 +70,6 @@@@ initMemory(struct SensorModul* sm) d75 1 a75 1 @@@@ -83,7 +77,6 @@@@ updateMemory(void) d83 1 a83 1 @@@@ -95,37 +88,26 @@@@ updateMemory(void) d133 1 a133 1 @@@@ -154,27 +136,63 @@@@ printUsedInfo(const char* cmd) @ 1.3 log @Teach ksysguard more about NetBSD. Fixes PR pkg/28338. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- ksysguard/ksysguardd/NetBSD/Memory.c.orig 2006-10-08 15:49:27.000000000 +1300 d5 9 a13 1 @@@@ -45,8 +45,11 @@@@ d27 2 a28 1 @@@@ -55,19 +58,18 @@@@ static kvm_t *kd; d38 3 a40 5 + if ((kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open")) == NULL) { + log_error("kvm_open()"); return; } d53 9 a61 1 @@@@ -83,7 +85,6 @@@@ updateMemory(void) d69 1 a69 1 @@@@ -95,37 +96,26 @@@@ updateMemory(void) d119 1 a119 1 @@@@ -154,27 +144,63 @@@@ printUsedInfo(const char* cmd) @ 1.2 log @Update to KDE 3.4 Highlights at a glance * Text-to-speech system with support built into Konqueror, Kate, KPDF and the standalone application KSayIt * Support for text to speech synthesis is integrated with the desktop * Completely redesigned, more flexible trash system * Kicker with improved look and feel * KPDF now enables you to select, copy & paste text and images from PDFs, along with many other improvements * Kontact supports now various groupware servers, including eGroupware, GroupWise, Kolab, OpenGroupware.org and SLOX * Kopete supports Novell Groupwise and Lotus Sametime and gets integrated into Kontact * DBUS/HAL support allows to keep dynamic device icons in media:/ and on the desktop in sync with the state of all devices * KHTML has improved standard support and now close to full support for CSS 2.1 and the CSS 3 Selectors module * Better synchronization between 2 PCs * A new high contrast style and a complete monochrome icon set * An icon effect to paint all icons in two chosen colors, converting third party application icons into high contrast monochrome icons * Akregator allows you to read news from your favourite RSS-enabled websites in one application * Juk has now an album cover management via Google Image Search * KMail now stores passwords securely with KWallet * SVG files can now be used as wallpapers * KHTML plug-ins are now configurable, so the user can selectively disable ones that are not used. This does not include Netscape-style plug-ins. Netscape plug-in in CPU usage can be manually lowered, and plug-ins are more stable. * more than 6,500 bugs have been fixed * more than 1,700 wishes have been fullfilled * more than 80,000 contributions with several million lines of code and documentation added or changed @ text @d1 1 a1 1 $NetBSD: patch-fi,v 1.1 2004/11/01 16:39:06 gavan Exp $ d3 173 a175 11 --- kcontrol/info/memory_solaris.cpp.orig 2004-05-22 21:26:41.000000000 +0100 +++ kcontrol/info/memory_solaris.cpp @@@@ -4,6 +4,8 @@@@ * Torsten Kasch */ +#undef _FILE_OFFSET_BITS + #include #include #include @ 1.1 log @Workaround for compilation problems on Solaris/gcc. @ text @d1 1 a1 1 $NetBSD$ @