head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.24 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.22 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.20 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.18 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.16 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.14 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.12 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.10 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.8 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.6 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.4 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.2 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.8.0.8 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.6 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.4 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.2 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.6.0.2 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2007.09.20.21.12.18; author wiz; state dead; branches; next 1.8; 1.8 date 2006.09.01.06.54.29; author joerg; state Exp; branches; next 1.7; 1.7 date 2006.08.06.19.06.44; author jmmv; state Exp; branches; next 1.6; 1.6 date 2006.03.30.21.09.48; author jmmv; state Exp; branches; next 1.5; 1.5 date 2006.03.08.15.52.54; author joerg; state Exp; branches; next 1.4; 1.4 date 2006.02.28.23.48.11; author joerg; state Exp; branches; next 1.3; 1.3 date 2005.10.12.21.49.39; author jmmv; state Exp; branches; next 1.2; 1.2 date 2004.05.04.23.36.16; author minskim; state Exp; branches; next 1.1; 1.1 date 2004.04.02.12.09.16; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.04.02.12.09.16; author jmmv; state Exp; branches; next ; desc @@ 1.9 log @Rename libgtop2 to libgtop, to match upstream name. @ text @$NetBSD: patch-aa,v 1.8 2006/09/01 06:54:29 joerg Exp $ --- configure.orig 2006-07-27 18:43:37.000000000 +0000 +++ configure @@@@ -20112,17 +20112,17 @@@@ echo $ECHO_N "checking for libgtop sysde libgtop_have_sysinfo=yes libgtop_need_server=no ;; - freebsd*|netbsd*|openbsd*|bsdi*) + freebsd*|netbsd*|openbsd*|bsdi*|dragonfly*) libgtop_sysdeps_dir=freebsd libgtop_use_machine_h=yes libgtop_need_server=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' + libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server' ;; solaris*) libgtop_sysdeps_dir=solaris libgtop_use_machine_h=yes libgtop_need_server=yes - libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' + libgtop_postinstall='chgrp sys $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server' ;; aix*) libgtop_sysdeps_dir=aix @@@@ -20170,7 +20170,7 @@@@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 case "$host_os" in - *bsd*) + *bsd* | *dragonfly*) echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6 if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then @@@@ -20413,7 +20413,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF #include #include -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__DragonFly__) +#include +#elif defined(__FreeBSD__) || defined(__NetBSD__) #include #else #include @@@@ -20488,7 +20490,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF #include #include -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__DragonFly__) +#include +#elif defined(__FreeBSD__) || defined(__NetBSD__) #include #else #include @@@@ -20561,9 +20565,10 @@@@ echo $ECHO_N "checking what we need to d echo $ECHO_N "(cached) $ECHO_C" >&6 else msginfo_needs= - for def in nothing KERNEL _KERNEL; do + for def in nothing KERNEL _KERNEL_STRUCTURES _KERNEL; do cat >conftest.$ac_ext <<_ACEOF #define $def +#include #include #include #include @@@@ -23925,6 +23930,146 @@@@ fi esac +echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 +echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6 +if test "${ac_cv_lib_mach_kvm_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkvm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char kvm_open (); +int +main () +{ +kvm_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mach_kvm_open=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mach_kvm_open=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mach_kvm_open" >&5 +echo "${ECHO_T}$ac_cv_lib_mach_kvm_open" >&6 +if test $ac_cv_lib_mach_kvm_open = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBMACH 1 +_ACEOF + + KVM_LIBS="-lkvm $KVM_LIBS" + +fi + +echo "$as_me:$LINENO: checking for kinfo_get_sched_hz in -lkinfo" >&5 +echo $ECHO_N "checking for kinfo_get_sched_hz in -lkinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_kinfo_kinfo_get_sched_gz+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkinfo $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char kinfo_get_sched_hz (); +int +main () +{ +kinfo_get_sched_hz (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_kinfo_kinfo_get_sched_hz=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_kinfo_kinfo_get_sched_hz=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_kinfo_kinfo_get_sched_hz" >&5 +echo "${ECHO_T}$ac_cv_lib_kinfo_kinfo_get_sched_hz" >&6 +if test $ac_cv_lib_kinfo_kinfo_get_sched_hz = yes; then + + LIBS="-lkinfo $LIBS" # we need kvm as well +fi + echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6 if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then @@@@ -29952,7 +30097,7 @@@@ if test x$cross_compiling = xyes ; then sunos*) fu_cv_sys_stat_statfs4=yes ;; - freebsd*) + freebsd* | dragonfly*) fu_cv_sys_stat_statfs2_bsize=yes ;; osf*) @@@@ -30603,7 +30748,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "f_type;" >/dev/null 2>&1; then + $EGREP "f_type;|struct statvfs" >/dev/null 2>&1; then ok=yes fi rm -f conftest* @@@@ -32141,6 +32290,7 @@@@ s,@@ECHO_C@@,$ECHO_C,;t t s,@@ECHO_N@@,$ECHO_N,;t t s,@@ECHO_T@@,$ECHO_T,;t t s,@@LIBS@@,$LIBS,;t t +s,@@KVM_LIBS@@,$KVM_LIBS,;t t s,@@build@@,$build,;t t s,@@build_cpu@@,$build_cpu,;t t s,@@build_vendor@@,$build_vendor,;t t @ 1.8 log @Fix build on DragonFly 1.4. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update to 2.14.2. Grrr, how much I hate this package -- and its collection of patches --, you can't imagine. July 27, 2006: Overview of changes in 2.14.2 ============================================ * Updated solaris support (hua.zhang@@sun.com) * Small linux updates and improvments. April 10, 2006: Overview of changes in 2.14.1 ============================================= * Updated translations. * Fixed NetBSD port (Julio M. Merino Vidal ). * Fixed some warnings. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2006/03/30 21:09:48 jmmv Exp $ d3 1 a3 1 --- configure.orig 2006-03-13 10:04:55.000000000 +0100 d5 1 a5 1 @@@@ -20242,17 +20242,17 @@@@ echo $ECHO_N "checking for libgtop sysde d26 10 a35 1 @@@@ -20472,7 +20472,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF d46 1 a46 1 @@@@ -20547,7 +20549,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF d57 13 a69 1 @@@@ -23902,6 +23906,146 @@@@ fi d216 1 a216 1 @@@@ -29624,7 +29768,7 @@@@ if test x$cross_compiling = xyes ; then d225 1 a225 1 @@@@ -30275,7 +30419,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF d234 1 a234 1 @@@@ -31803,6 +31947,7 @@@@ s,@@ECHO_C@@,$ECHO_C,;t t @ 1.6 log @Update to 2.14.0: Mars 13, 2006: Overview of changes in 2.14.0 ============================================ * Updated translations. February 27, 2006: Overview of changes in 2.13.92 ================================================= * Fixed proc_state documentation. * Updated mountlist ignore list. January 23, 2006: Overview of changes in 2.13.3 =============================================== * linux: - fixe get_procmap for linux < 2.6.14. January 2, 2006: Overview of changes in 2.13.2 ============================================== * Fixed libtool versioning (James Henstridge) December 15, 2005: Overview of changes in 2.13.1 ================================================ * linux: - fixed proclist - implemented server->real_ncpu December 13, 2005: Overview of changes in 2.13.0 ================================================ * Requires automake-1.9 (James Henstridge) * Supports up to 32 CPU * Supports Linux smaps * linux: fixed SMP detection This release is not ABI compatible with previous releases. Sorry. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $ a25 9 @@@@ -20300,7 +20300,7 @@@@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 case "$host_os" in - *bsd*) + *bsd*|dragonfly*) for ac_header in net/if_var.h do @ 1.5 log @Readd -lkvm handling which got lost in the last commit. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2005-11-29 11:49:14.000000000 +0100 d5 1 a5 1 @@@@ -20691,17 +20691,17 @@@@ echo $ECHO_N "checking for libgtop sysde d24 1 a24 1 aix*) d26 1 a26 1 @@@@ -20749,7 +20749,7 @@@@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 d35 1 a35 1 @@@@ -20921,7 +20921,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF d46 1 a46 1 @@@@ -20995,7 +20997,9 @@@@ cat >>conftest.$ac_ext <<_ACEOF d57 1 a57 1 @@@@ -24343,6 +24347,146 @@@@ fi d204 1 a204 1 @@@@ -30043,7 +30187,7 @@@@ if test x$cross_compiling = xyes ; then d213 1 a213 1 @@@@ -30688,7 +30832,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF d222 1 a222 1 @@@@ -32094,6 +32240,7 @@@@ s,@@ECHO_C@@,$ECHO_C,;t t @ 1.4 log @Add support for DragonFly. There are some minor issues left, e.g. installing of the backend daemon as kmem, but I don't want to make it the default, since almost all operations work without it. @ text @d3 1 a3 1 --- configure.orig 2005-11-29 10:49:14.000000000 +0000 d57 1 a57 2 @@@@ -24342,6 +24346,73 @@@@ fi ;; d60 73 d198 1 a198 1 + LIBS="-lkinfo -lkvm $LIBS" # we need kvm as well d200 1 a200 1 d203 2 a204 1 @@@@ -30043,7 +30114,7 @@@@ if test x$cross_compiling = xyes ; then d213 1 a213 1 @@@@ -30688,7 +30759,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF d222 8 @ 1.3 log @Update to 2.12.0. Thanks go to the FreeBSD GNOME developers for all the patches I borrowed from them (patch-b*). September 4, 2005: Overview of changes from 2.11.92 to 2.12.0 ============================================================= * Updated translations. August 22, 2005: Overview of changes from 2.11.91 to 2.11.92 ============================================================ * Linux: - fixed for 2.6 without /sys - glibtop_get_cpu() : Do not add irq, softirq and iowait to idle. August 9, 2005: Overview of changes from 2.11.90 to 2.11.91 =========================================================== * All: - cleaned some headers. - removed static examples. * Linux: - fixed some issues with 2.6 without /sys July 24, 2005: Overview of changes from 2.11.2 to 2.11.90 ========================================================= * Linux: - fixed glibtop_uptime .flags. July &3, 2005: Overview of changes from 2.11.1 to 2.11.2 ======================================================== * Linux: - little improvements for 2.6. July 3, 2005: Overview of changes from 2.11.0 to 2.11.1 ======================================================= * Linux: - glibtop_get_swap : added page(in|out) for linux 2.6. June 8, 2005: Overview of changes from 2.10.x to 2.11.0 ======================================================= * Replaced a lot of macros by functions * Got rid of dozens of useless files. * libgtop 2.11.x are and will stay API and ABI compatible with 2.10.x, i swear. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2004/05/04 23:36:16 minskim Exp $ d3 1 a3 1 --- configure.orig 2005-09-04 17:54:58.000000000 +0200 d5 6 a10 1 @@@@ -20141,13 +20141,13 @@@@ echo $ECHO_N "checking for libgtop sysde d26 33 a58 1 @@@@ -23761,6 +23761,78 @@@@ fi d61 3 a63 4 +echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 +echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6 +if test "${ac_cv_lib_mach_kvm_open+set}" = set; then d67 1 a67 1 +LIBS="-lkvm $LIBS" d81 1 a81 1 +char kvm_open (); d85 1 a85 1 +kvm_open (); d111 1 a111 1 + ac_cv_lib_mach_kvm_open=yes d116 1 a116 1 +ac_cv_lib_mach_kvm_open=no d122 3 a124 8 +echo "$as_me:$LINENO: result: $ac_cv_lib_mach_kvm_open" >&5 +echo "${ECHO_T}$ac_cv_lib_mach_kvm_open" >&6 +if test $ac_cv_lib_mach_kvm_open = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBMACH 1 +_ACEOF + + KVM_LIBS="-lkvm $KVM_LIBS" d126 1 d128 1 a128 1 + d131 10 a140 2 if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then @@@@ -30106,7 +30178,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF a148 8 @@@@ -31512,6 +31584,7 @@@@ s,@@ECHO_C@@,$ECHO_C,;t t s,@@ECHO_N@@,$ECHO_N,;t t s,@@ECHO_T@@,$ECHO_T,;t t s,@@LIBS@@,$LIBS,;t t +s,@@KVM_LIBS@@,$KVM_LIBS,;t t s,@@build@@,$build,;t t s,@@build_cpu@@,$build_cpu,;t t s,@@build_vendor@@,$build_vendor,;t t @ 1.2 log @statvfs fix for NetBSD-current>=2.0D. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2004-04-07 05:19:43.000000000 -0500 d5 1 a5 1 @@@@ -20463,13 +20463,13 @@@@ echo $ECHO_N "checking for libgtop sysde d21 80 a100 1 @@@@ -30110,7 +30110,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF d109 8 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2004/04/01 18:34:27 jmmv Exp $ d3 3 a5 3 --- configure.orig 2003-12-13 08:32:17.000000000 +0100 +++ configure 2003-12-13 08:33:16.000000000 +0100 @@@@ -19717,13 +19717,13 @@@@ d21 9 @ 1.1.1.1 log @Move libgtop2 to the sysutils category, coming from devel. This is version 2.5.2. @ text @@