Update lavaps to 2.7.

Note: there's an alternate Gnome user interface now; it would be nice to
be able to use it via PKG_OPTIONS, but I haven't done this yet.

9 files changed, 86 insertions, 113 deletions

diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index d4f7c1b5a0f..97a86e55c63 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2007/06/30 19:18:47 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/07/21 02:55:34 dholland Exp $
 #
 
-DISTNAME=	lavaps-1.20
-PKGREVISION=	1
+DISTNAME=	lavaps-2.7
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
@@ -14,17 +13,19 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-additional-includes=-I${LOCALBASE:Q}/include \
-		--with-additional-libs=-L${LOCALBASE:Q}/lib \
-		--with-tcl-ver=8.3.2 \
-		--with-tk-ver=8.3.2 \
+CONFIGURE_ARGS+=--with-tcltk \
+		--with-tcl-ver=8.4.18 \
+		--with-tk-ver=8.4.18 \
 		--with-tcltk-lib-suffix-type=nodot
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../x11/tk83/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo
index 10bcbd6d087..e8c4aefc2b3 100644
--- a/sysutils/lavaps/distinfo
+++ b/sysutils/lavaps/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.7 2008/01/28 00:54:50 rillig Exp $
+$NetBSD: distinfo,v 1.8 2008/07/21 02:55:34 dholland Exp $
 
-SHA1 (lavaps-1.20.tar.gz) = 36411710a29bcb751f23ae35a2782a5286ec0f2e
-RMD160 (lavaps-1.20.tar.gz) = 7577052acb3452a7588b767cd43554f035ee45f8
-Size (lavaps-1.20.tar.gz) = 160724 bytes
-SHA1 (patch-aa) = 8c1c15dd3ccfbe35c29804561a74e47d86d114ab
-SHA1 (patch-ab) = e26b086f85868502a1816aded296b7e0da3bda88
-SHA1 (patch-ac) = 1a4b569d95568ad2b4047d656eb70bda16cba453
-SHA1 (patch-ad) = 297e60786e066f05099497bd9d10cac965d0ddbd
-SHA1 (patch-ae) = 075f9943110c68aa01acfddaac006d9840de93ff
-SHA1 (patch-af) = 5482aac0382cd55aedda2d2436c3386a2221a6da
+SHA1 (lavaps-2.7.tar.gz) = 5fb788359e22f80842423f211d42d8ebe2c58236
+RMD160 (lavaps-2.7.tar.gz) = 286530bca67f9d324c0edfc2def6d6b2a6f24255
+Size (lavaps-2.7.tar.gz) = 399332 bytes
+SHA1 (patch-aa) = 8a159ee81f0a3261214a71e38f97e1e20e703f57
+SHA1 (patch-ab) = 2bfc2059afab1a8a4fa16aa91ba6d2f9425c573d
+SHA1 (patch-ac) = 8d6f43933eecc72cc75ffec1489cbf316a21c5fe
+SHA1 (patch-ad) = 520a4cc7bbafcca8cab50d0f92aed2a333e4da72
+SHA1 (patch-ae) = 82b0d0161eeef941f868b20282b9a7743be89461
+SHA1 (patch-af) = de66e431cdf61697d16df1f6e21d5f65390b845f
+SHA1 (patch-ag) = 59a691ec3ef98b2becae78f5ec05586ec400698e
diff --git a/sysutils/lavaps/patches/patch-aa b/sysutils/lavaps/patches/patch-aa
index 1c33a646bdc..cff1d9b9896 100644
--- a/sysutils/lavaps/patches/patch-aa
+++ b/sysutils/lavaps/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2004/02/19 00:31:37 kristerw Exp $
+$NetBSD: patch-aa,v 1.6 2008/07/21 02:55:34 dholland Exp $
 
