head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.44 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.42 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.40 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.38 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.36 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.34 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.32 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.30 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.28 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.26 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.24 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.22 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.20 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.18 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.16 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.14 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.12 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.10 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.8 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.6 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.4 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2005.01.03.14.32.31; author wiz; state dead; branches; next 1.4; 1.4 date 2001.12.03.15.37.19; author skrll; state Exp; branches; next 1.3; 1.3 date 2001.10.15.22.46.00; author skrll; state Exp; branches; next 1.2; 1.2 date 2001.03.15.17.58.48; author skrll; state Exp; branches; next 1.1; 1.1 date 2001.03.14.16.03.13; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.03.14.16.03.13; author skrll; state Exp; branches; next ; desc @@ 1.5 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-ai,v 1.4 2001/12/03 15:37:19 skrll Exp $ --- kcontrol/access/Makefile.in.orig Sat Nov 10 07:58:17 2001 +++ kcontrol/access/Makefile.in @@@@ -277,15 +277,19 @@@@ bin_PROGRAMS = kaccess -kaccess_SOURCES = dummy.cpp +kaccess_SOURCES = kaccess_main.cpp kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kaccess_LDADD = kaccess.la +kaccess_LDADD = libkaccess_sl.la -kde_module_LTLIBRARIES = libkcm_access.la kaccess.la +kde_module_LTLIBRARIES = libkcm_access.la libkaccess_sl.la kaccess.la -kaccess_la_SOURCES = kaccess.cpp main.cpp +libkaccess_sl_la_SOURCES = kaccess.cpp main.cpp +libkaccess_sl_la_LDFLAGS = $(all_libraries) +libkaccess_sl_la_LIBADD = $(LIB_KDEUI) + +kaccess_la_SOURCES = kaccess_main.cpp kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version -kaccess_la_LIBADD = $(LIB_KDEUI) +kaccess_la_LIBADD = libkaccess_sl.la $(LIB_KDEUI) libkcm_access_la_SOURCES = kcmaccess.cpp libkcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@@@ -318,21 +322,25 @@@@ libkcm_access_la_meta_unload.lo @@KDE_USE_FINAL_FALSE@@libkcm_access_la_OBJECTS = $(libkcm_access_la_nofinal_OBJECTS) @@KDE_USE_FINAL_TRUE@@libkcm_access_la_OBJECTS = $(libkcm_access_la_final_OBJECTS) -kaccess_la_DEPENDENCIES = -#>- kaccess_la_OBJECTS = kaccess.lo main.lo +libkaccess_sl_la_DEPENDENCIES = +#>- libkaccess_sl_la_OBJECTS = kaccess.lo main.lo #>+ 5 -kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo -kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo \ - kaccess_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS) +libkaccess_sl_la_final_OBJECTS = libkaccess_sl_la.all_cpp.lo +libkaccess_sl_la_nofinal_OBJECTS = kaccess.lo main.lo \ + libkaccess_sl_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_final_OBJECTS) +kaccess_la_DEPENDENCIES = libkaccess_sl.la +#>- kaccess_la_OBJECTS = kaccess_main.lo +#>+ 1 +kaccess_la_OBJECTS = kaccess_main.lo bin_PROGRAMS = kaccess$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -#>- kaccess_OBJECTS = dummy.$(OBJEXT) +#>- kaccess_OBJECTS = kaccess_main.$(OBJEXT) #>+ 1 -kaccess_OBJECTS = dummy.$(OBJEXT) -kaccess_DEPENDENCIES = kaccess.la +kaccess_OBJECTS = kaccess_main.$(OBJEXT) +kaccess_DEPENDENCIES = libkaccess_sl.la CXXFLAGS = @@CXXFLAGS@@ #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 1 @@@@ -353,15 +361,15 @@@@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kaccess.desktop configure.in.in kaccess.h kcmaccess.desktop +KDE_DIST=configure.in.in kcmaccess.desktop kaccess.desktop kaccess.h DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) TAR = tar GZIP_ENV = --best -SOURCES = $(libkcm_access_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES) -OBJECTS = $(libkcm_access_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS) +SOURCES = $(libkcm_access_la_SOURCES) $(libkaccess_sl_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES) +OBJECTS = $(libkcm_access_la_OBJECTS) $(libkaccess_sl_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS) #>- all: all-redirect #>+ 1 @@@@ -454,6 +462,9 @@@@ @@KDE_USE_CLOSURE_FALSE@@libkcm_access.la: $(libkcm_access_la_OBJECTS) $(libkcm_access_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(libkcm_access_la_LDFLAGS) $(libkcm_access_la_OBJECTS) $(libkcm_access_la_LIBADD) $(LIBS) +libkaccess_sl.la: $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(libkaccess_sl_la_LDFLAGS) $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_LIBADD) $(LIBS) + kaccess.la: $(kaccess_la_OBJECTS) $(kaccess_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(kaccess_la_LDFLAGS) $(kaccess_la_OBJECTS) $(kaccess_la_LIBADD) $(LIBS) @@@@ -676,9 +687,6 @@@@ $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot $(XGETTEXT) $(libkcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot -dummy.cpp: - echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@@@ -731,21 +739,21 @@@@ #>+ 12 -kaccess_la_meta_unload.cpp: kaccess.moc - @@echo 'creating kaccess_la_meta_unload.cpp' - @@-rm -f kaccess_la_meta_unload.cpp +libkaccess_sl_la_meta_unload.cpp: kaccess.moc + @@echo 'creating libkaccess_sl_la_meta_unload.cpp' + @@-rm -f libkaccess_sl_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp ;\ - cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp ;\ - echo '0};' >> kaccess_la_meta_unload.cpp ;\ - echo '#include ' >> kaccess_la_meta_unload.cpp ;\ - echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp ;\ - else echo > kaccess_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkaccess_sl_la[] = {' > libkaccess_sl_la_meta_unload.cpp ;\ + cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_sl_la_meta_unload.cpp ;\ + echo '0};' >> libkaccess_sl_la_meta_unload.cpp ;\ + echo '#include ' >> libkaccess_sl_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkaccess_sl_la)' >> libkaccess_sl_la_meta_unload.cpp ;\ + else echo > libkaccess_sl_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f libkcm_access_la_meta_unload.cpp kaccess_la_meta_unload.cpp + -rm -f libkcm_access_la_meta_unload.cpp libkaccess_sl_la_meta_unload.cpp #>+ 11 libkcm_access_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmaccess.cpp libkcm_access_la_meta_unload.cpp kcmaccess.moc kaccess.moc @@@@ -760,11 +768,23 @@@@ rm -f libkcm_access_la.all_cpp.final libkcm_access_la.all_cpp.files #>+ 11 -kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess_la_meta_unload.cpp +libkaccess_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp libkaccess_sl_la_meta_unload.cpp + @@echo 'creating libkaccess_sl_la.all_cpp.cpp ...'; \ + rm -f libkaccess_sl_la.all_cpp.files libkaccess_sl_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkaccess_sl_la.all_cpp.final; \ + for file in kaccess.cpp main.cpp libkaccess_sl_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkaccess_sl_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaccess_sl_la.all_cpp.final; \ + done; \ + cat libkaccess_sl_la.all_cpp.final libkaccess_sl_la.all_cpp.files > libkaccess_sl_la.all_cpp.cpp; \ + rm -f libkaccess_sl_la.all_cpp.final libkaccess_sl_la.all_cpp.files + +#>+ 11 +kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp @@echo 'creating kaccess_la.all_cpp.cpp ...'; \ rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \ - for file in kaccess.cpp main.cpp kaccess_la_meta_unload.cpp ; do \ + for file in kaccess_main.cpp ; do \ echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \ done; \ @@@@ -772,11 +792,11 @@@@ rm -f kaccess_la.all_cpp.final kaccess_la.all_cpp.files #>+ 11 -kaccess.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kaccess.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp @@echo 'creating kaccess.all_cpp.cpp ...'; \ rm -f kaccess.all_cpp.files kaccess.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kaccess.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kaccess_main.cpp ; do \ echo "#include \"$$file\"" >> kaccess.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess.all_cpp.final; \ done; \ @@@@ -785,20 +805,20 @@@@ #>+ 3 clean-final: - -rm -f libkcm_access_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp + -rm -f libkcm_access_la.all_cpp.cpp libkaccess_sl_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp #>+ 2 final: - $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" all-am + $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" install-am + $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" all-am + $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" install-am + $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.4 log @Update to KDE 2.2.2 Closes pkg/14728 from Mark Davies . Changes from him with updates from myself. From www.kde.org... The principal improvements over KDE 2.2.1, release two months ago, include: o security-related - SSL certificate loading - symlink vulnerability in .wmrc access by KDM introduced in 2.2 - security problem with eFax (used by klprfax) - potential problem in PAM invocation by KDM - potential harmful side-effect of failed KDM session starts o new features - added support for CodeWeavers' CrossOver plug-in (provides support for QuickTime, etc.) - added support for the wheelmouse for scrolling through the KGhostview PS/PDF viewer component - ability to search for multiple patterns at a time in the file search dialog - debugging multi-threaded applications with KDevelop o improvements/fixes - handling of HTTP links that redirect to FTP - POST using SSL through a proxy and sending headers through proxies - saving of recently-selected files in the file dialog - handling of non-ASCII characters over SMB - toolbar button captions with certain styles - selecting items with the mouse in Konqueror - sorting in Konqueror's textview - saving current settings as a theme in the theme manager - crashes in KMail with certain mails - crash on invoking the KDM chooser - non-Latin languages with KDevelop performance - icon loading optimized - file dialog speedups - stop spinning SMB client processes - handling of large files in Kate @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update to KDE 2.2.1 With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc. @ text @d3 1 a3 1 --- kcontrol/access/Makefile.in.orig Sat Sep 8 01:36:21 2001 d5 4 a8 1 @@@@ -278 +278 @@@@ d11 1 a11 1 @@@@ -280 +280 @@@@ d14 1 a14 1 @@@@ -282 +282 @@@@ d17 1 a17 1 @@@@ -284 +284,5 @@@@ d24 1 a24 1 @@@@ -286 +290 @@@@ d27 7 a33 1 @@@@ -319,2 +323,2 @@@@ d38 1 a38 1 @@@@ -322,5 +326,9 @@@@ d41 1 a41 1 -kaccess_la_meta_unload.lo d46 1 a46 1 +libkaccess_sl_la_meta_unload.lo d53 3 a55 1 @@@@ -330 +338 @@@@ d58 1 a58 1 @@@@ -332,2 +340,2 @@@@ d63 7 a69 1 @@@@ -354 +362 @@@@ d72 6 a77 1 @@@@ -361,2 +369,2 @@@@ d82 7 a88 1 @@@@ -454,0 +463,3 @@@@ d92 7 a98 13 @@@@ -565,11 +575,0 @@@@ -#>- @@for file in $(DISTFILES); do \ -#>- d=$(srcdir); \ -#>- if test -d $$d/$$file; then \ -#>- cp -pr $$/$$file $(distdir)/$$file; \ -#>- else \ -#>- test -f $(distdir)/$$file \ -#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ -#>- fi; \ -#>- done -#>+ 10 @@@@ -688,3 +687,0 @@@@ d102 7 a108 1 @@@@ -741,8 +738,8 @@@@ a111 5 - @@echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp - @@cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp - @@echo '0};' >> kaccess_la_meta_unload.cpp - @@echo '#include ' >> kaccess_la_meta_unload.cpp - @@echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp d115 17 a131 6 + @@echo 'static const char * _metalist_libkaccess_sl_la[] = {' > libkaccess_sl_la_meta_unload.cpp + @@cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_sl_la_meta_unload.cpp + @@echo '0};' >> libkaccess_sl_la_meta_unload.cpp + @@echo '#include ' >> libkaccess_sl_la_meta_unload.cpp + @@echo '_UNLOAD(libkaccess_sl_la)' >> libkaccess_sl_la_meta_unload.cpp @@@@ -753 +750 @@@@ d134 7 a140 1 @@@@ -768 +765,13 @@@@ d155 3 a157 1 @@@@ -772 +781 @@@@ d160 7 a166 1 @@@@ -780 +789 @@@@ d169 3 a171 1 @@@@ -784 +793 @@@@ d174 7 a180 1 @@@@ -793 +802 @@@@ d183 3 a185 1 @@@@ -797 +806 @@@@ d188 6 a193 1 @@@@ -800 +809 @@@@ d196 7 @ 1.2 log @Get the right includes file for versions after 1.5.x @ text @d3 130 a132 73 --- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Jul 28 00:59:28 2000 +++ ksysguard/ksysguardd/FreeBSD/Memory.c @@@@ -29,7 +29,12 @@@@ #include #include +/* Everything post 1.5.x uses uvm/uvm_* includes */ +#if __NetBSD_Version__ >= 105010000 +#include +#else #include +#endif #include #include #include @@@@ -65,9 +70,16 @@@@ struct vmtotal p; FILE *file; char buf[256]; + int rc; 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; /* Q&D hack for swap display. Borrowed from xsysinfo-1.4 */ @@@@ -92,23 +104,40 @@@@ } +#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 log @Initial revision @ text @d5 14 a18 1 @@@@ -65,9 +65,16 @@@@ d35 1 a35 1 @@@@ -92,23 +99,40 @@@@ @ 1.1.1.1 log @Import of KDE 2.1 kdebase package. a.out doesn't build at the moment, but I'm looking into it. @ text @@