head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.26 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.24 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.22 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.20 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.18 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.16 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.14 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.12 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.10 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.8 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.6 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.4 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.2 pkgsrc-2007Q2-base:1.6 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.2.0.2 netbsd-1-6-1-base:1.2 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.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2007.05.23.13.05.36; author markd; state dead; branches; next 1.5; 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.26; author markd; state dead; branches; next 1.3; 1.3 date 2003.02.24.08.12.32; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.45; author jlam; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2002.05.31.13.19.18; author skrll; state Exp; branches 1.1.1.1; next ; 1.2.2.1 date 2003.03.02.10.24.18; author agc; state Exp; branches; 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 ; desc @@ 1.6 log @Update to KDE 3.5.7 KDE base * Various DragonFlyBSD fixes. * Removed "Serbia and Montenegro" (yu), added "Serbia" (rs) and "Montenegro" (me). Kicker * Added option to change the font color used by the taskbar applet. Kate * Fix not honoring current locale in some situations. KControl * Allow changing of font colors for taskbar. * Fix various crashes on KHotKeys. KDesktop * Use mkfontscale/mkfontdir to create fonts.scale/fonts.dir - as opposed to custom code. * Make kdesktop_lock honour kiosk switch user restriction. KWin * Option to turn off alt+tab outline. * Support for new windows types for compositing. * Fix bug in dead program detection in 64 bit architectures. * Fix crash on consecutive 'Show Desktop'. @ text @$NetBSD: patch-de,v 1.5 2005/11/08 18:25:44 joerg Exp $ --- ksysguard/ksysguardd/FreeBSD/CPU.c.orig 2005-05-23 12:15:08.000000000 +0000 +++ ksysguard/ksysguardd/FreeBSD/CPU.c @@@@ -22,7 +22,10 @@@@ #include #include -#if __FreeBSD_version < 500101 +#if defined(__DragonFly__) +#include +#include +#elif __FreeBSD_version < 500101 #include #else #include @@@@ -40,6 +43,18 @@@@ #include "Command.h" #include "ksysguardd.h" +#if defined(__DragonFly__) +static void cputime_percentages(int[4], struct kinfo_cputime *, + struct kinfo_cputime *); +static struct kinfo_cputime cp_time, cp_old; + +#define CPUSTATES 4 +#define CP_USER 0 +#define CP_NICE 1 +#define CP_SYS 2 +#define CP_IDLE 3 + +#else long percentages(int cnt, int *out, long *new, long *old, long *diffs); unsigned long cp_time_offset; @@@@ -47,6 +62,8 @@@@ unsigned long cp_time_offset; long cp_time[CPUSTATES]; long cp_old[CPUSTATES]; long cp_diff[CPUSTATES]; +#endif + int cpu_states[CPUSTATES]; void @@@@ -73,9 +90,14 @@@@ exitCpuInfo(void) int updateCpuInfo(void) { +#if defined(__DragonFly__) + kinfo_get_sched_cputime(&cp_time); + cputime_percentages(cpu_states, &cp_time, &cp_old); +#else size_t len = sizeof(cp_time); sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0); percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); +#endif return (0); } @@@@ -148,7 +170,44 @@@@ printCPUIdleInfo(const char* cmd) * The routine assumes modulo arithmetic. This function is especially * useful on BSD mchines for calculating cpu state percentages. */ +#if defined(__DragonFly__) +static void +cputime_percentages(int out[4], struct kinfo_cputime *new, struct kinfo_cputime * old) +{ + struct kinfo_cputime diffs; + int i; + uint64_t total_change, half_total; + + /* initialization */ + total_change = 0; + + diffs.cp_user = new->cp_user - old->cp_user; + diffs.cp_nice = new->cp_nice - old->cp_nice; + diffs.cp_sys = new->cp_sys - old->cp_sys; + diffs.cp_intr = new->cp_intr - old->cp_intr; + diffs.cp_idle = new->cp_idle - old->cp_idle; + total_change = diffs.cp_user + diffs.cp_nice + diffs.cp_sys + + diffs.cp_intr + diffs.cp_idle; + old->cp_user = new->cp_user; + old->cp_nice = new->cp_nice; + old->cp_sys = new->cp_sys; + old->cp_intr = new->cp_intr; + old->cp_idle = new->cp_idle; + + /* avoid divide by zero potential */ + if (total_change == 0) + total_change = 1; + + /* calculate percentages based on overall change, rounding up */ + half_total = total_change >> 1; + + out[0] = ((diffs.cp_user * 1000LL + half_total) / total_change); + out[1] = ((diffs.cp_nice * 1000LL + half_total) / total_change); + out[2] = (((diffs.cp_sys + diffs.cp_intr) * 1000LL + half_total) / total_change); + out[4] = ((diffs.cp_idle * 1000LL + half_total) / total_change); +} +#else long percentages(cnt, out, new, old, diffs) int cnt; @@@@ -201,3 +260,4 @@@@ long *diffs; /* return the total in case the caller wants to use it */ return(total_change); } +#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-de,v 1.3 2003/02/24 08:12:32 skrll Exp $ d3 29 a31 12 --- ksysguard/ksysguardd/FreeBSD/apm.c.orig Tue Sep 18 15:03:53 2001 +++ ksysguard/ksysguardd/FreeBSD/apm.c @@@@ -20,6 +20,14 @@@@ */ +#if defined(__NetBSD_APM__) + #include +#if defined(__NetBSD__) +#include +#include +#include d33 7 a39 1 #include d41 2 a42 1 #include d44 4 a47 2 @@@@ -63,6 +71,14 @@@@ int updateApm(void) d49 3 a51 9 - struct apm_info info; int retval; +#if defined(__NetBSD__) + struct apm_power_info info; + + retval = ioctl(ApmFD, APM_IOC_GETPOWER, &info); + + BattFill = info.battery_life; + BattTime = info.minutes_left; d53 3 a55 6 + struct apm_info info; retval = ioctl(ApmFD, APMIO_GETINFO, &info); @@@@ -70,4 +86,5 @@@@ updateApm(void) BattFill = info.ai_batt_life; BattTime = info.ai_batt_time; d57 2 d60 7 a66 9 return retval; @@@@ -97,2 +114,22 @@@@ printApmBatTimeInfo(const char* c) fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); } + +#else + +void +initApm(void) d68 31 d100 9 a108 12 + +void +exitApm(void) +{ +} + +int +updateApm(void) +{ + return -1; +} + @ 1.3 log @Let platforms that don't have apm compile ksysguard. This fixes PR 18340 and PR 20439. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 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-de,v 1.1.2.1 2002/06/23 19:05:49 jlam Exp $ d5 1 a5 1 @@@@ -20,7 +20,13 @@@@ d8 2 d20 1 a20 3 #include "Command.h" @@@@ -62,13 +68,22 @@@@ int d36 1 a36 1 d42 2 d45 20 @ 1.2.2.1 log @Some non-i386 compile fixes for the netbsd-1-6-1 branch. Requested by Nick Hudson. > Date: Mon, 24 Feb 2003 10:12:32 +0200 (EET) > From: Nick Hudson > > Module Name: pkgsrc > Committed By: skrll > Date: Mon Feb 24 08:12:32 UTC 2003 > > Modified Files: > pkgsrc/x11/kdebase3: Makefile distinfo > pkgsrc/x11/kdebase3/patches: patch-de > > Log Message: > Let platforms that don't have apm compile ksysguard. This fixes PR 18340 > and PR 20439. @ text @d1 1 a1 1 $NetBSD: patch-de,v 1.2 2002/08/25 19:23:45 jlam Exp $ d5 1 a5 1 @@@@ -20,6 +20,14 @@@@ a7 2 +#if defined(__NetBSD_APM__) + d18 3 a20 1 @@@@ -63,6 +71,14 @@@@ int d36 1 a36 1 @@@@ -70,4 +86,5 @@@@ updateApm(void) a41 2 @@@@ -97,2 +114,22 @@@@ printApmBatTimeInfo(const char* c) fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); a42 20 + +#else + +void +initApm(void) +{ +} + +void +exitApm(void) +{ +} + +int +updateApm(void) +{ + return -1; +} + +#endif @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdebase3 pkg @ text @@ 1.1.1.1.2.1 log @file patch-de was added on branch buildlink2 on 2002-06-23 19:05:49 +0000 @ text @d1 42 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 42 $NetBSD: patch-de,v 1.1.1.1.2.1 2002/06/23 19:05:49 jlam Exp $ --- ksysguard/ksysguardd/FreeBSD/apm.c.orig Tue Sep 18 15:03:53 2001 +++ ksysguard/ksysguardd/FreeBSD/apm.c @@@@ -20,7 +20,13 @@@@ */ #include +#if defined(__NetBSD__) +#include +#include +#include +#else #include +#endif #include #include "Command.h" @@@@ -62,13 +68,22 @@@@ int updateApm(void) { - struct apm_info info; int retval; +#if defined(__NetBSD__) + struct apm_power_info info; + + retval = ioctl(ApmFD, APM_IOC_GETPOWER, &info); + + BattFill = info.battery_life; + BattTime = info.minutes_left; +#else + struct apm_info info; retval = ioctl(ApmFD, APMIO_GETINFO, &info); BattFill = info.ai_batt_life; BattTime = info.ai_batt_time; +#endif return retval; } @