---- process_view.cc.orig	Thu Feb 19 01:24:04 2004
-+++ process_view.cc	Thu Feb 19 01:24:25 2004
-@@ -22,6 +22,7 @@
- #include "config.h"
+--- src/process_view.cc~	2008-07-20 21:38:23.000000000 -0400
++++ src/process_view.cc	2008-07-20 21:39:06.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <sstream>
  
- #include <stdio.h>  // snprintf
+ #include <math.h>
 +#include <assert.h>
  
  #include "main.hh"
diff --git a/sysutils/lavaps/patches/patch-ab b/sysutils/lavaps/patches/patch-ab
index 1b47009e08c..0ebeb3410cf 100644
--- a/sysutils/lavaps/patches/patch-ab
+++ b/sysutils/lavaps/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2004/02/19 00:31:37 kristerw Exp $
+$NetBSD: patch-ab,v 1.5 2008/07/21 02:55:34 dholland Exp $
 
---- tcl_blob.cc.orig	Thu Feb 19 01:25:34 2004
-+++ tcl_blob.cc	Thu Feb 19 01:25:31 2004
-@@ -22,6 +22,7 @@
+--- src/tcl_blob.cc~	2003-12-01 20:11:32.000000000 -0500
++++ src/tcl_blob.cc	2008-07-20 21:39:56.000000000 -0400
+@@ -24,6 +24,7 @@
  #ifdef USE_TCL_BLOB
  
  #include <stdlib.h>  // atoi
 +#include <assert.h>
  #include <tcl.h>
- #include <iostream.h>
  
+ #include <signal.h>
diff --git a/sysutils/lavaps/patches/patch-ac b/sysutils/lavaps/patches/patch-ac
index 09e0ad68847..7a364ea674d 100644
--- a/sysutils/lavaps/patches/patch-ac
+++ b/sysutils/lavaps/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2004/02/19 00:31:37 kristerw Exp $
+$NetBSD: patch-ac,v 1.2 2008/07/21 02:55:34 dholland Exp $
 
---- tcl_blob_shape.cc.orig	Thu Feb 19 01:26:05 2004
-+++ tcl_blob_shape.cc	Thu Feb 19 01:26:13 2004
+--- src/tcl_blob_shape.cc~	2003-11-30 20:05:57.000000000 -0500
++++ src/tcl_blob_shape.cc	2008-07-20 21:40:57.000000000 -0400
 @@ -24,6 +24,7 @@
  #ifdef USE_TCL_BLOB
  
  #include <stdlib.h>  // atoi
 +#include <assert.h>
  #include <tcl.h>
- #include <iostream.h>
  
+ #include <iostream>
diff --git a/sysutils/lavaps/patches/patch-ad b/sysutils/lavaps/patches/patch-ad
index 18be5343096..0e7c489bfed 100644
--- a/sysutils/lavaps/patches/patch-ad
+++ b/sysutils/lavaps/patches/patch-ad
@@ -1,25 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2008/01/28 00:54:51 rillig Exp $
+$NetBSD: patch-ad,v 1.3 2008/07/21 02:55:34 dholland Exp $
 
---- configure.orig	2001-10-30 21:27:30.000000000 +0000
-+++ configure
-@@ -1561,9 +1561,10 @@ if test "$ac_x_libraries" = NO; then
- cat > conftest.$ac_ext <<EOF
- #line 1563 "configure"
- #include "confdefs.h"
-+#include <X11/Intrinsic.h>
- 
- int main() {
--${x_direct_test_function}()
-+XtMalloc(0);
- ; return 0; }
- EOF
- if { (eval echo configure:1570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -2632,7 +2633,7 @@ case "${platform}" in
- 	PLATFORM_SUBDIRS=""
- 	echo "$ac_t""yes---AIX" 1>&6
+--- configure~	2004-12-24 21:37:07.000000000 -0500
++++ configure	2008-07-20 21:43:31.000000000 -0400
+@@ -6232,7 +6232,7 @@
+ 	echo "$as_me:$LINENO: result: yes---Mach/MacOS-X" >&5
+ echo "${ECHO_T}yes---Mach/MacOS-X" >&6
  	;;
 -*-*-*bsd*)
 +*-*-*bsd* | *-*-dragonfly*)
