head 1.6; access; symbols pkgsrc-2017Q3:1.5.0.102 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.98 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.96 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.94 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.92 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.90 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.88 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.86 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.84 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.82 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.80 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.78 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.76 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.74 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.72 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.70 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.68 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.66 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.64 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.62 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.60 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.58 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.56 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.54 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.52 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.50 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.48 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.46 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.44 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.42 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.40 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.38 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.36 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.34 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.32 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.30 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.28 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.26 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.24 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.22 pkgsrc-2008Q1:1.5.0.20 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.18 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.16 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.14 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.12 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.10 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.8 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.6 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.4 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.2 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.2 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.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 2005.11.08.18.25.44; author joerg; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.25; author markd; state dead; branches; next 1.3; 1.3 date 2002.08.25.19.23.45; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.08.21.15.33.05; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.19.18; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.19.18; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.19.18; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.05.49; author jlam; state Exp; branches; next 1.1.1.1.2.3; 1.1.1.1.2.3 date 2002.08.22.11.13.28; author jlam; 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-dd,v 1.5 2005/11/08 18:25:44 joerg Exp $ --- kdm/backend/sessreg.c.orig 2005-08-17 23:36:04.000000000 +0000 +++ kdm/backend/sessreg.c @@@@ -63,7 +63,7 @@@@ from The Open Group. #endif #ifdef BSD -# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) +# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) /* *BSD doesn't like a ':0' type entry in utmp */ # define NO_UTMP # endif @ 1.5 log @Add support for building on DragonFly. Add mkfontdir as build tool, non-native bulk builds fail otherwise. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d1 1 a1 1 $NetBSD: patch-dd,v 1.3 2002/08/25 19:23:45 jlam Exp $ d3 4 a6 12 --- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Sep 14 22:11:20 2001 +++ ksysguard/ksysguardd/FreeBSD/Memory.c Tue Aug 20 14:20:49 2002 @@@@ -32,7 +32,12 @@@@ #include #include #include +/* Everything post 1.5.x uses uvm/uvm_* includes */ +#if __NetBSD_Version__ >= 105010000 +#include +#else #include +#endif d8 6 a13 60 #include "Command.h" #include "Memory.h" @@@@ -77,6 +82,49 @@@@ exitMemory(void) int updateMemory(void) { +#ifdef __NetBSD__ +#define ARRLEN(X) (sizeof(X)/sizeof(X[0])) + long pagesize; /* using a long promotes the arithmetic */ + size_t len; + + { static int mib[]={ CTL_HW, HW_PHYSMEM }; + + len = sizeof(Total); + sysctl(mib, ARRLEN(mib), &Total, &len, NULL, 0); + Total >>= 10; + } + + { struct uvmexp x; + static int mib[] = { CTL_VM, VM_UVMEXP }; + + len = sizeof(x); + STotal = SUsed = SFree = -1; + pagesize = 1; + if (-1 < sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0)) { + pagesize = x.pagesize; + STotal = (pagesize*x.swpages) >> 10; + SUsed = (pagesize*x.swpginuse) >> 10; + SFree = STotal - SUsed; + } + } + + /* 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; + } + } +#else int mib[2]; size_t len; struct vmtotal p; @@@@ -119,6 +167,7 @@@@ updateMemory(void) sysctlbyname("vm.vmmeter", &p, &len, NULL, 0); MFree = p.t_free * getpagesize() / 1024; Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached; +#endif return 0; } @ 1.3 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-dd,v 1.1.2.2 2002/08/22 11:13:28 jlam Exp $ @ 1.2 log @Apply the fixes provided in pkg/17912 and pkg/17981 so that ksysguardd can show something useful. Both PRs are from Hume Smith PKGREVISION++ @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d4 1 a4 1 +++ ksysguard/ksysguardd/FreeBSD/Memory.c d18 4 a21 43 @@@@ -82,15 +87,25 @@@@ struct vmtotal p; FILE *file; char buf[256]; + int rc; +#ifndef __NetBSD__ struct kvm_swap kswap[16]; int i, swap_count, hlen, pagesize = getpagesize(); long blocksize; +#endif len = sizeof (Total); +#ifdef __NetBSD__ + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + sysctl(mib, sizeof(mib), &Total, &len, NULL, 0); +#else sysctlbyname("hw.physmem", &Total, &len, NULL, 0); +#endif Total /= 1024; /* Borrowed from pstat */ +#ifndef __NetBSD__ swap_count = kvm_getswapinfo(kd, kswap, 16, SWIF_DEV_PREFIX); getbsize(&hlen, &blocksize); @@@@ -101,24 +116,42 @@@@ SUsed = CONVERT(kswap[0].ksw_used); SFree = CONVERT(kswap[0].ksw_total - kswap[0].ksw_used); } +#endif +#ifdef __NetBSD__ + /* NetBSD doesn't know about vfs.bufspace */ + Buffers = -1; +#else len = sizeof (Buffers); if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len) Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */ +#endif Buffers /= 1024; d23 28 d53 11 d65 4 a68 15 len = sizeof (Cached); if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len) Cached = 0; /* Doesn't work under FreeBSD v2.2.x */ +#endif Cached *= getpagesize() / 1024; +#ifdef __NetBSD__ + /* No idea where to get them right now. + * I don't want to start kmem-digging... */ + MFree = -1; + Used = -1; +#else /* initializes the pointer to the vmmeter struct */ len = sizeof (p); @ 1.1.1.1 log @Initial import of a kdebase3 pkg @ text @@ 1.1.1.1.2.1 log @file patch-dd was added on branch buildlink2 on 2002-06-23 19:05:49 +0000 @ text @d1 86 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 86 $NetBSD: patch-dd,v 1.1.1.1.2.1 2002/06/23 19:05:49 jlam Exp $ --- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Sep 14 22:11:20 2001 +++ ksysguard/ksysguardd/FreeBSD/Memory.c @@@@ -32,7 +32,12 @@@@ #include #include #include +/* Everything post 1.5.x uses uvm/uvm_* includes */ +#if __NetBSD_Version__ >= 105010000 +#include +#else #include +#endif #include "Command.h" #include "Memory.h" @@@@ -82,15 +87,25 @@@@ struct vmtotal p; FILE *file; char buf[256]; + int rc; +#ifndef __NetBSD__ struct kvm_swap kswap[16]; int i, swap_count, hlen, pagesize = getpagesize(); long blocksize; +#endif len = sizeof (Total); +#ifdef __NetBSD__ + mib[0] = CTL_HW; + mib[1] = HW_PHYSMEM; + sysctl(mib, sizeof(mib), &Total, &len, NULL, 0); +#else sysctlbyname("hw.physmem", &Total, &len, NULL, 0); +#endif Total /= 1024; /* Borrowed from pstat */ +#ifndef __NetBSD__ swap_count = kvm_getswapinfo(kd, kswap, 16, SWIF_DEV_PREFIX); getbsize(&hlen, &blocksize); @@@@ -101,24 +116,42 @@@@ SUsed = CONVERT(kswap[0].ksw_used); SFree = CONVERT(kswap[0].ksw_total - kswap[0].ksw_used); } +#endif +#ifdef __NetBSD__ + /* NetBSD doesn't know about vfs.bufspace */ + Buffers = -1; +#else len = sizeof (Buffers); if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len) Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */ +#endif Buffers /= 1024; +#ifdef __NetBSD__ + /* NetBSD doesn't know about vm.stats */ + Cached = -1; +#else len = sizeof (Cached); if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len) Cached = 0; /* Doesn't work under FreeBSD v2.2.x */ +#endif Cached *= getpagesize() / 1024; +#ifdef __NetBSD__ + /* No idea where to get them right now. + * I don't want to start kmem-digging... */ + MFree = -1; + Used = -1; +#else /* initializes the pointer to the vmmeter struct */ len = sizeof (p); sysctlbyname("vm.vmmeter", &p, &len, NULL, 0); MFree = p.t_free * getpagesize() / 1024; Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached; +#endif return 0; } @ 1.1.1.1.2.3 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-dd,v 1.1.1.1.2.2 2002/08/22 11:13:28 jlam Exp $ d4 1 a4 1 +++ ksysguard/ksysguardd/FreeBSD/Memory.c Tue Aug 20 14:20:49 2002 d18 43 a60 4 @@@@ -77,6 +82,49 @@@@ exitMemory(void) int updateMemory(void) { a61 28 +#define ARRLEN(X) (sizeof(X)/sizeof(X[0])) + long pagesize; /* using a long promotes the arithmetic */ + size_t len; + + { static int mib[]={ CTL_HW, HW_PHYSMEM }; + + len = sizeof(Total); + sysctl(mib, ARRLEN(mib), &Total, &len, NULL, 0); + Total >>= 10; + } + + { struct uvmexp x; + static int mib[] = { CTL_VM, VM_UVMEXP }; + + len = sizeof(x); + STotal = SUsed = SFree = -1; + pagesize = 1; + if (-1 < sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0)) { + pagesize = x.pagesize; + STotal = (pagesize*x.swpages) >> 10; + SUsed = (pagesize*x.swpginuse) >> 10; + SFree = STotal - SUsed; + } + } + + /* can't find NetBSD filesystem buffer info */ + Buffers = -1; + a63 11 + + { 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; + } + } d65 15 a79 4 int mib[2]; size_t len; struct vmtotal p; @@@@ -119,6 +167,7 @@@@ updateMemory(void) @