- 	TCLTK_INCLUDES="-I/usr/local/include/tk$TK_DOTTED_HI_VERS -I/usr/local/include/tcl$TCL_DOTTED_HI_VERS -L/usr/local/lib"
- 	if test x$TCLTK_LIB_SUFFIX_TYPE = xunspecified
- 	then
+ 	PLATFORM_SPECIFIC_TCLTK_INCLUDES="-I/usr/local/include/tk$TK_DOTTED_HI_VERS -I/usr/local/include/tcl$TCL_DOTTED_HI_VERS -L/usr/local/lib"
+ 	case "${platform}" in
+ 	*-*-*darwin*)
diff --git a/sysutils/lavaps/patches/patch-ae b/sysutils/lavaps/patches/patch-ae
index f07e83ffdd9..d76a71d6a00 100644
--- a/sysutils/lavaps/patches/patch-ae
+++ b/sysutils/lavaps/patches/patch-ae
@@ -1,19 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2007/06/30 19:18:47 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2008/07/21 02:55:34 dholland Exp $
 
---- change_tracking.hh.orig	2001-04-19 15:51:34.000000000 +0000
-+++ change_tracking.hh
-@@ -47,11 +47,11 @@ template <class T, class SUM>
- class sum_change_tracking : public change_tracking<T> {
- protected:
- 	static SUM s_;
--	void update_sum() { s_.sum_ += change_; }
-+	void update_sum() { s_.sum_ += this->change_; }
- public:
- 	sum_change_tracking() {};
--	sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(frst); };
--	~sum_change_tracking() { tick_incr(-last_); };
-+	sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(this->frst); };
-+	~sum_change_tracking() { tick_incr(-this->last_); };
+--- src/process_model.cc.orig	2003-07-14 23:32:09.000000000 -0400
++++ src/process_model.cc	2008-07-20 21:58:55.000000000 -0400
+@@ -86,7 +86,7 @@ process_model::set_cmd(const char *cmd)
+ void
+ process_model::dump()
+ {
+-	cout << int(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " <<
++	cout << intptr_t(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " <<
+ 		endl;
+ }
  
- 
- 	void tick_set(T current) { change_tracking<T>::tick_set(current); update_sum(); };
diff --git a/sysutils/lavaps/patches/patch-af b/sysutils/lavaps/patches/patch-af
index 6316fb1186f..8d6f0bce674 100644
--- a/sysutils/lavaps/patches/patch-af
+++ b/sysutils/lavaps/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2007/06/30 19:18:47 joerg Exp $
+$NetBSD: patch-af,v 1.2 2008/07/21 02:55:34 dholland Exp $
 
---- process_scan_bsd.cc.orig	2007-06-30 18:48:04.000000000 +0000
-+++ process_scan_bsd.cc
-@@ -42,7 +42,13 @@ extern "C" {
+--- src/process_scan_bsd.cc~	2003-11-30 20:04:48.000000000 -0500
++++ src/process_scan_bsd.cc	2008-07-20 21:50:04.000000000 -0400
+@@ -56,7 +56,13 @@ extern "C" {
  #include <sys/param.h>
  #include <sys/sysctl.h> // KERN_PROC_ALL
  #include <sys/types.h>
@@ -16,41 +16,17 @@ $NetBSD: patch-af,v 1.1 2007/06/30 19:18:47 joerg Exp $
  #include <fcntl.h>
  #include <kvm.h>
  #include <unistd.h>
-@@ -78,7 +84,11 @@ public:
- 	virtual void life(process_model *pm);
- 
- 	virtual int cur_pid() { return int(cur_kp_->kp_proc.p_pid); }
-+#ifdef __DragonFly__
-+	virtual int cur_uid() { return int(cur_kp_->kp_eproc.e_ucred.cr_ruid); }
-+#else
- 	virtual int cur_uid() { return int(cur_kp_->kp_eproc.e_pcred.p_ruid); }
-+#endif
- };
- 
- 
-@@ -256,7 +266,11 @@ process_scan_bsd::birth()
- {
- 	process_model *pm = new process_model(int(cur_kp_->kp_proc.p_pid));
- 	// fill in init-time only bits:
-+#ifdef __DragonFly__
-+	pm->set_uid(int(cur_kp_->kp_eproc.e_ucred.cr_ruid));
-+#else
- 	pm->set_uid(int(cur_kp_->kp_eproc.e_pcred.p_ruid));
-+#endif
- 	pm->set_nice(cur_kp_->kp_proc.p_nice);
- 	pm->set_start_time(0);  // xxx: not in bsd?
- 	life(pm);
-@@ -267,8 +281,13 @@ void
- process_scan_bsd::life(process_model *pm)
- {
- 	// OS-specific bits:
-+#ifdef __DragonFly__
-+	pm->set_utime(ticks_to_msec(cur_kp_->kp_eproc.e_uticks));
-+	pm->set_stime(ticks_to_msec(cur_kp_->kp_eproc.e_sticks));
-+#else
- 	pm->set_utime(ticks_to_msec(cur_kp_->kp_proc.p_uticks));
- 	pm->set_stime(ticks_to_msec(cur_kp_->kp_proc.p_sticks));
-+#endif
- 	// xxx: skip p_iticks
- 
- 	int size, resident;
+@@ -226,6 +232,13 @@ int process_scan_bsd::extract_uid() { re
+ int process_scan_bsd::extract_nice() { return int(cur_kp_->kp_proc.p_nice); }
+ int process_scan_bsd::extract_utime_msec() { return time_value_t_to_msec(kur_kp_->times.user_time) + time_value_t_to_msec(cur_kp_->tasks_info.user_time); }
+ int process_scan_bsd::extract_stime_msec() { return time_value_t_to_msec(kur_kp_->times.system _time) + time_value_t_to_msec(cur_kp_->tasks_info.system_time); }
++#elif defined(__DragonFly__)
++char *process_scan_bsd::extract_cmd() { return cur_kp_->kp_proc.p_comm; }
++int process_scan_bsd::extract_pid() { return int(cur_kp_->kp_proc.p_pid); }
++int process_scan_bsd::extract_uid() { return int(cur_kp_->kp_eproc.e_pcred.cr_ruid); }
++int process_scan_bsd::extract_nice() { return int(cur_kp_->kp_proc.p_nice); }
++int process_scan_bsd::extract_utime_msec() { return ticks_to_msec(cur_kp_->kp_eproc.e_uticks); }
++int process_scan_bsd::extract_stime_msec() { return ticks_to_msec(cur_kp_->kp_eproc.e_sticks); }
+ #else
+ #error unknown bsd variant
+ #endif
diff --git a/sysutils/lavaps/patches/patch-ag b/sysutils/lavaps/patches/patch-ag
new file mode 100644
index 00000000000..7402d016fea
--- /dev/null
+++ b/sysutils/lavaps/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2008/07/21 02:55:34 dholland Exp $
+
+--- src/blob.cc~	2008-07-20 22:00:41.000000000 -0400
++++ src/blob.cc	2008-07-20 22:00:56.000000000 -0400
+@@ -503,7 +503,7 @@ void
+ blob::print()
+ {
+ 	ENTRY_TRACE(__FILE__,__LINE__);
+-	cout << O_("blob: ") << (unsigned)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":");
++	cout << O_("blob: ") << (uintptr_t)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":");
+ 	for (int i = 0; i < num_; i++) {
+ 		cout << O_(" ") << y_lows_[i] << O_("-") << y_highs_[i];
+ 	};